+ Added IsaMill.

+ Added repackaged Sun classes.
+ Added Milled ores.
+ Added Milling Balls.
$ Disabled Hand-pump pumping from non-GT tile entities.
> Maybe did other things, but in a hurry to commit.

4 files changed, 114 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 566b8f70a0..37428b18d6 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -314,9 +314,6 @@ public class CoalTar extends ItemPackage {
 	@Override
 	public void fluids() {
 
-
-		//Special Compatibility for Coke
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
 		//Create Coal Gas
 		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
 		//Ethanol
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 88f9bb29a5..039e9e3d4a 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -16,6 +16,7 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -88,6 +89,19 @@ public class GenericChem extends ItemPackage {
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
 	public static ItemGenericChemBase mGenericChemItem1;
 
+	private ItemStack mCatalystCarrier;
+	
+	public static ItemStack mRedCatalyst;
+	public static ItemStack mYellowCatalyst;
+	public static ItemStack mBlueCatalyst;
+	public static ItemStack mOrangeCatalyst;
+	public static ItemStack mPurpleCatalyst;
+	public static ItemStack mBrownCatalyst;
+	public static ItemStack mPinkCatalyst;
+
+	public static ItemStack mMillingBallAlumina;
+	public static ItemStack mMillingBallSoapstone;
+
 
 
 	@Override
@@ -101,17 +115,11 @@ public class GenericChem extends ItemPackage {
 		
 		registerItemStacks();
 		registerOreDict();
-	}
 
-	private ItemStack mCatalystCarrier;
-	
-	public static ItemStack mRedCatalyst;
-	public static ItemStack mYellowCatalyst;
-	public static ItemStack mBlueCatalyst;
-	public static ItemStack mOrangeCatalyst;
-	public static ItemStack mPurpleCatalyst;
-	public static ItemStack mBrownCatalyst;
-	public static ItemStack mPinkCatalyst;
+		GregtechItemList.Milling_Ball_Alumina.set(mMillingBallAlumina);
+		GregtechItemList.Milling_Ball_Soapstone.set(mMillingBallSoapstone);
+		
+	}
 	
 	
 	public void registerItemStacks() {
@@ -125,6 +133,8 @@ public class GenericChem extends ItemPackage {
 		mPurpleCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 4, 1);
 		mBrownCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 5, 1);
 		mPinkCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 6, 1);
+		mMillingBallAlumina = ItemUtils.simpleMetaStack(mGenericChemItem1, 7, 1);
+		mMillingBallSoapstone = ItemUtils.simpleMetaStack(mGenericChemItem1, 8, 1);
 		
 	}
 	
@@ -137,6 +147,8 @@ public class GenericChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mPurpleCatalyst, "catalystIridiumRuthenium");
 		ItemUtils.addItemToOreDictionary(mBrownCatalyst, "catalystNickelAluminium");
 		ItemUtils.addItemToOreDictionary(mPinkCatalyst, "catalystPlatinumRhodium");
+		ItemUtils.addItemToOreDictionary(mMillingBallAlumina, "millingballAlumina");
+		ItemUtils.addItemToOreDictionary(mMillingBallSoapstone, "millingballSoapstone");
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
new file mode 100644
index 0000000000..4491c12bb1
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -0,0 +1,89 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.item.base.ore.BaseItemMilledOre;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import net.minecraft.item.Item;
+import net.minecraftforge.fluids.Fluid;
+
+public class MilledOreProcessing extends ItemPackage {
+
+	/**
+	 * Fluids
+	 */
+	
+	public static Fluid ZincFlotationFroth;
+	public static Fluid CopperFlotationFroth;
+	
+	
+	/**
+	 * Items
+	 */
+
+	public static Item milledSphalerite;
+	public static Item milledChalcopyrite;
+	
+
+	@Override
+	public void items() {
+
+		milledSphalerite = BaseItemMilledOre.generate(Materials.Sphalerite, MaterialUtils.getVoltageForTier(5));
+		milledChalcopyrite = BaseItemMilledOre.generate(Materials.Chalcopyrite, MaterialUtils.getVoltageForTier(4));
+		
+	}
+
+	@Override
+	public void blocks() {
+		// None yet
+	}
+
+	@Override
+	public void fluids() {
+		
+		short[] aZincFrothRGB = Materials.Sphalerite.mRGBa;
+		ZincFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.zincflotation", "Zinc Froth", 32 + 175, new short[] { aZincFrothRGB[0], aZincFrothRGB[1], aZincFrothRGB[2], 100 }, true);
+		short[] aCopperFrothRGB = Materials.Chalcopyrite.mRGBa;
+		CopperFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.copperflotation", "Copper Froth", 32 + 175, new short[] { aCopperFrothRGB[0], aCopperFrothRGB[1], aCopperFrothRGB[2], 100 }, true);
+		
+	}
+	
+	
+
+	public MilledOreProcessing() {
+		super();
+		Logger.INFO("Adding Ore Milling content");
+	}
+
+	private static void addMiscRecipes() {
+
+		/*GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedBioCircuit(10),
+				GT_Values.NI,
+				FluidUtils.getFluidStack(MilledOreProcessing.ZincFlotationFroth, 1000),
+				FluidUtils.getWater(500),
+				ELEMENT.getInstance().IRON.getSmallDust(1),
+				ELEMENT.getInstance().COPPER.getSmallDust(1),
+				ELEMENT.getInstance().TIN.getSmallDust(1),
+				ELEMENT.getInstance().SULFUR.getSmallDust(1),
+				ELEMENT.getInstance().NICKEL.getTinyDust(1),
+				ELEMENT.getInstance().LEAD.getTinyDust(1),
+				new int[] { 3000, 3000, 2000, 2000, 1000, 1000 }, 
+				30 * 20, 
+				30);*/
+
+	}
+
+	@Override
+	public String errorMessage() {
+		return "Failed to generate recipes for OreMillingProc.";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		addMiscRecipes();
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 208fecd57c..7fb5f207f6 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -19,7 +19,7 @@ public class ItemGenericChemBase extends Item {
 
 	final protected IIcon base[];
 	
-	final private int aMetaSize = 7;
+	final private int aMetaSize = 9;
 	
 	/*
 	 * 0 - Red Metal Catalyst //FeCu
@@ -29,7 +29,8 @@ public class ItemGenericChemBase extends Item {
 	 * 4 - Purple Metal Catalyst //IrIdium Ruthenium
 	 * 5 - Brown Metal Catalyst //NiAl
 	 * 6 - Pink Metal Catalyst //PtRh
-	 * 
+	 * 7 - Alumina Grinding Ball
+	 * 8 - Soapstone Grinding Ball
 	 */
 	
 	public ItemGenericChemBase() {