Removed all pipe textures, we only need white

src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java

@@ -14,7 +14,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.block.BlockRI;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.IRotatable;
 import cpw.mods.fml.relauncher.Side;
@@ -42,7 +42,7 @@ public class BlockTurntable extends BlockRI
 	public void registerIcons(IconRegister iconReg)
 	{
 		super.registerIcons(iconReg);
-		this.top = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "turntable");
+		this.top = iconReg.registerIcon(Mechanical.PREFIX + "turntable");
 	}
 
 	@Override

src/main/java/resonantinduction/core/debug/BlockDebug.java

@@ -14,7 +14,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.prefab.block.BlockRI;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
@@ -41,7 +41,7 @@ public class BlockDebug extends BlockRI implements IExtraBlockInfo
 		{
 			if (block.enabled)
 			{
-				block.icon = iconReg.registerIcon(ResonantInductionTransport.PREFIX + block.getTextureName());
+				block.icon = iconReg.registerIcon(Mechanical.PREFIX + block.getTextureName());
 			}
 		}
 	}

src/main/java/resonantinduction/core/prefab/block/BlockRI.java

@@ -1,7 +1,6 @@
 package resonantinduction.core.prefab.block;
 
 import net.minecraft.block.material.Material;
-
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.Reference;
 import resonantinduction.core.ResonantInductionTabs;

src/main/java/resonantinduction/core/resource/item/ItemParts.java

@@ -2,7 +2,6 @@ package resonantinduction.core.resource.item;
 
 import java.util.List;
 
-import calclavia.lib.content.IExtraInfo.IExtraItemInfo;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
@@ -12,6 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.item.ItemBase;
+import calclavia.lib.content.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java

@@ -110,7 +110,7 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo
 	@Override
 	public int getRenderType()
 	{
-		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.ID;
 	}
 
 	@Override

src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java

@@ -15,11 +15,11 @@ import resonantinduction.electrical.armbot.command.TaskGOTO;
 import resonantinduction.electrical.armbot.command.TaskGrabItem;
 import resonantinduction.electrical.armbot.command.TaskReturn;
 import resonantinduction.electrical.armbot.command.TaskRotateTo;
+import resonantinduction.mechanical.Mechanical;
 import resonantinduction.old.api.IArmbot;
 import resonantinduction.old.api.coding.IProgram;
 import resonantinduction.old.api.coding.ProgramHelper;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.ResonantInductionTransport;
 import resonantinduction.old.transport.TileEntityAssembly;
 import resonantinduction.old.transport.encoder.ItemDisk;
 import universalelectricity.api.vector.Vector2;
@@ -308,11 +308,11 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
 	{
 		if (this.grabbedObject instanceof ItemStack)
 		{
-			PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "armbotItem", true, ((ItemStack) this.grabbedObject).writeToNBT(new NBTTagCompound())), worldObj, new Vector3(this), 64);
+			PacketHandler.sendPacketToClients(Mechanical.getTilePacket().getPacket(this, "armbotItem", true, ((ItemStack) this.grabbedObject).writeToNBT(new NBTTagCompound())), worldObj, new Vector3(this), 64);
 		}
 		else
 		{
-			PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "armbotItem", false), worldObj, new Vector3(this), 64);
+			PacketHandler.sendPacketToClients(Mechanical.getTilePacket().getPacket(this, "armbotItem", false), worldObj, new Vector3(this), 64);
 		}
 	}
 

src/main/java/resonantinduction/electrical/tesla/TileTesla.java

@@ -33,7 +33,6 @@ import calclavia.lib.network.IPacketSender;
 import calclavia.lib.prefab.tile.TileElectrical;
 import calclavia.lib.render.EnumColor;
 import calclavia.lib.utility.LanguageUtility;
-import codechicken.lib.colour.ColourRGBA;
 
 import com.google.common.io.ByteArrayDataInput;
 

src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java

@@ -335,7 +335,7 @@ public class BlockConveyorBelt extends BlockRI
 	@Override
 	public int getRenderType()
 	{
-		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.ID;
 	}
 
 	@Override

src/main/java/resonantinduction/mechanical/belt/RenderConveyorBelt.java

@@ -7,7 +7,6 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
-import resonantinduction.mechanical.belt.TileConveyorBelt;
 import resonantinduction.mechanical.belt.TileConveyorBelt.SlantType;
 import resonantinduction.old.client.model.ModelAngledBelt;
 import resonantinduction.old.client.model.ModelConveyorBelt;

src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java

@@ -15,7 +15,6 @@ import resonantinduction.old.api.IBelt;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import resonantinduction.old.transport.TileEntityAssembly;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.network.PacketHandler;
 import calclavia.lib.prefab.tile.IRotatable;
 
 import com.google.common.io.ByteArrayDataInput;

src/main/java/resonantinduction/mechanical/fluid/BlockReleaseValve.java

@@ -1,20 +1,11 @@
 package resonantinduction.mechanical.fluid;
 
 import java.util.Random;
-import java.util.Set;
 
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockRI;
-import resonantinduction.old.core.recipe.RecipeLoader;
-
-import com.builtbroken.common.Pair;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/mechanical/fluid/FluidCraftingHandler.java

@@ -10,8 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.mechanical.fluid.network.IFluidRecipeCrafter;
 import resonantinduction.mechanical.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
+import resonantinduction.mechanical.fluid.network.IFluidRecipeCrafter;
 import calclavia.lib.utility.FluidHelper;
 
 import com.builtbroken.common.Pair;

src/main/java/resonantinduction/mechanical/fluid/pipes/BlockPipe.java

@@ -2,7 +2,6 @@ package resonantinduction.mechanical.fluid.pipes;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,16 +12,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
-import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockRI;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
-
-import com.builtbroken.common.Pair;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.lib.helpers.ColorCode;

src/main/java/resonantinduction/mechanical/fluid/pipes/FluidPartsMaterial.java

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.mechanical.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.mechanical.fluid.prefab.TileFluidNetworkTile;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import dark.lib.helpers.ColorCode;
 
@@ -160,9 +160,9 @@ public enum FluidPartsMaterial
 		int meta = world.getBlockMetadata(x, y, z);
 		TileEntity ent = world.getBlockTileEntity(x, y, z);
 		meta *= spacing;
-		if (ent instanceof TileEntityFluidNetworkTile)
+		if (ent instanceof TileFluidNetworkTile)
 		{
-			meta += ((TileEntityFluidNetworkTile) ent).getSubID();
+			meta += ((TileFluidNetworkTile) ent).getSubID();
 		}
 		return meta;
 	}

src/main/java/resonantinduction/mechanical/fluid/pipes/ItemBlockPipe.java

@@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.mechanical.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.mechanical.fluid.prefab.TileFluidNetworkTile;
 import resonantinduction.mechanical.fluid.tank.TileTank;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import universalelectricity.api.vector.Vector3;
