aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/materials
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-03-15 05:53:40 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-03-15 05:53:40 +1000
commitefdf31f6df4588474b148d118f0fe8286e316b4f (patch)
tree15b9d0621bc45c50e1e31cdd828d5d807e283ed2 /src/Java/gtPlusPlus/core/item/materials
parent6ac0ce1de39cde85be8dd60eff8276d0849a2d20 (diff)
downloadGT5-Unofficial-efdf31f6df4588474b148d118f0fe8286e316b4f.tar.gz
GT5-Unofficial-efdf31f6df4588474b148d118f0fe8286e316b4f.tar.bz2
GT5-Unofficial-efdf31f6df4588474b148d118f0fe8286e316b4f.zip
+ Added additional processes for obtaining Radon.
+ Added Radium items to en_US.lang. % Base work on tickCounting for Tickable items in containers. $ Small Mass Fabricator fix.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/materials')
-rw-r--r--src/Java/gtPlusPlus/core/item/materials/DustDecayable.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
index 1bfdddf7d8..8e19896b92 100644
--- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -7,7 +7,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import gregtech.api.util.GT_OreDictUnificator;
@@ -23,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, unlocal, colour, maxTicks, desc1);
+ super(true, true, unlocal, colour, maxTicks, desc1);
this.turnsIntoItem = turnsInto;
this.radLevel = radLevel;
GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this));
@@ -58,7 +57,7 @@ public class DustDecayable extends BaseItemTickable {
}
}
- if (!tickItemTag(iStack)) {
+ if (!tickItemTag(world, iStack)) {
if (entityHolding instanceof EntityPlayer){
ItemStack replacement = ItemUtils.getSimpleStack(turnsIntoItem);
//Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+replacement.getDisplayName()+".");