Merge pull request #2 from GTNewHorizons/master

update

4 files changed, 45 insertions, 39 deletions

diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 90aca7b09e..9c100bb8e5 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -439,19 +439,19 @@ public class Recipes {
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), 288000,
 				new Object[] {
-						ItemList.Circuit_Board_Elite.get(1),
-						GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64),
-						new Object[]{OrePrefixes.circuit.get(Materials.Master), 4},
-						ItemList.Circuit_Parts_Crystal_Chip_Master.get(36),
-						ItemList.Circuit_Parts_Crystal_Chip_Master.get(36),
-						ItemList.Circuit_Chip_HPIC.get(64),
-						ItemList.Circuit_Parts_DiodeASMD.get(8),
-						ItemList.Circuit_Parts_CapacitorASMD.get(8),
-						ItemList.Circuit_Parts_ResistorASMD.get(8),
-						ItemList.Circuit_Parts_TransistorASMD.get(8),
-						GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64),
-						GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4),
-						GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24)
+					GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4),
+					GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24),
+					ItemList.Circuit_Board_Elite.get(1),
+					GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64),
+					new Object[]{OrePrefixes.circuit.get(Materials.Master), 4},
+					ItemList.Circuit_Parts_Crystal_Chip_Master.get(36),
+					ItemList.Circuit_Parts_Crystal_Chip_Master.get(36),
+					ItemList.Circuit_Chip_HPIC.get(64),
+					ItemList.Circuit_Parts_DiodeASMD.get(8),
+					ItemList.Circuit_Parts_CapacitorASMD.get(8),
+					ItemList.Circuit_Parts_ResistorASMD.get(8),
+					ItemList.Circuit_Parts_TransistorASMD.get(8),
+					GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64)
 				},
 				new FluidStack[] {
 						Materials.SolderingAlloy.getMolten(720)
@@ -462,19 +462,19 @@ public class Recipes {
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2), 288000,
 				new Object[] {
-				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L),
-				new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
-				new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
-				new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
-				new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
-				ItemList.Energy_LapotronicOrb2.get(8L),
-				ItemList.Field_Generator_LuV.get(2),
-				ItemList.Circuit_Wafer_SoC2.get(64),
-				ItemList.Circuit_Wafer_SoC2.get(64),
-				ItemList.Circuit_Parts_DiodeASMD.get(8),
-				GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32),
-				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
-				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24)
+					GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
+					GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24),
+					GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L),
+					new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
+					new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
+					new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
+					new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 1},
+					ItemList.Energy_LapotronicOrb2.get(8L),
+					ItemList.Field_Generator_LuV.get(2),
+					ItemList.Circuit_Wafer_SoC2.get(64),
+					ItemList.Circuit_Wafer_SoC2.get(64),
+					ItemList.Circuit_Parts_DiodeASMD.get(8),
+					GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)
 		},
 				new FluidStack[] {
 						Materials.SolderingAlloy.getMolten(2880),
@@ -486,6 +486,8 @@ public class Recipes {
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), 288000,
 				new Object[] {
+					GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4),
+					GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24),
 					GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L),
 					new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 1},
 					new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 1},
@@ -496,9 +498,7 @@ public class Recipes {
 					ItemList.Circuit_Wafer_HPIC.get(64),
 					ItemList.Circuit_Wafer_HPIC.get(64),
 					ItemList.Circuit_Parts_DiodeASMD.get(16),
-					GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32),
-						GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4),
-						GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24)
+					GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32)
 		},
 				new FluidStack[] {
 						Materials.SolderingAlloy.getMolten(2880),
@@ -510,6 +510,8 @@ public class Recipes {
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), 288000,
 				new Object[] {
+						GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4),
+						GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24),
 						GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
 						GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
 						new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1},
@@ -521,9 +523,7 @@ public class Recipes {
 						ItemList.Circuit_Wafer_UHPIC.get(64),
 						ItemList.Circuit_Wafer_UHPIC.get(64),
 						ItemList.Circuit_Wafer_SoC2.get(32),
-						ItemList.Circuit_Parts_DiodeASMD.get(64),
-						GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4),
-						GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24)
+						ItemList.Circuit_Parts_DiodeASMD.get(64)
 				},
 				new FluidStack[] {
 						Materials.SolderingAlloy.getMolten(3760),
diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
index 709d2c42bb..a12f4130cb 100644
--- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
@@ -178,22 +178,26 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
 				for (GT_MetaTileEntity_Hatch_Output outputHatch : super.mOutputHatches) {
 					if (outputHatch.isFluidLocked() && outputHatch.getLockedFluidName().equals(storedFluidCopy.getUnlocalizedName())) {
 						storedFluidCopy.amount += outputHatch.getCapacity() - outputHatch.getFluidAmount();
-					} else if (outputHatch.getFluid() != null && outputHatch.getFluid().getUnlocalizedName().equals(storedFluidCopy.getUnlocalizedName())) {
+						addFluidToHatch(storedFluidCopy,outputHatch);
+					} else if (outputHatch.getFluid() != null && outputHatch.getFluid().isFluidEqual(storedFluidCopy)) {
 						storedFluidCopy.amount += outputHatch.getCapacity() - outputHatch.getFluidAmount();
-					} else if (outputHatch.getFluid() == null) {
+						addFluidToHatch(storedFluidCopy,outputHatch);
+					} else if (!outputHatch.isFluidLocked() && outputHatch.getFluid() == null) {
 						storedFluidCopy.amount += outputHatch.getCapacity() - outputHatch.getFluidAmount();
+						addFluidToHatch(storedFluidCopy,outputHatch);
 					}
 				}
-				// Test how much can actually be drained and drain that amount
-				storedFluidCopy.amount = mfh.pullFluid(storedFluidCopy, true);
-				// Add to output
-				super.addOutput(storedFluidCopy);
 			}
 		}
 
 		return true;
 	}
 
+	public void addFluidToHatch(FluidStack aFluid, GT_MetaTileEntity_Hatch_Output aHatch) {
+		aFluid.amount = mfh.pullFluid(aFluid, true);
+		aHatch.fill(aFluid,true);
+	}
+
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
 		super.onPostTick(aBaseMetaTileEntity, aTick);
diff --git a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
index 408399b677..fc2579604a 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
@@ -183,6 +183,8 @@ public class GTMTE_TFFTMultiHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection from) {
+        if (mfh == null)
+            return null;
         FluidStack[] fluids = mfh.getAllFluids();
         int length = fluids.length;
         int maxCapcity = mfh.getCapacity();
diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java
index 936ecf5042..399f9faa8b 100644
--- a/src/main/java/kekztech/MultiFluidHandler.java
+++ b/src/main/java/kekztech/MultiFluidHandler.java
@@ -383,7 +383,7 @@ public class MultiFluidHandler {
 			return 0;
 		}
 		FluidStack tFluid = fluids[slot];
-		if(tFluid == null && tFluid.equals(pull)) {
+		if(tFluid == null || !tFluid.equals(pull)) {
 			return 0;
 		} else {
 			final int rec = Math.min(pull.amount, tFluid.amount);