@@ -107,12 +107,12 @@ public class ItemBlockPipe extends ItemBlock
 		if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, (stack.getItemDamage() / FluidPartsMaterial.spacing)))
 		{
 			TileEntity tile = world.getBlockTileEntity(x, y, z);
-			if (tile instanceof TileEntityFluidNetworkTile)
+			if (tile instanceof TileFluidNetworkTile)
 			{
-				((TileEntityFluidNetworkTile) tile).setSubID(stack.getItemDamage());
+				((TileFluidNetworkTile) tile).setSubID(stack.getItemDamage());
 				if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid"))
 				{
-					((TileEntityFluidNetworkTile) tile).fill(ForgeDirection.UNKNOWN, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true);
+					((TileFluidNetworkTile) tile).fill(ForgeDirection.UNKNOWN, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true);
 				}
 			}
 			return true;

src/main/java/resonantinduction/mechanical/fluid/pipes/TileEntityPipe.java

@@ -8,14 +8,14 @@ import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.tilenetwork.ITileConnector;
 import resonantinduction.core.tilenetwork.ITileNetwork;
 import resonantinduction.mechanical.fluid.network.NetworkPipes;
-import resonantinduction.mechanical.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.mechanical.fluid.prefab.TileFluidNetworkTile;
 import resonantinduction.old.api.fluid.INetworkPipe;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 import dark.lib.helpers.ColorCode;
 import dark.lib.helpers.ColorCode.IColorCoded;
 
-public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColorCoded, INetworkPipe
+public class TileEntityPipe extends TileFluidNetworkTile implements IColorCoded, INetworkPipe
 {
 	/** gets the current color mark of the pipe */
 	@Override

src/main/java/resonantinduction/mechanical/fluid/prefab/TileFluidNetworkTile.java

@@ -20,6 +20,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
 
 import org.bouncycastle.util.Arrays;
 
+import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.network.ISimplePacketReceiver;
 import resonantinduction.core.tilenetwork.INetworkPart;
 import resonantinduction.core.tilenetwork.ITileNetwork;
@@ -27,7 +28,6 @@ import resonantinduction.mechanical.fluid.network.NetworkFluidTiles;
 import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.old.api.fluid.FluidMasterList;
 import resonantinduction.old.api.fluid.INetworkFluidPart;
-import resonantinduction.old.transport.ResonantInductionTransport;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
 
@@ -37,7 +37,7 @@ import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
+public abstract class TileFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
 {
 	private int updateTick = 1;
 	public static int refreshRate = 10;
@@ -53,12 +53,12 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
 
 	protected NetworkFluidTiles network;
 
-	public TileEntityFluidNetworkTile()
+	public TileFluidNetworkTile()
 	{
 		this(1);
 	}
 
-	public TileEntityFluidNetworkTile(int tankCap)
+	public TileFluidNetworkTile(int tankCap)
 	{
 		if (tankCap <= 0)
 		{
@@ -90,7 +90,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
 				this.updateTick = this.worldObj.rand.nextInt(5) * 40 + 20;
 				this.refresh();
 			}
-			if (ticks % TileEntityFluidNetworkTile.refreshRate == 0)
+			if (ticks % TileFluidNetworkTile.refreshRate == 0)
 			{
 				if (this.getTank().getFluid() == null && this.prevStack == null)
 				{
@@ -433,7 +433,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
 		data[6] = this.renderConnection[5];
 		data[7] = this.getTank().getCapacity();
 		data[8] = this.getTank().writeToNBT(new NBTTagCompound());
-		return ResonantInductionTransport.getTilePacket().getPacket(this, "DescriptionPacket", data);
+		return ResonantInduction.PACKET_TILE.getPacket(this, "DescriptionPacket", data);
 	}
 
 	public void sendRenderUpdate()
@@ -446,14 +446,14 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
 		data[4] = this.renderConnection[3];
 		data[5] = this.renderConnection[4];
 		data[6] = this.renderConnection[5];
-		PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "RenderPacket", data));
+		PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, "RenderPacket", data));
 	}
 
 	public void sendTankUpdate(int index)
 	{
 		if (this.getTank() != null && index == 0)
 		{
-			PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60);
+			PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60);
 		}
 	}
 

src/main/java/resonantinduction/mechanical/fluid/tank/BlockTank.java

@@ -2,28 +2,21 @@ package resonantinduction.mechanical.fluid.tank;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
-import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import net.minecraftforge.common.Configuration;
-import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockRI;
 import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.mechanical.fluid.pipes.ItemBlockPipe;
 import resonantinduction.mechanical.fluid.pipes.TileEntityPipe;
-import resonantinduction.old.client.render.BlockRenderHelper;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 import calclavia.lib.utility.HelperMethods;
-
-import com.builtbroken.common.Pair;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -55,7 +48,7 @@ public class BlockTank extends BlockRI
 	@SideOnly(Side.CLIENT)
 	public int getRenderType()
 	{
-		return BlockRenderHelper.renderID;
+		return MechanicalBlockRenderingHandler.ID;
 	}
 
 	@Override
@@ -112,6 +105,7 @@ public class BlockTank extends BlockRI
 		for (FluidPartsMaterial data : FluidPartsMaterial.values())
 		{
 			par3List.add(new ItemStack(this, 1, data.ordinal() * FluidPartsMaterial.spacing));
+			break;
 		}
 	}
 

src/main/java/resonantinduction/mechanical/fluid/tank/RenderTank.java

@@ -8,6 +8,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
+import resonantinduction.core.Reference;
 import resonantinduction.core.render.RenderFluidHelper;
 import resonantinduction.old.client.model.ModelTankSide;
 import cpw.mods.fml.relauncher.Side;
@@ -17,14 +18,9 @@ import dark.lib.helpers.ColorCode;
 @SideOnly(Side.CLIENT)
 public class RenderTank extends TileEntitySpecialRenderer
 {
-	private ModelTankSide model;
+	public static final ModelTankSide MODEL = new ModelTankSide();
 
 	// TODO https://www.opengl.org/sdk/docs/man/xhtml/glDepthMask.xml <- fix z fighting
-	public RenderTank()
-	{
-		model = new ModelTankSide();
-	}
-
 	@Override
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8)
 	{
@@ -103,16 +99,17 @@ public class RenderTank extends TileEntitySpecialRenderer
 						break;
 				}
 				bindTexture(this.getTexture(tileEntity.getBlockType().blockID, tileEntity.getBlockMetadata()));
-				model.render(0.0625F, left, right, top, bot);
+				MODEL.render(0.0625F, left, right, top, bot);
 				GL11.glPopMatrix();
 			}
 		}
 
 	}
 
-	public ResourceLocation getTexture(int block, int meta)
+	public static ResourceLocation getTexture(int block, int meta)
 	{
 		String texture = "";
+		
 		if (ColorCode.get(meta) == ColorCode.RED)
 		{
 			texture = "textures/blocks/obsidian.png";
@@ -121,6 +118,7 @@ public class RenderTank extends TileEntitySpecialRenderer
 		{
 			texture = "textures/blocks/iron_block.png";
 		}
+		
 		return new ResourceLocation(texture);
 	}
 }

