23 errors

src/main/java/net/minecraft/src/EntityPlayerMP.java

@@ -920,10 +920,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting
      */
     public String getPlayerIP()
     {
-        String var1 = this.playerNetServerHandler.netManager.getSocketAddress().toString();
-        var1 = var1.substring(var1.indexOf("/") + 1);
-        var1 = var1.substring(0, var1.indexOf(":"));
-        return var1;
+        return null;
     }
 
     public void updateClientInfo(Packet204ClientInfo par1Packet204ClientInfo)

src/main/java/net/minecraft/src/Minecraft.java

@@ -7,7 +7,7 @@ import net.lax1dude.eaglercraft.GuiScreenEditProfile;
 import net.lax1dude.eaglercraft.GuiScreenSingleplayerConnecting;
 import net.lax1dude.eaglercraft.GuiScreenSingleplayerLoading;
 import net.lax1dude.eaglercraft.GuiScreenVSyncWarning;
-import net.lax1dude.eaglercraft.IntegratedServer;
+//import net.lax1dude.eaglercraft.IntegratedServer;
 import net.lax1dude.eaglercraft.IntegratedServerLAN;
 import net.lax1dude.eaglercraft.WorkerNetworkManager;
 import net.lax1dude.eaglercraft.adapter.Tessellator;
@@ -2293,6 +2293,10 @@ public class Minecraft implements IPlayerUsage
         return this.gameSettings.snooperEnabled;
     }
 
+    public void scheduleTexturePackRefresh() {
+        this.refreshTexturePacksScheduled = true;
+    }
+
     /**
      * Set the current ServerData instance.
      */
@@ -2301,6 +2305,10 @@ public class Minecraft implements IPlayerUsage
         this.currentServerData = par1ServerData;
     }
 
+    public ServerData getServerData() {
+        return this.currentServerData;
+    }
+
     public boolean isIntegratedServerRunning()
     {
         return this.integratedServerIsRunning;

src/main/java/net/minecraft/src/NetClientHandler.java

@@ -15,6 +15,7 @@ import java.util.Random;
 
 import net.lax1dude.eaglercraft.WebsocketNetworkManager;
 import net.minecraft.client.ClientBrandRetriever;
+//import net.lax1dude.eaglercraft.IntegratedServer;
 import org.lwjgl.input.Keyboard;
 
 public class NetClientHandler extends NetHandler
@@ -79,7 +80,7 @@ public class NetClientHandler extends NetHandler
 
 	public NetClientHandler(Minecraft par1Minecraft, String channel) throws IOException {
 		this.mc = par1Minecraft;
-		this.netManager = IntegratedServer.openConnection(channel, this);
+		//this.netManager = IntegratedServer.openConnection(channel, this); // FIX THIS
 	}
 
 

src/main/java/net/minecraft/src/ServerConfigurationManager.java

@@ -68,10 +68,10 @@ public abstract class ServerConfigurationManager
         par2EntityPlayerMP.theItemInWorldManager.setWorld((WorldServer)par2EntityPlayerMP.worldObj);
         String var4 = "local";
 
-        if (par1INetworkManager.getSocketAddress() != null)
+        /*if (par1INetworkManager.getSocketAddress() != null)
         {
             var4 = par1INetworkManager.getSocketAddress().toString();
-        }
+        }*/
 
         this.mcServer.getLogAgent().logInfo(par2EntityPlayerMP.getCommandSenderName() + "[" + var4 + "] logged in with entity id " + par2EntityPlayerMP.entityId + " at (" + par2EntityPlayerMP.posX + ", " + par2EntityPlayerMP.posY + ", " + par2EntityPlayerMP.posZ + ")");
         WorldServer var5 = this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension);

src/main/java/net/minecraft/src/ServerData.java

@@ -67,6 +67,14 @@ public class ServerData
         return var1;
     }
 
+    public boolean getAcceptsTextures() {
+        return this.acceptsTextures;
+    }
+
+    public boolean func_78840_c() {
+        return this.field_78842_g;
+    }
+
     public void setAcceptsTextures(boolean par1)
     {
         this.acceptsTextures = par1;

src/main/java/net/minecraft/src/TextureStitched.java

@@ -36,7 +36,7 @@ public class TextureStitched implements Icon {
 	protected int tickCounter = 0;
 
 	public static TextureStitched makeTextureStitched(String par0Str) {
-		return (TextureStitched) ("clock".equals(par0Str) ? new TextureClock() : ("compass".equals(par0Str) ? new TextureCompass() : new TextureStitched(par0Str)));
+		return (TextureStitched) ("clock".equals(par0Str) ? new TextureClock("clock") : ("compass".equals(par0Str) ? new TextureCompass("compass") : new TextureStitched(par0Str)));
 	}
 
 	protected TextureStitched(String par1) {