Add spell quick access keys

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

@@ -16,6 +16,7 @@ import electroblob.wizardry.client.particle.*;
 import electroblob.wizardry.client.particle.ParticleWizardry.IWizardryParticleFactory;
 import electroblob.wizardry.client.renderer.*;
 import electroblob.wizardry.command.SpellEmitter;
+import electroblob.wizardry.constants.Constants;
 import electroblob.wizardry.data.DispenserCastingData;
 import electroblob.wizardry.data.SpellEmitterData;
 import electroblob.wizardry.data.SpellGlyphData;
@@ -72,6 +73,7 @@ import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.village.MerchantRecipeList;
 import net.minecraft.world.World;
 import net.minecraftforge.client.settings.KeyConflictContext;
+import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Property;
 import net.minecraftforge.fml.client.config.GuiConfigEntries.NumberSliderEntry;
@@ -103,6 +105,14 @@ public class ClientProxy extends CommonProxy {
 	// Key Bindings
 	public static final KeyBinding NEXT_SPELL = new KeyBinding("key." + Wizardry.MODID + ".next_spell", KeyConflictContext.IN_GAME, Keyboard.KEY_N, "key.categories." + Wizardry.MODID);
 	public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key." + Wizardry.MODID + ".previous_spell", KeyConflictContext.IN_GAME, Keyboard.KEY_B, "key.categories." + Wizardry.MODID);
+	public static final KeyBinding[] SPELL_QUICK_ACCESS = new KeyBinding[ItemWand.BASE_SPELL_SLOTS + Constants.UPGRADE_STACK_LIMIT];
+
+	static {
+		for(int i = 0; i < SPELL_QUICK_ACCESS.length; i++){
+			SPELL_QUICK_ACCESS[i] = new KeyBinding("key." + Wizardry.MODID + ".spell_" + (i+1),
+					KeyConflictContext.IN_GAME, KeyModifier.ALT, Keyboard.KEY_1 + i, "key.categories." + Wizardry.MODID);
+		}
+	}
 
 	// Armour Model
 	public static final ModelBiped WIZARD_ARMOUR_MODEL = new ModelWizardArmour(0.75f);
@@ -122,6 +132,7 @@ public class ClientProxy extends CommonProxy {
 	public void registerKeyBindings(){
 		ClientRegistry.registerKeyBinding(NEXT_SPELL);
 		ClientRegistry.registerKeyBinding(PREVIOUS_SPELL);
+		for(KeyBinding key : SPELL_QUICK_ACCESS) ClientRegistry.registerKeyBinding(key);
 	}
 
 	@Override

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

@@ -4,6 +4,7 @@ import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.gui.GuiSpellDisplay;
 import electroblob.wizardry.item.ISpellCastingItem;
 import electroblob.wizardry.packet.PacketControlInput;
+import electroblob.wizardry.packet.PacketSpellQuickAccess;
 import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.WizardrySounds;
 import net.minecraft.client.Minecraft;
@@ -24,6 +25,7 @@ public class WizardryControlHandler {
 
 	static boolean NkeyPressed = false;
 	static boolean BkeyPressed = false;
+	static boolean[] quickAccessKeyPressed = new boolean[ClientProxy.SPELL_QUICK_ACCESS.length];
 
 	// 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!
@@ -59,6 +61,19 @@ public class WizardryControlHandler {
 				}else{
 					BkeyPressed = false;
 				}
+
+				for(int i = 0; i < ClientProxy.SPELL_QUICK_ACCESS.length; i++){
+					if(ClientProxy.SPELL_QUICK_ACCESS[i].isKeyDown() && Minecraft.getMinecraft().inGameHasFocus){
+						if(!quickAccessKeyPressed[i]){
+							quickAccessKeyPressed[i] = true;
+							// Packet building
+							selectSpell(wand, i);
+						}
+					}else{
+						quickAccessKeyPressed[i] = false;
+					}
+				}
+
 			}
 		}
 	}
@@ -118,4 +133,17 @@ public class WizardryControlHandler {
 		GuiSpellDisplay.playSpellSwitchAnimation(false);
 		Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(WizardrySounds.ITEM_WAND_SWITCH_SPELL, 1));
 	}
+
+	private static void selectSpell(ItemStack wand, int index){
+		// GUI switch animation
+		if(((ISpellCastingItem)wand.getItem()).selectSpell(wand, index)){ // Makes sure the spell is set immediately for the client
+			// Packet building (no point sending it unless the client-side spell selection succeeded
+			IMessage msg = new PacketSpellQuickAccess.Message(index);
+			WizardryPacketHandler.net.sendToServer(msg);
+
+			GuiSpellDisplay.playSpellSwitchAnimation(true); // This will do, it's only an animation
+			Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(WizardrySounds.ITEM_WAND_SWITCH_SPELL, 1));
+		}
+	}
+
 }