Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

9 files changed, 202 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index 7c11e7232b..ab359c3853 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -19,7 +19,7 @@ public class BlockPos implements Serializable{
 	public final int yPos;
 	public final int zPos;
 	public final int dim;
-	public final World world;
+	public final transient World world;
 	
 	public static BlockPos generateBlockPos(String sUUID) {
 		String[] s2 = sUUID.split("@");
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
new file mode 100644
index 0000000000..8c76513d09
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
@@ -0,0 +1,62 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class CubicObject<T> {
+
+	public final T NORTH;
+	public final T SOUTH;
+
+	public final T WEST;
+	public final T EAST;
+
+	public final T UP;
+	public final T DOWN;	
+	
+	public CubicObject(AutoMap<T> aDataSet) {
+		this(aDataSet.get(0), aDataSet.get(1), aDataSet.get(2), aDataSet.get(3), aDataSet.get(4), aDataSet.get(5));
+	}
+	
+	public CubicObject(T[] aDataSet) {
+		this(aDataSet[0], aDataSet[1], aDataSet[2], aDataSet[3], aDataSet[4], aDataSet[5]);
+	}
+
+	public CubicObject(T aDOWN, T aUP, T aNORTH, T aSOUTH, T aWEST, T aEAST) {
+		DOWN = aDOWN;
+		UP = aUP;
+		NORTH = aNORTH;
+		SOUTH = aSOUTH;
+		WEST = aWEST;
+		EAST = aEAST;
+	}
+
+	public T get(int aSide) {
+		return get(ForgeDirection.getOrientation(aSide));
+	}
+
+	public T get(ForgeDirection aSide) {
+		if (aSide == ForgeDirection.DOWN) {
+			return DOWN;
+		}
+		else if (aSide == ForgeDirection.UP) {
+			return UP;
+		}
+		else if (aSide == ForgeDirection.NORTH) {
+			return NORTH;
+		}
+		else if (aSide == ForgeDirection.SOUTH) {
+			return SOUTH;
+		}
+		else if (aSide == ForgeDirection.WEST) {
+			return WEST;
+		}
+		else if (aSide == ForgeDirection.EAST) {
+			return EAST;
+		}
+		else {
+			return null;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
index d0c1f3f040..d5db8081dc 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
@@ -12,7 +12,7 @@ import net.minecraftforge.common.DimensionManager;
 public class FakeBlockPos extends BlockPos {
 
 	private static final long serialVersionUID = -6442245826092414593L;
-	private Block aBlockAtPos;
+	private transient Block aBlockAtPos;
 	private int aBlockMetaAtPos = 0;
 	
 	public static FakeBlockPos generateBlockPos(String sUUID) {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
new file mode 100644
index 0000000000..7c418b5a77
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -0,0 +1,64 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.HashMap;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.util.IIcon;
+
+/**
+ * A Server Side safe object that can hold {@link IIcon}s.
+ * @author Alkalus
+ *
+ */
+public class SafeTexture implements Runnable {	
+
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<Integer, IIcon>();
+	
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<String, Integer> mPathToHashCash = new HashMap<String, Integer>();
+	
+	private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<String, SafeTexture>();	
+	
+	private final int mHash;
+	
+	private final String mTextureName;
+	
+	private final static String getKey(String aTexPath) {
+		String aNameKey = Utils.sanitizeString(aTexPath);
+		aNameKey = aNameKey.replace('/', ' ');
+		aNameKey = aNameKey.toLowerCase();
+		return aNameKey;
+	}
+	
+	public static SafeTexture register(String aTexturePath) {
+		String aNameKey = getKey(aTexturePath);
+		SafeTexture g = mTextureObjectCache.get(aNameKey);
+		if (g == null) {
+			g = new SafeTexture(aTexturePath);			
+			mTextureObjectCache.put(aNameKey, g);			
+			mPathToHashCash.put(aTexturePath, aTexturePath.hashCode());			
+		}	
+		return g;
+	}
+	
+	private SafeTexture(String aTexturePath) {
+		mTextureName = aTexturePath;
+		mHash = getKey(aTexturePath).hashCode();
+		GregTech_API.sGTBlockIconload.add(this);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon() {
+		return mHashToIconCache.get(mHash);
+	}
+
+	@Override
+	public void run() {
+		mHashToIconCache.put(getKey(mTextureName).hashCode(), GregTech_API.sBlockIcons.registerIcon(mTextureName));	
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
index 1073e63914..c0e9b20c54 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -3,11 +3,7 @@ package gtPlusPlus.api.objects.minecraft;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
-import gtPlusPlus.xmod.ic2.item.IC2_Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.ShapedOreRecipe;
@@ -36,13 +32,7 @@ public class ShapedRecipe {
 		String[] aLoggingInfo = new String[9];
 
 		if (mBlackList == null) {
-			mBlackList = new ItemStack[] {
-					ItemUtils.getSimpleStack(ModBlocks.blockNet),
-					ItemUtils.getSimpleStack(ModBlocks.blockXpConverter),
-					ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard),
-					ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive),
-					ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame),
-			};
+			mBlackList = new ItemStack[] {};
 		}
 
 		//Just to be safe
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
index 393d3260b5..b7462250b1 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
@@ -21,7 +21,7 @@ public class ThreadFakeWorldGenerator extends Thread {
 	
 	public ThreadFakeWorldGenerator() {
         setName("gtpp.handler.fakeworldtrees");
-        run();
+        start();
 	}
 	
 	public static ThreadFakeWorldGenerator getInstance() {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
index a5f466b19f..0ff6e112ac 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
@@ -33,7 +33,7 @@ public class ThreadPooCollector extends Thread {
 	
 	public ThreadPooCollector() {
         setName("gtpp.handler.poop");
-        run();
+        start();
 	}
 	
 	public static ThreadPooCollector getInstance() {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
new file mode 100644
index 0000000000..4dc032d01f
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gtPlusPlus.core.recipe.common.CI;
+import net.minecraft.item.ItemStack;
+
+public class NoOutputBonusMultiBehaviour extends SpecialMultiBehaviour {
+
+	public NoOutputBonusMultiBehaviour() {
+		// Used by other mods which may wish to not obtain bonus outputs on their Sifting or Maceration recipes.
+	}
+	
+	@Override
+	public ItemStack getTriggerItem() {
+		return CI.getNumberedBioCircuit(22);
+	}
+
+	@Override
+	public String getTriggerItemTooltip() {
+		return "Prevents bonus output % on GT++ multiblocks when used";
+	}
+
+	@Override
+	public int getOutputChanceRoll() {
+		return 10000;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java b/src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
new file mode 100644
index 0000000000..e562ccc40b
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Extend this class to implement custom behaviour for multiblocks.
+ * The Trigger item when in a special slot or input bus, will cause the multiblock to behave as specified.
+ * Not overriding a method here will cause the default values to be used.
+ * @author Alkalus
+ *
+ */
+public abstract class SpecialMultiBehaviour {
+
+	private final int mMaxParallelRecipes = Short.MIN_VALUE;
+	private final int mEUPercent = Short.MIN_VALUE;
+	private final int mSpeedBonusPercent = Short.MIN_VALUE;
+	private final int mOutputChanceRoll = Short.MIN_VALUE;	
+	
+	public abstract ItemStack getTriggerItem();
+	
+	public abstract String getTriggerItemTooltip();
+
+	public int getMaxParallelRecipes() {
+		return this.mMaxParallelRecipes;
+	}
+
+	public int getEUPercent() {
+		return this.mEUPercent;
+	}
+
+	public int getSpeedBonusPercent() {
+		return this.mSpeedBonusPercent;
+	}
+
+	public int getOutputChanceRoll() {
+		return this.mOutputChanceRoll;
+	}	
+	
+	public final boolean isTriggerItem(ItemStack aToMatch) {
+		return GT_Utility.areStacksEqual(getTriggerItem(), aToMatch, false);
+	}
+	
+}