diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java index 4acb5fa69f..df331d4539 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -52,7 +52,7 @@ public class ItemAirFilter extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { - String itemName = "Air Filter"; + String itemName = tItem == null ? "Air Filter" : tItem.getDisplayName(); String suffixName = ""; if (tItem.getItemDamage() == 0){ suffixName = " [Tier 1]"; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java index 0404e6f083..ee5a106bd3 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java @@ -18,7 +18,7 @@ public class blockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti this.setBlockTextureName("minecraft" + ":" + "dirt"); LanguageRegistry.addName(this, "Polluted Soil"); } - + @Override @SideOnly(Side.CLIENT) public int getBlockColor() diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java index 6f3a713058..41bc620722 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java @@ -21,6 +21,7 @@ public class ItemBlockToxicEverglades extends ItemBlock { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.mID == 0){ //blockDarkWorldPortalFrame + list.add("Use this to access the Toxic Everglades."); list.add("Assembled in the same shape as the Nether Portal."); } else if (this.mID == 1){ //blockDarkWorldPortal @@ -30,7 +31,10 @@ public class ItemBlockToxicEverglades extends ItemBlock { list.add("Will burn very quickly if it happens to catch fire."); } else if (this.mID == 3){ //blockDarkWorldPollutedDirt - list.add("Maybe you can do something with this?."); + list.add("Maybe you can do something with this?."); + if (stack.getItemDamage() > 0) { + list.add("This smells worse than a bean fart..."); + } } } |