From cb187c0b7d9c3904227fa1fbedeee74c0a87b64a Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 20:21:06 +1000 Subject: ^ Version Bump. $ Reverted Utils.java (Fixes ArrayList cannot be converted to List) $ Fixed use of generics in MultiPickaxeBase.java. --- .../gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 6499dc696b..da152bb8d8 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -257,10 +257,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ final Pair Y = this.enchantment; if (Y != null){ if (Y.getKey() != null){ - enchant = (Enchantment) ((Pair) this.enchantment).getKey(); + enchant = (Enchantment) this.enchantment.getKey(); } if (Y.getValue() != null){ - enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); + enchantmentLevel = ((Integer) this.enchantment.getValue()).intValue(); } } final ItemStack itemToEnchant = mThisItem; @@ -277,10 +277,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ final Pair Y = this.enchantment; if (Y != null){ if (Y.getKey() != null){ - enchant = (Enchantment) ((Pair) this.enchantment).getKey(); + enchant = (Enchantment) this.enchantment.getKey(); } if (Y.getValue() != null){ - enchantmentLevel = (byte) ((Pair) this.enchantment).getValue(); + enchantmentLevel = ((Integer) this.enchantment.getValue()).intValue(); } } -- cgit