diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 5b39a96f9..dcb421163 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -328,6 +328,11 @@ public class EventHooks { CustomGuiController.onSlotChange(event); } + public static void onCustomGuiUnfocused(ScriptPlayer player, ICustomGui gui, int textfieldId) { + CustomGuiEvent.UnfocusedEvent event = new CustomGuiEvent.UnfocusedEvent(player, gui, textfieldId); + CustomGuiController.onCustomGuiUnfocused(event); + } + public static void onCustomGuiScrollClick(ScriptPlayer player, ICustomGui gui, int scrollId, int scrollIndex, String[] selection, boolean doubleClick) { CustomGuiEvent.ScrollEvent event = new CustomGuiEvent.ScrollEvent(player, gui, scrollId, scrollIndex, selection, doubleClick); CustomGuiController.onScrollClick(event); diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index bae601c11..61816ea25 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -75,24 +75,25 @@ public class PacketHandlerServer{ if(type == EnumPacketServer.IsGuiOpen) { isGuiOpenPacket(buffer, player); return; - } else if (type == EnumPacketServer.CustomGuiButton) { - if (player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiButton((ScriptPlayer)NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); - return; - } - } else if (type == EnumPacketServer.CustomGuiSlotChange) { - if (player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiSlot((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); - return; - } + } else if (type == EnumPacketServer.CustomGuiButton && player.openContainer instanceof ContainerCustomGui) { + ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); + EventHooks.onCustomGuiButton((ScriptPlayer)NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); + return; + } else if (type == EnumPacketServer.CustomGuiSlotChange && player.openContainer instanceof ContainerCustomGui) { + ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); + EventHooks.onCustomGuiSlot((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); + return; + } else if(type == EnumPacketServer.CustomGuiUnfocused && player.openContainer instanceof ContainerCustomGui) { + ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); + EventHooks.onCustomGuiUnfocused((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt()); + return; } else if (type == EnumPacketServer.CustomGuiScrollClick && player.openContainer instanceof ContainerCustomGui) { ((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); EventHooks.onCustomGuiScrollClick((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt(), buffer.readInt(), CustomGuiController.readScrollSelection(buffer), buffer.readBoolean()); return; } else if (type == EnumPacketServer.CustomGuiClose) { EventHooks.onCustomGuiClose((ScriptPlayer)NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(Server.readNBT(buffer))); + return; } if(type.needsNpc && npc == null){ diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index 25feafb1e..7ad35397e 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -466,6 +466,10 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD } } + public void onTextFieldUnfocused(CustomGuiTextField textField){ + Client.sendData(EnumPacketServer.CustomGuiUnfocused, new Object[]{this.updateGui().toNBT(), textField.getID()}); + } + ScriptGui updateGui() { Iterator var1 = this.dataHolders.iterator(); diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java index 879d15081..bc9004798 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java @@ -8,10 +8,12 @@ package noppes.npcs.client.gui.custom.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.client.Client; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IKeyListener; +import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.scripted.gui.ScriptGuiTextField; import noppes.npcs.scripted.interfaces.ICustomGuiComponent; @@ -75,6 +77,11 @@ public class CustomGuiTextField extends GuiTextField implements IKeyListener, ID public boolean mouseClicked(GuiCustom gui, int mouseX, int mouseY, int mouseButton) { this.mouseClicked(mouseX, mouseY, mouseButton); + + if (!this.isFocused() && mouseButton == 0){ + parent.onTextFieldUnfocused(this); + } + return true; } } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index dc0e06c8e..dfe0f38d6 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -146,6 +146,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb hookList.add("customGuiButton"); hookList.add("customGuiSlot"); hookList.add("customGuiScroll"); + hookList.add("customGuiTextfield"); } else if(handler instanceof ForgeDataScript) { hooks.setSize(238, 198); diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 595ccb08a..4591be8c4 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -78,7 +78,7 @@ public enum EnumPacketServer { NaturalSpawnGetAll, MailOpenSetup, DimensionsGet, DimensionTeleport, GetTileEntity, Gui, IsGuiOpen, - CustomGuiButton,CustomGuiSlotChange,CustomGuiScrollClick,CustomGuiClose; + CustomGuiButton,CustomGuiSlotChange,CustomGuiScrollClick,CustomGuiClose,CustomGuiUnfocused; public CustomNpcsPermissions.Permission permission = null; public boolean needsNpc = false; diff --git a/src/main/java/noppes/npcs/constants/EnumScriptType.java b/src/main/java/noppes/npcs/constants/EnumScriptType.java index 7ac39469d..a103ba293 100644 --- a/src/main/java/noppes/npcs/constants/EnumScriptType.java +++ b/src/main/java/noppes/npcs/constants/EnumScriptType.java @@ -57,6 +57,7 @@ public enum EnumScriptType { CUSTOM_GUI_BUTTON("customGuiButton"), CUSTOM_GUI_SLOT("customGuiSlot"), CUSTOM_GUI_SCROLL("customGuiScroll"), + CUSTOM_GUI_TEXTFIELD("customGuiTextfield"), PICKUP_XP("pickupXP"), MOUSE_CLICKED("mouseClicked"), START_USING_ITEM("startItem"), diff --git a/src/main/java/noppes/npcs/controllers/CustomGuiController.java b/src/main/java/noppes/npcs/controllers/CustomGuiController.java index 790a1b84a..edb1cf15c 100644 --- a/src/main/java/noppes/npcs/controllers/CustomGuiController.java +++ b/src/main/java/noppes/npcs/controllers/CustomGuiController.java @@ -83,6 +83,15 @@ public class CustomGuiController { WrapperNpcAPI.EVENT_BUS.post(event); } + public static void onCustomGuiUnfocused(CustomGuiEvent.UnfocusedEvent event) { + EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); + if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { + getOpenGui(player).getScriptHandler().callScript(EnumScriptType.CUSTOM_GUI_TEXTFIELD, event); + } + + WrapperNpcAPI.EVENT_BUS.post(event); + } + public static void onScrollClick(CustomGuiEvent.ScrollEvent event) { EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { diff --git a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java index 5a96e3a5e..6c20658d0 100644 --- a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java @@ -23,6 +23,15 @@ public class CustomGuiEvent extends Event { } } + public static class UnfocusedEvent extends CustomGuiEvent { + public final int textfieldId; + + public UnfocusedEvent(IPlayer player, ICustomGui gui, int textfieldId) { + super(player, gui); + this.textfieldId = textfieldId; + } + } + public static class CloseEvent extends CustomGuiEvent { public CloseEvent(IPlayer player, ICustomGui gui) { super(player, gui);