$ Hopefully fixed a crash concerning Assembly Line recipes.

$ Fixed amount of fluid ender used within a Cyclotron recipe.

2 files changed, 31 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 9d34aa371d..6f4e8870d7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1955,7 +1955,7 @@ public class RECIPES_GREGTECH {
 						Particle.getBaseParticle(Particle.UNKNOWN),
 						Particle.getBaseParticle(Particle.UNKNOWN),
 						},
-				FluidUtils.getWildcardFluidStack("ender", 1000),
+				FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000),
 				new ItemStack[] {
 						ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)
 						}, 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index a5cf9527a9..6fa58804dd 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -35,6 +35,7 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
@@ -1012,4 +1013,33 @@ public class ItemUtils {
 	
 	}
 
+	public static String getItemName(ItemStack aStack) {
+		if (aStack == null) {
+			return "ERROR - Empty Stack";
+		}
+		String aDisplay = null;
+		try {
+			aDisplay = ("" + StatCollector
+					.translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
+							.trim();
+			if (aStack.hasTagCompound()) {
+				if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) {
+					NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display");
+
+					if (nbttagcompound.hasKey("Name", 8)) {
+						aDisplay = nbttagcompound.getString("Name");
+					}
+				}
+			}
+		} catch (Throwable t) {
+
+		}
+		if (aDisplay == null || aDisplay.length() <= 0) {
+			aDisplay = aStack.getUnlocalizedName() + ":" + aStack.getItemDamage();
+		} else {
+			aDisplay += " | Meta: " + aStack.getItemDamage();
+		}
+		return aDisplay;
+	}
+
 }