Fixed Resource Location and asset loading

mod/assemblyline -> assets/al

resources/mcmod.info

@@ -1,20 +0,0 @@
-[
-{
-  "modid" : "AssemblyLine",
-  "name" : "Assembly Line",
-  "version" : "0.2.8",
-  "url" : "http://calclavia.com/universalelectricity/?m=18",
-  "credits" : "",
-  "authors": [
-    "Calclavia",
-	"Darkguardsman",
-	"Briman"
-  ],
-  "description": "A mod that brings conveyor belt transporting systems to Minecraft.",
-  "logoFile" : "/al_logo.png",
-  "updateUrl" : "http://universalelectricity.com/?m=assembly_line",
-  "parent" : "",
-  "screenshots": [
-  ]
-}
-]

src/minecraft/assemblyline/client/gui/GuiAutoCrafting.java

@@ -1,9 +1,9 @@
 package assemblyline.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ContainerWorkbench;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
@@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class GuiAutoCrafting extends GuiContainer
 {
-	private static final ResourceLocation gui_pic = new ResourceLocation(AssemblyLine.GUI_TEXTURES_PATH + "gui_crafting.png");
+	private static final ResourceLocation gui_pic = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_crafting.png");
 
 	public GuiAutoCrafting(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5)
 	{

src/minecraft/assemblyline/client/gui/GuiEncoder.java

@@ -14,9 +14,9 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
@@ -310,7 +310,7 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
-		this.mc.func_110434_K().func_110577_a( new ResourceLocation(AssemblyLine.GUI_TEXTURES_PATH + "gui_encoder.png"));
+		this.mc.func_110434_K().func_110577_a( new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder.png"));
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
 		this.drawTexturedModalRect(containerWidth, containerHeight + ContainerEncoder.Y_OFFSET, 0, 0, this.xSize, this.ySize);

src/minecraft/assemblyline/client/gui/GuiImprinter.java

@@ -1,8 +1,8 @@
 package assemblyline.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -37,7 +37,7 @@ public class GuiImprinter extends GuiContainer
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
-		this.mc.func_110434_K().func_110577_a(new ResourceLocation(AssemblyLine.GUI_TEXTURES_PATH + "gui_imprinter.png"));
+		this.mc.func_110434_K().func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_imprinter.png"));
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		this.containerWidth = (this.width - this.xSize) / 2;
 		this.containerHeight = (this.height - this.ySize) / 2;

src/minecraft/assemblyline/client/render/BlockRenderingHandler.java

@@ -2,7 +2,7 @@ package assemblyline.client.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 
 import org.lwjgl.opengl.GL11;
@@ -34,13 +34,13 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 			GL11.glPushMatrix();
 			GL11.glTranslatef((float) 0.0F, (float) 1.5F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + "belt/frame0.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame0.png"));
 			modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
 			GL11.glPopMatrix();
 		}
 		else if (block.blockID == AssemblyLine.blockRejector.blockID)
 		{
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + "rejector.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png"));
 			GL11.glPushMatrix();
 			GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
@@ -51,7 +51,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		}
 		else if (block.blockID == AssemblyLine.blockManipulator.blockID)
 		{
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + "manipulator1.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png"));
 			GL11.glPushMatrix();
 			GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
@@ -61,7 +61,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		}
 		else if (block.blockID == AssemblyLine.blockArmbot.blockID)
 		{
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + RenderArmbot.TEXTURE));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
 			GL11.glPushMatrix();
 			GL11.glTranslatef(0.4f, 0.8f, 0f);
 			GL11.glScalef(0.7f, 0.7f, 0.7f);
@@ -72,7 +72,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		}
 		else if (block.blockID == AssemblyLine.blockCraneController.blockID)
 		{
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + RenderCraneController.TEXTURE));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneController.TEXTURE));
 			GL11.glPushMatrix();
 			GL11.glTranslatef(0f, 1f, 0f);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
@@ -82,7 +82,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		}
 		else if (block.blockID == AssemblyLine.blockCraneFrame.blockID)
 		{
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + RenderCraneFrame.TEXTURE));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderCraneFrame.TEXTURE));
 			GL11.glPushMatrix();
 			GL11.glTranslatef(0f, 1f, 0f);
 			GL11.glRotatef(180f, 0f, 0f, 1f);

src/minecraft/assemblyline/client/render/RenderArmbot.java

@@ -5,12 +5,12 @@ 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.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -43,7 +43,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
 					}
 				}
 			}
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + TEXTURE);
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
 			func_110628_a(name);
 
 			GL11.glPushMatrix();

