diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java | 16 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java | 8 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java index 78c2724ea8..006c346c64 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -51,7 +51,10 @@ public class BaseItemTickable extends CoreItem { public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (world == null || iStack == null) { return; - } + } + if (world.isRemote) { + return; + } boolean active = getIsActive(world, iStack); @@ -120,7 +123,7 @@ public class BaseItemTickable extends CoreItem { //Try set world time if (world != null) { - tagNBT.setLong("CreationDate", world.getTotalWorldTime()); + //tagNBT.setLong("CreationDate", world.getTotalWorldTime()); } tagMain.setTag("TickableItem", tagNBT); @@ -250,9 +253,9 @@ public class BaseItemTickable extends CoreItem { if (aNBT.hasKey("TickableItem")) { aNBT = aNBT.getCompoundTag("TickableItem"); - if (!aNBT.hasKey("CreationDate") && world != null) { + /*if (!aNBT.hasKey("CreationDate") && world != null) { aNBT.setLong("CreationDate", world.getTotalWorldTime()); - } + }*/ //Done Ticking if (maxTicks-getFilterDamage(world, aStack) <= 0) { @@ -269,7 +272,10 @@ public class BaseItemTickable extends CoreItem { return true; } - } + } + else { + return false; + } } } return createNBT(world, aStack); diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java index 77689f83aa..b9cd9ede5f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java @@ -38,6 +38,14 @@ public class ItemBlockBasicTile extends ItemBlock{ list.add("Change default setting with a Screwdriver"); list.add("Default is used to select slot for auto-insertion"); } + else if (this.mID == 5){ //Decayables Chest + list.add("Holds radioactive materials"); + list.add("Items which decay will tick while inside"); + } + else { + list.add("Bad Tooltip ID - "+mID); + + } super.addInformation(stack, aPlayer, list, bool); } |