diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 20:21:06 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 20:21:06 +1000 |
| commit | cb187c0b7d9c3904227fa1fbedeee74c0a87b64a (patch) | |
| tree | 13d95bde48cebc87b85deb9cd6c634b3f11fc2d9 /src/Java/gtPlusPlus/core/item | |
| parent | d075c734a4c0bdce8ef4c5f761fdfdc0fd33c322 (diff) | |
| download | GT5-Unofficial-cb187c0b7d9c3904227fa1fbedeee74c0a87b64a.tar.gz GT5-Unofficial-cb187c0b7d9c3904227fa1fbedeee74c0a87b64a.tar.bz2 GT5-Unofficial-cb187c0b7d9c3904227fa1fbedeee74c0a87b64a.zip | |
^ Version Bump.
$ Reverted Utils.java (Fixes ArrayList<ArrayList> cannot be converted to List<Object>)
$ Fixed use of generics in MultiPickaxeBase.java.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 8 |
1 files changed, 4 insertions, 4 deletions
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(); } } |