src/minecraft/assemblyline/client/render/RenderConveyorBelt.java

@@ -1,8 +1,8 @@
 package assemblyline.client.render;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -11,7 +11,6 @@ import assemblyline.client.model.ModelConveyorBelt;
 import assemblyline.common.AssemblyLine;
 import assemblyline.common.machine.belt.TileEntityConveyorBelt;
 import assemblyline.common.machine.belt.TileEntityConveyorBelt.SlantType;
-import assemblyline.common.machine.crane.TileEntityCraneController;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -53,7 +52,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 
 			if (slantType == SlantType.UP)
 			{
-				ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + "slantedbelt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
 				func_110628_a(name);
 
 				GL11.glTranslatef(0f, 0.8f, -0.8f);
@@ -75,7 +74,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 			}
 			else if (slantType == SlantType.DOWN)
 			{
-				ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + "slantedbelt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
 				func_110628_a(name);
 				GL11.glRotatef(180f, 0f, 1f, 0f);
 				boolean slantAdjust = false;
@@ -96,7 +95,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 			}
 			else
 			{
-				ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + "belt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
 				func_110628_a(name);
 				GL11.glRotatef(180, 0f, 1f, 0f);
 				GL11.glTranslatef(0f, -0.68f, 0f);
@@ -120,7 +119,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 					GL11.glRotatef(90f, 0f, 1f, 0f);
 					break;
 			}
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + "belt/frame" + frame + ".png");
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
 			func_110628_a(name);
 			MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false, true);
 

src/minecraft/assemblyline/client/render/RenderCraneController.java

@@ -6,8 +6,8 @@ import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;
 import static org.lwjgl.opengl.GL11.glRotatef;
 import static org.lwjgl.opengl.GL11.glTranslated;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import assemblyline.client.model.ModelCraneController;
 import assemblyline.common.AssemblyLine;
@@ -25,7 +25,7 @@ public class RenderCraneController extends RenderImprintable
 	{
 		if (tileEntity != null && tileEntity instanceof TileEntityCraneController)
 		{
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + (((TileEntityCraneController) tileEntity).isCraneValid() ? TEXTURE_VALID : TEXTURE));
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY+(((TileEntityCraneController) tileEntity).isCraneValid() ? TEXTURE_VALID : TEXTURE));
 			func_110628_a(name);
 			ForgeDirection front = ForgeDirection.getOrientation(tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
 			ForgeDirection right = CraneHelper.rotateClockwise(front);

src/minecraft/assemblyline/client/render/RenderCraneFrame.java

@@ -7,8 +7,8 @@ import static org.lwjgl.opengl.GL11.glPushMatrix;
 import static org.lwjgl.opengl.GL11.glRotatef;
 import static org.lwjgl.opengl.GL11.glTranslated;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import assemblyline.client.model.ModelCraneRail;
 import assemblyline.common.AssemblyLine;
@@ -42,7 +42,7 @@ public class RenderCraneFrame extends TileEntitySpecialRenderer
 			boolean renderFoot = tileEntity.worldObj.isBlockSolidOnSide(tX, tY - 1, tZ, ForgeDirection.UP);
 			if ((renderLeft && renderRight) || (renderFront && renderBack))
 				renderFoot = false;
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":" + TEXTURE);
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
 			func_110628_a(name);
 			glPushMatrix();
 			glTranslated(x + 0.5, y + 1.5, z + 0.5);

src/minecraft/assemblyline/client/render/RenderManipulator.java

@@ -1,7 +1,7 @@
 package assemblyline.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -23,12 +23,12 @@ public class RenderManipulator extends RenderImprintable
 
 		if (tileEntity.isOutput())
 		{
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":manipulator1.png"); 
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png"); 
 			func_110628_a(name);
 		}
 		else
 		{
-			ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":manipulator2.png"); 
+			ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator2.png"); 
 			func_110628_a(name);
 		}
 

src/minecraft/assemblyline/client/render/RenderRejector.java

@@ -1,7 +1,7 @@
 package assemblyline.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -23,7 +23,7 @@ public class RenderRejector extends RenderImprintable
 		{
 			pos = 8;
 		}
-		ResourceLocation name = new ResourceLocation(AssemblyLine.MODEL_TEXTURES_PATH + ":rejector.png"); 
+		ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png"); 
 		func_110628_a(name);
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);

src/minecraft/assemblyline/common/AssemblyLine.java

@@ -72,6 +72,8 @@ public class AssemblyLine
 	public static final String MOD_ID = "AssemblyLine";
 	public static final String MOD_NAME = "Assembly Line";
 	public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
