From 1e88a4458d99f14f1b37c093df72963bb724d3ec Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Wed, 13 Apr 2022 04:25:44 -0500 Subject: [PATCH 1/2] Fixed bug with NPC dialog scripts. --- src/main/java/noppes/npcs/EventHooks.java | 10 ++++++++-- .../noppes/npcs/scripted/event/ScriptEventDialog.java | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 899ed8380..abf0a84a8 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -76,7 +76,10 @@ public class EventHooks { NpcEvent.DialogEvent event = new NpcEvent.DialogEvent(npc.wrappedNPC, player, dialogId, optionId, dialog); ScriptController.Instance.npcScripts.callScript(EnumScriptType.DIALOG, event); - npc.script.callScript(EnumScriptType.DIALOG, "event", new ScriptEventDialog(player,dialogId,optionId,dialog)); + + ScriptEventDialog npcEvent = new ScriptEventDialog(player,dialogId,optionId,dialog); + npc.script.callScript(EnumScriptType.DIALOG, "event", npcEvent, "player", npcEvent.getPlayer(), "dialog", npcEvent.getDialogId(), "option", npcEvent.getOptionId(), "dialogObj", npcEvent.getDialog()); + WrapperNpcAPI.EVENT_BUS.post(event); } @@ -86,7 +89,10 @@ public class EventHooks { NpcEvent.DialogClosedEvent event = new NpcEvent.DialogClosedEvent(npc.wrappedNPC, player, dialogId, optionId, dialog); ScriptController.Instance.npcScripts.callScript(EnumScriptType.DIALOG_CLOSE, event); - npc.script.callScript(EnumScriptType.DIALOG_CLOSE, "event", new ScriptEventDialog(player,dialogId,optionId,dialog)); + + ScriptEventDialog npcEvent = new ScriptEventDialog(player,dialogId,optionId,dialog); + npc.script.callScript(EnumScriptType.DIALOG_CLOSE, "event", npcEvent, "player", npcEvent.getPlayer(), "dialog", npcEvent.getDialogId(), "option", npcEvent.getOptionId(), "dialogObj", npcEvent.getDialog()); + WrapperNpcAPI.EVENT_BUS.post(event); } diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java index 8e13699de..3e8d3bc2f 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java +++ b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java @@ -6,19 +6,19 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.interfaces.IPlayer; public class ScriptEventDialog extends ScriptEvent{ - public EntityPlayer player; + public IPlayer player; public int dialog; public int option; public Dialog dialogObj; public ScriptEventDialog(EntityPlayer player, int dialog, int option, Dialog dialogObj){ - this.player = player; + this.player = (IPlayer)NpcAPI.Instance().getIEntity(player); this.dialog = dialog; this.option = option; this.dialogObj = dialogObj; } - public EntityPlayer getPlayer() { + public IPlayer getPlayer() { return player; } From b90406ddd6d977cc05d61e7ea4e710d9a3a19002 Mon Sep 17 00:00:00 2001 From: Kamron Vaswani Date: Wed, 20 Apr 2022 17:23:45 -0400 Subject: [PATCH 2/2] Revert "Remove redundant files and make support for specific OS for zstd compression" --- build.gradle | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index d0941ad37..debbbf286 100644 --- a/build.gradle +++ b/build.gradle @@ -34,16 +34,6 @@ configurations { compile.extendsFrom shade } -// List of all supported OS for zstd compression (This is include only for anyone which is not using the default compression) -def supportedOS = [ - "linux_amd64", - "linux_i386", - "win_amd64", - "win_x86", - "darwin_x86_64", - "darwin_aarch64" -] - dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. @@ -57,12 +47,7 @@ dependencies { // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html -// shade 'com.github.luben:zstd-jni:1.5.2-2' - Remove almost implementations of zstd - - for (os in supportedOS) { - shade ("com.github.luben:zstd-jni:1.5.2-2:${os}") - } - + shade 'com.github.luben:zstd-jni:1.5.2-2' } processResources