SteamWar/BauSystem2.0
Archiviert
12
0

LoaderRework #175

Zusammengeführt
YoyoNow hat 20 Commits von LoaderRework nach master 2023-05-09 18:31:42 +02:00 zusammengeführt
4 geänderte Dateien mit 31 neuen und 11 gelöschten Zeilen
Nur Änderungen aus Commit bb654018d6 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -807,7 +807,9 @@ LOADER_BUTTON_LECTERN=Lectern
LOADER_BUTTON_TRAPDOOR=Trapdoor LOADER_BUTTON_TRAPDOOR=Trapdoor
LOADER_BUTTON_DOOR=Door LOADER_BUTTON_DOOR=Door
LOADER_BUTTON_FENCEGATE=Fencegate LOADER_BUTTON_FENCEGATE=Fencegate
LOADER_HELP_SETUP=§8/§eloader setup §8- §7Starts recording actions LOADER_HELP_SETUP=§8/§eloader setup §8- §7Starts recording actions
LOADER_SETUP_STOP_FIRST=§cPlease stop the current loader first!
LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded action LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded action
LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pauses Loader LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pauses Loader
LOADER_HELP_GUI=§8/§7loader gui §8- §7Shows Loader gui LOADER_HELP_GUI=§8/§7loader gui §8- §7Shows Loader gui
@ -820,6 +822,14 @@ LOADER_STOP=§7The Loader has been stopped.
LOADER_PAUSED=§7The Loader is now paused. LOADER_PAUSED=§7The Loader is now paused.
LOADER_PERMS=§cYou are not allowed to use the Loader here LOADER_PERMS=§cYou are not allowed to use the Loader here
LOADER_NOTHING_RECORDED=§cYou have not recorded anything yet!
LOADER_GUI_TITLE=Loader GUI
LOADER_GUI_SHOW_INTERACTIONS=§eShow only Interactions
LOADER_GUI_SHOW_WAITS=§eShow only Waits
LOADER_GUI_SHOW_WAITS_SET_BETWEEN_TNT=§7Wait Time between TNT
LOADER_GUI_SHOW_WAITS_SET_ALL=§7Wait Time all
LOADER_GUI_SHOW_WAITS_TITLE=§7Wait Time
# Loadtimer # Loadtimer
LOADTIMER_HELP_OVERVIEW=§7Compete with your friends loading your cannon and get information about the cannon LOADTIMER_HELP_OVERVIEW=§7Compete with your friends loading your cannon and get information about the cannon
LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Starts the simple Loadtimer LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Starts the simple Loadtimer

Datei anzeigen

@ -780,7 +780,9 @@ LOADER_BUTTON_LECTERN=Lectern
LOADER_BUTTON_TRAPDOOR=Trapdoor LOADER_BUTTON_TRAPDOOR=Trapdoor
LOADER_BUTTON_DOOR=Door LOADER_BUTTON_DOOR=Door
LOADER_BUTTON_FENCEGATE=Fencegate LOADER_BUTTON_FENCEGATE=Fencegate
LOADER_HELP_SETUP=§8/§eloader setup §8- §7Startet die Aufnahme der Aktionen LOADER_HELP_SETUP=§8/§eloader setup §8- §7Startet die Aufnahme der Aktionen
LOADER_SETUP_STOP_FIRST=§cBitte stoppe zuerst den Loader
LOADER_HELP_START=§8/§eloader start §8- §7Spielt die zuvor aufgenommenen Aktionen ab LOADER_HELP_START=§8/§eloader start §8- §7Spielt die zuvor aufgenommenen Aktionen ab
LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pausiert das Abspielen LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pausiert das Abspielen
LOADER_HELP_GUI=§8/§7loader settings §8- §7Zeigt die Einstellungen an LOADER_HELP_GUI=§8/§7loader settings §8- §7Zeigt die Einstellungen an
@ -793,6 +795,14 @@ LOADER_STOP=§7Der Loader ist nun gestoppt.
LOADER_PAUSED=§7Der Loader ist nun pausiert. LOADER_PAUSED=§7Der Loader ist nun pausiert.
LOADER_PERMS=§cDu darfst hier nicht den Detonator nutzen LOADER_PERMS=§cDu darfst hier nicht den Detonator nutzen
LOADER_NOTHING_RECORDED=§cEs wurden keine Elemente aufgenommen!
LOADER_GUI_TITLE=Loader Einstellungen
LOADER_GUI_SHOW_INTERACTIONS=§eZeige Interaktionen
LOADER_GUI_SHOW_WAITS=§eZeige Wartezeiten
LOADER_GUI_SHOW_WAITS_SET_BETWEEN_TNT=§7Wait Time zwischen TNT
LOADER_GUI_SHOW_WAITS_SET_ALL=§7Wait Time alle
LOADER_GUI_SHOW_WAITS_TITLE=§7Wartezeit
# Loadtimer # Loadtimer
LOADTIMER_HELP_OVERVIEW=§7Messe dich und deine Freunde beim Beladen einer Kanone und bekomme informationen über die Kanone LOADTIMER_HELP_OVERVIEW=§7Messe dich und deine Freunde beim Beladen einer Kanone und bekomme informationen über die Kanone
LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Startet den einfachen Loadtimer LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Startet den einfachen Loadtimer