+	public static final String DOMAIN = "al";
+	public static final String PREFIX = DOMAIN + ":";
 
 	// @NetworkMod
 	public static final String CHANNEL = "AssemblyLine";
@@ -85,17 +87,18 @@ public class AssemblyLine
 	@Metadata(AssemblyLine.MOD_ID)
 	public static ModMetadata meta;
 
-	public static final String DIRECTORY_NO_SLASH = "mods/assemblyline/";
+	public static final String DIRECTORY_NO_SLASH = "assets/al/";
 	public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
-	public static final String SOUND_PATH = "audio/";
-	public static final String TEXTURE_PATHS = DIRECTORY + "textures/";
-	public static final String MODEL_TEXTURES_PATH = TEXTURE_PATHS + "models/";
-	public static final String BLOCK_TEXTURES_PATH = TEXTURE_PATHS + "blocks/";
-	public static final String ITEM_TEXTURES_PATH = TEXTURE_PATHS + "items/";
-	public static final String GUI_TEXTURES_PATH = TEXTURE_PATHS + "gui/";
 	public static final String LANGUAGE_PATH = DIRECTORY + "languages/";
+	public static final String SOUND_PATH = DIRECTORY + "audio/";
 
-	public static final String TEXTURE_NAME_PREFIX = "assemblyline:";
+	public static final String TEXTURE_DIRECTORY = "textures/";
+	public static final String BLOCK_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
+	public static final String ITEM_DIRECTORY = TEXTURE_DIRECTORY + "items/";
+	public static final String MODEL_DIRECTORY = TEXTURE_DIRECTORY + "models/";
+	public static final String GUI_DIRECTORY = TEXTURE_DIRECTORY + "gui/";
+
+	//public static final String TEXTURE_NAME_PREFIX = "assemblyline:";
 
 	private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "nl_NL", "fr_FR", "de_DE" };
 

src/minecraft/assemblyline/common/imprinter/BlockImprinter.java

@@ -33,9 +33,9 @@ public class BlockImprinter extends BlockAssembly
 	@Override
 	public void registerIcons(IconRegister iconReg)
 	{
-		this.imprinter_side = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprinter_side");
-		this.imprinter_top = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprinter_top");
-		this.imprinter_bottom = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprinter_bottom");
+		this.imprinter_side = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_side");
+		this.imprinter_top = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_top");
+		this.imprinter_bottom = iconReg.registerIcon(AssemblyLine.PREFIX + "imprinter_bottom");
 	}
 
 	@Override

src/minecraft/assemblyline/common/imprinter/ItemImprinter.java

@@ -31,7 +31,7 @@ public class ItemImprinter extends Item
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprint");
+		this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "imprint");
 	}
 
 	@Override

src/minecraft/assemblyline/common/imprinter/prefab/TileEntityFilterable.java

@@ -5,8 +5,6 @@ import java.util.ArrayList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.network.IPacketReceiver;
 import universalelectricity.prefab.network.PacketManager;

src/minecraft/assemblyline/common/machine/BlockAssembly.java

@@ -28,7 +28,7 @@ public class BlockAssembly extends BlockMachine
 	@Override
 	public void registerIcons(IconRegister iconReg)
 	{
-		this.machine_icon = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "machine");
+		this.machine_icon = iconReg.registerIcon(AssemblyLine.PREFIX + "machine");
 	}
 
 	@Override

src/minecraft/assemblyline/common/machine/BlockCrate.java

@@ -34,7 +34,7 @@ public class BlockCrate extends BlockAssembly
 	@Override
 	public void registerIcons(IconRegister iconReg)
 	{
-		this.crate_icon = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "crate");
+		this.crate_icon = iconReg.registerIcon(AssemblyLine.PREFIX + "crate");
 	}
 
 	@Override

src/minecraft/assemblyline/common/machine/BlockTurntable.java

@@ -34,7 +34,7 @@ public class BlockTurntable extends BlockAssembly
 	public void registerIcons(IconRegister iconReg)
 	{
 		super.registerIcons(iconReg);
-		this.top = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "turntable");
+		this.top = iconReg.registerIcon(AssemblyLine.PREFIX + "turntable");
 	}
 
 	@Override

src/minecraft/assemblyline/common/machine/InvInteractionHelper.java

@@ -136,21 +136,6 @@ public class InvInteractionHelper
 				}
 
 			}
