~Refactored quite a few classes around, for cleaner code structure.

3 files changed, 7 insertions, 79 deletions

diff --git a/src/Java/miscutil/core/handler/InvSlotRadiation.java b/src/Java/miscutil/core/handler/InvSlotRadiation.java
deleted file mode 100644
index 8dd918f7e3..0000000000
--- a/src/Java/miscutil/core/handler/InvSlotRadiation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package miscutil.core.handler;
-
-import ic2.core.block.invslot.InvSlot;
-import miscutil.core.tileentities.TileEntityHeliumGenerator;
-import net.minecraft.item.ItemStack;
-
-public class InvSlotRadiation extends InvSlot
-{
-	public InvSlotRadiation(TileEntityHeliumGenerator base, String name1, int oldStartIndex1, int count)
-	{
-		super(base, name1, oldStartIndex1, InvSlot.Access.IO, count);
-
-		setStackSizeLimit(1);
-	}
-
-	@Override
-	public boolean accepts(ItemStack itemStack)
-	{
-		return ((TileEntityHeliumGenerator)this.base).isUsefulItem(itemStack, true);
-	}
-
-	@Override
-	public int size()
-	{
-		//Utils.LOG_INFO("InvSlotRadiation/Size");
-		return 3 * 6;
-	}
-
-	public int rawSize()
-	{
-		return super.size();
-	}
-
-	@Override
-	public ItemStack get(int index)
-	{
-		return super.get(mapIndex(index));
-	}
-
-	public ItemStack get(int x, int y)
-	{
-		return super.get(y * 9 + x);
-	}
-
-	@Override
-	public void put(int index, ItemStack content)
-	{
-		super.put(mapIndex(index), content);
-	}
-
-	public void put(int x, int y, ItemStack content)
-	{
-		super.put(y * 9 + x, content);
-	}
-
-	private int mapIndex(int index)
-	{
-		int size = size();
-		int cols = size / 6;
-		if (index < size)
-		{
-			int row = index / cols;
-			int col = index % cols;
-
-			return row * 9 + col;
-		}
-		index -= size;
-		int remCols = 9 - cols;
-
-		int row = index / remCols;
-		int col = cols + index % remCols;
-
-		return row * 9 + col;
-	}
-
-	private final int rows = 6;
-	private final int maxCols = 9;
-}
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index dc544be0fb..b51e41b5ab 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -211,6 +211,12 @@ public class RECIPES_Machines {
 	}
 
 	private static void run(){
+		//Staballoy Dust - TEMP
+		UtilsItems.recipeBuilder("dustTitanium", "dustUranium", "dustUranium",
+				"dustUranium", "dustUranium", "dustUranium",
+				"dustUranium", "dustUranium", "dustUranium",
+				RECIPES_Shapeless.dustStaballoy);
+		
 		//Buffer Core
 		UtilsItems.recipeBuilder(
 				plateTier1, cableTier1, plateTier1,
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java
index c249bb9d77..34eefffea3 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java
@@ -22,7 +22,7 @@ public class RECIPES_Shapeless {
 		static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
 	
 	public static final void RECIPES_LOAD(){
-		run();
+		//run();
 		Utils.LOG_INFO("Loading Shapeless Recipes.");
 	}