Update version number

CREDITS.md

@@ -1,7 +1,7 @@
 # Credits
 
 Electroblob's Wizardry  
-Version 4.1.3
+Version 4.1.4
 For Minecraft 1.12.2
 
 Designed, coded and textured by Electroblob

ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 Please read the [guide for contributing](https://github.com/Electroblob77/Wizardry/blob/1.12.2/guide_for_contributing.md) before posting.
 
 Minecraft version: 1.12.2 [change as necessary]  
-Wizardry version: 4.1.3 [change as necessary]
+Wizardry version: 4.1.4 [change as necessary]
 Environment: Singleplayer/LAN game/Server [delete as necessary]
 
 Issue details: [describe what you were doing when the issue occurred, what went wrong, what you expected to happen, etc.]

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = " 4.1.3 - MC 1.12.2"
+version = " 4.1.4 - MC 1.12.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

@@ -1,7 +1,5 @@
 package electroblob.wizardry;
 
-import org.apache.logging.log4j.Logger;
-
 import electroblob.wizardry.command.CommandCastSpell;
 import electroblob.wizardry.command.CommandDiscoverSpell;
 import electroblob.wizardry.command.CommandSetAlly;
@@ -30,6 +28,7 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
+import org.apache.logging.log4j.Logger;
 
 @Mod(modid = Wizardry.MODID, name = Wizardry.NAME, version = Wizardry.VERSION, guiFactory = "electroblob.wizardry.WizardryGuiFactory")
 public class Wizardry {
@@ -48,7 +47,7 @@ public class Wizardry {
 	 * 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 = "4.1.3";
+	public static final String VERSION = "4.1.4";
 
 	// 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
@@ -136,7 +135,6 @@ public class Wizardry {
 
 		// Event Handlers
 		GameRegistry.registerWorldGenerator(generator, 0);
-		MinecraftForge.EVENT_BUS.register(new WizardryKeyHandler());
 		MinecraftForge.EVENT_BUS.register(instance);
 		proxy.registerSpellHUD(); // This can't easily be converted to use the new @Mod.EventBusSubscriber system
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new WizardryGuiHandler());

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

@@ -1,25 +1,30 @@
-package electroblob.wizardry;
+package electroblob.wizardry.client;
 
-import electroblob.wizardry.client.ClientProxy;
+import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.item.ItemWand;
 import electroblob.wizardry.packet.PacketControlInput;
 import electroblob.wizardry.packet.WizardryPacketHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
+@SideOnly(Side.CLIENT)
+@Mod.EventBusSubscriber(Side.CLIENT)
 public class WizardryKeyHandler {
 
-	boolean NkeyPressed = false;
-	boolean BkeyPressed = false;
+	static boolean NkeyPressed = false;
+	static boolean BkeyPressed = false;
 
 	// Changed to a tick event to allow mouse button keybinds
 	// The 'lag' that happened previously was actually because the code only fired when a keyboard key was pressed!
 	@SubscribeEvent
-	public void onTickEvent(TickEvent.ClientTickEvent event){
+	public static void onTickEvent(TickEvent.ClientTickEvent event){
 
 		if(event.phase == TickEvent.Phase.END) return; // Only really needs to be once per tick
 

src/main/resources/mcmod.info

@@ -2,7 +2,7 @@
 {
   "modid" : "ebwizardry",
   "name" : "Electroblob's Wizardry",
-  "version" : "4.1.3",
+  "version" : "4.1.4",
   "url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry",
   "credits" : "Designed, coded and textured by Electroblob. Code contributed by: Corail31, 12foo, Shadows-of-Fire, HellFirePvP. Translators: MadWrist (Spanish, Mexican Spanish), VilagVil (Russian), ZHENGLOC/dragon-evol (Chinese).",
   "authors" : [