From 5d96f4d7003f5076e9d7cfcd0c9d8329613fc820 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Fri, 21 Feb 2020 17:55:45 +0000
Subject: [PATCH] I can't string, and unboxing is weird

---
 src/main/java/electroblob/wizardry/Settings.java            | 2 +-
 src/main/java/electroblob/wizardry/spell/Divination.java    | 2 +-
 src/main/java/electroblob/wizardry/spell/ImbueWeapon.java   | 4 ++--
 src/main/java/electroblob/wizardry/spell/PocketFurnace.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/Settings.java b/src/main/java/electroblob/wizardry/Settings.java
index d5fcc8c5..cccf75db 100644
--- a/src/main/java/electroblob/wizardry/Settings.java
+++ b/src/main/java/electroblob/wizardry/Settings.java
@@ -1104,7 +1104,7 @@ public final class Settings {
 
 		try {
 			meta = Short.parseShort(itemArgs[itemArgs.length-1]);
-			item = String.join("", Arrays.copyOfRange(itemArgs, 0, itemArgs.length-2));
+			item = String.join(":", Arrays.copyOfRange(itemArgs, 0, itemArgs.length-1));
 		}catch(NumberFormatException e){ // If no metadata is specified
 			meta = 0;
 			item = string;
diff --git a/src/main/java/electroblob/wizardry/spell/Divination.java b/src/main/java/electroblob/wizardry/spell/Divination.java
index 76f8c8be..066726a2 100644
--- a/src/main/java/electroblob/wizardry/spell/Divination.java
+++ b/src/main/java/electroblob/wizardry/spell/Divination.java
@@ -72,7 +72,7 @@ public class Divination extends Spell {
 								|| block instanceof BlockRedstoneOre
 								|| block instanceof BlockCrystalOre
 								|| Arrays.asList(Wizardry.settings.divinationOreWhitelist)
-					.contains(Pair.of(block.getRegistryName(), block.getMetaFromState(world.getBlockState(b)))));
+					.contains(Pair.of(block.getRegistryName(), (short)block.getMetaFromState(world.getBlockState(b)))));
 		});
 
 		Strength strength = Strength.NOTHING;
diff --git a/src/main/java/electroblob/wizardry/spell/ImbueWeapon.java b/src/main/java/electroblob/wizardry/spell/ImbueWeapon.java
index e200d768..fbdeffb8 100644
--- a/src/main/java/electroblob/wizardry/spell/ImbueWeapon.java
+++ b/src/main/java/electroblob/wizardry/spell/ImbueWeapon.java
@@ -82,12 +82,12 @@ public class ImbueWeapon extends Spell {
 
 	/** Returns true if the given item counts as a sword, i.e. it extends {@link ItemSword} or is in the whitelist. */
 	public static boolean isSword(ItemStack stack){
-		return stack.getItem() instanceof ItemSword || Arrays.asList(Wizardry.settings.swordItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata()));
+		return stack.getItem() instanceof ItemSword || Arrays.asList(Wizardry.settings.swordItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()));
 	}
 
 	/** Returns true if the given item counts as a bow, i.e. it extends {@link ItemBow} or is in the whitelist. */
 	public static boolean isBow(ItemStack stack){
-		return stack.getItem() instanceof ItemBow || Arrays.asList(Wizardry.settings.bowItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata()));
+		return stack.getItem() instanceof ItemBow || Arrays.asList(Wizardry.settings.bowItemWhitelist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()));
 	}
 
 }
diff --git a/src/main/java/electroblob/wizardry/spell/PocketFurnace.java b/src/main/java/electroblob/wizardry/spell/PocketFurnace.java
index b3f86584..c617b3af 100644
--- a/src/main/java/electroblob/wizardry/spell/PocketFurnace.java
+++ b/src/main/java/electroblob/wizardry/spell/PocketFurnace.java
@@ -40,7 +40,7 @@ public class PocketFurnace extends Spell {
 
 				if(!result.isEmpty() && !(stack.getItem() instanceof ItemTool) && !(stack.getItem() instanceof ItemSword)
 						&& !(stack.getItem() instanceof ItemArmor)
-						&& !Arrays.asList(Wizardry.settings.pocketFurnaceItemBlacklist).contains(Pair.of(stack.getItem().getRegistryName(), stack.getMetadata()))){
+						&& !Arrays.asList(Wizardry.settings.pocketFurnaceItemBlacklist).contains(Pair.of(stack.getItem().getRegistryName(), (short)stack.getMetadata()))){
 
 					if(stack.getCount() <= usesLeft){
 						ItemStack stack2 = new ItemStack(result.getItem(), stack.getCount(), result.getItemDamage());