Renabled Conveyor Belt

src/main/java/resonantinduction/core/resource/BlockGasOre.java

@@ -21,7 +21,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.old.transport.fluid.EnumGas;
+import resonantinduction.mechanical.fluid.EnumGas;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/electrical/Electrical.java

@@ -58,7 +58,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  * @author Calclavia
  * 
  */
-@Mod(modid = Electrical.ID, name = Electrical.NAME, version = Reference.VERSION, dependencies = "before:ThermalExpansion;required-after:" + ResonantInduction.ID)
+@Mod(modid = Electrical.ID, name = Electrical.NAME, version = Reference.VERSION, dependencies = "before:ThermalExpansion;after:" + ResonantInduction.ID + "|Mechanical;required-after:" + ResonantInduction.ID)
 @NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
 public class Electrical
 {

src/main/java/resonantinduction/electrical/MultipartElectrical.java

@@ -28,30 +28,20 @@ public class MultipartElectrical implements IPartFactory
 	@Override
 	public TMultiPart createPart(String name, boolean client)
 	{
-		if (name == "resonant_induction_wire")
+		switch (name)
 		{
-			return new PartFramedWire();
-		}
-		else if (name == "resonant_induction_switch_wire")
-		{
-			return new PartFramedSwitchWire();
-		}
-
-		else if (name == "resonant_induction_flat_wire")
-		{
-			return new PartFlatWire();
-		}
-		else if (name == "resonant_induction_flat_switch_wire")
-		{
-			return new PartFlatSwitchWire();
-		}
-		else if (name == "resonant_induction_multimeter")
-		{
-			return new PartMultimeter();
-		}
-		else if (name == "resonant_induction_transformer")
-		{
-			return new PartTransformer();
+			case "resonant_induction_wire":
+				return new PartFramedWire();
+			case "resonant_induction_switch_wire":
+				return new PartFramedSwitchWire();
+			case "resonant_induction_flat_wire":
+				return new PartFlatWire();
+			case "resonant_induction_flat_switch_wire":
+				return new PartFlatSwitchWire();
+			case "resonant_induction_multimeter":
+				return new PartMultimeter();
+			case "resonant_induction_transformer":
+				return new PartTransformer();
 		}
 
 		return null;

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

@@ -13,7 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.client.render.BlockRenderingHandler;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderArmbot;
 import calclavia.lib.multiblock.link.IBlockActivate;
 import calclavia.lib.multiblock.link.IMultiBlock;
@@ -110,7 +110,7 @@ public class BlockArmbot extends BlockMachine implements IExtraBlockInfo
 	@Override
 	public int getRenderType()
 	{
-		return BlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
 	}
 
 	@Override

src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java

@@ -1,12 +1,11 @@
 package resonantinduction.electrical.generator.solar;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.electrical.render.ElectricalBlockRenderingHandler;
-import resonantinduction.old.client.render.BlockRenderingHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockSolarPanel extends BlockMachine
 {

src/main/java/resonantinduction/mechanical/ClientProxy.java

@@ -1,6 +1,12 @@
 package resonantinduction.mechanical;
 
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+
 public class ClientProxy extends CommonProxy
 {
-
+	public void preInit()
+	{
+		RenderingRegistry.registerBlockHandler(MechanicalBlockRenderingHandler.INSTANCE);
+	}
 }

src/main/java/resonantinduction/mechanical/Mechanical.java

@@ -1,8 +1,12 @@
 package resonantinduction.mechanical;
 
+import net.minecraft.block.Block;
 import resonantinduction.core.Reference;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
+import resonantinduction.mechanical.belt.BlockConveyorBelt;
+import resonantinduction.old.core.recipe.RecipeLoader;
+import resonantinduction.old.transport.ResonantInductionTransport;
 import calclavia.lib.network.PacketHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -13,6 +17,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
+import dark.lib.CoreRegistry;
 
 /**
  * Resonant Induction Archaic Module
@@ -37,15 +42,20 @@ public class Mechanical
 	@Mod.Metadata(ID)
 	public static ModMetadata metadata;
 
+	public static Block blockConveyorBelt;
+
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt)
 	{
 		NetworkRegistry.instance().registerGuiHandler(this, proxy);
+		blockConveyorBelt = CoreRegistry.createNewBlock("RIConveyorBelt", ID, BlockConveyorBelt.class);
+		proxy.preInit();
 	}
 
 	@EventHandler
 	public void init(FMLInitializationEvent evt)
 	{
 		Settings.setModMetadata(metadata, ID, NAME);
+		proxy.init();
 	}
 }

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

@@ -19,7 +19,7 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.mechanical.belt.TileConveyorBelt.SlantType;
-import resonantinduction.old.client.render.BlockRenderingHandler;
+import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderConveyorBelt;
 
 import com.builtbroken.common.Pair;
@@ -354,7 +354,7 @@ public class BlockConveyorBelt extends BlockMachine implements IExtraBlockInfo
     @Override
     public int getRenderType()
     {
-        return BlockRenderingHandler.BLOCK_RENDER_ID;
+        return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.Set;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.Random;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.Random;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,10 +14,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockMachine;
+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.old.transport.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.old.transport.fluid.pipes.ItemBlockPipe;
-import resonantinduction.old.transport.fluid.pipes.TileEntityPipe;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 import calclavia.lib.utility.HelperMethods;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import com.builtbroken.common.science.ChemElement;
 import com.builtbroken.common.science.ChemicalCompound;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -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.old.transport.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
-import resonantinduction.old.transport.fluid.network.IFluidRecipeCrafter;
+import resonantinduction.mechanical.fluid.network.IFluidRecipeCrafter;
+import resonantinduction.mechanical.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
 import calclavia.lib.utility.FluidHelper;
 
 import com.builtbroken.common.Pair;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.tilenetwork.ITileConnector;
+import resonantinduction.mechanical.fluid.network.NetworkPipes;
+import resonantinduction.mechanical.fluid.prefab.TileEntityFluidDevice;
 import resonantinduction.old.api.fluid.INetworkPipe;
-import resonantinduction.old.transport.fluid.network.NetworkPipes;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidDevice;
 import calclavia.lib.utility.HelperMethods;
 import dark.lib.interfaces.IReadOut;
 

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

@@ -1,12 +1,12 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraft.tileentity.TileEntity;
 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.old.api.fluid.INetworkFluidPart;
-import resonantinduction.old.transport.fluid.network.NetworkFluidContainers;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
 
 public class TileEntityTank extends TileEntityFluidNetworkTile
 {

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid;
+package resonantinduction.mechanical.fluid;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
@@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.core.network.ISimplePacketReceiver;
+import resonantinduction.mechanical.fluid.prefab.TileEntityFluidStorage;
 import resonantinduction.old.transport.ResonantInductionTransport;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidStorage;
 import calclavia.lib.network.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;

src/main/java/resonantinduction/mechanical/fluid/network/FluidPressurePack.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 import net.minecraftforge.fluids.FluidStack;
 

src/main/java/resonantinduction/mechanical/fluid/network/FluidRecipeInfo.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/mechanical/fluid/network/IFluidRecipeCrafter.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 /**
  * Use this if you want to take advantage of the {@link #FluidCraftingHandler} 's auto crafting

src/main/java/resonantinduction/mechanical/fluid/network/NetworkFluidContainers.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/mechanical/fluid/network/NetworkFluidTiles.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -16,8 +16,8 @@ import resonantinduction.core.tilenetwork.INetworkPart;
 import resonantinduction.core.tilenetwork.ITileNetwork;
 import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities;
 import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler;
+import resonantinduction.mechanical.fluid.FluidCraftingHandler;
 import resonantinduction.old.api.fluid.INetworkFluidPart;
-import resonantinduction.old.transport.fluid.FluidCraftingHandler;
 import calclavia.lib.utility.FluidHelper;
 
 public class NetworkFluidTiles extends NetworkTileEntities

src/main/java/resonantinduction/mechanical/fluid/network/NetworkPipes.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.network;
+package resonantinduction.mechanical.fluid.network;
 
 import java.util.EnumSet;
 import java.util.Map.Entry;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import dark.lib.helpers.ColorCode;
 import dark.lib.helpers.ColorCode.IColoredId;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import dark.lib.helpers.ColorCode;
 import dark.lib.helpers.ColorCode.IColoredId;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,8 +7,8 @@ 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.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import dark.lib.helpers.ColorCode;
 
 /**

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import dark.lib.helpers.ColorCode.IColoredId;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import java.util.List;
 
@@ -14,9 +14,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
+import resonantinduction.mechanical.fluid.TileEntityTank;
+import resonantinduction.mechanical.fluid.prefab.TileEntityFluidNetworkTile;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.fluid.TileEntityTank;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import universalelectricity.api.vector.Vector3;
 
 public class ItemBlockPipe extends ItemBlock

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pipes;
+package resonantinduction.mechanical.fluid.pipes;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
@@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidStack;
 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.old.api.fluid.INetworkPipe;
-import resonantinduction.old.transport.fluid.network.NetworkPipes;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 import dark.lib.helpers.ColorCode;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.prefab;
+package resonantinduction.mechanical.fluid.prefab;
 
 import java.util.Random;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.prefab;
+package resonantinduction.mechanical.fluid.prefab;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,11 +23,11 @@ import org.bouncycastle.util.Arrays;
 import resonantinduction.core.network.ISimplePacketReceiver;
 import resonantinduction.core.tilenetwork.INetworkPart;
 import resonantinduction.core.tilenetwork.ITileNetwork;
+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 resonantinduction.old.transport.fluid.network.NetworkFluidTiles;
-import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.prefab;
+package resonantinduction.mechanical.fluid.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/resonantinduction/mechanical/fluid/pump/BlockConstructionPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.List;
 import java.util.Set;

src/main/java/resonantinduction/mechanical/fluid/pump/BlockDrain.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.Set;
 

src/main/java/resonantinduction/mechanical/fluid/pump/BlockPumpMachine.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.List;
 import java.util.Set;

src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/resonantinduction/mechanical/fluid/pump/TileEntityConstructionPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -16,9 +16,9 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.tilenetwork.ITileConnector;
+import resonantinduction.mechanical.fluid.network.NetworkFluidTiles;
 import resonantinduction.old.api.fluid.IDrain;
 import resonantinduction.old.api.fluid.INetworkPipe;
-import resonantinduction.old.transport.fluid.network.NetworkFluidTiles;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorHelper;
 

src/main/java/resonantinduction/mechanical/fluid/pump/TileEntityDrain.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,8 +15,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
+import resonantinduction.mechanical.fluid.prefab.TileEntityFluidDevice;
 import resonantinduction.old.api.fluid.IDrain;
-import resonantinduction.old.transport.fluid.prefab.TileEntityFluidDevice;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 

src/main/java/resonantinduction/mechanical/fluid/pump/TileEntityStarterPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.transport.fluid.pump;
+package resonantinduction.mechanical.fluid.pump;
 
 import java.util.Iterator;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package resonantinduction.old.client.render;
+package resonantinduction.mechanical.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -8,13 +8,12 @@ import net.minecraft.world.IBlockAccess;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.Mechanical;
 import resonantinduction.old.client.model.ModelConveyorBelt;
 import resonantinduction.old.client.model.ModelCrusher;
 import resonantinduction.old.client.model.ModelGrinder;
-import resonantinduction.old.client.model.ModelMachine;
 import resonantinduction.old.client.model.ModelManipulator;
 import resonantinduction.old.client.model.ModelRejectorPiston;
-import resonantinduction.old.client.model.ModelSolarPanel;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import resonantinduction.old.transport.hopper.BlockAdvancedHopper;
 import cpw.mods.fml.client.FMLClientHandler;
@@ -24,26 +23,25 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
+public class MechanicalBlockRenderingHandler implements ISimpleBlockRenderingHandler
 {
-	public static BlockRenderingHandler instance = new BlockRenderingHandler();
+	public static MechanicalBlockRenderingHandler INSTANCE = new MechanicalBlockRenderingHandler();
 	public static final int BLOCK_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
 	private ModelConveyorBelt modelConveyorBelt = new ModelConveyorBelt();
 	private ModelRejectorPiston modelEjector = new ModelRejectorPiston();
 	private ModelManipulator modelInjector = new ModelManipulator();
 	private ModelCrusher modelCrushor = new ModelCrusher();
 	private ModelGrinder grinderModel = new ModelGrinder();
-	private static ModelSolarPanel solarPanelModel = new ModelSolarPanel();
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
 	{
-		if (RecipeLoader.blockConveyorBelt != null && block.blockID == RecipeLoader.blockConveyorBelt.blockID)
+		if (block == Mechanical.blockConveyorBelt)
 		{
 			GL11.glPushMatrix();
-			GL11.glTranslatef(0.0F, 1.5F, 0.0F);
+			GL11.glTranslatef(0.0F, 1.3F, 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "belt/frame0.png"));
+			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "belt/frame0.png"));
 			modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
 			GL11.glPopMatrix();
 		}
@@ -68,7 +66,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 			modelInjector.render(0.0625F, true, 0);
 			GL11.glPopMatrix();
 		}
-		else if (RecipeLoader.blockArmbot != null && block.blockID == RecipeLoader.blockArmbot.blockID)
+		/*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();
@@ -78,7 +76,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 			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"));
@@ -101,21 +99,14 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 			this.grinderModel.renderRotation(0.0625f, 0);
 			GL11.glPopMatrix();
 		}
-		else if (RecipeLoader.blockSolar != null && block.blockID == RecipeLoader.blockSolar.blockID)
-		{
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBlockSolarPanel.TEXTURE);
-			GL11.glTranslatef(0.0F, 1.1F, 0.0F);
-			GL11.glRotatef(180f, 0f, 0f, 1f);
-			solarPanelModel.render(0.0625F);
-		}
-		else if (RecipeLoader.blockSteamGen != null && block.blockID == RecipeLoader.blockSteamGen.blockID)
+		/*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

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

@@ -7,13 +7,19 @@ import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
+import resonantinduction.mechanical.fluid.TileEntityReleaseValve;
+import resonantinduction.mechanical.fluid.TileEntityTank;
+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.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.BlockRenderingHandler;
+import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.ItemPipeRenderer;
 import resonantinduction.old.client.render.ItemRenderFluidCan;
 import resonantinduction.old.client.render.ItemTankRenderer;
@@ -30,12 +36,6 @@ import resonantinduction.old.core.misc.EntityTurkey;
 import resonantinduction.old.core.recipe.RecipeLoader;
 import resonantinduction.old.mechanics.processor.TileEntityProcessor;
 import resonantinduction.old.transport.encoder.TileEntityEncoder;
-import resonantinduction.old.transport.fluid.TileEntityReleaseValve;
-import resonantinduction.old.transport.fluid.TileEntityTank;
-import resonantinduction.old.transport.fluid.TileKitchenSink;
-import resonantinduction.old.transport.fluid.pipes.TileEntityPipe;
-import resonantinduction.old.transport.fluid.pump.TileEntityConstructionPump;
-import resonantinduction.old.transport.fluid.pump.TileEntityStarterPump;
 import resonantinduction.old.transport.imprinter.TileEntityImprinter;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -49,7 +49,7 @@ public class ClientProxy extends CommonProxy
 	@Override
 	public void preInit()
 	{
-		RenderingRegistry.registerBlockHandler(new BlockRenderingHandler());
+		RenderingRegistry.registerBlockHandler(new MechanicalBlockRenderingHandler());
 		RenderingRegistry.registerEntityRenderingHandler(EntityTurkey.class, new RenderTurkey());
 		RenderingRegistry.registerEntityRenderingHandler(EntityFarmEgg.class, new RenderSnowball(Item.egg));
 		RenderingRegistry.registerEntityRenderingHandler(EntityTestCar.class, new RenderTestCar());
@@ -74,7 +74,7 @@ public class ClientProxy extends CommonProxy
 		MinecraftForgeClient.registerItemRenderer(RecipeLoader.blockReleaseValve.blockID, new ItemPipeRenderer());
 
 		RenderingRegistry.registerBlockHandler(new BlockRenderHelper());
-		RenderingRegistry.registerBlockHandler(new BlockRenderingHandler());
+		RenderingRegistry.registerBlockHandler(new MechanicalBlockRenderingHandler());
 		if (RecipeLoader.itemFluidCan != null)
 			MinecraftForgeClient.registerItemRenderer(RecipeLoader.itemFluidCan.itemID, new ItemRenderFluidCan());
 	}

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

@@ -7,9 +7,9 @@ import net.minecraftforge.client.IItemRenderer;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.old.client.model.ModelReleaseValve;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

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

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

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

@@ -10,9 +10,9 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.BlockTank;
 import resonantinduction.old.client.model.ModelTankSide;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.fluid.BlockTank;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

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

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.pump.TileEntityConstructionPump;
 import resonantinduction.old.client.model.ModelConstructionPump;
-import resonantinduction.old.transport.fluid.pump.TileEntityConstructionPump;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

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

@@ -20,8 +20,10 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 	public static final ModelConveyorBelt MODEL = new ModelConveyorBelt();
 	public static final ModelAngledBelt MODEL2 = new ModelAngledBelt();
 
-	private void renderAModelAt(TileConveyorBelt tileEntity, double x, double y, double z, float f)
+	@Override
+	public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)
 	{
+		TileConveyorBelt tileEntity = (TileConveyorBelt) t;
 		SlantType slantType = tileEntity.getSlant();
 		int face = tileEntity.getDirection().ordinal();
 
@@ -51,7 +53,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 
 			if (slantType == SlantType.UP)
 			{
-				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "slantedbelt/frame" + frame + ".png");
 				bindTexture(name);
 
 				GL11.glTranslatef(0f, 0.8f, -0.8f);
@@ -73,7 +75,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 			}
 			else if (slantType == SlantType.DOWN)
 			{
-				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "slantedbelt/frame" + frame + ".png");
 				bindTexture(name);
 				GL11.glRotatef(180f, 0f, 1f, 0f);
 				boolean slantAdjust = false;
@@ -94,7 +96,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 			}
 			else
 			{
-				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
+				ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "belt/frame" + frame + ".png");
 				bindTexture(name);
 				GL11.glRotatef(180, 0f, 1f, 0f);
 				GL11.glTranslatef(0f, -0.68f, 0f);
@@ -118,7 +120,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 					GL11.glRotatef(90f, 0f, 1f, 0f);
 					break;
 			}
-			ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
+			ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "belt/frame" + frame + ".png");
 			bindTexture(name);
 			MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), false, false, false, true);
 
@@ -129,11 +131,4 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
 		GL11.glPopMatrix();
 
 	}
-
-	@Override
-	public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
-	{
-		this.renderAModelAt((TileConveyorBelt) tileEntity, var2, var4, var6, var8);
-	}
-
 }

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

@@ -10,11 +10,11 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.pipes.EnumPipeType;
+import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
+import resonantinduction.mechanical.fluid.pipes.TileEntityPipe;
 import resonantinduction.old.client.model.ModelLargePipe;
 import resonantinduction.old.client.model.ModelOpenTrough;
-import resonantinduction.old.transport.fluid.pipes.EnumPipeType;
-import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.old.transport.fluid.pipes.TileEntityPipe;
 
 import com.builtbroken.common.Pair;
 

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

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.pump.TileEntityStarterPump;
 import resonantinduction.old.client.model.ModelPump;
-import resonantinduction.old.transport.fluid.pump.TileEntityStarterPump;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

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

@@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.mechanical.fluid.TileEntityReleaseValve;
 import resonantinduction.old.client.model.ModelLargePipe;
 import resonantinduction.old.client.model.ModelReleaseValve;
-import resonantinduction.old.transport.fluid.TileEntityReleaseValve;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

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

@@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
+import resonantinduction.mechanical.fluid.TileEntityTank;
 import resonantinduction.old.client.model.ModelTankSide;
-import resonantinduction.old.transport.fluid.TileEntityTank;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.lib.helpers.ColorCode;

src/main/java/resonantinduction/old/core/recipe/RecipeLoader.java

@@ -11,11 +11,11 @@ import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import resonantinduction.core.resource.item.ItemParts.Parts;
+import resonantinduction.mechanical.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.old.core.ItemOreDirv;
 import resonantinduction.old.core.misc.EnumTool;
 import resonantinduction.old.mechanics.processor.BlockProcessor;
 import resonantinduction.old.transport.crate.BlockCrate;
-import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
 import cpw.mods.fml.common.registry.GameRegistry;
 import dark.lib.EnumMaterial;
 import dark.lib.EnumOrePart;

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

@@ -9,9 +9,9 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidBlock;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
+import resonantinduction.mechanical.fluid.EnumGas;
+import resonantinduction.mechanical.fluid.GasTank;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.transport.fluid.EnumGas;
-import resonantinduction.old.transport.fluid.GasTank;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.multiblock.link.IBlockActivate;
 import calclavia.lib.utility.FluidHelper;

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

@@ -15,7 +15,7 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.mechanical.CommonProxy;
-import resonantinduction.old.client.render.BlockRenderingHandler;
+import resonantinduction.old.client.render.MechanicalBlockRenderingHandler;
 import resonantinduction.old.client.render.RenderProcessor;
 import resonantinduction.old.transport.ResonantInductionTransport;
 
@@ -135,7 +135,7 @@ public class BlockProcessor extends BlockMachine implements IExtraBlockInfo
 	@Override
 	public int getRenderType()
 	{
-		return BlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
 	}
 
 	@Override

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

@@ -53,6 +53,17 @@ 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.BlockTank;
+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.old.api.coding.TaskRegistry;
 import resonantinduction.old.core.ItemOreDirv;
 import resonantinduction.old.core.misc.BehaviorDispenseEgg;
@@ -67,17 +78,6 @@ 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.fluid.BlockKitchenSink;
-import resonantinduction.old.transport.fluid.BlockReleaseValve;
-import resonantinduction.old.transport.fluid.BlockTank;
-import resonantinduction.old.transport.fluid.EnumGas;
-import resonantinduction.old.transport.fluid.ItemFluidCan;
-import resonantinduction.old.transport.fluid.pipes.BlockPipe;
-import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.old.transport.fluid.pipes.ItemBlockPipe;
-import resonantinduction.old.transport.fluid.pump.BlockConstructionPump;
-import resonantinduction.old.transport.fluid.pump.BlockDrain;
-import resonantinduction.old.transport.fluid.pump.BlockPumpMachine;
 import resonantinduction.old.transport.hopper.BlockAdvancedHopper;
 import resonantinduction.old.transport.imprinter.BlockImprinter;
 import resonantinduction.old.transport.imprinter.ItemImprinter;
@@ -257,7 +257,6 @@ public class ResonantInductionTransport
 	{
 
 		/* BLOCKS */
-		RecipeLoader.blockConveyorBelt = CoreRegistry.createNewBlock("ALBlockConveyor", ResonantInductionTransport.MOD_ID, BlockConveyorBelt.class);
 		RecipeLoader.blockManipulator = CoreRegistry.createNewBlock("Manipulator", ResonantInductionTransport.MOD_ID, BlockManipulator.class);
 		RecipeLoader.blockCrate = (BlockCrate) CoreRegistry.createNewBlock("Crate", ResonantInductionTransport.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
 		RecipeLoader.blockImprinter = CoreRegistry.createNewBlock("Imprinter", ResonantInductionTransport.MOD_ID, BlockImprinter.class);

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.BlockRenderingHandler;
+import resonantinduction.old.client.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 BlockRenderingHandler.BLOCK_RENDER_ID;
+		return MechanicalBlockRenderingHandler.BLOCK_RENDER_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.BlockRenderingHandler;
+import resonantinduction.old.client.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 : BlockRenderingHandler.BLOCK_RENDER_ID;
+		return this.zeroRendering ? 0 : MechanicalBlockRenderingHandler.BLOCK_RENDER_ID;
 	}
 
 	@SideOnly(Side.CLIENT)