EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Flag info

Browse Source
This commit is contained in:
Jesse Boyd 2016-05-13 03:38:32 +10:00
parent dee8072d83
commit 0095af0ce5
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -483,6 +483,7 @@ public enum C {
PLOT_INFO_SIZE("$1Size:$2 %size%", "Info"), PLOT_INFO_SIZE("$1Size:$2 %size%", "Info"),
PLOT_INFO_EXPIRES("$1Expires:$2 %expires%", "Info"), PLOT_INFO_EXPIRES("$1Expires:$2 %expires%", "Info"),
PLOT_USER_LIST(" $1%user%$2,", "Info"), PLOT_USER_LIST(" $1%user%$2,", "Info"),
PLOT_FLAG_LIST("$1%s0:%s1$2", "Info"),
INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"), INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"),
/* /*
* Generating * Generating
@ -686,6 +687,10 @@ public enum C {
} }
} }
public String f(final Object... args) {
return format(s(), args);
}
public static String color(String string) { public static String color(String string) {
return StringMan.replaceFromMap(string, replacements); return StringMan.replaceFromMap(string, replacements);
} }

51
Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -5,6 +5,7 @@ import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagManager;
import com.intellectualcrafters.plot.flag.Flags; import com.intellectualcrafters.plot.flag.Flags;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.ChunkLoc;
@ -18,7 +19,6 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.PseudoRandom; import com.intellectualcrafters.plot.object.PseudoRandom;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.object.RunnableVal;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -39,7 +39,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
/** /**
* plot functions * plot functions
@ -737,32 +736,38 @@ public class MainUtil {
Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION); Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION);
String description = !descriptionFlag.isPresent() ? C.NONE.s() : Flags.DESCRIPTION.valueToString(descriptionFlag.get()); String description = !descriptionFlag.isPresent() ? C.NONE.s() : Flags.DESCRIPTION.valueToString(descriptionFlag.get());
String flags; StringBuilder flags = new StringBuilder();
if (!StringMan.join(FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true).values(), "").isEmpty()) { {
flags = StringMan.replaceFromMap( HashMap<Flag<?>, Object> flagMap = FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true);
"$2" + StringMan.join(FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true).values(), "$1, $2"), C.replacements); if (flagMap.isEmpty()) {
} else { flags.append(C.NONE.s());
flags = StringMan.replaceFromMap("$2" + C.NONE.s(), C.replacements); } else {
String prefix = "";
for (Entry<Flag<?>, Object> entry : flagMap.entrySet()) {
flags.append(prefix).append(C.PLOT_FLAG_LIST.f(entry.getKey().getName(), entry.getValue()));
prefix = ", ";
}
}
} }
boolean build = plot.isAdded(player.getUUID()); boolean build = plot.isAdded(player.getUUID());
String owner = plot.getOwners().isEmpty() ? "unowned" : getPlayerList(plot.getOwners()); String owner = plot.getOwners().isEmpty() ? "unowned" : getPlayerList(plot.getOwners());
info = info.replaceAll("%id%", plot.getId().toString()); info = info.replace("%id%", plot.getId().toString());
info = info.replaceAll("%alias%", alias); info = info.replace("%alias%", alias);
info = info.replaceAll("%num%", num + ""); info = info.replace("%num%", num + "");
info = info.replaceAll("%desc%", description); info = info.replace("%desc%", description);
info = info.replaceAll("%biome%", biome); info = info.replace("%biome%", biome);
info = info.replaceAll("%owner%", owner); info = info.replace("%owner%", owner);
info = info.replaceAll("%members%", members); info = info.replace("%members%", members);
info = info.replaceAll("%player%", player.getName()); info = info.replace("%player%", player.getName());
info = info.replaceAll("%trusted%", trusted); info = info.replace("%trusted%", trusted);
info = info.replaceAll("%helpers%", members); info = info.replace("%helpers%", members);
info = info.replaceAll("%denied%", denied); info = info.replace("%denied%", denied);
info = info.replaceAll("%expires%", expires); info = info.replace("%expires%", expires);
info = info.replaceAll("%flags%", Matcher.quoteReplacement(flags)); info = info.replace("%flags%", flags);
info = info.replaceAll("%build%", build + ""); info = info.replace("%build%", build + "");
info = info.replaceAll("%desc%", "No description set."); info = info.replace("%desc%", "No description set.");
if (info.contains("%rating%")) { if (info.contains("%rating%")) {
final String newInfo = info; final String newInfo = info;
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {