Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
Ursprung
4a895939f6
Commit
c30f90081e
@ -95,6 +95,7 @@ AUTOSTART_MESSAGE_NO-REGION = §cDu befindest dich derzeit in keiner Region
|
|||||||
AUTOSTART_MESSAGE_RESET = §eDer AutostartTimer wurde zurückgesetzt
|
AUTOSTART_MESSAGE_RESET = §eDer AutostartTimer wurde zurückgesetzt
|
||||||
AUTOSTART_MESSAGE_START = §eAutostartTimer gestartet
|
AUTOSTART_MESSAGE_START = §eAutostartTimer gestartet
|
||||||
AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0}
|
AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0}
|
||||||
|
AUTOSTART_MESSAGE_DATE_PATTERN=mm:ss SSSS
|
||||||
AUTOSTART_MESSAGE_RESULT2 = §eZeitdifferenz in ticks §7bis {0} Sekunden§8:§e {1}
|
AUTOSTART_MESSAGE_RESULT2 = §eZeitdifferenz in ticks §7bis {0} Sekunden§8:§e {1}
|
||||||
AUTOSTART_MESSAGE_RESULT3 = §7Positiv, wenn zu wenig, negativ wenn zu viel
|
AUTOSTART_MESSAGE_RESULT3 = §7Positiv, wenn zu wenig, negativ wenn zu viel
|
||||||
|
|
||||||
@ -134,6 +135,11 @@ BAU-INFO_ITEM_LORE-PROTECT = §7Protect§8: §e{0}
|
|||||||
BAU-INFO_COMMAND_HELP = §8/§ebauinfo §8- §7Gibt Informationen über den Bau
|
BAU-INFO_COMMAND_HELP = §8/§ebauinfo §8- §7Gibt Informationen über den Bau
|
||||||
BAU-INFO_COMMAND_OWNER = §7Besitzer: §e{0}
|
BAU-INFO_COMMAND_OWNER = §7Besitzer: §e{0}
|
||||||
BAU-INFO_COMMAND_MEMBER = §7Mitglieder: §e
|
BAU-INFO_COMMAND_MEMBER = §7Mitglieder: §e
|
||||||
|
BAU-INFO_MEMBER_INFO = §e{0}§8[{1}§8,{1}§8] §8
|
||||||
|
BAU-INFO_MEMBER_WE_ALLOW = §aWE
|
||||||
|
BAU-INFO_MEMBER_WE_DISALLOW = §cWE
|
||||||
|
BAU-INFO_MEMBER_WORLD_ALLOW = §aW
|
||||||
|
BAU-INFO_MEMBER_WORLD_DISALLOW = §cW
|
||||||
BAU-INFO_COMMAND_FLAG = §e{0} §8: §7{1}
|
BAU-INFO_COMMAND_FLAG = §e{0} §8: §7{1}
|
||||||
BAU-INFO_COMMAND_TPS = TPS:§e
|
BAU-INFO_COMMAND_TPS = TPS:§e
|
||||||
|
|
||||||
@ -174,6 +180,10 @@ DETONATOR_INVALID_POINT=§cEin Punkt konnte nicht ausgeführt werden
|
|||||||
DETONATOR_INVALID_POINTS=§c{0} Punkte konnten nicht ausgeführt werden
|
DETONATOR_INVALID_POINTS=§c{0} Punkte konnten nicht ausgeführt werden
|
||||||
DETONATOR_INVALID_BLOCK=§eDer Block konnte nicht hinzugefügt werden
|
DETONATOR_INVALID_BLOCK=§eDer Block konnte nicht hinzugefügt werden
|
||||||
# Hotbar
|
# Hotbar
|
||||||
|
HOTBAR_HELP_1=§7Speichert eine Hotbar. Diese wird beim Joinen eines Bauserver, wo du ein Leeres Inventar hast geladen.
|
||||||
|
HOTBAR_HELP_2=§8/§ehotbar save §8-§7 Speicher deine Aktuelle Hotbar
|
||||||
|
HOTBAR_HELP_3=§8/§ehotbar load §8-§7 Lade deine Standard Hotbar
|
||||||
|
HOTBAR_HELP_4=§8/§ehotbar show §8-§7 Zeigt dir deine Standard Hotbar
|
||||||
HOTBAR_SAVED=§7Deine Hotbar wurde als Standard gespeichert
|
HOTBAR_SAVED=§7Deine Hotbar wurde als Standard gespeichert
|
||||||
HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen
|
HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen
|
||||||
HOTBAR_INVENTORY=Standard Hotbar
|
HOTBAR_INVENTORY=Standard Hotbar
|
||||||
@ -225,9 +235,11 @@ TRACE_MESSAGE_DISALLOWED = §cDu darfst hier nicht den TNT-Tracer nutzen
|
|||||||
TRACE_COMMAND_HELP_START = §8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen
|
TRACE_COMMAND_HELP_START = §8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen
|
||||||
TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stoppt den TNT-Tracer
|
TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stoppt den TNT-Tracer
|
||||||
TRACE_COMMAND_HELP_AUTO = §8/§etrace toggleauto §8- §7Automatischer Aufnahmenstart
|
TRACE_COMMAND_HELP_AUTO = §8/§etrace toggleauto §8- §7Automatischer Aufnahmenstart
|
||||||
|
TRACE_COMMAND_HELP_SHOW_GUI = §8/§etrace show gui §8- §7Zeigt die Trace show gui
|
||||||
TRACE_COMMAND_HELP_SHOW = §8/§etrace show §8- <§e-water§8|§e-interpolate-xz§8|-interpolate-y§8> - §7Zeigt alle TNT-Positionen
|
TRACE_COMMAND_HELP_SHOW = §8/§etrace show §8- <§e-water§8|§e-interpolate-xz§8|-interpolate-y§8> - §7Zeigt alle TNT-Positionen
|
||||||
TRACE_COMMAND_HELP_HIDE = §8/§etrace hide §8- §7Versteckt alle TNT-Positionen
|
TRACE_COMMAND_HELP_HIDE = §8/§etrace hide §8- §7Versteckt alle TNT-Positionen
|
||||||
TRACE_COMMAND_HELP_DELETE = §8/§etrace delete §8- §7Löscht alle TNT-Positionen
|
TRACE_COMMAND_HELP_DELETE = §8/§etrace delete §8- §7Löscht alle TNT-Positionen
|
||||||
|
TRACE_COMMAND_HELP_GUI = §8/§etrace gui §8- §7Zeigt die Trace Oberfläche an
|
||||||
|
|
||||||
TRACE_GUI_NAME = Tracer Gui
|
TRACE_GUI_NAME = Tracer Gui
|
||||||
TRACE_GUI_TRACE-INACTIVE = §eTracer Starten
|
TRACE_GUI_TRACE-INACTIVE = §eTracer Starten
|
||||||
@ -573,3 +585,5 @@ WARP_HELP_3=§8/§ewarp info §8[§7Name§8] - §7Infos zu einem Punkt
|
|||||||
WARP_HELP_4=§8/§ewarp delete §8[§7Name§8] - §7Lösche einen Warp
|
WARP_HELP_4=§8/§ewarp delete §8[§7Name§8] - §7Lösche einen Warp
|
||||||
WARP_HELP_5=§8/§ewarp gui - §7Öffne die Warp-GUI
|
WARP_HELP_5=§8/§ewarp gui - §7Öffne die Warp-GUI
|
||||||
WARP_HELP_6=§8/§ewarp list - §7Liste alle Warp-Punkt auf
|
WARP_HELP_6=§8/§ewarp list - §7Liste alle Warp-Punkt auf
|
||||||
|
WARP_MOON_ITEM_NAME=§3Atemkugel
|
||||||
|
WARP_MOON_COUNTDOOWN=§7Noch §e§l{0} §77Sekunden!
|
||||||
|
@ -103,7 +103,9 @@ public class AutostartListener implements Listener {
|
|||||||
if (!region.hasType(RegionType.TESTBLOCK)) return;
|
if (!region.hasType(RegionType.TESTBLOCK)) return;
|
||||||
if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
|
if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
|
||||||
long tickDiff = TPSUtils.currentTick.get() - regionStartTime.remove(region);
|
long tickDiff = TPSUtils.currentTick.get() - regionStartTime.remove(region);
|
||||||
RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", new SimpleDateFormat("mm:ss SSSS").format(new Date(tickDiff * 50)));
|
RegionUtils.message(region, player -> {
|
||||||
|
return BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_RESULT1", player, new SimpleDateFormat(BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_DATE_PATTERN", player)).format(new Date(tickDiff * 50)));
|
||||||
|
});
|
||||||
RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", 30, (600 - tickDiff));
|
RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", 30, (600 - tickDiff));
|
||||||
RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
|
RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
|
||||||
});
|
});
|
||||||
|
@ -56,9 +56,10 @@ public class InfoCommand extends SWCommand {
|
|||||||
membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU-INFO_COMMAND_MEMBER", p));
|
membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU-INFO_COMMAND_MEMBER", p));
|
||||||
|
|
||||||
for (BauweltMember member : members) {
|
for (BauweltMember member : members) {
|
||||||
membermessage.append("§e").append(SteamwarUser.get(member.getMemberID()).getUserName()).append("§8[");
|
membermessage.append(BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_INFO", p,
|
||||||
membermessage.append(member.isWorldEdit() ? "§a" : "§c").append("WE").append("§8,");
|
member.isWorldEdit() ? BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WE_ALLOW", p) : BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WE_DISALLOW", p),
|
||||||
membermessage.append(member.isWorld() ? "§a" : "§c").append("W").append("§8]").append(" ");
|
member.isWorld() ? BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WORLD_ALLOW", p) : BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WORLD_DISALLOW", p)
|
||||||
|
));
|
||||||
}
|
}
|
||||||
p.sendMessage(membermessage.toString());
|
p.sendMessage(membermessage.toString());
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
package de.steamwar.bausystem.features.hotbar;
|
package de.steamwar.bausystem.features.hotbar;
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
import de.steamwar.bausystem.BauSystem;
|
||||||
import de.steamwar.bausystem.config.ColorConfig;
|
|
||||||
import de.steamwar.bausystem.linkage.LinkageType;
|
import de.steamwar.bausystem.linkage.LinkageType;
|
||||||
import de.steamwar.bausystem.linkage.Linked;
|
import de.steamwar.bausystem.linkage.Linked;
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
@ -37,11 +36,11 @@ public class HotbarCommand extends SWCommand {
|
|||||||
|
|
||||||
@Register(help = true)
|
@Register(help = true)
|
||||||
public void genericHelp(Player p, String... args) {
|
public void genericHelp(Player p, String... args) {
|
||||||
p.sendMessage(ColorConfig.BASE + "---=== (" + ColorConfig.HIGHLIGHT + "Hotbar" + ColorConfig.BASE + ") ===---");
|
BauSystem.MESSAGE.sendPrefixless("COMMAND_HELP_HEAD", p, "Hotbar");
|
||||||
p.sendMessage(ColorConfig.BASE + "Speichert eine Hotbar. Diese wird beim Joinen eines Bauserver, wo du ein Leeres Inventar hast geladen.");
|
BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_1", p);
|
||||||
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar save" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Speicher deine Aktuelle Hotbar");
|
BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_2", p);
|
||||||
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar load" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Lade deine Standard Hotbar");
|
BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_3", p);
|
||||||
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar show" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Zeigt dir deine Standard Hotbar");
|
BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_4", p);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register("load")
|
@Register("load")
|
||||||
|
@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
|
|||||||
import de.steamwar.bausystem.Permission;
|
import de.steamwar.bausystem.Permission;
|
||||||
import de.steamwar.bausystem.linkage.LinkageType;
|
import de.steamwar.bausystem.linkage.LinkageType;
|
||||||
import de.steamwar.bausystem.linkage.Linked;
|
import de.steamwar.bausystem.linkage.Linked;
|
||||||
import de.steamwar.command.CommandParseException;
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
import de.steamwar.command.SWCommandUtils;
|
import de.steamwar.command.SWCommandUtils;
|
||||||
import de.steamwar.command.TypeMapper;
|
import de.steamwar.command.TypeMapper;
|
||||||
|
@ -64,7 +64,7 @@ public class ColorCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
if (colorizationType == ColorizationType.GLOBAL) {
|
if (colorizationType == ColorizationType.GLOBAL) {
|
||||||
Region.setGlobal(Flag.COLOR, color);
|
Region.setGlobal(Flag.COLOR, color);
|
||||||
BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, color.name().toLowerCase());
|
BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Region region = Region.getRegion(p.getLocation());
|
Region region = Region.getRegion(p.getLocation());
|
||||||
|
@ -87,7 +87,7 @@ public class ColorBauGuiItem extends BauGuiItem {
|
|||||||
public ItemStack getItem(Player player) {
|
public ItemStack getItem(Player player) {
|
||||||
Region region = Region.getRegion(player.getLocation());
|
Region region = Region.getRegion(player.getLocation());
|
||||||
ColorMode mode = region.getPlain(Flag.COLOR, ColorMode.class);
|
ColorMode mode = region.getPlain(Flag.COLOR, ColorMode.class);
|
||||||
return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, mode.getChatValue())).getItemStack();
|
return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -96,7 +96,7 @@ public class ColorBauGuiItem extends BauGuiItem {
|
|||||||
ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class);
|
ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class);
|
||||||
List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
|
List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
|
||||||
for (ColorMode value : ColorMode.values()) {
|
for (ColorMode value : ColorMode.values()) {
|
||||||
items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + value.getChatValue(), Collections.emptyList(), value == current, clickType -> {
|
items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
|
||||||
}), value));
|
}), value));
|
||||||
}
|
}
|
||||||
SWListInv<ColorMode> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("REGION_ITEM_COLOR_CHOOSE", p), items, (clickType, colorMode) -> {
|
SWListInv<ColorMode> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("REGION_ITEM_COLOR_CHOOSE", p), items, (clickType, colorMode) -> {
|
||||||
|
@ -93,12 +93,12 @@ public class TraceCommand extends SWCommand {
|
|||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_START", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_START", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_STOP", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_STOP", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_AUTO", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_AUTO", p);
|
||||||
p.sendMessage("§8/§etrace show gui §8- §7Zeigt die Trace show gui");
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_SHOW_GUI", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_SHOW", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_SHOW", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_HIDE", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_HIDE", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_DELETE", p);
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_DELETE", p);
|
||||||
// p.sendMessage("§8/§etrace list §8<§7FRAME-ID§8> §8- §7Listet alle TNT auf");
|
// p.sendMessage("§8/§etrace list §8<§7FRAME-ID§8> §8- §7Listet alle TNT auf");
|
||||||
p.sendMessage("§8/§etrace gui §8- §7Zeigt die Trace Oberfläche an");
|
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_GUI", p);
|
||||||
// p.sendMessage("§7Optionale Parameter mit §8<>§7, Benötigte Parameter mit §8[]");
|
// p.sendMessage("§7Optionale Parameter mit §8<>§7, Benötigte Parameter mit §8[]");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
public class Moon {
|
public class Moon {
|
||||||
|
|
||||||
public static void startMoon(Player player) {
|
public static void startMoon(Player player) {
|
||||||
player.getInventory().setHelmet(new SWItem(Material.GLASS, "§3Atemkugel").getItemStack());
|
player.getInventory().setHelmet(new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("WARP_MOON_ITEM_NAME", player)).getItemStack());
|
||||||
AtomicInteger countDown = new AtomicInteger(5);
|
AtomicInteger countDown = new AtomicInteger(5);
|
||||||
Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), bukkitTask -> {
|
Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), bukkitTask -> {
|
||||||
if (countDown.get() == 0) {
|
if (countDown.get() == 0) {
|
||||||
@ -52,7 +52,7 @@ public class Moon {
|
|||||||
}, 0, 1);
|
}, 0, 1);
|
||||||
bukkitTask.cancel();
|
bukkitTask.cancel();
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage("§7Noch §e§l" + countDown.getAndDecrement() + " §7Sekunden!");
|
BauSystem.MESSAGE.sendPrefixless("WARP_MOON_COUNTDOOWN", player, countDown.getAndIncrement());
|
||||||
}
|
}
|
||||||
}, 0, 20);
|
}, 0, 20);
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren