aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-12-29 14:46:40 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-12-29 14:46:40 +1000
commitc818088eb463b7e93357bef0bdc756863f206cc1 (patch)
tree28151d521d973e36f9fa2c502cef906e7b669639 /src/Java/gtPlusPlus/core
parentdfc223857dc9a28fadb88f96b278fb86f135aa12 (diff)
downloadGT5-Unofficial-c818088eb463b7e93357bef0bdc756863f206cc1.tar.gz
GT5-Unofficial-c818088eb463b7e93357bef0bdc756863f206cc1.tar.bz2
GT5-Unofficial-c818088eb463b7e93357bef0bdc756863f206cc1.zip
$ Total rewrite of Portable tank NBT handling, now they work perfectly, ssp and smp tested.
% Slight change to molten fluid generation. % Name changed to Molten ZrF4.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index f1055a2723..99020b7b3b 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -418,7 +418,7 @@ public final class ModItems {
//GT_OreDictUnificator.registerOre("dustZirconiumTetrafluoride", new ItemStack(ModItems.dustZrF4));
GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
- FluidUtils.generateFluid("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100});
+ FluidUtils.generateFluid("ZirconiumTetrafluoride", "Zirconium Tetrafluoride [ZrF4]", 500, new short[]{170, 170, 140, 100});
//Coolant Salt
//NaBF4 - NaF - 621C
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 381aa81fb4..2e0973d9a4 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -350,7 +350,7 @@ public class FluidUtils {
}
public final static Fluid generateFluid(String unlocalizedName, String localizedName, int MeltingPoint, short[] RGBA){
- if (FluidUtils.getFluidStack("molten"+localizedName, 1) == null && ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null){
+ if (FluidUtils.getFluidStack("molten"+"."+unlocalizedName.toLowerCase(), 1) == null && ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null){
Utils.LOG_WARNING("Generating our own fluid.");
//Generate a Cell if we need to