Lots of compile fixes

src/main/java/appeng/me/Grid.java

@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import appeng.api.AEApi;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridCache;
 import appeng.api.networking.IGridHost;

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -33,6 +33,7 @@ import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.fml.hooks.BasicEventHooks;
@@ -94,7 +95,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	private final List<TileCraftingMonitorTile> status = new ArrayList<>();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
 	private ICraftingLink myLastLink;
-	private String myName = "";
+	private ITextComponent myName = null;
 	private boolean isDestroyed = false;
 	/**
 	 * crafting job info
@@ -971,7 +972,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	}
 
 	@Override
-	public String getName()
+	public ITextComponent getName()
 	{
 		return this.myName;
 	}
@@ -1258,19 +1259,19 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 	public void updateName()
 	{
-		this.myName = "";
+		this.myName = null;
 		for( final TileCraftingTile te : this.tiles )
 		{
 
 			if( te.hasCustomInventoryName() )
 			{
-				if( this.myName.length() > 0 )
+				if( this.myName != null )
 				{
-					this.myName += ' ' + te.getCustomInventoryName();
+					this.myName.appendText(" ").appendSibling(te.getCustomInventoryName());
 				}
 				else
 				{
-					this.myName = te.getCustomInventoryName();
+					this.myName = te.getCustomInventoryName().shallowCopy();
 				}
 			}
 		}

src/main/java/appeng/me/helpers/AENetworkProxy.java

@@ -24,6 +24,7 @@ import java.util.EnumSet;
 
 import appeng.core.Api;
 import appeng.core.worlddata.WorldData;
+import appeng.me.cache.P2PCache;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.entity.player.PlayerEntity;
@@ -108,13 +109,13 @@ public class AENetworkProxy implements IGridBlock
 		}
 	}
 
-	public void onChunkUnload()
+	public void onChunkUnloaded()
 	{
 		this.isReady = false;
-		this.invalidate();
+		this.remove();
 	}
 
-	public void invalidate()
+	public void remove()
 	{
 		this.isReady = false;
 		if( this.node != null )
@@ -240,23 +241,23 @@ public class AENetworkProxy implements IGridBlock
 		return pg;
 	}
 
-// FIXME	public P2PCache getP2P() throws GridAccessException
-// FIXME	{
-// FIXME		final IGrid grid = this.getGrid();
-// FIXME		if( grid == null )
-// FIXME		{
-// FIXME			throw new GridAccessException();
-// FIXME		}
-// FIXME
-// FIXME		final P2PCache pg = grid.getCache( P2PCache.class );
-// FIXME
-// FIXME		if( pg == null )
-// FIXME		{
-// FIXME			throw new GridAccessException();
-// FIXME		}
-// FIXME
-// FIXME		return pg;
-// FIXME	}
+	public P2PCache getP2P() throws GridAccessException
+	{
+		final IGrid grid = this.getGrid();
+		if( grid == null )
+		{
+			throw new GridAccessException();
+		}
+
+		final P2PCache pg = grid.getCache( P2PCache.class );
+
+		if( pg == null )
+		{
+			throw new GridAccessException();
+		}
+
+		return pg;
+	}
 
 	public ISecurityGrid getSecurity() throws GridAccessException
 	{