Skip to content

Commit

Permalink
modernize chat command and handle offline player gentler
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Nov 14, 2022
1 parent a66133f commit 57ffac9
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 59 deletions.
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
View file
Expand Up @@ -5090,7 +5090,7 @@ else if (state instanceof Dropper) {
// <LocationTag.has_loot_table>
// @Example
// # Sets the chest's loot table to a bonus chest
// - adjust <[location]> loot_table:chests/ancient_city
// - adjust <[location]> loot_table_id:chests/ancient_city
// -->
if (mechanism.matches("loot_table_id")) {
BlockState state = getBlockState();
Expand Down
93 changes: 35 additions & 58 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java
View file
@@ -1,14 +1,15 @@
package com.denizenscript.denizen.scripts.commands.player;

import com.denizenscript.denizen.objects.NPCTag;
import com.denizenscript.denizen.objects.PlayerTag;
import com.denizenscript.denizen.utilities.Utilities;
import com.denizenscript.denizencore.exceptions.InvalidArgumentsRuntimeException;
import com.denizenscript.denizencore.scripts.commands.generator.*;
import com.denizenscript.denizencore.utilities.debugging.Debug;
import com.denizenscript.denizen.utilities.Settings;
import com.denizenscript.denizen.npc.speech.DenizenSpeechContext;
import com.denizenscript.denizen.npc.speech.DenizenSpeechController;
import com.denizenscript.denizen.objects.EntityTag;
import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
import com.denizenscript.denizencore.objects.Argument;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.core.ListTag;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
Expand All @@ -21,6 +22,10 @@ public ChatCommand() {
setSyntax("chat [<text>] (no_target/targets:<entity>|...) (talkers:<entity>|...) (range:<#.#>)");
setRequiredArguments(1, 4);
isProcedural = false;
addRemappedPrefixes("targets", "target", "t");
addRemappedPrefixes("talkers", "talker");
addRemappedPrefixes("range", "r");
autoCompile();
}

// TODO: Should the chat command be in the NPC group instead?
Expand Down Expand Up @@ -49,7 +54,7 @@ public ChatCommand() {
// </code>
// The player being chatted to, by default the attached Player to the script queue, will see a message 'Jack says to you, Hello!',
// however surrounding entities will see something along the lines of 'Jack says to Bob, Hello!'.
// The format for this is configurable.
// The format for this is configurable via the "Denizen/config.yml" file.
//
// If sending messages to the Player without any surrounding entities hearing the message is desirable,
// it is often times recommended to instead use the 'narrate' command.
Expand All @@ -67,66 +72,38 @@ public ChatCommand() {
// - chat targets:<npc.location.find_players_within[6].filter[has_flag[clan_initiate]]> "Welcome, initiate!"
// -->

@Override
public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
boolean specified_targets = false;
boolean specified_talker = false;
for (Argument arg : scriptEntry) {
if (arg.matchesPrefix("target", "targets", "t")) {
if (arg.matchesArgumentList(EntityTag.class)) {
scriptEntry.addObject("targets", arg.asType(ListTag.class));
public static void autoExecute(ScriptEntry scriptEntry,
@ArgName("message") @ArgLinear String message,
@ArgName("talkers") @ArgPrefixed @ArgDefaultNull ListTag talkers,
@ArgName("targets") @ArgPrefixed @ArgDefaultNull ListTag targets,
@ArgName("no_target") boolean noTarget,
@ArgName("range") @ArgPrefixed @ArgDefaultText("-1") double chatRange) {
if (targets == null) {
targets = new ListTag();
if (!noTarget) {
PlayerTag player = Utilities.getEntryPlayer(scriptEntry);
if (player == null) {
throw new InvalidArgumentsRuntimeException("Missing targets!");
}
specified_targets = true;
}
else if (arg.matches("no_target")) {
scriptEntry.addObject("targets", new ListTag());
}
else if (arg.matchesPrefix("talker", "talkers")) {
if (arg.matchesArgumentList(EntityTag.class)) {
scriptEntry.addObject("talkers", arg.asType(ListTag.class));
}
specified_talker = true;
}
else if (arg.matchesPrefix("range", "r")) {
if (arg.matchesFloat()) {
scriptEntry.addObject("range", arg.asElement());
if (!player.isOnline()) {
Debug.echoDebug(scriptEntry, "Player is not online, skipping.");
return;
}
}
else if (!scriptEntry.hasObject("message")) {
scriptEntry.addObject("message", arg.getRawElement());
}
else {
arg.reportUnhandled();
targets.addObject(player);
}
}
if (!scriptEntry.hasObject("targets") && Utilities.entryHasPlayer(scriptEntry) && !specified_targets) {
scriptEntry.defaultObject("targets", new ListTag(Utilities.getEntryPlayer(scriptEntry)));
}
if (!scriptEntry.hasObject("talkers") && Utilities.entryHasNPC(scriptEntry) && !specified_talker) {
scriptEntry.defaultObject("talkers", new ListTag(Utilities.getEntryNPC(scriptEntry)));
}
if (!scriptEntry.hasObject("targets")) {
throw new InvalidArgumentsException("Must specify valid targets!");
}
if (!scriptEntry.hasObject("talkers")) {
throw new InvalidArgumentsException("Must specify valid talkers!");
}
if (!scriptEntry.hasObject("message")) {
throw new InvalidArgumentsException("Must specify a message!");
if (talkers == null) {
talkers = new ListTag();
NPCTag talker = Utilities.getEntryNPC(scriptEntry);
if (talker == null) {
throw new InvalidArgumentsRuntimeException("Missing talker!");
}
talkers.addObject(talker);
}
scriptEntry.defaultObject("range", new ElementTag(Settings.chatBystandersRange()));
}

@Override
public void execute(ScriptEntry scriptEntry) {
ListTag talkers = scriptEntry.getObjectTag("talkers");
ListTag targets = scriptEntry.getObjectTag("targets");
ElementTag message = scriptEntry.getElement("message");
ElementTag chatRange = scriptEntry.getElement("range");
if (scriptEntry.dbCallShouldDebug()) {
Debug.report(scriptEntry, getName(), talkers, targets, message, chatRange);
if (chatRange == -1) {
chatRange = Settings.chatBystandersRange();
}
DenizenSpeechContext context = new DenizenSpeechContext(message.asString(), scriptEntry, chatRange.asDouble());
DenizenSpeechContext context = new DenizenSpeechContext(message, scriptEntry, chatRange);
if (!targets.isEmpty()) {
for (EntityTag ent : targets.filter(EntityTag.class, scriptEntry)) {
context.addRecipient(ent.getBukkitEntity());
Expand Down

0 comments on commit 57ffac9

Please sign in to comment.