+ 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.

11 files changed, 181 insertions, 37 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 1c8b33430d..a8536683b5 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -55,6 +55,7 @@ public final class ModBlocks {
 	public static Block blockCasings2Misc;
 	public static Block blockCasings3Misc;
 	public static Block blockCasings4Misc;	
+	public static Block blockCasings5Misc;	
 	public static Block blockCasingsTieredGTPP;
 	public static Block blockSpecialMultiCasings;
 	
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index d7c971e71f..21f3e1d6cd 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -83,6 +83,7 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMiniRaFusion;
@@ -218,6 +219,7 @@ public class COMPAT_HANDLER {
 			GregtechFluidReactor.run();
 			GregtechAlgaeContent.run();
 			GregtechIndustrialAlloySmelter.run();
+			GregtechIsaMill.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index b0e98d389e..6f3e62659f 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -35,6 +35,7 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.CoalTar;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
+import gtPlusPlus.core.item.chemistry.MilledOreProcessing;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
@@ -999,6 +1000,8 @@ public final class ModItems {
 		//General Chemistry
 		new GenericChem();
 		
+		// Milled Ore Processing
+		new MilledOreProcessing();
 		
 		//Bombs
 		itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc);
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
new file mode 100644
index 0000000000..4edf4ae75d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.core.item.base.ore;
+
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import net.minecraft.item.Item;
+
+public class BaseItemMilledOre extends BaseOreComponent{
+
+	public BaseItemMilledOre(final Material material, int aMaterialEU) {
+		super(material, BaseOreComponent.ComponentTypes.MILLED);
+		CORE.RA.addMillingRecipe(material, aMaterialEU);
+	}	
+
+	public static Item generate(Materials aMat, int aMaterialEU) {
+		return generate(MaterialUtils.generateMaterialFromGtENUM(aMat), aMaterialEU);
+	}
+	
+	public static Item generate(Material aMat, int aMaterialEU) {
+		return new BaseItemMilledOre(aMat, aMaterialEU);
+	}
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index c5b7191ddd..24c87c3334 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -48,7 +48,6 @@ public class BaseOreComponent extends Item{
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(this.unlocalName);
 		this.setMaxStackSize(64);
-		//this.setTextureName(this.getCorrectTextures());
 		this.componentColour = material.getRgbAsHex();
 		GameRegistry.registerItem(this, this.unlocalName);
 		registerComponent();
@@ -59,9 +58,9 @@ public class BaseOreComponent extends Item{
 				//ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel);				
 			}
 		}
-		
+
 	}
-	
+
 	public boolean registerComponent() {	
 		Logger.MATERIALS("Attempting to register "+this.getUnlocalizedName()+".");	
 		if (this.componentMaterial == null) {
@@ -92,7 +91,10 @@ public class BaseOreComponent extends Item{
 		else if (componentType == ComponentTypes.DUSTPURE) {
 			aKey = OrePrefixes.dustPure.name();
 		}
-		
+		else if (componentType == ComponentTypes.MILLED) {
+			aKey = "milled";
+		}
+
 		ItemStack x = aMap.get(aKey);
 		if (x == null) {
 			aMap.put(aKey, ItemUtils.getSimpleStack(this));
@@ -107,13 +109,6 @@ public class BaseOreComponent extends Item{
 		}
 	}
 
-	public String getCorrectTextures(){
-		if (!CORE.ConfigSwitches.useGregtechTextures){
-			return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME;
-		}
-		return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME;
-	}
-
 	/*@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 			return (this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME);
@@ -181,7 +176,13 @@ public class BaseOreComponent extends Item{
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(final IIconRegister par1IconRegister){
-		if (CORE.ConfigSwitches.useGregtechTextures){
+		if (this.componentType == ComponentTypes.MILLED) {
+			this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent());
+			if (this.componentType.hasOverlay()){
+				this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent()+"_Overlay");
+			}
+		}		
+		else if (CORE.ConfigSwitches.useGregtechTextures){
 			//Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the layer 0 texture path.");
 			this.base = par1IconRegister.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME);
 			if (this.componentType.hasOverlay()){
@@ -199,13 +200,21 @@ public class BaseOreComponent extends Item{
 
 	@Override
 	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+		if (this.componentType == ComponentTypes.MILLED) {			
+			if (renderPass == 1){
+				return Utils.rgbtoHexValue(230, 230, 230);
+			}
 			return this.componentColour;
 		}
-		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
-			return Utils.rgbtoHexValue(230, 230, 230);
-		}
-		return this.componentColour;
+		else {
+			if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+				return this.componentColour;
+			}
+			if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
+				return Utils.rgbtoHexValue(230, 230, 230);
+			}
+			return this.componentColour;
+		}		
 	}
 
 
@@ -226,7 +235,8 @@ public class BaseOreComponent extends Item{
 		DUSTPURE("dustPure", "Purified ", " Dust", true),
 		CRUSHED("crushed", "Crushed ", " Ore", true),
 		CRUSHEDCENTRIFUGED("crushedCentrifuged", "Centrifuged Crushed "," Ore", true),
-		CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true);
+		CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true),
+		MILLED("milled", "Milled ", " Ore", true);
 
 		private String COMPONENT_NAME;
 		private String PREFIX;
@@ -252,7 +262,7 @@ public class BaseOreComponent extends Item{
 		public boolean hasOverlay(){
 			return this.HAS_OVERLAY;
 		}
-		
+
 		public String getPrefix(){
 			return this.PREFIX;
 		}
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() {
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index a48573888e..e43dc8546b 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -19,7 +19,6 @@ import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
@@ -200,7 +199,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 
 		if (aOffsetMeta <= 3) {
 			FluidStack f = getFluid(aStack);
-			aList.add("Can also drain any other standard fluid container block");
+			aList.add("Cannot drain any other standard fluid container block");
 			aList.add("Cannot be emptied via RMB, use inside a tank with GUI");
 			aList.add(EnumChatFormatting.DARK_GRAY+"This is technically just a fancy fluid cell");
 			aList.add(EnumChatFormatting.BLUE + (f != null ? f.getLocalizedName() : "No Fluids Contained"));
@@ -973,7 +972,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 						} 
 						//Try support Standard Fluid Tanks too (May disable if dupes appear again)
 						else if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) {
-							return this.drainIFluidTank(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ);
+							//return this.drainIFluidTank(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ);
+							return false;
 						}
 					}
 				}
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index b5922dde53..9cdf16fe01 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -24,6 +24,7 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 import net.minecraft.block.Block;
@@ -890,6 +891,9 @@ public class Material {
 	public final ItemStack getDustImpure(final int stacksize){
 		return getComponentByPrefix(OrePrefixes.dustImpure, stacksize);
 	}
+	public final ItemStack getMilled(final int stacksize){
+		return getComponentByPrefix(CustomOrePrefix.get(CustomOrePrefix.Milled), stacksize);
+	}
 	
 	public final boolean hasSolidForm() {		
 		if (ItemUtils.checkForInvalidItems(new ItemStack[] {getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1)})) {