diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
4 files changed, 38 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index cc0b4325f3..a9ad289e7f 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -775,8 +775,8 @@ public final class ModItems { } dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); - dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", ""+StringUtils.superscript("226Ra"), ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; - dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon 222 ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); + dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", "Contains Radon ("+StringUtils.superscript("222Rn")+")", ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; + dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); itemBoilerChassis = new ItemBoilerChassis(); itemDehydratorCoilWire = new ItemDehydratorCoilWire(); 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); } diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java index aa3b044802..18d147e98c 100644 --- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import gregtech.api.util.GT_OreDictUnificator; - +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemTickable; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -22,7 +22,7 @@ public class DustDecayable extends BaseItemTickable { private final int radLevel; public DustDecayable(String unlocal, int colour, int maxTicks, String[] desc1, Item turnsInto, int radLevel) { - super(true, true, unlocal, colour, maxTicks, desc1); + super(true, true, unlocal, colour, (maxTicks/1), desc1); this.turnsIntoItem = turnsInto; this.radLevel = radLevel; GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); @@ -30,9 +30,9 @@ public class DustDecayable extends BaseItemTickable { @Override public void registerIcons(IIconRegister reg) { - String gt = "gregtech" + ":" + "materialicons/"+"SHINY"+"/" + "dust"; + String gt = "gregtech" + ":" + "materialicons/"+"NUCLEAR"+"/" + "dust"; this.mIcon[0] = reg.registerIcon(gt); - String gt2 = "gregtech" + ":" + "materialicons/"+"SHINY"+"/" + "dust" + "_OVERLAY"; + String gt2 = "gregtech" + ":" + "materialicons/"+"NUCLEAR"+"/" + "dust" + "_OVERLAY"; this.mIcon[1] = reg.registerIcon(gt2); } @@ -50,16 +50,23 @@ public class DustDecayable extends BaseItemTickable { if (world == null || iStack == null) { return; } + if (world.isRemote) { + return; + } if (entityHolding instanceof EntityPlayer){ if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){ EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.radLevel, world, entityHolding); } } + boolean a1, a2; - if (!tickItemTag(world, iStack) && !this.getIsActive(world, iStack)) { + a1 = this.getIsActive(world, iStack); + a2 = tickItemTag(world, iStack); + + if (!a1 && !a2) { if (entityHolding instanceof EntityPlayer){ - ItemStack replacement = ItemUtils.getSimpleStack(turnsIntoItem); + ItemStack replacement = ItemUtils.getSimpleStack(getDecayResult()); //Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+replacement.getDisplayName()+"."); final ItemStack tempTransform = replacement; if (iStack.stackSize > 1){ @@ -79,5 +86,9 @@ public class DustDecayable extends BaseItemTickable { } } } + + public Item getDecayResult() { + return turnsIntoItem; + } } |