diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-12-25 00:28:13 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-12-25 00:28:13 +1000 |
| commit | de969b4f8c5f5574fe06cfe6ce6d303307138001 (patch) | |
| tree | 843ecbec053439a3b1c72ccd1133cbe2ef65e252 | |
| parent | 530d84ed415e3cc35715e697635e9f8fb06bbd5d (diff) | |
| download | GT5-Unofficial-de969b4f8c5f5574fe06cfe6ce6d303307138001.tar.gz GT5-Unofficial-de969b4f8c5f5574fe06cfe6ce6d303307138001.tar.bz2 GT5-Unofficial-de969b4f8c5f5574fe06cfe6ce6d303307138001.zip | |
% Renamed the Helium blob to Hydrogen.
% More work on the small tank.
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index a344b11ecc..2657af18fa 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -198,7 +198,7 @@ public final class ModItems { //Register Hydrogen Blobs first, so we can replace old helium blobs. - itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Blob of Helium", tabMisc).setTextureName(CORE.MODID + ":itemHydrogenBlob"); + itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHydrogenBlob"); //GT_OreDictUnificator.registerOre("dustHydrogen", new ItemStack(ModItems.itemHydrogenBlob)); //Register Old Helium Blob, this will be replaced when held by a player. itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc, ItemUtils.getSimpleStack(itemHydrogenBlob)).setTextureName(CORE.MODID + ":itemHeliumBlob"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 5c0c2f86f3..6e3acc93fa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -94,37 +94,37 @@ extends GT_MetaTileEntity_BasicTank { public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); setVars(); - mRecipeStuff.setString("mFluidName", mFluidName); - mRecipeStuff.setInteger("mFluidAmount", mFluidAmount); - aNBT.setTag("GT.CraftingComponents", mRecipeStuff); + NBTTagCompound lRecipeStuff = new NBTTagCompound(); + if (lRecipeStuff != null){ + lRecipeStuff.setString("mFluidName", mFluidName); + lRecipeStuff.setInteger("mFluidAmount", mFluidAmount); + Utils.LOG_INFO(mFluidName+" Amount: "+mFluidAmount+"L"); + + } + //Utils.LOG_INFO(mFluidName+" Amxount: "+mFluidAmount+"L"); + aNBT.setTag("GT.CraftingComponents", lRecipeStuff); } @Override public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - if (mRecipeStuff == null){ - mRecipeStuff = new NBTTagCompound(); - } - else { + super.loadNBTData(aNBT); mRecipeStuff = aNBT.getCompoundTag("GT.CraftingComponents"); mFluidName = mRecipeStuff.getString("mFluidName"); mFluidAmount = mRecipeStuff.getInteger("mFluidAmount"); + //mInternalTank = mFluid; mFluid = FluidUtils.getFluidStack(mFluidName, mFluidAmount); - } setItemNBT(aNBT); } @Override public void setItemNBT(NBTTagCompound aNBT) { super.setItemNBT(aNBT); - if (mRecipeStuff == null){ - mRecipeStuff = new NBTTagCompound(); - } - else { - mRecipeStuff.setString("mFluidName", mFluidName); - mRecipeStuff.setInteger("mFluidAmount", mFluidAmount); + NBTTagCompound lRecipeStuff = new NBTTagCompound(); + if (lRecipeStuff != null){ + lRecipeStuff.setString("mFluidName", mFluidName); + lRecipeStuff.setInteger("mFluidAmount", mFluidAmount); } - aNBT.setTag("GT.CraftingComponents", mRecipeStuff); + aNBT.setTag("GT.CraftingComponents", lRecipeStuff); } |