From ab5d32e501450fc145ff61afcb7c06036ae23b52 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Fri, 23 Feb 2018 22:22:31 +1000 Subject: $ Fixes bad Air Filter names. $ Fixes bad Buffer Core registration. $ Fixes blank tooltip added to some items. > It appears @codewarrior0 tried to PR this in #221 while I was out at dinner. His fixes are identical to mine, but mine simply weren't committed. So, this Closes #221. --- src/Java/gtPlusPlus/core/item/ModItems.java | 2 +- src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java | 1 - src/Java/gtPlusPlus/core/item/general/BufferCore.java | 1 - src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 5f85b1193a..a3c40d53cc 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -874,7 +874,7 @@ public final class ModItems { for(int i=1; i<=10; i++){ //Utils.LOG_INFO(""+i); itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); - GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i); + GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()); //System.out.println("Buffer Core registration count is: "+i); } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java index 4c9ad1e486..7eb9e29f17 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java @@ -22,7 +22,6 @@ public class BaseItemWithDamageValue extends Item{ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(EnumChatFormatting.GOLD+""); super.addInformation(stack, aPlayer, list, bool); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java index ffecaa40fb..7e35503b8f 100644 --- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java @@ -40,7 +40,6 @@ public class BufferCore extends BaseItemWithDamageValue{ @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add(EnumChatFormatting.GRAY+"A key crafting component for making energy buffers."); - super.addInformation(stack, aPlayer, list, bool); } public final int getCoreTier() { diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java index df331d4539..1596b5985b 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 = tItem == null ? "Air Filter" : tItem.getDisplayName(); + String itemName = tItem == null ? "Air Filter" : super.getItemStackDisplayName(tItem); String suffixName = ""; if (tItem.getItemDamage() == 0){ suffixName = " [Tier 1]"; -- cgit