Spell HUD rewrite and retexturing:

- Replaces the old hardcoded drawing methods with a new json-based system with support for multiple inbuilt and resource pack-defined skins. - Adds a config option for choosing the spell HUD skin, along with a custom config GUI screen allowing the user to select from a list of available skins with a preview of the currently selected skin. - Replaces the HUD texture file with a spell_hud subfolder, containing all the necessary textures and json files for the 12 inbuilt skins. - Adds a subtle sound effect and scroling animation when switching spells - Reorganises the control event code into a single handler class and converts this class and the spell HUD class to static event handlers. - Fixes the HUD position option which got broken in the previous spell HUD commit
2018-07-02 22:33:09 +01:00
parent b7cd3db8bc
commit af01beb583
42 changed files with 1393 additions and 223 deletions
@@ -0,0 +1,132 @@
+package electroblob.wizardry.client;
+
+import org.lwjgl.input.Keyboard;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.gui.GuiSpellDisplay;
+import electroblob.wizardry.item.ItemWand;
+import electroblob.wizardry.packet.PacketControlInput;
+import electroblob.wizardry.packet.WizardryPacketHandler;
+import electroblob.wizardry.registry.WizardrySounds;
+import electroblob.wizardry.util.WandHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.event.MouseEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+/** Event handler class responsible for handling wizardry's controls. */
+@SideOnly(Side.CLIENT)
+@Mod.EventBusSubscriber(Side.CLIENT)
+public class WizardryControlHandler {
+
+	static boolean NkeyPressed = false;
+	static boolean BkeyPressed = false;
+	static boolean NkeyAlreadyPressed = false;
+	static boolean BkeyAlreadyPressed = false;
+
+	@SubscribeEvent
+	public static void onKeyInput(InputEvent.KeyInputEvent event){
+
+		// Key pressed
+		if(Keyboard.getEventKeyState()){
+
+			if(Wizardry.proxy instanceof ClientProxy){
+				
+				EntityPlayer player = Minecraft.getMinecraft().player;
+				ItemStack wand = player.getHeldItemMainhand();
+
+				if(!(wand.getItem() instanceof ItemWand)){
+					wand = player.getHeldItemOffhand();
+					// If the player isn't holding a wand, then nothing else needs to be done.
+					if(!(wand.getItem() instanceof ItemWand)) return;
+				}
+
+				if(ClientProxy.NEXT_SPELL.isPressed() && Minecraft.getMinecraft().inGameHasFocus){
+					if(!NkeyPressed){
+						NkeyPressed = true;
+					}else{
+						NkeyAlreadyPressed = true;
+					}
+					if(!NkeyAlreadyPressed){
+						selectNextSpell(wand);
+					}
+				}
+
+				if(ClientProxy.PREVIOUS_SPELL.isPressed() && Minecraft.getMinecraft().inGameHasFocus){
+					if(!BkeyPressed){
+						BkeyPressed = true;
+					}else{
+						BkeyAlreadyPressed = true;
+					}
+					if(!BkeyAlreadyPressed){
+						selectPreviousSpell(wand);
+					}
+				}
+			}
+		}
+
+		// Key released
+		else{
+			if(NkeyPressed){
+				NkeyPressed = false;
+				NkeyAlreadyPressed = false;
+			}else if(BkeyPressed){
+				BkeyPressed = false;
+				BkeyAlreadyPressed = false;
+			}
+		}
+	}
+	
+	// Shift-scrolling to change spells
+	@SubscribeEvent
+	public static void onMouseEvent(MouseEvent event){
+
+		EntityPlayer player = Minecraft.getMinecraft().player;
+		ItemStack wand = player.getHeldItemMainhand();
+
+		if(!(wand.getItem() instanceof ItemWand)){
+			wand = player.getHeldItemOffhand();
+			// If the player isn't holding a wand, then nothing else needs to be done.
+			if(!(wand.getItem() instanceof ItemWand)) return;
+		}
+
+		if(Minecraft.getMinecraft().inGameHasFocus && !wand.isEmpty() && event.getDwheel() != 0 && player.isSneaking()
+				&& Wizardry.settings.enableShiftScrolling){
+
+			event.setCanceled(true);
+
+			if(event.getDwheel() > 0){
+				selectNextSpell(wand);
+			}else if(event.getDwheel() < 0){
+				selectPreviousSpell(wand);
+			}
+		}
+	}
+	
+	private static void selectNextSpell(ItemStack wand){
+		// Packet building
+		IMessage msg = new PacketControlInput.Message(PacketControlInput.ControlType.NEXT_SPELL_KEY);
+		WizardryPacketHandler.net.sendToServer(msg);
+		// GUI switch animation
+		WandHelper.selectNextSpell(wand); // Makes sure the spell is set immediately for the client
+		GuiSpellDisplay.playSpellSwitchAnimation(true);
+		Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(WizardrySounds.SELECT_SPELL, 1));
+	}
+	
+	private static void selectPreviousSpell(ItemStack wand){
+		// Packet building
+		IMessage msg = new PacketControlInput.Message(PacketControlInput.ControlType.PREVIOUS_SPELL_KEY);
+		WizardryPacketHandler.net.sendToServer(msg);
+		// GUI switch animation
+		WandHelper.selectPreviousSpell(wand); // Makes sure the spell is set immediately for the client
+		GuiSpellDisplay.playSpellSwitchAnimation(false);
+		Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(WizardrySounds.SELECT_SPELL, 1));
+	}
+}