diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandBau.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandBau.java index f8bcc4f..8abce2a 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandBau.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandBau.java @@ -16,10 +16,9 @@ public class CommandBau extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - if (!permissionCheck(p)) return; - p.sendMessage(BauSystem.PREFIX + "§e/bau togglebuild §8[§7Player§8] §8- §7Editiere die Bau Rechte eines Spielers"); - p.sendMessage(BauSystem.PREFIX + "§e/bau togglewe §8[§7Player§8] §8- §7Editiere die WorldEdit Rechte eines Spielers"); - p.sendMessage(BauSystem.PREFIX + "§e/bau toggleworld §8[§7Player§8] §8- §7Editiere die Werlt Rechte eines Spielers"); + p.sendMessage(BauSystem.PREFIX + "§8/§ebau togglebuild §8[§7Player§8] §8- §7Editiere die Bau Rechte eines Spielers"); + p.sendMessage(BauSystem.PREFIX + "§8/§ebau togglewe §8[§7Player§8] §8- §7Editiere die WorldEdit Rechte eines Spielers"); + p.sendMessage(BauSystem.PREFIX + "§8/§ebau toggleworld §8[§7Player§8] §8- §7Editiere die Werlt Rechte eines Spielers"); } @Register("togglebuild") diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java index 2c397a5..6afc95f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java @@ -17,9 +17,8 @@ public class CommandClear extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - p.sendMessage(BauSystem.PREFIX + "§e/clear §8- §7Leere dein Inventar"); - if (!permissionCheck(p)) return; - p.sendMessage(BauSystem.PREFIX + "§e/bau clear §8[§7Player§8] §8- §7Leere ein Spieler Inventar"); + p.sendMessage(BauSystem.PREFIX + "§8/§eclear §8- §7Leere dein Inventar"); + p.sendMessage(BauSystem.PREFIX + "§8/§ebau clear §8[§7Player§8] §8- §7Leere ein Spieler Inventar"); } @Register diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java index 14c711c..c84f4a3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java @@ -14,6 +14,11 @@ public class CommandDebugStick extends SWCommand { super("debugstick"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§edebugstick §8- §7Erhalte einen DebugStick"); + } + @Register public void genericCommand(Player p) { if (Welt.noPermission(p, Permission.build)) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java index 6260e03..8d4017e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java @@ -44,6 +44,12 @@ public class CommandGUI extends SWCommand implements Listener { Bukkit.getScheduler().runTaskTimerAsynchronously(BauSystem.getPlugin(), LAST_F_PLAYER::clear, 0, 20); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§egui §8- §7Öffne die GUI"); + p.sendMessage(BauSystem.PREFIX + "§8/§egui item §8- §7Gebe das GUI item"); + } + @Register public void genericCommand(Player p) { openBauGui(p); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java index 5c2608b..3b657a3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java @@ -13,7 +13,6 @@ public class CommandGamemode extends SWCommand { super("gamemode", "gm"); } - @Register(help = true) public void gamemodeHelp(Player p, String... args) { p.sendMessage(BauSystem.PREFIX + "§cUnbekannter Spielmodus"); @@ -21,30 +20,20 @@ public class CommandGamemode extends SWCommand { @Register public void genericCommand(Player p) { - if (!permissionCheck(p)) { - //noinspection UnnecessaryReturnStatement - return; + if (!permissionCheck(p)) return; + if (p.getGameMode() == GameMode.CREATIVE) { + p.setGameMode(GameMode.SPECTATOR); } else { - if (p.getGameMode() == GameMode.CREATIVE) { - p.setGameMode(GameMode.SPECTATOR); - } else { - p.setGameMode(GameMode.CREATIVE); - } + p.setGameMode(GameMode.CREATIVE); } } - @Register public void gamemodeCommand(Player p, GameMode gameMode) { - if (!permissionCheck(p)) { - //noinspection UnnecessaryReturnStatement - return; - } else { - p.setGameMode(gameMode); - } + if (!permissionCheck(p)) return; + p.setGameMode(gameMode); } - private boolean permissionCheck(Player p) { if (!p.getUniqueId().equals(BauSystem.getOwner())) { BauweltMember member = BauweltMember.getBauMember(BauSystem.getOwner(), p.getUniqueId()); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java index 1060008..60186bc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java @@ -31,6 +31,11 @@ public class CommandGills extends SWCommand { super("watervision", "wv"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§ewatervision §8- §7Toggle WaterBreathing"); + } + @Register public void genericCommand(Player p) { toggleGills(p); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java index 3a48e27..fd6728d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java @@ -38,6 +38,11 @@ public class CommandInfo extends SWCommand { super("bauinfo"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§ebauinfo §8- §7Gebe Informationen über den Bau"); + } + @Register public void genericCommand(Player p) { p.sendMessage(BauSystem.PREFIX + "Besitzer: §e" + SteamwarUser.get(BauSystem.getOwnerID()).getUserName()); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java index da22b91..e56408a 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java @@ -31,6 +31,11 @@ public class CommandNV extends SWCommand { super("nightvision", "nv"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§enightvision §8- §7Toggle NightVision"); + } + @Register public void genericCommand(Player p) { toggleNightvision(p); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java index 31d9ac2..95dc923 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java @@ -37,6 +37,12 @@ public class CommandProtect extends SWCommand { super("protect"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§eprotect §8- §7Schütze die Region"); + p.sendMessage(BauSystem.PREFIX + "§8/§eprotect §8[§7Schematic§8] §8- §7Schütze die Region mit einer Schematic"); + } + @Register public void genericTestblockCommand(Player p) { if (!permissionCheck(p)) return; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java index 5859ba6..899e804 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java @@ -34,6 +34,11 @@ public class CommandRedstoneTester extends SWCommand { super("redstonetester", "rt"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§eredstonetester §8- §7Gibt den RedstoneTester"); + } + @Register public void genericCommand(Player p) { VersionedRunnable.call(new VersionedRunnable(() -> { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java index 2ff81f8..19d25fd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java @@ -37,6 +37,12 @@ public class CommandReset extends SWCommand { super("reset"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§ereset §8- §7Setzte die Region zurück"); + p.sendMessage(BauSystem.PREFIX + "§8/§ereset §8[§7Schematic§8] §8- §7Setzte die Region mit einer Schematic zurück"); + } + @Register public void genericResetCommand(Player p) { if (!permissionCheck(p)) return; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java index f54b373..9e6caa1 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java @@ -21,6 +21,7 @@ package de.steamwar.bausystem.commands; +import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.SWUtils; import de.steamwar.command.SWCommand; import org.bukkit.Material; @@ -81,6 +82,11 @@ public class CommandScript extends SWCommand { BOOK.setItemMeta(bookMeta); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§escript §8- §7Gibt das Script Buch"); + } + @Register public void giveCommand(Player p) { SWUtils.giveItemToPlayer(p, BOOK); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java index 45c2d79..8ac0eff 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java @@ -15,6 +15,14 @@ public class CommandScriptVars extends SWCommand { super("scripvars"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§escriptvars §8- §7Zähle alle globalen Variablen auf"); + p.sendMessage(BauSystem.PREFIX + "§8/§escriptvars §8[§7Variable§8] §8- §7Gebe den Wert der Variable zurück"); + p.sendMessage(BauSystem.PREFIX + "§8/§escriptvars §8[§7Variable§8] §8[§7Value§8] §8- §7Setzte eine Variable auf einen Wert"); + p.sendMessage(BauSystem.PREFIX + "§8/§escriptvars §8[§7Variable§8] §8<§7remove§8|§7delete§8|§7clear§8> §8- §7Lösche eine Variable"); + } + @Register public void genericCommand(Player p) { Map globalVariables = ScriptListener.GLOBAL_VARIABLES.get(p); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java index 470e2b6..e971404 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java @@ -35,7 +35,7 @@ public class CommandSkull extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - p.sendMessage(BauSystem.PREFIX + "§8/§eskull §8[§eSpieler§8]"); + p.sendMessage(BauSystem.PREFIX + "§8/§eskull §8[§eSpieler§8] §8- §7Gibt einen SpielerKopf"); } @Register diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java index 192274c..a31fa3b 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java @@ -36,7 +36,7 @@ public class CommandSpeed extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - p.sendMessage(BauSystem.PREFIX + "/speed [Geschwindigkeit]"); + p.sendMessage(BauSystem.PREFIX + "§8/§espeed §8[§7Geschwindigkeit§8] §8- §7Setzte deine Flug- und Gehgeschwindigkeit"); } @Register({"default"}) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java index bda7dfc..71ded24 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java @@ -60,6 +60,12 @@ public class CommandTNT extends SWCommand implements Listener { Bukkit.getPluginManager().registerEvents(this, BauSystem.getPlugin()); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§etnt §8- §7Ändere das TNT verhalten"); + p.sendMessage(BauSystem.PREFIX + "§8/§etnt §8[§7Mode§8] §8- §7Setzte das TNT verhalten auf einen Modus"); + } + @Register public void toggleCommand(Player p) { if (!permissionCheck(p)) return; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java index 17bcfc3..e00815b 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java @@ -37,6 +37,12 @@ public class CommandTestblock extends SWCommand { super("testblock", "tb"); } + @Register(help = true) + public void genericHelp(Player p, String... args) { + p.sendMessage(BauSystem.PREFIX + "§8/§etestblock §8- §7Setzte den Testblock zurück"); + p.sendMessage(BauSystem.PREFIX + "§8/§etestblock §8[§7Schematic§8] §8- §7Setzte den Testblock mit einer Schematic zurück"); + } + @Register public void genericTestblockCommand(Player p) { if (!permissionCheck(p)) return;