Deprecation cleanup (#637)

17 files changed, 18 insertions, 43 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
index a4040e14b2..194e585c0d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
@@ -128,7 +128,7 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         if (this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset) != null) {
             return this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset).getValue();
         }
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
index 8c3fdeb0f9..e846603070 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
@@ -86,7 +86,7 @@ public class BaseItemColourable extends Item {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return this.hasEffect;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
index 9f026e0192..8fbc005ce8 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
@@ -76,7 +76,7 @@ public class BaseItemDamageable extends Item {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         int dmg = (int) getItemDamage(par1ItemStack);
         if (dmg > 200) {
             return true;
@@ -174,13 +174,7 @@ public class BaseItemDamageable extends Item {
     }
 
     @Override
-    public boolean hasContainerItem() {
-        return true;
-    }
-
-    @Override
     public boolean hasContainerItem(ItemStack stack) {
-        Logger.INFO("hasContainerItem? " + stack.getDisplayName());
         return true;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
index 1e2ddb4aea..b1b9e05b9e 100644
--- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
@@ -232,7 +232,7 @@ public class CoreItem extends Item {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return this.hasEffect;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index f0f14c264d..8befe3c3ab 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -91,7 +91,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
+    public int getDamage(ItemStack stack) {
         return 0;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index 414fd8c13b..80178b6c31 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -84,7 +84,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
+    public int getDamage(ItemStack stack) {
         return 0;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 90258da65b..004ae5f3e2 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -115,11 +115,6 @@ public class ItemGenericChemBase extends Item {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
-        return stack.getItemDamage();
-    }
-
-    @Override
     public int getItemEnchantability() {
         return 0;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
index e176dc603a..0f9f7d0e5c 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
@@ -96,11 +96,6 @@ public class ItemNuclearChemBase extends Item {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
-        return stack.getItemDamage();
-    }
-
-    @Override
     public int getItemEnchantability() {
         return 0;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
index d2ae1efca0..0b1c8eeadd 100644
--- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
+++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
@@ -349,11 +349,6 @@ public class BaseItemMetaFood extends ItemFood {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
-        return stack.getItemDamage();
-    }
-
-    @Override
     public boolean showDurabilityBar(ItemStack stack) {
         return false;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
index c48a54bc67..87ebded077 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -53,6 +53,7 @@ public class ItemGenericToken extends CoreItem {
         mCustomNameColours = new HashMap<Integer, EnumChatFormatting>();
         mIcons = new HashMap<Integer, IIcon>();
         mTextureDir = aTextureDir;
+        setMaxStackSize(64);
     }
 
     public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
@@ -135,7 +136,7 @@ public class ItemGenericToken extends CoreItem {
     }
 
     @Override
-    public boolean hasEffect(ItemStack par1ItemStack) {
+    public boolean hasEffect(ItemStack par1ItemStack, final int pass) {
         return false;
     }
 
@@ -145,7 +146,7 @@ public class ItemGenericToken extends CoreItem {
     }
 
     @Override
-    public int getDisplayDamage(ItemStack stack) {
+    public int getDamage(ItemStack stack) {
         return 0;
     }
 
@@ -165,20 +166,15 @@ public class ItemGenericToken extends CoreItem {
     }
 
     @Override
-    public int getItemStackLimit() {
-        return 64;
-    }
-
-    @Override
     public int getItemStackLimit(ItemStack aStack) {
         if (aStack == null) {
-            return getItemStackLimit();
+            return maxStackSize;
         } else {
             Integer aSize = mMaxStackSizes.get(aStack.getItemDamage());
             if (aSize != null) {
                 return aSize;
             } else {
-                return getItemStackLimit();
+                return maxStackSize;
             }
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index a8a279299b..a614a2b737 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -173,7 +173,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         int h = getCorrectMetaForItemstack(par1ItemStack);
         if (this.hasEffect.get(h) != null) {
             return this.hasEffect.get(h);
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
index 044519028d..dbaee70bd0 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
@@ -69,7 +69,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return false;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index 8df0ca1e55..d4caadc7f7 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -222,7 +222,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return false;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
index 6dd6973749..ab154c2b24 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
@@ -131,7 +131,7 @@ public class MultiSpadeBase extends StaballoySpade {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return false;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
index 7ec3be72ca..660ec408c1 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
@@ -366,7 +366,7 @@ public class StaballoyAxe extends ItemAxe {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return true;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
index 4fa76cc288..9601662c39 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
@@ -436,7 +436,7 @@ public class StaballoyPickaxe extends ItemPickaxe {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return true;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
index 3be95912fe..c9a4def88c 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
@@ -383,7 +383,7 @@ public class StaballoySpade extends ItemSpade {
     }
 
     @Override
-    public boolean hasEffect(final ItemStack par1ItemStack) {
+    public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
         return true;
     }