From cf938c1ed77f873782e2c2c4869947562236b7b3 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 10 Dec 2021 09:51:39 +0000
Subject: Added ability to clear all output hatches on GT++ multis with a
 plunger. Changed fluid textures for many autogenerated fluids. Renamed &
 remapped Cryolite to Cryolite (F). Fixed toArray() in AutoMap.java. Fixed
 Sparging. Final touches to Nuclear Fuel reprocessing.

---
 .../gtPlusPlus/core/util/minecraft/FluidUtils.java |  2 +-
 .../gtPlusPlus/core/util/minecraft/ItemUtils.java  | 42 ++++++++++++++++++++--
 .../core/util/minecraft/RecipeUtils.java           |  5 +--
 3 files changed, 42 insertions(+), 7 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/util/minecraft')

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 3988cdb0c4..a6bd50ff17 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -175,7 +175,7 @@ public class FluidUtils {
 	}
 
 	public static Fluid addGTFluid(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) {
-		return addGTFluid("molten."+aName, "molten.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
+		return addGTFluid("molten."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
 	}
 
 	public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 6330efd694..e96bd3391b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -703,6 +703,44 @@ public class ItemUtils {
 		}
 		return sRadiation;
 	}
+	
+	public static String getArrayStackNames(ArrayList<?> aStack) {
+		Object aType = aStack.get(0);
+		if (aType instanceof FluidStack) {
+			FluidStack[] aItems = new FluidStack[aStack.size()];
+			for (int i=0;i<aItems.length;i++) {
+				aItems[i] = (FluidStack) aStack.get(i);
+			}
+			return getArrayStackNames(aItems);
+		}			
+		if (aType instanceof ItemStack) {
+			ItemStack[] aItems = new ItemStack[aStack.size()];
+			for (int i=0;i<aItems.length;i++) {
+				aItems[i] = (ItemStack) aStack.get(i);
+			}
+			return getArrayStackNames(aItems);
+		}
+		return "";	
+	}
+
+	public static String getArrayStackNames(final AutoMap<?> aStack) {
+		Object aType = aStack.get(0);
+		if (aType instanceof FluidStack) {
+			FluidStack[] aItems = new FluidStack[aStack.size()];
+			for (int i=0;i<aItems.length;i++) {
+				aItems[i] = (FluidStack) aStack.get(i);
+			}
+			return getArrayStackNames(aItems);
+		}			
+		if (aType instanceof ItemStack) {
+			ItemStack[] aItems = new ItemStack[aStack.size()];
+			for (int i=0;i<aItems.length;i++) {
+				aItems[i] = (ItemStack) aStack.get(i);
+			}
+			return getArrayStackNames(aItems);
+		}
+		return "";		
+	}
 
 	public static String getArrayStackNames(final FluidStack[] aStack) {
 		String itemNames = "Fluid Array: ";
@@ -717,7 +755,7 @@ public class ItemUtils {
 		}
 		return itemNames;
 	}
-
+	
 	public static String getArrayStackNames(final ItemStack[] aStack) {
 		String itemNames = "";
 		int aPos = 0;
@@ -1376,6 +1414,6 @@ public class ItemUtils {
 	
 	public static boolean areItemsEqual(ItemStack aStack1, ItemStack aStack2, boolean aIgnoreNBT) {
 		return GT_Utility.areStacksEqual(aStack1, aStack2, aIgnoreNBT);
-	}
+	}	
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 0a5779d109..8c1b6a4c02 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -506,10 +506,7 @@ public static int mInvalidID = 1;
 		result.put("Is Enabled? "+m.mEnabled);
 		result.put("Special Value: "+m.mSpecialValue);
 		result.put("=====================================");		
-		String s[] = new String[result.size()];
-		for (int i=0;i<result.size();i++) {
-			s[i] = result.get(i);
-		}		
+		String s[] = result.toArray();	
 		return s;
 	}
 
-- 
cgit