From 5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 5 Feb 2019 20:02:33 +0000
Subject: + Added recipe for Nano Healer. + Added recipe for Strange Dust. +
 Added recipe for Slow Builders Ring. + Added recipes for Charge Packs. +
 Added recipes to make obtaining Zirconium a little earlier. + Added packager
 recipes for all ore materials. + Added lathe recipes for all materials ->
 rods. Closes #411. + Added way to process Silicon Carbide into Synthetic
 Graphite. Closes #407. + Added proper achievement localization for all new AL
 recipes. + Added more INIT_PHASE's. - Removed ways to obtain Trinium dust in
 GTNH. (Leave handling to GT instead). % Adjusted recipes for Cyclotron and
 Casings, it's now assembled instead of shape crafted. % Adjusted circuits
 used in lower tier dehydrator recipes for consistency. Closes #364. %
 Adjusted a few materials having '-' in their name within en_US.lang. %
 Adjusted power capacity of the Gem Batteries. % Adjusted tiering for Large
 Auto-Assembler, it has been reduced by one. % Adjusted composition of
 Pikyonium to now require Yttrium, instead of the rare Ytterbium. % Adjusted
 composition of DEEP_EARTH_REACTOR_FUEL_DEPOSIT to be slightly more balanced.
 % Adjusted smelting point of Zirconium Carbide. $ Fixed an NPE in
 GeneralTooltipEventHandler.java. $ Fixed weird invisible recipes. Closes
 #304. $ Confirmed Large Mixer is now working correctly. Closes #366. (Closed
 in previous commit
 https://github.com/draknyte1/GTplusplus/commit/918d763dabd82d47db739a1b0a51c01f0803adc0).
 $ Confirmed Matter Fabricator is now working correctly. Closes #360.

+ Auto Doors. Closes #338. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/22c6a05a8a3a00294bcb8890a1e2a0fdc9196de8).
% Changed Energy Buffer Recipes. Closes #52. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/499411aa21ac4a742b6d51ef3ce9c4046d0a22c1).
$ Invalid Recipe. Closes #241. (Closed in unknown, previous commit).
---
 .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 8f3e49d7b7..da8b4e4ff1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -15,6 +15,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -752,24 +753,25 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 
 	public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs_OLD, ItemStack aOutput, int aDuration, int aEUt) {
 		
-		FluidStack[] aFluidInputs = new FluidStack[4];		
-		if (aFluidInputs_OLD != null) {
-			int aC = 0;
-			for (FluidStack s : aFluidInputs) {
-				if (aC > 3) {
-					break;
-				}
-				if (s != null) {
-					aFluidInputs[aC++] = s;
-				}
+		FluidStack[] aFluidInputs = new FluidStack[4];	
+		AutoMap<FluidStack> aNewFluidMap = new AutoMap<FluidStack>();
+		if (aFluidInputs_OLD.length > 4) {
+			for (FluidStack s : aFluidInputs_OLD) {
+				aNewFluidMap.put(s);
 			}
+			for (int i = 0; i < 4; i++) {
+				aFluidInputs[i] = aNewFluidMap.get(i);				
+			}
+		}
+		else {
+			aFluidInputs = aFluidInputs_OLD;
 		}
 		
 		
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 			if (aInputs.length < 6 && aFluidInputs.length < 2) {
 				ItemStack[] aInputStack = new ItemStack[] {aResearchItem, aInputs[0], aInputs[1], aInputs[2], aInputs[3], aInputs[4]};
-				return CORE.RA.addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration, aEUt);
+				return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration, aEUt);
 			}        	
 			return false;
 		}
@@ -789,7 +791,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 						if (aInputs.length < 6 && aFluidInputs.length < 2) {
 							ItemStack[] aInputStack = new ItemStack[] { aResearchItem, aInputs[0], aInputs[1],
 									aInputs[2], aInputs[3], aInputs[4] };
-							return CORE.RA.addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration,
+							return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration,
 									aEUt);
 						}
 						return false;
@@ -798,7 +800,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 					if (aInputs.length < 6 && aFluidInputs.length < 2) {
 						ItemStack[] aInputStack = new ItemStack[] { aResearchItem, aInputs[0], aInputs[1], aInputs[2],
 								aInputs[3], aInputs[4] };
-						return CORE.RA.addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration,
+						return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration,
 								aEUt);
 					}
 					return false;
-- 
cgit