diff options
| author | Blood-Asp <Blood@Asp> | 2015-05-16 02:51:56 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-05-16 02:51:56 +0200 |
| commit | 1209f95bc278f81de4143a619696048c655313e8 (patch) | |
| tree | c8f348649814938a38d90756c96a1d6b9c3e260b /main/java/gregtech/common/tileentities | |
| parent | 277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f (diff) | |
| download | GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.tar.gz GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.tar.bz2 GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.zip | |
update 5.08.13
Turbine items and achievements
Diffstat (limited to 'main/java/gregtech/common/tileentities')
2 files changed, 7 insertions, 2 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index 5f66a7c54b..b139161228 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tileentities.machines.multi;
/* 2: */
-/* 3: */ import gregtech.api.GregTech_API;
+/* 3: */ import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
/* 4: */ import gregtech.api.enums.Materials;
/* 5: */ import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.Textures;
@@ -225,6 +226,7 @@ import gregtech.api.enums.Textures; /* 224: */ {
/* 225:151 */ if (++this.mProgresstime >= this.mMaxProgresstime)
/* 226: */ {
+ GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel");
/* 227:152 */ addOutputProducts();
/* 228:153 */ this.mOutputItem1 = null;
/* 229:154 */ this.mOutputItem2 = null;
diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index 3249ea4531..9b0b1683c2 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -132,7 +132,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach this.mInventory[0] = null; } } - if (this.mInventory[1] == null) + if (this.mInventory[1] == null&&mItemStack!=null) { this.mInventory[1] = mItemStack.copy(); this.mInventory[1].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); @@ -188,12 +188,15 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mItemCount", this.mItemCount); + if(this.mItemStack!=null) aNBT.setTag("mItemStack", this.mItemStack.writeToNBT(new NBTTagCompound())); } @Override public void loadNBTData(NBTTagCompound aNBT) { + if(aNBT.hasKey("mItemCount")) this.mItemCount = aNBT.getInteger("mItemCount"); + if(aNBT.hasKey("mItemStack")) this.mItemStack = ItemStack.loadItemStackFromNBT((NBTTagCompound) aNBT.getTag("mItemStack")); } |