Added missing Pine Tree textures.

Added recipes for Isamill and Flotation Cell content.
Corrected tooltip on IsaMill controller.
Fixed bad casing allocation.

4 files changed, 163 insertions, 32 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 0a4e760a17..9196fcfba5 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -99,6 +99,14 @@ public class RECIPES_Machines {
 	public static ItemStack RECIPE_LFTROuterCasing;
 	public static ItemStack RECIPE_LFTRInnerCasing;
 
+	//Milling
+	public static ItemStack RECIPE_ISAMill_Controller;
+	public static ItemStack RECIPE_ISAMill_Gearbox;
+	public static ItemStack RECIPE_ISAMill_Casing;
+	public static ItemStack RECIPE_ISAMill_Hatch;
+	public static ItemStack RECIPE_Flotation_Controller;
+	public static ItemStack RECIPE_Flotation_Casing;
+
 	//Cyclotron
 	public static ItemStack RECIPE_CyclotronController;
 	public static ItemStack RECIPE_CyclotronOuterCasing;
@@ -242,6 +250,7 @@ public class RECIPES_Machines {
 		algaeFarm();
 		chemPlant();
 		zyngen();
+		milling();
 
 	}
 
@@ -2367,6 +2376,151 @@ public class RECIPES_Machines {
 				60 * 20 * 12, 
 				MaterialUtils.getVoltageForTier(7));
 	}
+	
+	private static void milling() {
+
+
+		/*public static ItemStack RECIPE_ISAMill_Controller;
+		public static ItemStack RECIPE_ISAMill_Gearbox;
+		public static ItemStack RECIPE_ISAMill_Casing;
+		public static ItemStack RECIPE_ISAMill_Hatch;
+		public static ItemStack RECIPE_Flotation_Controller;
+		public static ItemStack RECIPE_Flotation_Casing;*/
+
+		// Isa Mill Controller
+		CORE.RA.addAssemblylineRecipe(
+				ItemList.Machine_IV_Macerator.get(1), 
+				20 * 60 * 20,
+				new ItemStack[] {
+						GregtechItemList.Casing_IsaMill_Gearbox.get(4),
+						CI.getTieredGTPPMachineCasing(6, 4),
+						ItemList.Component_Grinder_Tungsten.get(16),
+						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 8),
+						ALLOY.INCONEL_625.getGear(8),
+						ALLOY.INCONEL_625.getPlate(32),
+						ALLOY.ZERON_100.getPlateDouble(8),
+						ALLOY.ZERON_100.getPlateDouble(8),
+						ALLOY.ZERON_100.getScrew(64),
+						CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
+						CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
+						CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
+						CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
+
+				}, 
+				new FluidStack[] {
+						CI.getTieredFluid(6, 16 * 144),
+						CI.getAlternativeTieredFluid(6, 32 * 144),
+						CI.getTertiaryTieredFluid(6, 32 * 144)
+				}, 
+				GregtechItemList.Controller_IsaMill.get(1),
+				20 * 60 * 10, 
+				MaterialUtils.getVoltageForTier(6));
+
+		// Isa Mill Gearbox
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(7),
+						ItemList.Casing_Gearbox_Titanium.get(2),
+						ALLOY.INCONEL_625.getGear(4),
+						CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8),
+						ALLOY.INCONEL_625.getPlate(16),
+						ALLOY.ZERON_100.getBolt(16),
+				}, 
+				ALLOY.TUNGSTENSTEEL.getFluid(8 * 144), 
+				GregtechItemList.Casing_IsaMill_Gearbox.get(1), 
+				60 * 20 * 2, 
+				MaterialUtils.getVoltageForTier(6));
+
+		// Isa Mill Casing
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(7),
+						CI.getTieredGTPPMachineCasing(5, 1),
+						ALLOY.INCONEL_625.getPlate(8),
+						ALLOY.ZERON_100.getRod(4),
+						CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4),
+						ALLOY.ZERON_100.getScrew(8),
+				}, 
+				ELEMENT.getInstance().TITANIUM.getFluid(4 * 144), 
+				GregtechItemList.Casing_IsaMill_Casing.get(1), 
+				60 * 20 * 2, 
+				MaterialUtils.getVoltageForTier(6));
+
+		// Isa Mill Pipe
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(7),
+						CI.getTieredGTPPMachineCasing(4, 2),
+						ALLOY.INCONEL_625.getPlateDouble(4),
+						ALLOY.INCOLOY_MA956.getRing(8),
+						CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8),
+						ALLOY.INCOLOY_MA956.getBolt(16),
+				}, 
+				ELEMENT.getInstance().ALUMINIUM.getFluid(8 * 144), 
+				GregtechItemList.Casing_IsaMill_Pipe.get(1), 
+				60 * 20 * 8, 
+				MaterialUtils.getVoltageForTier(4));	
+
+		// Flotation Cell Controller
+		CORE.RA.addAssemblylineRecipe(
+				ItemList.Distillation_Tower.get(1), 
+				20 * 60 * 20,
+				new ItemStack[] {
+						GregtechItemList.Casing_Flotation_Cell.get(4),
+						CI.getTieredGTPPMachineCasing(5, 4),
+						ItemList.Machine_IV_Distillery.get(1),
+						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 8),
+						ALLOY.STELLITE.getGear(8),
+						ALLOY.STELLITE.getPlate(32),
+						ALLOY.HASTELLOY_N.getPlateDouble(8),
+						ALLOY.HASTELLOY_N.getPlateDouble(8),
+						ALLOY.HASTELLOY_N.getScrew(64),
+						CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+						CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+						CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
+						CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
+
+				}, 
+				new FluidStack[] {
+						CI.getTieredFluid(5, 16 * 144),
+						CI.getAlternativeTieredFluid(4, 32 * 144),
+						CI.getTertiaryTieredFluid(4, 32 * 144)
+				}, 
+				GregtechItemList.Controller_Flotation_Cell.get(1),
+				20 * 60 * 10, 
+				MaterialUtils.getVoltageForTier(6));
+
+		// Flotation Cell Casing
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(7),
+						CI.getTieredGTPPMachineCasing(4, 1),
+						ALLOY.AQUATIC_STEEL.getPlate(8),
+						ALLOY.STELLITE.getRing(8),
+						CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4),
+						ALLOY.HASTELLOY_N.getScrew(8),
+				}, 
+				ALLOY.STAINLESS_STEEL.getFluid(8 * 144), 
+				GregtechItemList.Casing_Flotation_Cell.get(1), 
+				60 * 20 * 2, 
+				MaterialUtils.getVoltageForTier(6));
+
+		// Milling Bus
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(7),
+						CI.getTieredGTPPMachineCasing(5, 1),
+						ItemList.Hatch_Input_Bus_EV.get(1),
+						CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8),
+						CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32),
+						CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
+				}, 
+				ELEMENT.getInstance().TUNGSTEN.getFluid(8 * 144), 
+				GregtechItemList.Bus_Milling_Balls.get(1), 
+				60 * 20 * 4, 
+				MaterialUtils.getVoltageForTier(5));
+
+	}
 
 	private static void fakeMachineCasingCovers() {	    
 		GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index fd5ceed89b..7ff40ccc12 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -396,6 +396,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	// Flotation Cell
 	Controller_Flotation_Cell,
+	Casing_Flotation_Cell,
 	
 	// Elemental Duplicator
 	/*Controller_ElementalDuplicator,*/
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index a4a396e4cf..5a5c923d10 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -64,7 +64,8 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
 		GregtechItemList.Casing_SolarTower_Structural.set(new ItemStack(this, 1, 6));
 		GregtechItemList.Casing_SolarTower_SaltContainment.set(new ItemStack(this, 1, 7));
 		GregtechItemList.Casing_SolarTower_HeatContainment.set(new ItemStack(this, 1, 8));
-		GregtechItemList.Casing_Reinforced_Engine_Casing.set(new ItemStack(this, 1, 9));
+		GregtechItemList.Casing_Flotation_Cell.set(new ItemStack(this, 1, 9));
+		GregtechItemList.Casing_Reinforced_Engine_Casing.set(new ItemStack(this, 1, 10));
 	}	
 
 	public IIcon getIcon(int aSide, int aMeta) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
