From 1cdeb3495362f4d59eccd3fd7648562394e63d50 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Sat, 20 Jan 2024 12:16:31 +0300 Subject: [PATCH 1/7] Implemented the interface for ScriptedCommandEvent --- .../npcs/scripted/event/CustomNPCsEvent.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java index e62d46d47..3f8508fc7 100644 --- a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java @@ -9,6 +9,7 @@ import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; import noppes.npcs.api.AbstractNpcAPI; import noppes.npcs.api.IPos; +import noppes.npcs.api.IWorld; import noppes.npcs.api.event.ICustomNPCsEvent; import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.constants.EnumScriptType; @@ -80,4 +81,56 @@ public class CustomNPCsEvent extends Event implements ICustomNPCsEvent { return this.airSpawnPassed; } } + + public static class ScriptedCommandEvent extends CustomNPCsEvent implements ICustomNPCsEvent.ScriptedCommandEvent { + + public IWorld world; + public IPos pos; + public String senderName; + public int id; + public String[] args; + public String replyMessage = ""; + + public ScriptedCommandEvent(IWorld world, IPos pos, String senderName, int id, String[] args){ + this.world = world; + this.pos = pos; + this.senderName = senderName; + this.id = id; + this.args = args; + } + + public String getHookName() { + return EnumScriptType.SCRIPT_COMMAND.function; + } + + @Override + public IWorld getSenderWorld() { + return world; + } + + @Override + public IPos getSenderPosition() { + return pos; + } + + @Override + public String getSenderName() { + return senderName; + } + + @Override + public void setReplyMessage(String message) { + replyMessage = message; + } + + @Override + public int getId() { + return id; + } + + @Override + public String[] getArgs() { + return args; + } + } } From 1421f9e81997c8d71050ead42d5bb78438ab7aaf Mon Sep 17 00:00:00 2001 From: Goodbird Date: Sat, 20 Jan 2024 12:17:15 +0300 Subject: [PATCH 2/7] Added an event hook for the scripted command event --- src/main/java/noppes/npcs/EventHooks.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index ea784ccd4..2a9cd8dc8 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -568,6 +568,13 @@ public class EventHooks { return false; } + public static void onScriptedCommand(CustomNPCsEvent.ScriptedCommandEvent event) { + ForgeDataScript handler = ScriptController.Instance.forgeScripts; + if (handler.isEnabled()) { + handler.callScript(EnumScriptType.SCRIPT_COMMAND, event); + } + } + public static void onCustomGuiButton(IPlayer player, ICustomGui gui, int buttonId) { CustomGuiEvent.ButtonEvent event = new CustomGuiEvent.ButtonEvent(player, gui, buttonId); CustomGuiController.onButton(event); From e6c86a61db49700ec98c14e9c9ad8a8eb59d5628 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Sat, 20 Jan 2024 12:22:05 +0300 Subject: [PATCH 3/7] Created a subcommand triggering scripted command event --- .../java/kamkeel/command/CommandCommand.java | 56 +++++++++++++++++++ .../java/kamkeel/command/CommandKamkeel.java | 1 + 2 files changed, 57 insertions(+) create mode 100644 src/main/java/kamkeel/command/CommandCommand.java diff --git a/src/main/java/kamkeel/command/CommandCommand.java b/src/main/java/kamkeel/command/CommandCommand.java new file mode 100644 index 000000000..81f0aa0ae --- /dev/null +++ b/src/main/java/kamkeel/command/CommandCommand.java @@ -0,0 +1,56 @@ +package kamkeel.command; + +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.math.BlockPos; +import noppes.npcs.EventHooks; +import noppes.npcs.api.IPos; +import noppes.npcs.api.IWorld; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.CustomNPCsEvent; + +public class CommandCommand extends CommandKamkeelBase { + + @Override + public String getCommandName() { + return "command"; + } + + @Override + public String getDescription() { + return "command CommandID [arg1 arg2 ... argn]"; + } + + + @Override + public void processCommand(ICommandSender sender, String[] args) throws CommandException { + if (args.length < 1) { + sendError(sender, "You must specify the command id"); + return; + } + + int commandId; + try { + commandId = Integer.parseInt(args[0]); + } catch (NumberFormatException ex) { + sendError(sender, "CommandID must be an integer: " + args[0]); + return; + } + + String[] commandArgs = new String[args.length - 1]; + System.arraycopy(args, 1, commandArgs, 0, args.length - 1); + + IWorld senderWorld = NpcAPI.Instance().getIWorld(sender.getEntityWorld()); + + ChunkCoordinates senderCoords = sender.getPlayerCoordinates(); + IPos senderPos = NpcAPI.Instance().getIPos(new BlockPos(senderCoords.posX, senderCoords.posY, senderCoords.posZ)); + + CustomNPCsEvent.ScriptedCommandEvent event = new CustomNPCsEvent.ScriptedCommandEvent(senderWorld, senderPos, sender.getCommandSenderName(), commandId, commandArgs); + EventHooks.onScriptedCommand(event); + + if (!event.replyMessage.isEmpty()) { + sendMessage(sender, event.replyMessage); + } + } +} diff --git a/src/main/java/kamkeel/command/CommandKamkeel.java b/src/main/java/kamkeel/command/CommandKamkeel.java index b2eacc390..8ab279507 100644 --- a/src/main/java/kamkeel/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/command/CommandKamkeel.java @@ -32,6 +32,7 @@ public class CommandKamkeel extends CommandBase{ registerCommand(new ConfigCommand()); registerCommand(new AnimationCommand()); registerCommand(new OverlayCommand()); + registerCommand(new CommandCommand()); } public void registerCommand(CommandKamkeelBase command){ From d9569d0ef7cca31ca28ecb1f7971883137b53572 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Sat, 20 Jan 2024 12:22:17 +0300 Subject: [PATCH 4/7] New API branch --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index e3980ce21..f96bb398f 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit e3980ce21720e963bb3d3169931885eb0bc60caa +Subproject commit f96bb398ff2179f4a7761740f7e959e6b0d22be8 From e882cdacb2332e6203f8d38df11aed8016c0c8d0 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Mon, 22 Jan 2024 23:05:12 +0300 Subject: [PATCH 5/7] Turned command id into a string --- src/main/java/kamkeel/command/CommandCommand.java | 12 +++--------- .../noppes/npcs/scripted/event/CustomNPCsEvent.java | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/kamkeel/command/CommandCommand.java b/src/main/java/kamkeel/command/CommandCommand.java index 81f0aa0ae..23fa242ca 100644 --- a/src/main/java/kamkeel/command/CommandCommand.java +++ b/src/main/java/kamkeel/command/CommandCommand.java @@ -19,24 +19,18 @@ public class CommandCommand extends CommandKamkeelBase { @Override public String getDescription() { - return "command CommandID [arg1 arg2 ... argn]"; + return "command CommandName [arg1 arg2 ... argn]"; } @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length < 1) { - sendError(sender, "You must specify the command id"); + sendError(sender, "You must specify the command name"); return; } - int commandId; - try { - commandId = Integer.parseInt(args[0]); - } catch (NumberFormatException ex) { - sendError(sender, "CommandID must be an integer: " + args[0]); - return; - } + String commandId = args[0]; String[] commandArgs = new String[args.length - 1]; System.arraycopy(args, 1, commandArgs, 0, args.length - 1); diff --git a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java index 3f8508fc7..32154a730 100644 --- a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java @@ -87,11 +87,11 @@ public class CustomNPCsEvent extends Event implements ICustomNPCsEvent { public IWorld world; public IPos pos; public String senderName; - public int id; + public String id; public String[] args; public String replyMessage = ""; - public ScriptedCommandEvent(IWorld world, IPos pos, String senderName, int id, String[] args){ + public ScriptedCommandEvent(IWorld world, IPos pos, String senderName, String id, String[] args){ this.world = world; this.pos = pos; this.senderName = senderName; @@ -124,7 +124,7 @@ public class CustomNPCsEvent extends Event implements ICustomNPCsEvent { } @Override - public int getId() { + public String getId() { return id; } From bd8fefc2a4b9f4940254ae8d3e245f73573d953c Mon Sep 17 00:00:00 2001 From: Goodbird Date: Mon, 22 Jan 2024 23:05:29 +0300 Subject: [PATCH 6/7] Changed API --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index f96bb398f..8afc6f6f3 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit f96bb398ff2179f4a7761740f7e959e6b0d22be8 +Subproject commit 8afc6f6f3d0aaaa351240cb18d97bf1d354fa384 From df8e7a1b3b09f028c2e250e4745c154ec3b96405 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 22 Jan 2024 21:56:06 -0500 Subject: [PATCH 7/7] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index 8afc6f6f3..f5bf161c4 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 8afc6f6f3d0aaaa351240cb18d97bf1d354fa384 +Subproject commit f5bf161c474ba661d4b6f59f756c43805c03a1b7