From 05bbcd4a48556ec371b446700e88aec185986f6c Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Sat, 4 Jan 2014 18:50:13 -0500
Subject: [PATCH] =?UTF-8?q?Attempt=20to=20remove=20MekanismAll,=20I=20real?=
 =?UTF-8?q?ly=20have=20no=20idea=20what=20I=E2=80=99m=20doing=20though=20A?=
 =?UTF-8?q?lso=20kill=20copied=20ItemMultiPart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  2 +-
 .../common/multipart/ItemPartTransmitter.java |  3 +-
 .../common/multipart/MItemMultiPart.java      | 73 -------------------
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 common/mekanism/common/multipart/MItemMultiPart.java

diff --git a/build.gradle b/build.gradle
index 332818697..ac0319386 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 }
 
 version = "6.0.0." + "$System.env.BUILD_NUMBER"
-archivesBaseName = "MekanismAll"
+
 libsDirName = "../output"
 distsDirName = "../output"
 
diff --git a/common/mekanism/common/multipart/ItemPartTransmitter.java b/common/mekanism/common/multipart/ItemPartTransmitter.java
index 9f28cf344..a90927f42 100644
--- a/common/mekanism/common/multipart/ItemPartTransmitter.java
+++ b/common/mekanism/common/multipart/ItemPartTransmitter.java
@@ -21,11 +21,12 @@ import org.lwjgl.input.Keyboard;
 
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
+import codechicken.multipart.JItemMultiPart;
 import codechicken.multipart.TMultiPart;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemPartTransmitter extends MItemMultiPart
+public class ItemPartTransmitter extends JItemMultiPart
 {
 	public ItemPartTransmitter(int id)
 	{
diff --git a/common/mekanism/common/multipart/MItemMultiPart.java b/common/mekanism/common/multipart/MItemMultiPart.java
deleted file mode 100644
index 6032a99a0..000000000
--- a/common/mekanism/common/multipart/MItemMultiPart.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package mekanism.common.multipart;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import codechicken.lib.vec.BlockCoord;
-import codechicken.lib.vec.Rotation;
-import codechicken.lib.vec.Vector3;
-import codechicken.multipart.TMultiPart;
-import codechicken.multipart.TileMultipart;
-
-/**
- * Taken from FMP to prevent compile issues
- * @author aidancbrady
- *
- */
-public abstract class MItemMultiPart extends Item
-{
-	public MItemMultiPart(int id)
-	{
-		super(id);
-	}
-	
-	private double getHitDepth(Vector3 vhit, int side)
-	{
-        return vhit.copy().scalarProject(Rotation.axes[side]) + (side%2^1);
-	}
-        
-    @Override
-    public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
-    {
-    	BlockCoord pos = new BlockCoord(x, y, z);
-        Vector3 vhit = new Vector3(hitX, hitY, hitZ);
-        double d = getHitDepth(vhit, side);
-        
-        if(d < 1 && place(item, player, world, x, y, z, side, hitX, hitY, hitZ, pos, vhit))
-        {
-            return true;
-        }
-        
-        pos.offset(side);
-        
-        return place(item, player, world, x, y, z, side, hitX, hitY, hitZ, pos, vhit);
-    }
-    
-    private boolean place(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, BlockCoord pos, Vector3 vhit)
-    {
-        TMultiPart part = newPart(item, player, world, pos, side, vhit);
-        
-        if(part == null || !TileMultipart.canPlacePart(world, pos, part))
-        {
-            return false;
-        }
-        
-        if(!world.isRemote)
-        {
-            TileMultipart.addPart(world, pos, part);
-        }
-        
-        if(!player.capabilities.isCreativeMode)
-        {
-            item.stackSize -= 1;
-        }
-        
-        return true;
-    }
-    
-    /**
-     * Create a new part based on the placement information parameters.
-     */
-    public abstract TMultiPart newPart(ItemStack item, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 vhit);
-}