More compile things

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -31,10 +31,11 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.registries.ForgeRegistries;
 
-import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IDefinitions;
@@ -43,6 +44,7 @@ import appeng.api.definitions.IParts;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.util.AEColor;
 import appeng.capabilities.Capabilities;
+import appeng.core.Api;
 
 
 public final class P2PTunnelRegistry implements IP2PTunnelRegistry
@@ -257,10 +259,10 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 	}
 
 	@Nonnull
-	private ItemStack getModItem( final String modID, final String name, final int meta )
+	private ItemStack getModItem( final String modID, final String name )
 	{
 
-		final Item item = Item.getByNameOrId( modID + ":" + name );
+		final Item item = ForgeRegistries.ITEMS.getValue( new ResourceLocation( modID + ":" + name ) );
 
 		if( item == null )
 		{

src/main/java/appeng/core/features/registries/WirelessRegistry.java

@@ -30,6 +30,7 @@ import appeng.api.AEApi;
 import appeng.api.features.ILocatable;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWirelessTermRegistry;
+import appeng.core.Api;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.sync.GuiBridge;
 import appeng.util.Platform;

src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java

@@ -15,6 +15,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AEPartLocation;
+import appeng.core.Api;
 import appeng.core.sync.GuiBridge;
 import appeng.util.Platform;
 

src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java

@@ -27,6 +27,7 @@ import appeng.api.storage.ICellInventoryHandler;
 import appeng.api.storage.ISaveProvider;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.core.Api;
 import appeng.items.storage.ItemCreativeStorageCell;
 import appeng.me.storage.CreativeCellInventory;