% Changed Steam Multi recipes to use Tumbaga instead of Potin.

% Changed some tooltips so that it's more obvious that steam things are ONLY for steam.
$ Fixed handling of Fluid Name handling on Custom Fluid Hatches.

4 files changed, 48 insertions, 40 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index cc51a9dcb2..6c6eedfb54 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -633,9 +633,9 @@ public class RECIPES_Machines {
 			ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
 			// Steam Macerator Multi
 			RecipeUtils.addShapedGregtechRecipe(
-					aBronzeBricks, ALLOY.POTIN.getGear(1), aBronzeBricks,
-					aBronzeBricks, ALLOY.POTIN.getFrameBox(1), aBronzeBricks,
-					aBronzeBricks, ALLOY.POTIN.getGear(1), aBronzeBricks,
+					aBronzeBricks, ALLOY.TUMBAGA.getGear(1), aBronzeBricks,
+					aBronzeBricks, ALLOY.TUMBAGA.getFrameBox(1), aBronzeBricks,
+					aBronzeBricks, ALLOY.TUMBAGA.getGear(1), aBronzeBricks,
 					GregtechItemList.Controller_SteamMaceratorMulti.get(1));
 
 			// Steam Hatch
@@ -647,15 +647,15 @@ public class RECIPES_Machines {
 			
 			// Steam Input Bus
 			RecipeUtils.addShapedGregtechRecipe(
-					"plateBronze", ALLOY.POTIN.getPlate(1), "plateBronze",
-					"plateTin", ItemUtils.getSimpleStack(Blocks.chest), "plateTin",
-					"plateBronze", ALLOY.POTIN.getPlate(1), "plateBronze",
+					"plateBronze", ALLOY.TUMBAGA.getPlate(1), "plateBronze",
+					"plateTin", ItemUtils.getSimpleStack(Blocks.hopper), "plateTin",
+					"plateBronze", ALLOY.TUMBAGA.getPlate(1), "plateBronze",
 					GregtechItemList.Hatch_Input_Bus_Steam.get(1));
 			
 			// Steam Output Bus
 			RecipeUtils.addShapedGregtechRecipe(
 					"plateBronze", "plateTin", "plateBronze",
-					ALLOY.POTIN.getPlate(1), ItemUtils.getSimpleStack(Blocks.chest), ALLOY.POTIN.getPlate(1),
+					ALLOY.TUMBAGA.getPlate(1), ItemUtils.getSimpleStack(Blocks.hopper), ALLOY.TUMBAGA.getPlate(1),
 					"plateBronze", "plateTin", "plateBronze",
 					GregtechItemList.Hatch_Output_Bus_Steam.get(1));
 			
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
index f358d13930..fb67b48e7f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
@@ -24,7 +24,8 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 		super(aID, aName, aNameRegional, aTier, getSlots(aTier), new String[]{
 				"Item Input for Steam Multiblocks",
 				"Shift + right click with screwdriver to toggle automatic item shuffling",
-				"Capacity: 4 stacks"});
+				"Capacity: 4 stacks",
+				"Does not work with non-steam multiblocks"});
 	}
 
 	public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
index 37dc016c1e..fb626cb817 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
@@ -15,7 +15,8 @@ import net.minecraft.item.ItemStack;
 public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_Hatch {
     public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 4, new String[]{"Item Output for Steam Multiblocks",
-        		"Capacity: 4 stacks"});
+        		"Capacity: 4 stacks",
+				"Does not work with non-steam multiblocks"});
     }
 
     public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
index c9b98a6a64..127d4c8407 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -15,7 +16,7 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 
 public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_Hatch_Input {
-	
+
 	public final Fluid mLockedFluid;
 	public final int mFluidCapacity;
 
@@ -64,46 +65,51 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
 	protected FluidStack mLockedStack = null;
 	protected Integer mLockedTemp = null;
 	protected String mTempMod = null;
-	
+
 	@Override
 	public String[] getDescription() {		
 		if (mLockedStack == null) {
 			mLockedStack = FluidUtils.getFluidStack(mLockedFluid, 1);
 		}
-		if (mLockedTemp == null) {
-			if (mLockedStack != null) {
-				mLockedTemp = mLockedStack.getFluid().getTemperature();
-			}
+		int aFluidTemp = 0;
+		boolean isSteam = false;
+		if (mLockedFluid != null) {
+			aFluidTemp = mLockedFluid.getTemperature();
+			mTempMod = mLockedFluid.getName();
 		}
-		if (mLockedTemp != null) {
-			if (mLockedTemp <= -3000) {
-				mTempMod = ""+EnumChatFormatting.DARK_PURPLE;
-			}
-			else if (mLockedTemp >= -2999 && mLockedTemp <= -500) {
-				mTempMod = ""+EnumChatFormatting.DARK_BLUE;
-			}
-			else if (mLockedTemp >= -499 && mLockedTemp <= -50) {
-				mTempMod = ""+EnumChatFormatting.BLUE;
-			}
-			else if (mLockedTemp >= 30 && mLockedTemp <= 300) {
-				mTempMod = ""+EnumChatFormatting.AQUA;
-			}
-			else if (mLockedTemp >= 301 && mLockedTemp <= 800) {
-				mTempMod = ""+EnumChatFormatting.YELLOW;
-			}
-			else if (mLockedTemp >= 801 && mLockedTemp <= 1500) {
-				mTempMod = ""+EnumChatFormatting.GOLD;
-			}
-			else if (mLockedTemp >= 1501) {
-				mTempMod = ""+EnumChatFormatting.RED;
-			}
+		if (mTempMod.toLowerCase().equals("steam")) {
+			isSteam = true;
 		}
 		
+		
+		EnumChatFormatting aColour = EnumChatFormatting.BLUE;
+		if (aFluidTemp <= -3000) {
+			aColour = EnumChatFormatting.DARK_PURPLE;
+		}
+		else if (aFluidTemp >= -2999 && aFluidTemp <= -500) {
+			aColour = EnumChatFormatting.DARK_BLUE;
+		}
+		else if (aFluidTemp >= -499 && aFluidTemp <= -50) {
+			aColour = EnumChatFormatting.BLUE;
+		}
+		else if (aFluidTemp >= 30 && aFluidTemp <= 300) {
+			aColour = EnumChatFormatting.AQUA;
+		}
+		else if (aFluidTemp >= 301 && aFluidTemp <= 800) {
+			aColour = EnumChatFormatting.YELLOW;
+		}
+		else if (aFluidTemp >= 801 && aFluidTemp <= 1500) {
+			aColour = EnumChatFormatting.GOLD;
+		}
+		else if (aFluidTemp >= 1501) {
+			aColour = EnumChatFormatting.RED;
+		}
+		String aFluidName = "Accepted Fluid: " + aColour + (mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty") + EnumChatFormatting.RESET;
 		String[] s2 = new String[]{
-				"Fluid Input for Multiblocks",
+				"Fluid Input for "+(isSteam ? "Steam " : "")+"Multiblocks",
 				"Capacity: " + getCapacity()+"L",
-				"Accepted Fluid: " + mTempMod + mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty"
-				};		
+				aFluidName
+		};		
 		return s2;
 	}