Datei anzeigen

@ -97,7 +97,7 @@ public class Loader implements Listener {
recorder = null; recorder = null;
} }
if (elements.isEmpty()) { if (elements.isEmpty()) {
p.sendMessage("§cEs wurden keine Elemente aufgenommen!"); BauSystem.MESSAGE.send("LOADER_NOTHING_RECORDED", p);
stop(); stop();
return; return;
} }
@ -137,24 +137,24 @@ public class Loader implements Listener {
} }
list.add(new SWListInv.SWListEntry<>(element.menu(p), element)); list.add(new SWListInv.SWListEntry<>(element.menu(p), element));
} }
SWListInv<LoaderElement> swListInv = new SWListInv<>(p, "Loader Settings", false, list, (clickType, loaderElement) -> {}); SWListInv<LoaderElement> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("LOADER_GUI_TITLE", p), false, list, (clickType, loaderElement) -> {});
swListInv.setCallback((clickType, entry) -> entry.click(p, swListInv::open)); swListInv.setCallback((clickType, entry) -> entry.click(p, swListInv::open));
SWItem onlyInteractionsElements = new SWItem(Material.REPEATER, "§eNur Interaktionen", clickType -> { SWItem onlyInteractionsElements = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_INTERACTIONS", p), clickType -> {
gui(settingsSorting == SettingsSorting.INTERACTIONS ? null : SettingsSorting.INTERACTIONS); gui(settingsSorting == SettingsSorting.INTERACTIONS ? null : SettingsSorting.INTERACTIONS);
}); });
if (settingsSorting == SettingsSorting.INTERACTIONS) onlyInteractionsElements.setEnchanted(true); if (settingsSorting == SettingsSorting.INTERACTIONS) onlyInteractionsElements.setEnchanted(true);
swListInv.setItem(47, onlyInteractionsElements); swListInv.setItem(47, onlyInteractionsElements);
SWItem onlyWaitElements = new SWItem(Material.CLOCK, "§eNur Warten", clickType -> { SWItem onlyWaitElements = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS", p), clickType -> {
gui(settingsSorting == SettingsSorting.WAIT ? null : SettingsSorting.WAIT); gui(settingsSorting == SettingsSorting.WAIT ? null : SettingsSorting.WAIT);
}); });
if (settingsSorting == SettingsSorting.WAIT) onlyWaitElements.setEnchanted(true); if (settingsSorting == SettingsSorting.WAIT) onlyWaitElements.setEnchanted(true);
swListInv.setItem(48, onlyWaitElements); swListInv.setItem(48, onlyWaitElements);
if (settingsSorting == SettingsSorting.WAIT) { if (settingsSorting == SettingsSorting.WAIT) {
SWItem waitBetweenTNT = new SWItem(Material.TNT, "§7Wait Time zwischen TNT", clickType -> { SWItem waitBetweenTNT = new SWItem(Material.TNT, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_SET_BETWEEN_TNT", p), clickType -> {
SWAnvilInv swAnvilInv = new SWAnvilInv(p, "§7Wartezeit", ""); SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_TITLE", p), "");
swAnvilInv.setCallback(s -> { swAnvilInv.setCallback(s -> {
try { try {
long delay = Long.parseLong(s); long delay = Long.parseLong(s);
@ -173,8 +173,8 @@ public class Loader implements Listener {
}); });
swListInv.setItem(50, waitBetweenTNT); swListInv.setItem(50, waitBetweenTNT);
SWItem waitTime = new SWItem(Material.PAPER, "§7Wait Time alle", clickType -> { SWItem waitTime = new SWItem(Material.PAPER, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_SET_ALL", p), clickType -> {
SWAnvilInv swAnvilInv = new SWAnvilInv(p, "§7Wartezeit", ""); SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_TITLE", p), "");
swAnvilInv.setCallback(s -> { swAnvilInv.setCallback(s -> {
try { try {
long delay = Long.parseLong(s); long delay = Long.parseLong(s);
@ -186,9 +186,9 @@ public class Loader implements Listener {
.forEach(loaderWait -> loaderWait.setDelay(finalDelay)); .forEach(loaderWait -> loaderWait.setDelay(finalDelay));
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
} }
swListInv.open(); gui(settingsSorting);
}); });
gui(settingsSorting); swAnvilInv.open();
}); });
swListInv.setItem(51, waitTime); swListInv.setItem(51, waitTime);
} else { } else {

Datei anzeigen

@ -44,7 +44,7 @@ public class LoaderCommand extends SWCommand {
@Register(value = "setup", description = "LOADER_HELP_SETUP") @Register(value = "setup", description = "LOADER_HELP_SETUP")
public void setupLoader(@Validator Player player) { public void setupLoader(@Validator Player player) {
if (Loader.getLoader(player) != null) { if (Loader.getLoader(player) != null) {
player.sendMessage("Please stop the current loader first!"); BauSystem.MESSAGE.send("LOADER_SETUP_STOP_FIRST", player);
return; return;
} }
Loader.newLoader(player); Loader.newLoader(player);