index 967c82ff74..c8a6850e42 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
@@ -81,7 +81,10 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase
 				.beginStructureBlock(3, 3, 4, false)
 				.addController("Front Center")
 				.addCasingInfo("IsaMill Exterior Casing", 40)
-				.addCasingInfo("IsaMill Gearbox", 6)
+                .addOtherStructurePart("IsaMill Gearbox", "Inner Blocks")
+                .addOtherStructurePart("IsaMill Piping", "8x, ring around controller")
+                .addStructureInfo("IsaMill Pipings must not be obstructed in front (only air blocks)")
+				.addOtherStructurePart("Milling Ball Hatch", "Any Casing")
 				.addInputBus("Any Casing", 1)
 				.addOutputBus("Any Casing", 1)
 				.addEnergyHatch("Any Casing", 1)
@@ -104,7 +107,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase
 							'C',
 							ofChain(
 									ofHatchAdder(
-											GregtechMetaTileEntity_IsaMill::addIsaMillList, getCasingTextureIndex(), 1
+											GregtechMetaTileEntity_IsaMill::addToMachineList, getCasingTextureIndex(), 1
 									),
 									onElementPass(
 											x -> ++x.mCasing,
@@ -143,34 +146,6 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase
 		return checkPiece(mName, 1, 1, 0) && mCasing >= 48 - 8 && checkHatch();
 	}
 
-	public final boolean addIsaMillList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
-		if (aTileEntity == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls){
-				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){
-				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
-				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){
-				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
-			}
-		}
-		return false;
-	}
-
 	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
 		return new ITexture[]{
 				Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(2)),
@@ -344,7 +319,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase
 	}
 
 	public byte getIntakeMeta() {
-		return 0;
+		return 1;
 	}
 
 	public Block getGearboxBlock() {