Skip to content

Commit

Permalink
Add per_player option to the Sidebar command
Browse files Browse the repository at this point in the history
  • Loading branch information
@Morphan1
Morphan1 committed Jul 18, 2015
1 parent 12b988a commit 0f29faf
Show file tree
Hide file tree
Showing 2 changed files with 149 additions and 33 deletions.
13 changes: 11 additions & 2 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
View file
Expand Up @@ -2290,7 +2290,7 @@ public void registerCoreMembers() {

// <--[command]
// @Name Sidebar
// @Syntax sidebar (add/remove/{set}) (title:<title>) (lines:<#>|...) (values:<line>|...) (start:<#>/{num_of_lines}) (increment:<#>/{-1}) (players:<player>|...)
// @Syntax sidebar (add/remove/{set}) (title:<title>) (lines:<#>|...) (values:<line>|...) (start:<#>/{num_of_lines}) (increment:<#>/{-1}) (players:<player>|...) (per_player)
// @Required 1
// @Stable stable
// @Short Controls clientside-only sidebars.
Expand All @@ -2316,6 +2316,11 @@ public void registerCoreMembers() {
// between each score and the default is -1. Using the default values of these, the sidebar displays each
// line in order with the score counting down from the total number of lines to 1.
//
// The per_player argument is also available, and helps to reduce the number of loops required for
// updating multiple players' sidebars. When it is specified, all tags in the command will fill based
// on each individual player in the players list. So, for example, you could have <player.name> on a
// lines and it will show each player specified their name on that line.
//
// @Tags
// None
//
Expand All @@ -2324,6 +2329,10 @@ public void registerCoreMembers() {
// - sidebar set "title:Hello World!" "values:This is|My Message!|Wee!" "players:<server.list_online_players>"
//
// @Usage
// Show a few players their ping.
// - sidebar set "title:Info" "value:Ping<&co> <player.ping>" "players:p@Morphan1|p@mcmonkey4eva|p@Matterom" per_player
//
// @Usage
// Set a line on the sidebar a player is viewing.
// - sidebar set "line:2" "value:This is my line now!"
//
Expand All @@ -2340,7 +2349,7 @@ public void registerCoreMembers() {
// - sidebar remove
// -->
registerCoreMember(SidebarCommand.class,
"SIDEBAR", "sidebar (add/remove/{set}) (title:<title>) (lines:<#>|...) (values:<line>|...) (start:<#>/{num_of_lines}) (increment:<#>/{-1}) (players:<player>|...)", 0);
"SIDEBAR", "sidebar (add/remove/{set}) (title:<title>) (lines:<#>|...) (values:<line>|...) (start:<#>/{num_of_lines}) (increment:<#>/{-1}) (players:<player>|...) (per_player)", 1);


// <--[command]
Expand Down
169 changes: 138 additions & 31 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java
View file
Expand Up @@ -2,6 +2,7 @@

import net.aufdemrand.denizen.BukkitScriptEntryData;
import net.aufdemrand.denizen.objects.dPlayer;
import net.aufdemrand.denizen.tags.BukkitTagContext;
import net.aufdemrand.denizen.utilities.DenizenAPI;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.packets.PacketHelper;
Expand All @@ -12,8 +13,9 @@
import net.aufdemrand.denizencore.objects.dList;
import net.aufdemrand.denizencore.scripts.ScriptEntry;
import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
import net.aufdemrand.denizencore.tags.TagContext;
import net.aufdemrand.denizencore.tags.TagManager;
import net.minecraft.server.v1_8_R3.*;
import org.bukkit.craftbukkit.v1_8_R3.scoreboard.CraftScoreboard;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand All @@ -35,7 +37,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException

Action action = Action.SET;

for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
for (aH.Argument arg : aH.interpret(scriptEntry.getOriginalArguments())) {

if (!scriptEntry.hasObject("action")
&& arg.matchesEnum(Action.values())) {
Expand All @@ -49,30 +51,32 @@ else if (!scriptEntry.hasObject("title")

else if (!scriptEntry.hasObject("lines")
&& arg.matchesPrefix("lines", "line", "l")) {
scriptEntry.addObject("lines", arg.asType(dList.class));
scriptEntry.addObject("lines", arg.asElement());
}

else if (!scriptEntry.hasObject("value")
&& arg.matchesPrefix("value", "values", "val", "v")) {
scriptEntry.addObject("value", arg.asType(dList.class));
scriptEntry.addObject("value", arg.asElement());
}

else if (!scriptEntry.hasObject("increment")
&& arg.matchesPrefix("increment", "inc", "i")
&& arg.matchesPrimitive(aH.PrimitiveType.Integer)) {
&& arg.matchesPrefix("increment", "inc", "i")) {
scriptEntry.addObject("increment", arg.asElement());
}

else if (!scriptEntry.hasObject("start")
&& arg.matchesPrefix("start", "s")
&& arg.matchesPrimitive(aH.PrimitiveType.Integer)) {
&& arg.matchesPrefix("start", "s")) {
scriptEntry.addObject("start", arg.asElement());
}

else if (!scriptEntry.hasObject("players")
&& arg.matchesPrefix("players", "player", "p")
&& arg.matchesArgumentList(dPlayer.class)) {
scriptEntry.addObject("players", arg.asType(dList.class));
&& arg.matchesPrefix("players", "player", "p")) {
scriptEntry.addObject("players", arg.asElement());
}

else if (!scriptEntry.hasObject("per_player")
&& arg.matches("per_player")) {
scriptEntry.addObject("per_player", new Element(true));
}
}

Expand All @@ -91,29 +95,90 @@ else if (!scriptEntry.hasObject("players")

scriptEntry.addObject("action", new Element(action.name()));

scriptEntry.defaultObject("players", new dList(Arrays.asList
(((BukkitScriptEntryData) scriptEntry.entryData).getPlayer())));
scriptEntry.defaultObject("per_player", new Element(false)).defaultObject("players",
new Element(((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().identify()));
}

@Override
public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {

Element action = scriptEntry.getElement("action");
Element title = scriptEntry.getElement("title");
dList lines = scriptEntry.getdObject("lines");
dList value = scriptEntry.getdObject("value");
Element increment = scriptEntry.getElement("increment");
Element start = scriptEntry.getElement("start");
dList players = scriptEntry.getdObject("players");

dB.report(scriptEntry, getName(),
action.debug() +
(title != null ? title.debug() : "") +
(lines != null ? lines.debug() : "") +
(value != null ? value.debug() : "") +
(increment != null ? increment.debug() : "") +
(start != null ? start.debug() : "") +
players.debug());
Element elTitle = scriptEntry.getElement("title");
Element elLines = scriptEntry.getElement("lines");
Element elValue = scriptEntry.getElement("value");
Element elIncrement = scriptEntry.getElement("increment");
Element elStart = scriptEntry.getElement("start");
Element elPlayers = scriptEntry.getElement("players");
Element elPerPlayer = scriptEntry.getElement("per_player");

dList players = dList.valueOf(TagManager.tag(elPlayers.asString(), new BukkitTagContext(scriptEntry, false)));
boolean per_player = elPerPlayer.asBoolean();

String perTitle = null;
String perLines = null;
String perValue = null;
String perIncrement = null;
String perStart = null;

Element title = null;
dList lines = null;
dList value = null;
Element increment = null;
Element start = null;

String debug;

if (per_player) {
if (elTitle != null) {
perTitle = elTitle.asString();
}
if (elLines != null) {
perLines = elLines.asString();
}
if (elValue != null) {
perValue = elValue.asString();
}
if (elIncrement != null) {
perIncrement = elIncrement.asString();
}
if (elStart != null) {
perStart = start.asString();
}
debug = action.debug() +
(elTitle != null ? elTitle.debug() : "") +
(elLines != null ? elLines.debug() : "") +
(elValue != null ? elValue.debug() : "") +
(elIncrement != null ? elIncrement.debug() : "") +
(elStart != null ? elStart.debug() : "") +
players.debug();
}
else {
BukkitTagContext context = new BukkitTagContext(scriptEntry, false);
if (elTitle != null) {
title = new Element(TagManager.tag(elTitle.asString(), context));
}
if (elLines != null) {
lines = dList.valueOf(TagManager.tag(elLines.asString(), context));
}
if (elValue != null) {
value = dList.valueOf(TagManager.tag(elValue.asString(), context));
}
if (elIncrement != null) {
increment = new Element(TagManager.tag(elIncrement.asString(), context));
}
if (elStart != null) {
start = new Element(TagManager.tag(elStart.asString(), context));
}
debug = action.debug() +
(title != null ? title.debug() : "") +
(lines != null ? lines.debug() : "") +
(value != null ? value.debug() : "") +
(increment != null ? increment.debug() : "") +
(start != null ? start.debug() : "") +
players.debug();
}

dB.report(scriptEntry, getName(), debug);

switch (Action.valueOf(action.asString())) {

Expand All @@ -124,6 +189,14 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
continue;
}
List<String> current = sidebar.getLines();
if (per_player) {
TagContext context = new BukkitTagContext(player, null, false, scriptEntry,
scriptEntry.shouldDebug(), scriptEntry.getScript());
value = dList.valueOf(TagManager.tag(perValue, context));
if (perLines != null) {
lines = dList.valueOf(TagManager.tag(perLines, context));
}
}
if (lines != null) {
try {
for (int i = 0; i < lines.size(); i++) {
Expand Down Expand Up @@ -151,6 +224,16 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
continue;
}
List<String> current = sidebar.getLines();
if (per_player) {
TagContext context = new BukkitTagContext(player, null, false, scriptEntry,
scriptEntry.shouldDebug(), scriptEntry.getScript());
if (perValue != null) {
value = dList.valueOf(TagManager.tag(perValue, context));
}
if (perLines != null) {
lines = dList.valueOf(TagManager.tag(perLines, context));
}
}
if (lines != null) {
try {
int offset = 0;
Expand Down Expand Up @@ -205,6 +288,25 @@ else if (value != null) {
}
List<String> current = sidebar.getLines();
boolean currEdited = false;
if (per_player) {
TagContext context = new BukkitTagContext(player, null, false, scriptEntry,
scriptEntry.shouldDebug(), scriptEntry.getScript());
if (perValue != null) {
value = dList.valueOf(TagManager.tag(perValue, context));
}
if (perLines != null) {
lines = dList.valueOf(TagManager.tag(perLines, context));
}
if (perStart != null) {
start = new Element(TagManager.tag(perStart, context));
}
if (perIncrement != null) {
increment = new Element(TagManager.tag(perIncrement, context));
}
if (perTitle != null) {
title = new Element(TagManager.tag(perTitle, context));
}
}
if (lines != null) {
try {
for (int i = 0; i < lines.size(); i++) {
Expand Down Expand Up @@ -271,7 +373,6 @@ public static class Sidebar {
private int[] scores;
private int start;
private int increment;
private ScoreboardObjective titleObjective;
private ScoreboardObjective obj1;
private ScoreboardObjective obj2;

Expand All @@ -292,9 +393,11 @@ public List<String> getLines() {
}

public void setTitle(String title) {
if (title.length() > 32) {
title = title.substring(0, 32);
}
if (this.title == null || !this.title.equals(title)) {
this.title = title;
this.titleObjective = new ScoreboardObjective(dummyScoreboard, title, dummyCriteria);
this.obj1.setDisplayName(title);
this.obj2.setDisplayName(title);
}
Expand All @@ -317,7 +420,11 @@ public void setLines(List<String> lines) {
score = lines.size();
}
for (int i = 0; i < lines.size() && i < this.lines.length; i++, score += this.increment) {
this.lines[i] = lines.get(i);
String line = lines.get(i);
if (line.length() > 48) {
line = line.substring(0, 48);
}
this.lines[i] = line;
this.scores[i] = score;
}
}
Expand Down

0 comments on commit 0f29faf

Please sign in to comment.