Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
Ursprung
f90a54728b
Commit
c320f92ea3
@ -37,8 +37,8 @@ SCOREBOARD_TPS_FROZEN = §e Frozen
|
|||||||
|
|
||||||
SCOREBOARD_TRACE_TICKS = Ticks
|
SCOREBOARD_TRACE_TICKS = Ticks
|
||||||
|
|
||||||
SCOREBOARD_TECHHIDER = TechHider
|
SCOREBOARD_TECHHIDER = TechHider§8: §aOn
|
||||||
SCOREBOARD_XRAY = XRay
|
SCOREBOARD_XRAY = XRay§8: §aOn
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
FLAG_COLOR = Color
|
FLAG_COLOR = Color
|
||||||
@ -731,7 +731,7 @@ TPSLIMIT_INVALID_FROZEN = §c and '0'
|
|||||||
|
|
||||||
# Trace
|
# Trace
|
||||||
TRACE_RECORD=§aon
|
TRACE_RECORD=§aon
|
||||||
TRACE_IDLE=§coff
|
TRACE_HAS_TRACES=§ehas Traces
|
||||||
TRACE_IDLE_SINGLE=§esingle
|
TRACE_IDLE_SINGLE=§esingle
|
||||||
TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
|
TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
|
||||||
TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
|
TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
|
||||||
@ -787,7 +787,6 @@ TRACE_GUI_POSITION_SOURCE = §7Source§8: §e{0}
|
|||||||
TRACE_GUI_POSITION_EXPLODED = §7Exploded§8: §e{0}
|
TRACE_GUI_POSITION_EXPLODED = §7Exploded§8: §e{0}
|
||||||
|
|
||||||
# Loader
|
# Loader
|
||||||
LOADER_OFF = §coff
|
|
||||||
LOADER_SETUP = §eSetup
|
LOADER_SETUP = §eSetup
|
||||||
LOADER_RUNNING = §aRunning
|
LOADER_RUNNING = §aRunning
|
||||||
LOADER_SINGLE_SIDEBAR = §aSingle
|
LOADER_SINGLE_SIDEBAR = §aSingle
|
||||||
|
@ -37,6 +37,9 @@ SCOREBOARD_TPS_FROZEN = §e Eingefroren
|
|||||||
|
|
||||||
SCOREBOARD_TRACE_TICKS = Ticks
|
SCOREBOARD_TRACE_TICKS = Ticks
|
||||||
|
|
||||||
|
SCOREBOARD_TECHHIDER = TechHider§8: §aAn
|
||||||
|
SCOREBOARD_XRAY = XRay§8: §aAn
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
FLAG_COLOR = Color
|
FLAG_COLOR = Color
|
||||||
FLAG_TNT = TNT
|
FLAG_TNT = TNT
|
||||||
@ -701,7 +704,7 @@ TPSLIMIT_INVALID_FROZEN = §c und '0'
|
|||||||
|
|
||||||
# Trace
|
# Trace
|
||||||
TRACE_RECORD=§aan
|
TRACE_RECORD=§aan
|
||||||
TRACE_IDLE=§caus
|
TRACE_HAS_TRACES=§ehat Traces
|
||||||
TRACE_IDLE_SINGLE=§esingle
|
TRACE_IDLE_SINGLE=§esingle
|
||||||
TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
|
TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
|
||||||
TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
|
TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
|
||||||
@ -757,7 +760,6 @@ TRACE_GUI_POSITION_SOURCE = §7Ursprung§8: §e{0}
|
|||||||
TRACE_GUI_POSITION_EXPLODED = §7Explodiert§8: §e{0}
|
TRACE_GUI_POSITION_EXPLODED = §7Explodiert§8: §e{0}
|
||||||
|
|
||||||
# Loader
|
# Loader
|
||||||
LOADER_OFF = §caus
|
|
||||||
LOADER_SETUP = §eEinrichtung
|
LOADER_SETUP = §eEinrichtung
|
||||||
LOADER_RUNNING = §aLaufend
|
LOADER_RUNNING = §aLaufend
|
||||||
LOADER_SINGLE_SIDEBAR = §aEiner
|
LOADER_SINGLE_SIDEBAR = §aEiner
|
||||||
|
@ -49,7 +49,7 @@ public class Recorder implements Listener {
|
|||||||
INSTANCE = this;
|
INSTANCE = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class NoopTraceRecorder implements TraceRecorder {
|
public static class NoopTraceRecorder implements TraceRecorder {
|
||||||
@Override
|
@Override
|
||||||
public String scoreboard(Player player) {
|
public String scoreboard(Player player) {
|
||||||
return null;
|
return null;
|
||||||
@ -82,7 +82,7 @@ public class Recorder implements Listener {
|
|||||||
private static class DisabledTracerRecorder implements TraceRecorder {
|
private static class DisabledTracerRecorder implements TraceRecorder {
|
||||||
@Override
|
@Override
|
||||||
public String scoreboard(Player player) {
|
public String scoreboard(Player player) {
|
||||||
return BauSystem.MESSAGE.parse("TRACE_IDLE", player);
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -8,6 +8,7 @@ import de.steamwar.bausystem.features.tpslimit.FreezeUtils;
|
|||||||
import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils;
|
import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils;
|
||||||
import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
|
import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
|
||||||
import de.steamwar.bausystem.features.tracer.record.Recorder;
|
import de.steamwar.bausystem.features.tracer.record.Recorder;
|
||||||
|
import de.steamwar.bausystem.features.tracer.show.StoredRecords;
|
||||||
import de.steamwar.bausystem.features.xray.XrayCommand;
|
import de.steamwar.bausystem.features.xray.XrayCommand;
|
||||||
import de.steamwar.bausystem.region.GlobalRegion;
|
import de.steamwar.bausystem.region.GlobalRegion;
|
||||||
import de.steamwar.bausystem.region.Region;
|
import de.steamwar.bausystem.region.Region;
|
||||||
@ -17,7 +18,6 @@ import de.steamwar.linkage.Linked;
|
|||||||
import de.steamwar.linkage.LinkedInstance;
|
import de.steamwar.linkage.LinkedInstance;
|
||||||
import de.steamwar.scoreboard.SWScoreboard;
|
import de.steamwar.scoreboard.SWScoreboard;
|
||||||
import de.steamwar.scoreboard.ScoreboardCallback;
|
import de.steamwar.scoreboard.ScoreboardCallback;
|
||||||
import de.steamwar.techhider.TechHider;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@ -89,22 +89,29 @@ public class BauScoreboard implements Listener {
|
|||||||
}
|
}
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse(flag.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(flag).getChatValue(), p).replace("§e", colorCode));
|
strings.add(colorCode + BauSystem.MESSAGE.parse(flag.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(flag).getChatValue(), p).replace("§e", colorCode));
|
||||||
}
|
}
|
||||||
|
strings.add("§3");
|
||||||
|
|
||||||
if (TechHiderCommand.isHidden(region, p)) {
|
if (TechHiderCommand.isHidden(region, p)) {
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TECHHIDER", p));
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TECHHIDER", p));
|
||||||
} else if (XrayCommand.isHidden(region, p)) {
|
} else if (XrayCommand.isHidden(region, p)) {
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_XRAY", p));
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_XRAY", p));
|
||||||
}
|
}
|
||||||
|
|
||||||
strings.add("§3");
|
|
||||||
String traceScore = recorder.get(region).scoreboard(p);
|
String traceScore = recorder.get(region).scoreboard(p);
|
||||||
if (traceScore != null) {
|
if (traceScore != null) {
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TRACE", p) + "§8: " + traceScore);
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TRACE", p) + "§8: " + traceScore);
|
||||||
|
} else if (!(recorder.get(region) instanceof Recorder.NoopTraceRecorder) && !StoredRecords.getRecords(region).isEmpty()) {
|
||||||
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TRACE", p) + "§8: " + BauSystem.MESSAGE.parse("TRACE_HAS_TRACES", p));
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader loader = Loader.getLoader(p);
|
Loader loader = Loader.getLoader(p);
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_LOADER", p) + "§8: " + BauSystem.MESSAGE.parse(loader != null ? loader.getStage().getChatValue() : "LOADER_OFF", p));
|
if (loader != null) {
|
||||||
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_LOADER", p) + "§8: " + BauSystem.MESSAGE.parse(loader.getStage().getChatValue(), p));
|
||||||
|
}
|
||||||
|
|
||||||
strings.add("§5");
|
if (!strings.get(strings.size() - 1).equals("§3")) {
|
||||||
|
strings.add("§5");
|
||||||
|
}
|
||||||
if (FreezeUtils.frozen()) {
|
if (FreezeUtils.frozen()) {
|
||||||
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p));
|
strings.add(colorCode + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p));
|
||||||
} else {
|
} else {
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren