Fix inability to upgrade non-elemental wands using tomes of arcana

Undoes previous commit, was made on the wrong branch

README.md

@@ -1,4 +1,4 @@
-# Wizardry
+# Wizardry  [![Curseforge](http://cf.way2muchnoise.eu/full_electroblobs-wizardry_downloads.svg)](https://minecraft.curseforge.com/projects/electroblobs-wizardry) [![Curseforge](http://cf.way2muchnoise.eu/versions/For%20MC_electroblobs-wizardry_all.svg)](https://minecraft.curseforge.com/projects/electroblobs-wizardry)
 
 ![Image not found](https://media-elerium.cursecdn.com/attachments/203/387/banner7.png)
 

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup.
 
 
-version = " 2.1.0 - MC 1.10.2"
+version = " 2.1.2 - MC 1.10.2"
 group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Electroblob's Wizardry "
 

src/main/java/electroblob/wizardry/Wizardry.java

@@ -46,7 +46,7 @@ public class Wizardry {
 	 * Wizardry 2.1, but they are for different versions of Minecraft and have separate minor versioning. 1.x.x
 	 * represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
 	 * 1.11.x versions, and so on. */
-	public static final String VERSION = "2.1.0";
+	public static final String VERSION = "2.1.2";
 	
 	// IDEA: Improve the algorithm that finds a place to summon creatures to take walls into account.
 	// IDEA: Replace all uses of Math.cos and Math.sin with MathHelper versions
@@ -137,6 +137,8 @@ public class Wizardry {
 		
 		// Moved to preInit, because apparently it has to be here now.
 		proxy.registerRenderers();
+		// It seems this also has to be here
+		proxy.registerKeyBindings();
 
 	}
 
@@ -145,8 +147,6 @@ public class Wizardry {
 
 		settings.initConfigExtras();
 
-		proxy.registerKeyBindings();
-
 		// Event Handlers
 		GameRegistry.registerWorldGenerator(generator, 0);
 		MinecraftForge.EVENT_BUS.register(new WizardryKeyHandler());

src/main/java/electroblob/wizardry/client/ClientProxy.java

@@ -154,8 +154,8 @@ public class ClientProxy extends CommonProxy {
 	public static MixedFontRenderer mixedFontRenderer;
 	
 	// Key Bindings
-	public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry:next_spell", Keyboard.KEY_N, "key.categories.wizardry");
+	public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry.next_spell", Keyboard.KEY_N, "key.categories.wizardry");
-	public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry:previous_spell", Keyboard.KEY_B, "key.categories.wizardry");
+	public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry.previous_spell", Keyboard.KEY_B, "key.categories.wizardry");
 
 	// Armour Model
 	public static final ModelBiped WIZARD_ARMOUR_MODEL = new ModelWizardArmour(0.75f);

src/main/java/electroblob/wizardry/client/particle/ParticleSparkle.java

@@ -81,8 +81,8 @@ public class ParticleSparkle extends ParticleCustomTexture {
 //        this.setRBGColorF(this.initialRed + (this.fadeRed - this.initialRed)*ageFraction,
 //        		this.initialGreen + (this.fadeGreen - this.initialGreen)*ageFraction,
 //        		this.initialBlue + (this.fadeBlue - this.initialBlue)*ageFraction);
-//
+
-//        this.setParticleTextureIndex((this.particleAge * 11)/this.particleMaxAge);
+		this.setParticleTextureIndex((this.particleAge * 11)/this.particleMaxAge);
     }
     
     /*

src/main/java/electroblob/wizardry/spell/Clairvoyance.java

@@ -76,8 +76,8 @@ public class Clairvoyance extends Spell {
 					if(path != null && path.getFinalPathPoint() != null){
 						
 						int x = path.getFinalPathPoint().xCoord;
-						int y = path.getFinalPathPoint().xCoord;
+						int y = path.getFinalPathPoint().yCoord;
-						int z = path.getFinalPathPoint().xCoord;
+						int z = path.getFinalPathPoint().zCoord;
 												
 						if(x == destination.getX() && y == destination.getY() && z == destination.getZ()){
 

src/main/java/electroblob/wizardry/spell/MindControl.java

@@ -188,6 +188,8 @@ public class MindControl extends Spell {
 	@SubscribeEvent
 	public static void onLivingSetAttackTargetEvent(LivingSetAttackTargetEvent event){
 		
+		if(event.getTarget() == null) return; // Prevents infinite loops with mind trick
+
 		if(event.getEntityLiving().isPotionActive(WizardryPotions.mind_control) && MindControl.canControl(event.getEntityLiving())){
 
 			NBTTagCompound entityNBT = event.getEntityLiving().getEntityData();
@@ -197,7 +199,7 @@ public class MindControl extends Spell {
 				Entity caster = WizardryUtilities.getEntityByUUID(event.getEntity().worldObj, entityNBT.getUniqueId(MindControl.NBT_KEY));
 
 				// If the target that the event tried to set is already a valid mind control target, nothing happens.
-				if(event.getTarget() != null && WizardryUtilities.isValidTarget(caster, event.getTarget())) return;
+				if(WizardryUtilities.isValidTarget(caster, event.getTarget())) return;
 
 				if(caster instanceof EntityLivingBase){
 
@@ -208,8 +210,7 @@ public class MindControl extends Spell {
 				}
 			}
 			// If the caster couldn't be found or no valid target was found, this just acts like mind trick.
-			// If the target is null already, no need to set it to null, or infinite loops will occur.
+			((EntityLiving)event.getEntityLiving()).setAttackTarget(null);
-			if(event.getTarget() != null) ((EntityLiving)event.getEntityLiving()).setAttackTarget(null);
 		}
 	}
 

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

@@ -970,6 +970,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));
 	}
 }

src/main/resources/assets/wizardry/lang/en_GB.lang

@@ -616,8 +616,8 @@ enchantment.wizardry:freezing_weapon=Frost Imbuement
 
 key.categories.wizardry=Wizardry
 
-key.wizardry:next_spell=Next Spell
+key.wizardry.next_spell=Next Spell
-key.wizardry:previous_spell=Previous Spell
+key.wizardry.previous_spell=Previous Spell
 
 death.attack.wizardry_magic=%1$s was killed by %2$s using magic
 death.attack.indirect_wizardry_magic=%1$s was killed by %2$s using magic

src/main/resources/assets/wizardry/lang/en_US.lang

@@ -616,8 +616,8 @@ enchantment.wizardry:freezing_weapon=Frost Imbuement
 
 key.categories.wizardry=Wizardry
 
-key.wizardry:next_spell=Next Spell
+key.wizardry.next_spell=Next Spell
-key.wizardry:previous_spell=Previous Spell
+key.wizardry.previous_spell=Previous Spell
 
 death.attack.wizardry_magic=%1$s was killed by %2$s using magic
 death.attack.indirect_wizardry_magic=%1$s was killed by %2$s using magic

src/main/resources/assets/wizardry/lang/es_ES.lang

@@ -615,8 +615,8 @@ enchantment.wizardry:freezing_weapon=Impregnacion de Fuego
 
 key.categories.wizardry=Wizardry
 
-key.wizardry:next_spell=Hechizo siguiente
+key.wizardry.next_spell=Hechizo siguiente
-key.wizardry:previous_spell=Hechizo anterior
+key.wizardry.previous_spell=Hechizo anterior
 
 death.attack.wizardry_magic=%1$s fue matado por %2$s usando magia
 death.attack.indirect_wizardry_magic=%1$s fue matado por %2$s usando magia

src/main/resources/assets/wizardry/lang/es_MX.lang

@@ -615,8 +615,8 @@ enchantment.wizardry:freezing_weapon=Impregnacion de Fuego
 
 key.categories.wizardry=Wizardry
 
-key.wizardry:next_spell=Hechizo siguiente
+key.wizardry.next_spell=Hechizo siguiente
-key.wizardry:previous_spell=Hechizo anterior
+key.wizardry.previous_spell=Hechizo anterior
 
 death.attack.wizardry_magic=%1$s fue matado por %2$s usando magia
 death.attack.indirect_wizardry_magic=%1$s fue matado por %2$s usando magia

src/main/resources/mcmod.info

@@ -2,7 +2,7 @@
 {
   "modid" : "wizardry",
   "name" : "Electroblob's Wizardry",
-  "version" : "2.1.0",
+  "version" : "2.1.2",
   "url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry",
   "credits" : "Made by Electroblob",
   "authors" : [