src/main/java/resonantinduction/mechanical/fluid/tank/TileTank.java

@@ -5,10 +5,10 @@ import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.tilenetwork.INetworkPart;
 import resonantinduction.core.tilenetwork.ITileNetwork;
 import resonantinduction.mechanical.fluid.network.NetworkFluidContainers;
-import resonantinduction.mechanical.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.mechanical.fluid.prefab.TileFluidNetworkTile;
 import resonantinduction.old.api.fluid.INetworkFluidPart;
 
-public class TileTank extends TileEntityFluidNetworkTile
+public class TileTank extends TileFluidNetworkTile
 {
 	public TileTank()
 	{

src/main/java/resonantinduction/mechanical/render/MechanicalBlockRenderingHandler.java

@@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
 import resonantinduction.mechanical.Mechanical;
+import resonantinduction.mechanical.fluid.tank.RenderTank;
 import resonantinduction.old.client.model.ModelConveyorBelt;
 import resonantinduction.old.client.model.ModelCrusher;
 import resonantinduction.old.client.model.ModelGrinder;
@@ -26,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHandler
 {
 	public static MechanicalBlockRenderingHandler INSTANCE = new MechanicalBlockRenderingHandler();
-	public static final int BLOCK_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+	public static final int ID = RenderingRegistry.getNextAvailableRenderId();
 	private ModelConveyorBelt modelConveyorBelt = new ModelConveyorBelt();
 	private ModelRejectorPiston modelEjector = new ModelRejectorPiston();
 	private ModelManipulator modelInjector = new ModelManipulator();
@@ -45,6 +46,15 @@ public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHan
 			modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
 			GL11.glPopMatrix();
 		}
+		else if (block == Mechanical.blockTank)
+		{
+			GL11.glPushMatrix();
+			GL11.glTranslatef(0.0F, 1.3F, 0.0F);
+			GL11.glRotatef(180f, 0f, 0f, 1f);
+			FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderTank.getTexture(0, 0));
+			RenderTank.MODEL.render(0.0625F, false, false, false, false);
+			GL11.glPopMatrix();
+		}
 		else if (RecipeLoader.blockRejector != null && block.blockID == RecipeLoader.blockRejector.blockID)
 		{
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "rejector.png"));
@@ -66,17 +76,21 @@ public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHan
 			modelInjector.render(0.0625F, true, 0);
 			GL11.glPopMatrix();
 		}
-		/*else if (RecipeLoader.blockArmbot != null && block.blockID == RecipeLoader.blockArmbot.blockID)
-		{
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
-			GL11.glPushMatrix();
-			GL11.glTranslatef(0.4f, 0.8f, 0f);
-			GL11.glScalef(0.7f, 0.7f, 0.7f);
-			GL11.glRotatef(180f, 0f, 0f, 1f);
-			GL11.glRotatef(-90f, 0f, 1f, 0f);
-			RenderArmbot.MODEL.render(0.0625F, 0, 0);
-			GL11.glPopMatrix();
-		}*/
+		/*
+		 * else if (RecipeLoader.blockArmbot != null && block.blockID ==
+		 * RecipeLoader.blockArmbot.blockID)
+		 * {
+		 * FMLClientHandler.instance().getClient().renderEngine.bindTexture(new
+		 * ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
+		 * GL11.glPushMatrix();
+		 * GL11.glTranslatef(0.4f, 0.8f, 0f);
+		 * GL11.glScalef(0.7f, 0.7f, 0.7f);
+		 * GL11.glRotatef(180f, 0f, 0f, 1f);
+		 * GL11.glRotatef(-90f, 0f, 1f, 0f);
+		 * RenderArmbot.MODEL.render(0.0625F, 0, 0);
+		 * GL11.glPopMatrix();
+		 * }
+		 */
 		else if (RecipeLoader.processorMachine != null && block.blockID == RecipeLoader.processorMachine.blockID && metadata == 0)
 		{
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "CrusherBlock.png"));
@@ -99,14 +113,18 @@ public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHan
 			this.grinderModel.renderRotation(0.0625f, 0);
 			GL11.glPopMatrix();
 		}
-		/*else if (RecipeLoader.blockSteamGen != null && block.blockID == RecipeLoader.blockSteamGen.blockID)
-		{
-			ModelMachine model = RenderSteamGen.getModel(metadata);
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture(metadata));
-			GL11.glTranslatef(0.0F, 1.1F, 0.0F);
-			GL11.glRotatef(180f, 0f, 0f, 1f);
-			model.render(0.0625F);
-		}*/
+		/*
+		 * else if (RecipeLoader.blockSteamGen != null && block.blockID ==
+		 * RecipeLoader.blockSteamGen.blockID)
+		 * {
+		 * ModelMachine model = RenderSteamGen.getModel(metadata);
+		 * FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture
+		 * (metadata));
+		 * GL11.glTranslatef(0.0F, 1.1F, 0.0F);
+		 * GL11.glRotatef(180f, 0f, 0f, 1f);
+		 * model.render(0.0625F);
+		 * }
+		 */
 	}
 
 	@Override
@@ -128,6 +146,6 @@ public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHan
 	@Override
 	public int getRenderId()
 	{
-		return BLOCK_RENDER_ID;
+		return ID;
 	}
 }

src/main/java/resonantinduction/old/client/ClientProxy.java

@@ -8,18 +8,18 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import resonantinduction.mechanical.fluid.TileEntityReleaseValve;
-import resonantinduction.mechanical.fluid.TileKitchenSink;
 import resonantinduction.mechanical.fluid.pipes.TileEntityPipe;
 import resonantinduction.mechanical.fluid.pump.TileEntityConstructionPump;
 import resonantinduction.mechanical.fluid.pump.TileEntityStarterPump;
+import resonantinduction.mechanical.fluid.tank.RenderTank;
 import resonantinduction.mechanical.fluid.tank.TileTank;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.gui.GuiEncoderCoder;
 import resonantinduction.old.client.gui.GuiEncoderHelp;
 import resonantinduction.old.client.gui.GuiEncoderInventory;
 import resonantinduction.old.client.gui.GuiImprinter;
 import resonantinduction.old.client.gui.GuiProcessor;
 import resonantinduction.old.client.render.BlockRenderHelper;
-import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.ItemPipeRenderer;
 import resonantinduction.old.client.render.ItemRenderFluidCan;
 import resonantinduction.old.client.render.ItemTankRenderer;
@@ -28,7 +28,6 @@ import resonantinduction.old.client.render.RenderPipe;
 import resonantinduction.old.client.render.RenderPump;
 import resonantinduction.old.client.render.RenderReleaseValve;
 import resonantinduction.old.client.render.RenderSink;