-			else if (tileEntity instanceof net.minecraftforge.common.ISidedInventory)
-			{
-				net.minecraftforge.common.ISidedInventory inventory = (net.minecraftforge.common.ISidedInventory) tileEntity;
-
-				int startIndex = inventory.getStartInventorySide(direction);
-
-				for (int i = startIndex; i < startIndex + inventory.getSizeInventorySide(direction); i++)
-				{
-					itemStack = this.addStackToInventory(i, inventory, itemStack);
-					if (itemStack == null)
-					{
-						return null;
-					}
-				}
-			}
 			else if (tileEntity instanceof IInventory)
 			{
 				IInventory inventory = (IInventory) tileEntity;
@@ -295,24 +280,6 @@ public class InvInteractionHelper
 					}
 				}
 			}
-			else if (tileEntity instanceof net.minecraftforge.common.ISidedInventory)
-			{
-				net.minecraftforge.common.ISidedInventory inventory = (net.minecraftforge.common.ISidedInventory) tileEntity;
-
-				int startIndex = inventory.getStartInventorySide(direction);
-
-				for (int i = startIndex; i < startIndex + inventory.getSizeInventorySide(direction); i++)
-				{
-					//TODO fix this to prevent item lose just in case it does cause some issues
-					ItemStack itemStack = this.removeStackFromInventory(i, inventory, ammount);
-
-					if (itemStack != null)
-					{
-						returnStack = itemStack;
-						break;
-					}
-				}
-			}
 			else if (tileEntity instanceof IInventory)
 			{
 				IInventory inventory = (IInventory) tileEntity;

src/minecraft/assemblyline/common/machine/TileEntityAssembly.java

@@ -14,7 +14,6 @@ import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.block.IConductor;
-import universalelectricity.core.electricity.ElectricityPack;
 import universalelectricity.core.grid.IElectricityNetwork;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.network.IPacketReceiver;

src/minecraft/assemblyline/common/machine/TileEntityRejector.java

@@ -5,7 +5,6 @@ import java.util.List;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;

src/minecraft/assemblyline/common/machine/crane/BlockCraneFrame.java

@@ -7,7 +7,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.UniversalElectricity;
 import assemblyline.client.render.BlockRenderingHandler;
-import assemblyline.common.TabAssemblyLine;
 import assemblyline.common.machine.BlockAssembly;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/minecraft/assemblyline/common/machine/detector/BlockDetector.java

@@ -67,8 +67,8 @@ public class BlockDetector extends BlockImprintable
 	public void registerIcons(IconRegister iconReg)
 	{
 		super.registerIcons(iconReg);
-		this.eye_green = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_green");
-		this.eye_red = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "detector_red");
+		this.eye_green = iconReg.registerIcon(AssemblyLine.PREFIX + "detector_green");
+		this.eye_red = iconReg.registerIcon(AssemblyLine.PREFIX + "detector_red");
 	}
 
 	@Override

src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java

@@ -9,7 +9,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import assemblyline.common.AssemblyLine;
 import assemblyline.common.CommonProxy;
-import assemblyline.common.TabAssemblyLine;
 import assemblyline.common.machine.BlockAssembly;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -28,9 +27,9 @@ public class BlockEncoder extends BlockAssembly
 	@Override
 	public void registerIcons(IconRegister iconReg)
 	{
-		this.encoder_side = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_side");
-		this.encoder_top = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_top");
-		this.encoder_bottom = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX+"encoder_bottom");
+		this.encoder_side = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_side");
+		this.encoder_top = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_top");
+		this.encoder_bottom = iconReg.registerIcon(AssemblyLine.PREFIX+"encoder_bottom");
 	}
 	
 	/**

src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java

@@ -28,7 +28,7 @@ public class ItemDisk extends Item
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "disk");
+		this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "disk");
 	}
 
 	@Override

src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java

@@ -3,12 +3,12 @@ package assemblyline.common.machine.encoder;
 import java.util.ArrayList;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.common.ISidedInventory;
 import universalelectricity.prefab.network.IPacketReceiver;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
 import assemblyline.common.armbot.command.Command;
@@ -125,18 +125,6 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece
 		return this.watcher;
 	}
 
-	@Override
-	public int getStartInventorySide(ForgeDirection side)
-	{
-		return 0;
-	}
-
-	@Override
-	public int getSizeInventorySide(ForgeDirection side)
-	{
-		return (side == ForgeDirection.UP) ? 1 : 0;
-	}
-
 	@Override
 	public void writeToNBT(NBTTagCompound nbt)
 	{
@@ -215,4 +203,25 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece
 		return false;
 	}
 
+	@Override
+	public int[] getAccessibleSlotsFromSide(int var1)
+	{
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	{
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	{
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }