Add fixes from 52d12c0, a4695bc and f4d7ba6 to 1.11.2 branch

src/main/java/electroblob/wizardry/util/WizardryUtilities.java

@@ -1079,6 +1079,7 @@ public final class WizardryUtilities {
 	 */
 	public static Item getWand(Tier tier, Element element){
 		if(tier == null) throw new NullPointerException("The given tier cannot be null.");
+		if(element == null) element = Element.MAGIC;
 		return WizardryItems.WAND_MAP.get(ImmutablePair.of(tier, element));
 	}
 }