-import resonantinduction.old.client.render.RenderTank;
 import resonantinduction.old.client.render.RenderTestCar;
 import resonantinduction.old.client.render.RenderTurkey;
 import resonantinduction.old.core.misc.EntityFarmEgg;

src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import resonantinduction.core.prefab.tile.TileEntityMachine;
 import resonantinduction.mechanical.CommonProxy;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import dark.lib.prefab.invgui.ContainerFake;
 import dark.lib.prefab.invgui.GuiMachineContainer;
 
@@ -13,7 +13,7 @@ public class GuiEncoderBase extends GuiMachineContainer
 	//
 	public GuiEncoderBase(InventoryPlayer player, TileEntityMachine tileEntity, Container container)
 	{
-		super(ResonantInductionTransport.instance, container, player, tileEntity);
+		super(Mechanical.instance, container, player, tileEntity);
 		this.guiID = CommonProxy.GUI_ENCODER;
 		this.guiID2 = CommonProxy.GUI_ENCODER_CODE;
 		this.guiID3 = CommonProxy.GUI_ENCODER_HELP;

src/main/java/resonantinduction/old/client/render/ItemRenderFluidCan.java

@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
-import resonantinduction.mechanical.fluid.ItemFluidCan;
+import resonantinduction.core.render.RenderFluidHelper;
 import resonantinduction.old.client.model.ModelSmallFluidCan;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import cpw.mods.fml.client.FMLClientHandler;

src/main/java/resonantinduction/old/client/render/ItemTankRenderer.java

@@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.core.render.RenderFluidHelper;
 import resonantinduction.mechanical.fluid.tank.BlockTank;
 import resonantinduction.old.client.model.ModelTankSide;
 import resonantinduction.old.core.recipe.RecipeLoader;

src/main/java/resonantinduction/old/client/render/RenderBlockEntity.java

@@ -10,6 +10,7 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
+import resonantinduction.render.BlockRenderInfo;
 import universalelectricity.api.vector.Vector3;
 
 public class RenderBlockEntity extends Render

src/main/java/resonantinduction/old/client/render/RenderPipe.java

@@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.core.render.RenderFluidHelper;
 import resonantinduction.mechanical.fluid.pipes.EnumPipeType;
 import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.mechanical.fluid.pipes.TileEntityPipe;

src/main/java/resonantinduction/old/core/ItemOreDirv.java

@@ -2,7 +2,6 @@ package resonantinduction.old.core;
 
 import java.util.List;
 
-import calclavia.lib.content.IExtraInfo.IExtraItemInfo;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -16,6 +15,7 @@ import resonantinduction.api.events.LaserEvent;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.item.ItemBase;
+import calclavia.lib.content.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.lib.EnumMaterial;

src/main/java/resonantinduction/old/core/misc/EnumBird.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import cpw.mods.fml.common.registry.EntityRegistry;
 
 /**
@@ -38,7 +38,7 @@ public enum EnumBird
 		public void register()
 		{
 			EntityRegistry.registerGlobalEntityID(EntityTurkey.class, "FTTurkey", EntityRegistry.findGlobalUniqueEntityId(), 5651507, Color.red.getRGB());
-			EntityRegistry.registerModEntity(EntityTurkey.class, "FTTurkey", ResonantInductionTransport.entitiesIds++, ResonantInductionTransport.instance, 64, 1, true);
+			EntityRegistry.registerModEntity(EntityTurkey.class, "FTTurkey", Mechanical.entitiesIds++, Mechanical.instance, 64, 1, true);
 			EntityRegistry.addSpawn(EntityTurkey.class, 3, 1, 10, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.river);
 		}
 

src/main/java/resonantinduction/old/mechanics/machine/mining/ItemMiningLaser.java

@@ -24,7 +24,7 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.api.events.LaserEvent;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.item.ItemElectric;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.content.ContentRegistry;
@@ -66,7 +66,7 @@ public class ItemMiningLaser extends ItemElectric implements IExtraItemInfo
 
 	public ItemMiningLaser()
 	{
-		super(ResonantInductionTransport.CONFIGURATION.getItem("LaserMiningGun", DarkCore.getNextItemId()).getInt());
+		super(Mechanical.CONFIGURATION.getItem("LaserMiningGun", DarkCore.getNextItemId()).getInt());
 		this.setUnlocalizedName("MiningLaser");
 		this.setMaxStackSize(1);
 		this.setCreativeTab(CreativeTabs.tabTools);

src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java

@@ -15,9 +15,9 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.prefab.block.BlockRI;
 import resonantinduction.mechanical.CommonProxy;
-import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
+import resonantinduction.mechanical.Mechanical;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderProcessor;
-import resonantinduction.old.transport.ResonantInductionTransport;
 import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
@@ -46,7 +46,7 @@ public class BlockProcessor extends BlockRI implements IExtraBlockInfo
 			}
 			else
 			{
-				entityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_PROCESSOR, world, x, y, z);
+				entityPlayer.openGui(Mechanical.instance, CommonProxy.GUI_PROCESSOR, world, x, y, z);
 				return true;
 			}
 		}
@@ -135,7 +135,7 @@ public class BlockProcessor extends BlockRI implements IExtraBlockInfo
 	@Override
 	public int getRenderType()
 	{
-		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.ID;
 	}
 
 	@Override

src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java

@@ -1,379 +0,0 @@
-package resonantinduction.old.transport;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.logging.Logger;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.oredict.OreDictionary;
-
-import org.modstats.Modstats;
-
-import resonantinduction.archaic.blocks.BlockColorGlass;
-import resonantinduction.archaic.blocks.BlockColorGlowGlass;
-import resonantinduction.archaic.blocks.BlockColorSand;
-import resonantinduction.archaic.blocks.BlockTurntable;
-import resonantinduction.archaic.blocks.ItemBlockColored;
-import resonantinduction.core.ResonantInductionTabs;
-import resonantinduction.core.debug.BlockDebug;
-import resonantinduction.core.network.PacketIDTile;
-import resonantinduction.core.resource.BlockGasOre;
-import resonantinduction.core.resource.BlockOre;
-import resonantinduction.core.resource.BlockOre.OreData;
-import resonantinduction.core.resource.GasOreGenerator;
-import resonantinduction.core.resource.item.ItemBlockOre;
-import resonantinduction.core.resource.item.ItemParts;
-import resonantinduction.core.resource.item.ItemParts.Parts;
-import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler;
-import resonantinduction.electrical.armbot.BlockArmbot;
-import resonantinduction.electrical.armbot.command.TaskBreak;
-import resonantinduction.electrical.armbot.command.TaskDrop;
-import resonantinduction.electrical.armbot.command.TaskEnd;
-import resonantinduction.electrical.armbot.command.TaskFire;
-import resonantinduction.electrical.armbot.command.TaskGOTO;
-import resonantinduction.electrical.armbot.command.TaskGive;
-import resonantinduction.electrical.armbot.command.TaskGrabEntity;
-import resonantinduction.electrical.armbot.command.TaskGrabItem;
-import resonantinduction.electrical.armbot.command.TaskHarvest;
-import resonantinduction.electrical.armbot.command.TaskIF;
-import resonantinduction.electrical.armbot.command.TaskIdle;
-import resonantinduction.electrical.armbot.command.TaskPlace;
-import resonantinduction.electrical.armbot.command.TaskReturn;
-import resonantinduction.electrical.armbot.command.TaskRotateBy;
-import resonantinduction.electrical.armbot.command.TaskRotateTo;
-import resonantinduction.electrical.armbot.command.TaskStart;
-import resonantinduction.electrical.armbot.command.TaskTake;
-import resonantinduction.electrical.armbot.command.TaskUse;
-import resonantinduction.electrical.generator.solar.BlockSolarPanel;
-import resonantinduction.electrical.multimeter.ItemReadoutTools;
-import resonantinduction.mechanical.belt.BlockConveyorBelt;
-import resonantinduction.mechanical.fluid.BlockKitchenSink;
-import resonantinduction.mechanical.fluid.BlockReleaseValve;
-import resonantinduction.mechanical.fluid.EnumGas;
-import resonantinduction.mechanical.fluid.ItemFluidCan;
-import resonantinduction.mechanical.fluid.pipes.BlockPipe;
-import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.mechanical.fluid.pipes.ItemBlockPipe;
-import resonantinduction.mechanical.fluid.pump.BlockConstructionPump;
-import resonantinduction.mechanical.fluid.pump.BlockDrain;
-import resonantinduction.mechanical.fluid.pump.BlockPumpMachine;
-import resonantinduction.mechanical.fluid.tank.BlockTank;
-import resonantinduction.old.api.coding.TaskRegistry;
-import resonantinduction.old.core.ItemOreDirv;
-import resonantinduction.old.core.misc.BehaviorDispenseEgg;
-import resonantinduction.old.core.misc.EntityFarmEgg;
-import resonantinduction.old.core.misc.EnumBird;
-import resonantinduction.old.core.misc.ItemColoredDust;
-import resonantinduction.old.core.misc.ItemCommonTool;
-import resonantinduction.old.core.misc.ItemFarmEgg;
-import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.mechanics.processor.BlockProcessor;
-import resonantinduction.old.transport.crate.BlockCrate;
-import resonantinduction.old.transport.crate.ItemBlockCrate;
-import resonantinduction.old.transport.encoder.BlockEncoder;
-import resonantinduction.old.transport.encoder.ItemDisk;
-import resonantinduction.old.transport.hopper.BlockAdvancedHopper;
-import resonantinduction.old.transport.imprinter.BlockImprinter;
-import resonantinduction.old.transport.imprinter.ItemImprinter;
-import resonantinduction.old.transport.logistic.BlockDetector;
-import resonantinduction.old.transport.logistic.BlockManipulator;
-import resonantinduction.old.transport.logistic.BlockRejector;
-import calclavia.lib.content.ContentRegistry;
-import calclavia.lib.ore.OreGenReplaceStone;
-import calclavia.lib.ore.OreGenerator;
-import calclavia.lib.prefab.item.ItemBlockHolder;
-import calclavia.lib.utility.FluidHelper;
-import calclavia.lib.utility.PlayerKeyHandler;
-import calclavia.lib.utility.SaveManager;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
-import dark.lib.EnumMaterial;
-import dark.lib.EnumOrePart;
-import dark.lib.LaserEntityDamageSource;
-
-//@Mod(modid = ResonantInductionTransport.MOD_ID, name = ResonantInductionTransport.MOD_NAME, version = ResonantInductionTransport.VERSION, useMetadata = true)
-//@NetworkMod(channels = { ResonantInductionTransport.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
-public class ResonantInductionTransport
-{
-	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 CHANNEL = "ALChannel";
-
-	// @Mod
-	public static final String MOD_ID = "AssemblyLine";
-	public static final String MOD_NAME = "Assembly Line";
-
-	public static final String DOMAIN = "al";
-	public static final String PREFIX = DOMAIN + ":";
-
-	public static String DIRECTORY_NO_SLASH = "assets/" + DOMAIN + "/";
-	public static String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
-	public static String LANGUAGE_PATH = DIRECTORY + "languages/";
-	public static String SOUND_PATH = DIRECTORY + "audio/";
-
-	// @SidedProxy(clientSide = "com.builtbroken.assemblyline.client.ClientProxy", serverSide =
-	// "com.builtbroken.assemblyline.CommonProxy")
-	public static CommonProxy proxy;
-
-	@Instance(ResonantInductionTransport.MOD_ID)
-	public static ResonantInductionTransport instance;
-
-	@Metadata(ResonantInductionTransport.MOD_ID)
-	public static ModMetadata meta;
-
-	private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "de_DE" };
-
-	public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "AssemblyLine.cfg"));
-
-	public static Logger FMLog = Logger.getLogger(ResonantInductionTransport.MOD_NAME);
-
-	public static boolean VINALLA_RECIPES = false;
-
-	public static int entitiesIds = 60;
-
-	private static PacketIDTile tilePacket;
-
-	public static PacketIDTile getTilePacket()
-	{
-		if (tilePacket == null)
-		{
-			tilePacket = new PacketIDTile(ResonantInductionTransport.CHANNEL);
-		}
-		return tilePacket;
-	}
-
-	@EventHandler
-	public void preInit(FMLPreInitializationEvent event)
-	{
-		CONFIGURATION.load();
-
-		DarkCore.instance().preLoad();
-		Modstats.instance().getReporter().registerMod(this);
-		MinecraftForge.EVENT_BUS.register(this);
-		MinecraftForge.EVENT_BUS.register(new FluidHelper());
-		MinecraftForge.EVENT_BUS.register(SaveManager.instance());
-		TickRegistry.registerTickHandler(NetworkUpdateHandler.instance(), Side.SERVER);
-		TickRegistry.registerScheduledTickHandler(new PlayerKeyHandler(ResonantInductionTransport.CHANNEL), Side.CLIENT);
-		MinecraftForge.EVENT_BUS.register(new LaserEntityDamageSource(null));
-		NetworkRegistry.instance().registerGuiHandler(this, proxy);
-
-		TaskRegistry.registerCommand(new TaskDrop());
-		TaskRegistry.registerCommand(new TaskGive());
-		TaskRegistry.registerCommand(new TaskTake());
-		TaskRegistry.registerCommand(new TaskGrabItem());
-		TaskRegistry.registerCommand(new TaskGrabEntity());
-		TaskRegistry.registerCommand(new TaskRotateBy());
-		TaskRegistry.registerCommand(new TaskRotateTo());
-		TaskRegistry.registerCommand(new TaskUse());
-		TaskRegistry.registerCommand(new TaskIF());
-		TaskRegistry.registerCommand(new TaskGOTO());
-		TaskRegistry.registerCommand(new TaskReturn());
-		TaskRegistry.registerCommand(new TaskEnd());
-		TaskRegistry.registerCommand(new TaskFire());
-		TaskRegistry.registerCommand(new TaskHarvest());
-		TaskRegistry.registerCommand(new TaskPlace());
-		TaskRegistry.registerCommand(new TaskBreak());
-		TaskRegistry.registerCommand(new TaskStart());
-		TaskRegistry.registerCommand(new TaskIdle());
-
-		this.registerObjects();
-		proxy.preInit();
-	}
-
-	@EventHandler
-	public void init(FMLInitializationEvent event)
-	{
-		DarkCore.instance().Load();
-
-		FMLog.info("Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages.");
-
-		for (EnumGas gas : EnumGas.values())
-		{
-			FluidRegistry.registerFluid(gas.getGas());
-		}
-		if (RecipeLoader.blockGas != null)
-		{
-			EnumGas.NATURAL_GAS.getGas().setBlockID(RecipeLoader.blockGas);
-		}
-		if (RecipeLoader.blockGas != null)
-		{
-			GameRegistry.registerWorldGenerator(new GasOreGenerator());
-		}
-		if (RecipeLoader.blockOre != null)
-		{
-			for (OreData data : OreData.values())
-			{
-				if (data.doWorldGen)
-				{
-					OreGenReplaceStone gen = data.getGeneratorSettings();
-					if (gen != null)
-					{
-						OreGenerator.addOre(gen);
-					}
-				}
-			}
-		}
-		if (RecipeLoader.itemParts != null)
-		{
-			for (Parts part : Parts.values())
-			{
-				OreDictionary.registerOre(part.name, new ItemStack(RecipeLoader.itemParts, 1, part.ordinal()));
-			}
-		}
-		proxy.init();
-	}
-
-	@EventHandler
-	public void postInit(FMLPostInitializationEvent event)
-	{
-		DarkCore.instance().postLoad();
-		proxy.postInit();
-		RecipeLoader.instance().loadRecipes();
-		CONFIGURATION.save();
-	}
-
-	/** Separated method for registering & creating objects */
-	public void registerObjects()
-	{
-
-		/* BLOCKS */
-		RecipeLoader.blockManipulator = ContentRegistry.createNewBlock("Manipulator", ResonantInductionTransport.MOD_ID, BlockManipulator.class);
-		RecipeLoader.blockCrate = (BlockCrate) ContentRegistry.createNewBlock("Crate", ResonantInductionTransport.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
-		RecipeLoader.blockImprinter = ContentRegistry.createNewBlock("Imprinter", ResonantInductionTransport.MOD_ID, BlockImprinter.class);
-		RecipeLoader.blockDetector = ContentRegistry.createNewBlock("Detector", ResonantInductionTransport.MOD_ID, BlockDetector.class);
-
-		RecipeLoader.blockRejector = ContentRegistry.createNewBlock("Rejector", ResonantInductionTransport.MOD_ID, BlockRejector.class);
-		RecipeLoader.blockEncoder = ContentRegistry.createNewBlock("Encoder", ResonantInductionTransport.MOD_ID, BlockEncoder.class);
-		RecipeLoader.blockArmbot = ContentRegistry.createNewBlock("Armbot", ResonantInductionTransport.MOD_ID, BlockArmbot.class);
-		RecipeLoader.blockTurntable = ContentRegistry.createNewBlock("Turntable", ResonantInductionTransport.MOD_ID, BlockTurntable.class);
-		RecipeLoader.processorMachine = ContentRegistry.createNewBlock("ALBlockProcessor", ResonantInductionTransport.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
-
-		RecipeLoader.blockAdvancedHopper = ContentRegistry.createNewBlock("ALBlockHopper", ResonantInductionTransport.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
-		RecipeLoader.blockPipe = ContentRegistry.createNewBlock("FMBlockPipe", ResonantInductionTransport.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
-		RecipeLoader.blockPumpMachine = ContentRegistry.createNewBlock("FMBlockPump", ResonantInductionTransport.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);
-		RecipeLoader.blockReleaseValve = ContentRegistry.createNewBlock("FMBlockReleaseValve", ResonantInductionTransport.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
-		RecipeLoader.blockTank = ContentRegistry.createNewBlock("FMBlockTank", ResonantInductionTransport.MOD_ID, BlockTank.class, ItemBlockPipe.class);
-
-		RecipeLoader.blockSink = ContentRegistry.createNewBlock("FMBlockSink", ResonantInductionTransport.MOD_ID, BlockKitchenSink.class, ItemBlockHolder.class);
-		RecipeLoader.blockDrain = ContentRegistry.createNewBlock("FMBlockDrain", ResonantInductionTransport.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
-		RecipeLoader.blockConPump = ContentRegistry.createNewBlock("FMBlockConstructionPump", ResonantInductionTransport.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
-		RecipeLoader.blockSteamGen = ContentRegistry.createNewBlock("DMBlockSteamMachine", ResonantInductionTransport.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);
-		RecipeLoader.blockOre = ContentRegistry.createNewBlock("DMBlockOre", ResonantInductionTransport.MOD_ID, BlockOre.class, ItemBlockOre.class);
-
-		RecipeLoader.blockWire = ContentRegistry.createNewBlock("DMBlockWire", ResonantInductionTransport.MOD_ID, BlockWire.class, ItemBlockWire.class);
-		RecipeLoader.blockDebug = ContentRegistry.createNewBlock("DMBlockDebug", ResonantInductionTransport.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
-		RecipeLoader.blockStainGlass = ContentRegistry.createNewBlock("DMBlockStainedGlass", ResonantInductionTransport.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
-		RecipeLoader.blockColorSand = ContentRegistry.createNewBlock("DMBlockColorSand", ResonantInductionTransport.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
-		RecipeLoader.blockBasalt = ContentRegistry.createNewBlock("DMBlockBasalt", ResonantInductionTransport.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
-
-		RecipeLoader.blockGlowGlass = ContentRegistry.createNewBlock("DMBlockGlowGlass", ResonantInductionTransport.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
-		RecipeLoader.blockSolar = ContentRegistry.createNewBlock("DMBlockSolar", ResonantInductionTransport.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
-		RecipeLoader.blockGas = ContentRegistry.createNewBlock("DMBlockGas", ResonantInductionTransport.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
-		RecipeLoader.blockBatBox = ContentRegistry.createNewBlock("DMBlockBatBox", ResonantInductionTransport.MOD_ID, BlockBatteryBox.class, ItemBlockEnergyStorage.class);
-
-		/* ITEMS */
-		RecipeLoader.itemTool = ContentRegistry.createNewItem("DMReadoutTools", ResonantInductionTransport.MOD_ID, ItemReadoutTools.class, true);
-		RecipeLoader.battery = ContentRegistry.createNewItem("DMItemBattery", ResonantInductionTransport.MOD_ID, ItemBattery.class, true);
-		RecipeLoader.wrench = ContentRegistry.createNewItem("DMWrench", ResonantInductionTransport.MOD_ID, ItemWrench.class, true);
-		RecipeLoader.itemGlowingSand = ContentRegistry.createNewItem("DMItemGlowingSand", ResonantInductionTransport.MOD_ID, ItemColoredDust.class, true);
-		RecipeLoader.itemDiggingTool = ContentRegistry.createNewItem("ItemDiggingTools", ResonantInductionTransport.MOD_ID, ItemCommonTool.class, true);
-
-		RecipeLoader.itemVehicleTest = ContentRegistry.createNewItem("ItemVehicleTest", ResonantInductionTransport.MOD_ID, ItemVehicleSpawn.class, true);
-		RecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
-		RecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
-		RecipeLoader.itemFluidCan = ContentRegistry.createNewItem("ItemFluidCan", ResonantInductionTransport.MOD_ID, ItemFluidCan.class, true);
-		RecipeLoader.itemParts = ContentRegistry.createNewItem("DMCraftingParts", ResonantInductionTransport.MOD_ID, ItemParts.class, true);
-
-		RecipeLoader.itemMetals = ContentRegistry.createNewItem("DMOreDirvParts", ResonantInductionTransport.MOD_ID, ItemOreDirv.class, true);
-		// ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID,
-		// ItemWire.class, true);
-
-		TileEntityAssembly.refresh_diff = CONFIGURATION.get("TileSettings", "RefreshRandomRange", 9, "n = value of config, 1 + n, random number range from 1 to n that will be added to the lowest refresh value").getInt();
-		TileEntityAssembly.refresh_min_rate = CONFIGURATION.get("TileSettings", "RefreshLowestValue", 20, "Lowest value the refresh rate of the tile network will be").getInt();
-
-		// Entities
-		if (ResonantInductionTransport.CONFIGURATION.get("Override", "Eggs", true).getBoolean(true))
-		{
-			Item.itemsList[Item.egg.itemID] = null;
-			Item.egg = null;
-			Item.egg = new ItemFarmEgg(88);
-			GameRegistry.registerItem(Item.egg, "FTEgg", MOD_ID);
-			EntityRegistry.registerGlobalEntityID(EntityFarmEgg.class, "FarmEgg", EntityRegistry.findGlobalUniqueEntityId());
-			EntityRegistry.registerModEntity(EntityFarmEgg.class, "FarmEgg", entitiesIds++, this, 64, 1, true);
-			BlockDispenser.dispenseBehaviorRegistry.putObject(Item.egg, new BehaviorDispenseEgg());
-		}
-
-		EntityRegistry.registerGlobalEntityID(EntityTestCar.class, "TestCar", EntityRegistry.findGlobalUniqueEntityId());
-		EntityRegistry.registerModEntity(EntityTestCar.class, "TestCar", 60, this, 64, 1, true);
-
-		for (EnumBird bird : EnumBird.values())
-		{
-			if (bird != EnumBird.VANILLA_CHICKEN && CONFIGURATION.get("Entities", "Enable_" + bird.name(), true).getBoolean(true))
-			{
-				bird.register();
-			}
-		}
-		// Post object creation, normally creative tab icon setup
-		if (RecipeLoader.blockPipe != null)
-		{
-			ResonantInductionTabs.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
-		}
-		else
-		{
-			ResonantInductionTabs.tabHydraulic().setIconItemStack(new ItemStack(Item.bucketWater));
-		}
-		if (RecipeLoader.itemMetals != null)
-		{
-			ResonantInductionTabs.tabIndustrial().itemStack = EnumMaterial.getStack(RecipeLoader.itemMetals, EnumMaterial.IRON, EnumOrePart.GEARS, 1);
-			RecipeLoader.parseOreNames(CONFIGURATION);
-		}
-		else
-		{
-
-		}
-		if (RecipeLoader.blockConveyorBelt != null)
-		{
-			ResonantInductionTabs.tabAutomation().setIconItemStack(new ItemStack(RecipeLoader.blockConveyorBelt));
-		}
-		else
-		{
-			ResonantInductionTabs.tabAutomation().setIconItemStack(new ItemStack(Block.pistonStickyBase));
-		}
-
-	}
-
-	public void loadModMeta()
-	{
-		meta.modId = ResonantInductionTransport.MOD_ID;
-		meta.name = ResonantInductionTransport.MOD_NAME;
-		meta.version = ResonantInductionTransport.VERSION;
-		meta.description = "Simi Realistic factory system for minecraft bring in conveyor belts, robotic arms, and simple machines";
-		meta.url = "http://www.universalelectricity.com/coremachine";
-		meta.logoFile = "/al_logo.png";
-
-		meta.authorList = Arrays.asList(new String[] { "DarkGuardsman" });
-		meta.credits = "Archadia - Developer" + "LiQuiD - Dev of BioTech\n" + "Hangcow - Ex-Dev Greater Security\n" + "Calclavia - Ex-CoDev of assembly line\n" + "Briman0094 - Ex-CoDev of assembly line\n" + "Elrath18 - Colored Glass, Sand, & Stone\n" + "Doppelgangerous - Researcher\n" + "Freesound.org - Sound effects\n" + "MineMan1(wdtod) - asset creation\n" + "AlphaToOmega - asset creation\n" + "pinksheep - asset creation\n" + "X-wing9 - asset creation\n" + "Azkhare - asset creation\n" + "Vexatos - German Translation\n" + "crafteverywhere - Chinese Translations\n" + "PancakeCandy - French & Dutch Translations\n";
-		meta.autogenerated = false;
-
-	}
-}

src/main/java/resonantinduction/old/transport/crafting/BlockCraftingTable.java

@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import resonantinduction.core.prefab.block.BlockRI;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -26,7 +26,7 @@ public class BlockCraftingTable extends BlockRI
 
 	public BlockCraftingTable()
 	{
-		super(ResonantInductionTransport.CONFIGURATION, "CraftingTable", Material.rock);
+		super(Mechanical.CONFIGURATION, "CraftingTable", Material.rock);
 	}
 
 	@Override

src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java

@@ -6,7 +6,7 @@ import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.network.ISimplePacketReceiver;
 import resonantinduction.core.prefab.tile.TileEntityInv;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 import calclavia.lib.network.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;
@@ -232,11 +232,11 @@ public class TileEntityCrate extends TileEntityInv implements ISimplePacketRecei
 		ItemStack stack = this.getSampleStack();
 		if (stack != null)
 		{
-			return PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, "InventoryItem", this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
+			return PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, "InventoryItem", this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
 		}
 		else
 		{
-			return PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, "InventoryItem", this, false);
+			return PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, "InventoryItem", this, false);
 		}
 	}
 

src/main/java/resonantinduction/old/transport/encoder/BlockEncoder.java

@@ -13,7 +13,7 @@ import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockRI;
 import resonantinduction.mechanical.CommonProxy;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 
 import com.builtbroken.common.Pair;
 
@@ -73,7 +73,7 @@ public class BlockEncoder extends BlockRI
     {
         if (!world.isRemote)
         {
-            entityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_ENCODER, world, x, y, z);
+            entityPlayer.openGui(Mechanical.instance, CommonProxy.GUI_ENCODER, world, x, y, z);
         }
 
         return true;

src/main/java/resonantinduction/old/transport/encoder/TileEntityEncoder.java

@@ -10,10 +10,10 @@ import net.minecraft.network.packet.Packet;
 import resonantinduction.core.prefab.tile.TileEntityMachine;
 import resonantinduction.electrical.armbot.Program;
 import resonantinduction.electrical.armbot.command.TaskRotateTo;
+import resonantinduction.mechanical.Mechanical;
 import resonantinduction.old.api.coding.IProgram;
 import resonantinduction.old.api.coding.ITask;
 import resonantinduction.old.api.coding.TaskRegistry;
-import resonantinduction.old.transport.ResonantInductionTransport;
 import universalelectricity.api.vector.Vector2;
 import calclavia.lib.network.PacketHandler;
 
@@ -186,7 +186,7 @@ public class TileEntityEncoder extends TileEntityMachine implements ISidedInvent
 		{
 			this.program.save(tag);
 		}
-		return PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, TileEntityEncoder.PROGRAM_PACKET_ID, this, exists, tag);
+		return PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, TileEntityEncoder.PROGRAM_PACKET_ID, this, exists, tag);
 
 	}
 
@@ -196,7 +196,7 @@ public class TileEntityEncoder extends TileEntityMachine implements ISidedInvent
 		{
 			if (this.worldObj.isRemote)
 			{
-				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, TileEntityEncoder.REMOVE_TASK_PACKET_ID, this, vec.intX(), vec.intY()));
+				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, TileEntityEncoder.REMOVE_TASK_PACKET_ID, this, vec.intX(), vec.intY()));
 			}
 			else
 			{
@@ -214,7 +214,7 @@ public class TileEntityEncoder extends TileEntityMachine implements ISidedInvent
 			{
 				NBTTagCompound nbt = new NBTTagCompound();
 				editTask.save(nbt);
-				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, TileEntityEncoder.PROGRAM_CHANGE_PACKET_ID, this, editTask.getMethodName(), editTask.getCol(), editTask.getRow(), nbt));
+				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, TileEntityEncoder.PROGRAM_CHANGE_PACKET_ID, this, editTask.getMethodName(), editTask.getCol(), editTask.getRow(), nbt));
 			}
 			else
 			{
@@ -232,7 +232,7 @@ public class TileEntityEncoder extends TileEntityMachine implements ISidedInvent
 			{
 				NBTTagCompound nbt = new NBTTagCompound();
 				editTask.save(nbt);
-				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, TileEntityEncoder.NEW_TASK_PACKET_ID, this, editTask.getMethodName(), editTask.getCol(), editTask.getRow(), nbt));
+				PacketDispatcher.sendPacketToServer(PacketHandler.instance().getTilePacket(Mechanical.CHANNEL, TileEntityEncoder.NEW_TASK_PACKET_ID, this, editTask.getMethodName(), editTask.getCol(), editTask.getRow(), nbt));
 			}
 			else
 			{

src/main/java/resonantinduction/old/transport/imprinter/BlockImprinter.java

@@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import resonantinduction.core.Reference;
 import resonantinduction.core.prefab.block.BlockRI;
-import resonantinduction.old.transport.ResonantInductionTransport;
+import resonantinduction.mechanical.Mechanical;
 
 import com.builtbroken.common.Pair;
 
@@ -74,7 +74,7 @@ public class BlockImprinter extends BlockRI
     {
         if (!world.isRemote)
         {
-            entityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_IMPRINTER, world, x, y, z);
+            entityPlayer.openGui(Mechanical.instance, CommonProxy.GUI_IMPRINTER, world, x, y, z);
         }
 
         return true;

src/main/java/resonantinduction/old/transport/logistic/BlockManipulator.java

@@ -10,7 +10,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatMessageComponent;
 import net.minecraft.world.World;
 import resonantinduction.core.prefab.block.BlockImprintable;
-import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderManipulator;
 import universalelectricity.api.UniversalElectricity;
 
@@ -110,7 +110,7 @@ public class BlockManipulator extends BlockImprintable
 	@Override
 	public int getRenderType()
 	{
-		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.ID;
 	}
 
 	@Override

src/main/java/resonantinduction/old/transport/logistic/BlockRejector.java

@@ -10,7 +10,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import resonantinduction.core.Reference;
 import resonantinduction.core.prefab.block.BlockImprintable;
-import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderRejector;
 import universalelectricity.api.UniversalElectricity;
 
@@ -52,7 +52,7 @@ public class BlockRejector extends BlockImprintable
 	@Override
 	public int getRenderType()
 	{
-		return this.zeroRendering ? 0 : MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
+		return this.zeroRendering ? 0 : MechanicalBlockRenderingHandler.ID;
 	}
 
 	@SideOnly(Side.CLIENT)

src/main/resources/assets/mechanizedmining/lang/de_DE.properties

@@ -1,17 +0,0 @@
-# German @author Archadia and Vexatos
-
-## Items
-item.HandDrill.name=Handbohrer
-item.InstaHole.name=[Dev]Instant-Loch
-item.MiningLaser.name=Laser-Handbohrer
-
-## Blocks
-tile.Machine_Fracker.name=Fracking-Maschine
-tile.Machine_OreScanner.name=Zyklischer Scanner
-tile.Fracking_Pipe.name=Fracking-Rohr
-tile.World_Rubble.name=Schutt
-tile.Machine_ApertureExcavator.name=Aperturexkavator
-tile.LaserMiner.name=Minierturm
-tile.LaserMiner.0.name=Minierturm: Laser
-tile.LaserMiner.1.name=Minierposten
-tile.Machine_LaserDrill.name=Apertur-Laser-Bohrer

src/main/resources/assets/mechanizedmining/lang/en_US.properties

@@ -1,17 +0,0 @@
-# English @author Archadia
-
-## Items
-item.HandDrill.name=Hand Drill: Bit
-item.InstaHole.name=[Dev]Instant Hole
-item.MiningLaser.name=Hand Drill: Laser
-
-## Blocks
-tile.Machine_Fracker.name=Fracking Machine
-tile.Machine_OreScanner.name=Cyclic Scanner
-tile.Fracking_Pipe.name=Fracking Pipe
-tile.World_Rubble.name=Rubble
-tile.Machine_ApertureExcavator.name=Aperture Excavator
-tile.LaserMiner.name=Mining Turret
-tile.LaserMiner.0.name=Mining Turret: Laser
-tile.LaserMiner.1.name=Mining Sentry: Laser
-tile.Machine_LaserDrill.name=Aperture Laser Drill