diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/bin/.project b/bin/.project deleted file mode 100644 index 05819b5..0000000 --- a/bin/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - ChallengesFix - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/bin/.settings/org.eclipse.core.resources.prefs b/bin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9a..0000000 --- a/bin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/bin/.settings/org.eclipse.jdt.core.prefs b/bin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2f5cc74..0000000 --- a/bin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bin/.settings/org.eclipse.m2e.core.prefs b/bin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/bin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bin/README.md b/bin/README.md deleted file mode 100644 index 36cb3a4..0000000 --- a/bin/README.md +++ /dev/null @@ -1 +0,0 @@ -# ChallengesFix diff --git a/bin/pom.xml b/bin/pom.xml deleted file mode 100644 index 678c043..0000000 --- a/bin/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - 4.0.0 - - net.brennholz.challenges - Challenges - 2.0 - - - UTF-8 - UTF-8 - UTF-8 - UTF-8 - 1.8 - 1.8 - - - - - clean package - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - ${project.artifactId} - - - - maven-compiler-plugin - 3.6.1 - - 8 - 8 - - - - - - src/main/resources - true - - - - - - - destroystokyo-repo - https://repo.destroystokyo.com/repository/maven-public/ - - - brokkonaut - https://www.iani.de/nexus/content/groups/public - - - - - com.destroystokyo.paper - paper-api - 1.15.2-R0.1-SNAPSHOT - provided - - - org.projectlombok - lombok - 1.16.22 - provided - - - - diff --git a/bin/src/main/java/net/brennholz/challenges/Backpack.class b/bin/src/main/java/net/brennholz/challenges/Backpack.class deleted file mode 100644 index 70095bc..0000000 --- a/bin/src/main/java/net/brennholz/challenges/Backpack.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/challenges/Challenges.class b/bin/src/main/java/net/brennholz/challenges/Challenges.class deleted file mode 100644 index 003f3dd..0000000 --- a/bin/src/main/java/net/brennholz/challenges/Challenges.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/challenges/RandomDrops.class b/bin/src/main/java/net/brennholz/challenges/RandomDrops.class deleted file mode 100644 index 8cf9c9b..0000000 --- a/bin/src/main/java/net/brennholz/challenges/RandomDrops.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/challenges/SBManager.class b/bin/src/main/java/net/brennholz/challenges/SBManager.class deleted file mode 100644 index 1c16d53..0000000 --- a/bin/src/main/java/net/brennholz/challenges/SBManager.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Challenges_Command.class b/bin/src/main/java/net/brennholz/commands/Challenges_Command.class deleted file mode 100644 index 761c15b..0000000 --- a/bin/src/main/java/net/brennholz/commands/Challenges_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Coords_Command.class b/bin/src/main/java/net/brennholz/commands/Coords_Command.class deleted file mode 100644 index 1215092..0000000 --- a/bin/src/main/java/net/brennholz/commands/Coords_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/HP_Command.class b/bin/src/main/java/net/brennholz/commands/HP_Command.class deleted file mode 100644 index 3afb678..0000000 --- a/bin/src/main/java/net/brennholz/commands/HP_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Reset_Command.class b/bin/src/main/java/net/brennholz/commands/Reset_Command.class deleted file mode 100644 index 59d7c07..0000000 --- a/bin/src/main/java/net/brennholz/commands/Reset_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Revive_Command.class b/bin/src/main/java/net/brennholz/commands/Revive_Command.class deleted file mode 100644 index ca4f81c..0000000 --- a/bin/src/main/java/net/brennholz/commands/Revive_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Settings_Command.class b/bin/src/main/java/net/brennholz/commands/Settings_Command.class deleted file mode 100644 index 29a71e3..0000000 --- a/bin/src/main/java/net/brennholz/commands/Settings_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/commands/Timer_Command.class b/bin/src/main/java/net/brennholz/commands/Timer_Command.class deleted file mode 100644 index c823844..0000000 --- a/bin/src/main/java/net/brennholz/commands/Timer_Command.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/BlockCreateListener.class b/bin/src/main/java/net/brennholz/events/BlockCreateListener.class deleted file mode 100644 index d114f68..0000000 --- a/bin/src/main/java/net/brennholz/events/BlockCreateListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/BlockDestroyListener.class b/bin/src/main/java/net/brennholz/events/BlockDestroyListener.class deleted file mode 100644 index 3ce43e4..0000000 --- a/bin/src/main/java/net/brennholz/events/BlockDestroyListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/DamageListener.class b/bin/src/main/java/net/brennholz/events/DamageListener.class deleted file mode 100644 index 55cb390..0000000 --- a/bin/src/main/java/net/brennholz/events/DamageListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/DeathListener.class b/bin/src/main/java/net/brennholz/events/DeathListener.class deleted file mode 100644 index 27ef8b8..0000000 --- a/bin/src/main/java/net/brennholz/events/DeathListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/InteractListener.class b/bin/src/main/java/net/brennholz/events/InteractListener.class deleted file mode 100644 index 324de42..0000000 --- a/bin/src/main/java/net/brennholz/events/InteractListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/InventoryClickListener.class b/bin/src/main/java/net/brennholz/events/InventoryClickListener.class deleted file mode 100644 index 412bf26..0000000 --- a/bin/src/main/java/net/brennholz/events/InventoryClickListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/java/net/brennholz/events/QuitJoinListener.class b/bin/src/main/java/net/brennholz/events/QuitJoinListener.class deleted file mode 100644 index a7cc44f..0000000 --- a/bin/src/main/java/net/brennholz/events/QuitJoinListener.class +++ /dev/null Binary files differ diff --git a/bin/src/main/resources/backpack.yml b/bin/src/main/resources/backpack.yml deleted file mode 100644 index e69de29..0000000 --- a/bin/src/main/resources/backpack.yml +++ /dev/null diff --git a/bin/src/main/resources/config.yml b/bin/src/main/resources/config.yml deleted file mode 100644 index cc31ee8..0000000 --- a/bin/src/main/resources/config.yml +++ /dev/null @@ -1,24 +0,0 @@ -craftingtable: true -allowtrading: true -deathonfall: false -damageonsneak: false -sneakdmg: 2 -rnddrops: false -sharedmg: false -respawn: true -onelife: false -dmginchat: false -deathonsprint: false -deathonjump: false -tabhp: true -#Mögliche werte: 9 18 27 36 45 54 -backpack_size: 27 -timer: - enabled: false - time: 0 - sek: '00' - min: '00' - hrs: 0 -Saved_Locations: {} -World_Name: world -World_Reset: false \ No newline at end of file diff --git a/bin/src/main/resources/plugin.yml b/bin/src/main/resources/plugin.yml deleted file mode 100644 index 838d10d..0000000 --- a/bin/src/main/resources/plugin.yml +++ /dev/null @@ -1,87 +0,0 @@ -name: Challenges -main: net.brennholz.challenges.Challenges -version: 2.0 -api-version: 1.13 -load: STARTUP -author: Brennholz3000 -commands: - hp: - description: Verwalte die HP eines Spielers - usage: Benutze /hp get/add/remove/set/max [Spieler] [Wert] - permission: challenges.hp - coords: - description: Teile oder speichere deine Position! - usage: Benutze /coords share/get/save/delete [Name] - permission: challenges.coords - settings: - description: Verwalte die Plugineinstellungen - usage: Benutze /settings Get/Crafting/Trading/DeathFall/DMGOnSneak/Respawn/OneLife/ChatDMG [True/False] - permission: challenges.settings - revive: - description: Wiederbelebe einen gestorbenen Spieler! - usage: Benutze /revive [world] [x] [y] [z] - permission: challenges.revive - timer: - description: Verwalte den Timer - usage: Benutze /timer resume/pause/reset/set [Zeit in Sekunden] - permission: challenges.timer - challenges: - description: Main Command - usage: Benutze /Challenges - permission: challenges.challenges - backpack: - description: Oeffne ein Backpack - usage: Benutze /backpack oder /bp - permission: challenges.backpack - aliases: [bp] - reset: - description: Setzte die Welt zurueck - usage: Benutze /Reset - permission: challenges.reset - -permissions: - challenges.*: - description: Voller Zugriff auf das Challenge Plugin - default: op - children: - challenges.hp: true - challenges.coords: true - challenges.settings: true - challenges.revive: true - challenges.timer: true - challenges.challenges: true - challenges.reset: true - challenges.hp: - description: Verwalte die HP eines Spielers - default: op - challenges.coords: - description: Teile oder speichere deine Position! - default: op - children: - challenges.coords.view: true - challenges.coords.share: true - challenges.coords.get: true - challenges.coords.save: true - challenges.coords.delete: true - challenges.settings: - description: Verwalte die Plugineinstellungen - default: op - children: - challenges.settings.view: true - challenges.settings.get: true - challenges.settings.modify: true - challenges.revive: - description: Wiederbelebe einen gestorbenen Spieler! - default: op - challenges.timer: - description: Verwalte den Timer - default: op - challenges.challenges: - description: Main Command - default: op - challenges.backpack: - description: Oeffne ein Backpack - default: op - challenges.reset: - description: Setze die Welt zurueck - default: op \ No newline at end of file diff --git a/bin/src/main/resources/rnddrops.yml b/bin/src/main/resources/rnddrops.yml deleted file mode 100644 index e69de29..0000000 --- a/bin/src/main/resources/rnddrops.yml +++ /dev/null diff --git a/pom.xml b/pom.xml index 3c0bd07..b3be2c8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.destroystokyo.paper paper - 1.16.2-R0.1-SNAPSHOT + 1.16.3-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index a2e8416..2a943d8 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -81,8 +81,11 @@ return plugin; } - public static final String PREFIX = ChatColor.of("#455aad") + "[" + ChatUtil.GREEN + "Challenge" + ChatColor.of("#455aad") + "]"; - public static final String GUIPREFIX = ChatColor.of("#2d8745") + "Challenge"; + public static final String CHALLENGESPREFIX = ChatColor.of("#455aad") + "[" + ChatUtil.GREEN + "Challenge" + ChatColor.of("#455aad") + "]"; + public static final String CHALLENGEGUIPREFIX = ChatColor.of("#2d8745") + "Challenge"; + + public static final String ADVENTUREPREFIX = ChatColor.of("#455aad") + "[" + ChatUtil.GREEN + "Adventure" + ChatColor.of("#455aad") + "]"; + public static final String ADVENTUREGUIPREFIX = ChatColor.of("#2d8745") + "Adventure"; private Player currentEditor; @@ -152,6 +155,7 @@ this.rndDrops.saveItems(); this.rndDrops.loadItems(); } else { + this.getBackpack().resize(getConfig().getInt("backpack_size") * 9); this.rndDrops.loadItems(); this.backpack.loadInventoryFromConfig(); } @@ -167,7 +171,8 @@ public void onDisable() { Bukkit.getBanList(BanList.Type.NAME).getBanEntries().forEach(b -> Bukkit.getBanList(BanList.Type.NAME).pardon(b.getTarget())); if (!getConfig().getBoolean("World_Reset")) { - this.backpack.saveInventoryToConfig();getConfig().set("backpack_size", backpack.getSize() / 9); + this.backpack.saveInventoryToConfig(); + getConfig().set("backpack_size", backpack.getSize() / 9); } else { this.backpack.clearConfig(); } diff --git a/src/main/java/de/fanta/challenges/Timer.java b/src/main/java/de/fanta/challenges/Timer.java index 51269e3..5d10ceb 100644 --- a/src/main/java/de/fanta/challenges/Timer.java +++ b/src/main/java/de/fanta/challenges/Timer.java @@ -62,8 +62,8 @@ p.setGameMode(GameMode.SPECTATOR); p.sendTitle(ChatColor.DARK_RED + "ZEIT ABGELAUFEN!", ChatColor.RED + "Challenge fehgeschlagen", 10, 60, 10); } - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.DARK_RED + " Die Zeit ist abgelaufen und die Challenge somit fehlgeschlagen!"); - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.GREEN + " Seed: " + ChatColor.AQUA + Bukkit.getWorlds().get(0).getSeed()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.DARK_RED + " Die Zeit ist abgelaufen und die Challenge somit fehlgeschlagen!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.GREEN + " Seed: " + ChatColor.AQUA + Bukkit.getWorlds().get(0).getSeed()); } else { for (Player p : Bukkit.getOnlinePlayers()) { @@ -122,7 +122,7 @@ public boolean triggerMLG() { if (plugin.getConfig().getBoolean("mlg.enabled") && !mlgActive && Bukkit.getOnlinePlayers().size() >= 1) { mlgActive = true; - Bukkit.broadcastMessage(Challenges.PREFIX + " §bZeit für einen MLG! §6Viel Glück!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " §bZeit für einen MLG! §6Viel Glück!"); timeSinceMLG = 0; for (Player p : Bukkit.getOnlinePlayers()) { if (p.getGameMode() == GameMode.SURVIVAL && !p.isDead()) { diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSaveCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSaveCommand.java index f4b97ca..ab9a5ce 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSaveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSaveCommand.java @@ -27,7 +27,6 @@ } if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { - //TODO Save World UUID uuid = plugin.getCurrentEditor().getUniqueId(); if (plugin.getConfig().getBoolean("firsttimerstart")) { ChatUtil.sendNormalMessage(sender, "Challenge wird gespeichert!"); diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java index f2df13f..9925ec1 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java @@ -28,7 +28,7 @@ int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + sender.getName() + ChatUtil.GREEN + " ist bei " + ChatUtil.ORANGE + x + "/" + y + "/" + z + " " + ChatUtil.ORANGE + w); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + sender.getName() + ChatUtil.GREEN + " ist bei " + ChatUtil.ORANGE + x + "/" + y + "/" + z + " " + ChatUtil.ORANGE + w); return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java index 1cfc619..1167bd0 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java @@ -34,7 +34,7 @@ return true; } else if (!plugin.isEditor(player)){ plugin.setCurrentEditor(player); - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GREEN + player.getName() + " wurde von " + sender.getName() + " zum Editor ernannt"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatColor.GREEN + player.getName() + " wurde von " + sender.getName() + " zum Editor ernannt"); ChatUtil.sendNormalMessage(player, "Du bist jetzt Editor und kannst diese Lobby bearbeiten. (/challenges)"); return true; } else { diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java index fa17f77..a56bb8d 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java @@ -26,7 +26,7 @@ } if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().setTime(0); - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.RED + " Der Timer wurde zurückgesetzt!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.RED + " Der Timer wurde zurückgesetzt!"); } else if (plugin.getCurrentEditor() != null) { ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! " + plugin.getCurrentEditor().getName() + " muss die Map bearbeiten!"); return true; diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java index f145059..8a1530c 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java @@ -26,9 +26,9 @@ if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().reverseTimer(); if (plugin.getTimer().isReverse()) { - Bukkit.broadcastMessage(Challenges.PREFIX + ChatUtil.BLUE + " Der Timer läuft nun rückwärts!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatUtil.BLUE + " Der Timer läuft nun rückwärts!"); } else { - Bukkit.broadcastMessage(Challenges.PREFIX + ChatUtil.GREEN + " Der Timer läuft nun vorwärts!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatUtil.GREEN + " Der Timer läuft nun vorwärts!"); } } else if (plugin.getCurrentEditor() != null) { ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! " + plugin.getCurrentEditor().getName() + " muss die Map bearbeiten!"); diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java index 88c6b2e..2e2aa67 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java @@ -29,7 +29,7 @@ if (time >= 0) { if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().setTime(time); - Bukkit.broadcastMessage(Challenges.PREFIX + " §bDer Timer wurde auf " + plugin.getTimer().formatTime(ChatColor.GREEN) + " §bgesetzt!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " §bDer Timer wurde auf " + plugin.getTimer().formatTime(ChatColor.GREEN) + " §bgesetzt!"); } else if (plugin.getCurrentEditor() != null) { ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! " + plugin.getCurrentEditor().getName() + " muss die Map bearbeiten!"); return true; diff --git a/src/main/java/de/fanta/challenges/guis/BackpackGui.java b/src/main/java/de/fanta/challenges/guis/BackpackGui.java index e7e030b..9347346 100644 --- a/src/main/java/de/fanta/challenges/guis/BackpackGui.java +++ b/src/main/java/de/fanta/challenges/guis/BackpackGui.java @@ -16,7 +16,7 @@ public class BackpackGui { - public static final String TITLE = Challenges.GUIPREFIX + " >> Backpack"; + public static final String TITLE = Challenges.CHALLENGEGUIPREFIX + " >> Backpack"; private Inventory backpack; public BackpackGui(int size) { @@ -42,7 +42,7 @@ ItemStack item = backpack.getItem(i); if (item != null && item.getType() != Material.AIR) { if (!newBackpack.addItem(item).isEmpty()) { - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.DARK_RED + " Backpack kann nicht verkleinert werden. Zu wenig Platz!"); // TODO COLOR + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.DARK_RED + " Backpack kann nicht verkleinert werden. Zu wenig Platz!"); // TODO COLOR return; } } diff --git a/src/main/java/de/fanta/challenges/guis/ResetGui.java b/src/main/java/de/fanta/challenges/guis/ResetGui.java index 91f4e93..047b570 100644 --- a/src/main/java/de/fanta/challenges/guis/ResetGui.java +++ b/src/main/java/de/fanta/challenges/guis/ResetGui.java @@ -17,7 +17,7 @@ private static final int RESET_INDEX = 2; public static final int INVENTORY_SIZE = 5; - public static final Inventory RESET_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, Challenges.GUIPREFIX + " >> Reset"); + public static final Inventory RESET_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, Challenges.CHALLENGEGUIPREFIX + " >> Reset"); public static void createResetGUI(Player p) { RESET_GUI.setItem(RESET_INDEX, GUIUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, ChatColor.DARK_RED + "Server resetten", ChatColor.RED + "Wenn du denn Server resettest wird", ChatColor.RED + "der Server komplett zurückgesetzt", ChatColor.RED + "und du musst von vorne beginnen!")); diff --git a/src/main/java/de/fanta/challenges/guis/TimerGui.java b/src/main/java/de/fanta/challenges/guis/TimerGui.java index 054e4a9..85adc99 100644 --- a/src/main/java/de/fanta/challenges/guis/TimerGui.java +++ b/src/main/java/de/fanta/challenges/guis/TimerGui.java @@ -19,7 +19,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory TIMER_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Timer"); + public static final Inventory TIMER_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Timer"); public static void createTimerGUI(Player p) { diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java index c3798d0..33acc80 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java @@ -5,9 +5,6 @@ import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -21,7 +18,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory EVENT_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Event Settings"); + public static final Inventory EVENT_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Event Settings"); private static final int NULL_EVENT_INDEX = 0; private static final int BINGO_EVENT_INDEX = 10; diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java index 62b0ff3..a5762cc 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java @@ -27,7 +27,7 @@ private static Challenges plugin = Challenges.getPlugin(); - public static final String TITLE = Challenges.GUIPREFIX + " >> Event Items"; + public static final String TITLE = Challenges.CHALLENGEGUIPREFIX + " >> Event Items"; private static final Inventory event_items = Bukkit.createInventory(null, InventoryType.DISPENSER, TITLE); private static Map playerInvs = new HashMap<>(); @@ -45,7 +45,7 @@ } public static void openPlayerInv(Player player) { - Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, Challenges.GUIPREFIX + " >> Bingo"); + Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, Challenges.CHALLENGEGUIPREFIX + " >> Bingo"); Bingo bingo = plugin.getBingo(); List playerMaterials = bingo.getPlayerMaterials().getOrDefault(player.getUniqueId(), new ArrayList<>()); bingo.getMaterials().forEach(material -> { diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java index 5dfd5d9..6ad5958 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java @@ -16,7 +16,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory MAIN_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Settings"); + public static final Inventory MAIN_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Settings"); private static final int CHALLENGES_INDEX = 10; private static final int OTHER_SETTINGS_INDEX = 13; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java index ab06a11..eaaa63b 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java @@ -25,7 +25,7 @@ private static final int BACKPACK_ADD_INDEX = 1; private static final int BACKPACK_REMOVE_INDEX = 19; - public static final Inventory OTHER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Other Settings"); + public static final Inventory OTHER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Other Settings"); private static final int CLOSE_IDEX = 26; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java index 75fed35..6dcc26d 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java @@ -18,7 +18,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory SERVER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Server Settings"); + public static final Inventory SERVER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Server Settings"); private static final int DIFFICULTY_INDEX = 10; private static final int KEEP_INVENTORY_INDEX = 11; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java index de58e74..89bc92c 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java @@ -17,7 +17,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 54; - public static final Inventory SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Challenges"); + public static final Inventory SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.CHALLENGEGUIPREFIX + " >> Challenges"); private static final int CRAFTING_TABLE_INDEX = 0; private static final int TRADING_INDEX = 9; diff --git a/src/main/java/de/fanta/challenges/listeners/DamageListener.java b/src/main/java/de/fanta/challenges/listeners/DamageListener.java index 8021dbd..4964f77 100644 --- a/src/main/java/de/fanta/challenges/listeners/DamageListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DamageListener.java @@ -40,20 +40,20 @@ if (e.getCause() == DamageCause.FALL) { if (plugin.getConfig().getBoolean("deathonfall")) { if (plugin.getConfig().getBoolean("dmginchat")) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); } Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> p.setHealth(0), 1); } else if (plugin.getConfig().getBoolean("dmginchat") && (plugin.getTimer().isRunning())) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); } } else if (e.getCause() == DamageCause.CUSTOM) { if (!p.isSneaking() && (plugin.getConfig().getBoolean("dmginchat"))) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + plugin.getConfig().getDouble("sneakdmg") + ChatUtil.GREEN + " HP Schaden genommen durch" + ChatUtil.ORANGE + " SNEAKING"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + plugin.getConfig().getDouble("sneakdmg") + ChatUtil.GREEN + " HP Schaden genommen durch" + ChatUtil.ORANGE + " SNEAKING"); } } else if (e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) { } else if (plugin.getConfig().getBoolean("dmginchat") && (plugin.getTimer().isRunning())) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause()); } if (plugin.getConfig().getBoolean("sharedmg") && plugin.getTimer().isRunning()) { for (Player pp : Bukkit.getOnlinePlayers()) { @@ -93,7 +93,7 @@ Player p = (Player) e.getEntity(); String dmg = new DecimalFormat("#.##").format(e.getFinalDamage()); if ((e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) && plugin.getConfig().getBoolean("dmginchat")) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getDamager().getName()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getDamager().getName()); } } if (!plugin.getTimer().isRunning()) { diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index 17988fd..3d568b8 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -13,6 +13,8 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent; +import java.util.Objects; + public class DeathListener implements Listener { private final Challenges plugin = Challenges.getPlugin(); @@ -24,15 +26,15 @@ for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); + e.setDeathMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); ChatUtil.sendBrodcastMessage("Verschwendete Zeit " + plugin.getTimer().formatTime(ChatColor.GOLD)); ChatUtil.sendBrodcastMessage("Welt Seed: " + Bukkit.getWorlds().get(0).getSeed()); ChatUtil.sendBrodcastMessage("Um alle wiederzubeleben benutze §c/revive ALL"); } else { if (plugin.getConfig().getBoolean("event.enabled")) { - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); + e.setDeathMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); } else { - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!" + ChatUtil.ORANGE + " (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")"); + e.setDeathMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!" + ChatUtil.ORANGE + " (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")"); } if (!plugin.getConfig().getBoolean("respawn")) { Player editor = plugin.getCurrentEditor(); @@ -43,20 +45,20 @@ @EventHandler public void DragonDeath(EntityDeathEvent e) { - if (!plugin.getConfig().getBoolean("event.enabled")) { + if (Objects.equals(plugin.getConfig().getString("event.type"), "nix")) { if ((e.getEntity() instanceof EnderDragon && plugin.getConfig().getBoolean("target")) || (e.getEntity() instanceof Wither && !plugin.getConfig().getBoolean("target"))) { plugin.getTimer().stopTimer(); - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.GREEN + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Der §2§l" + e.getEntity().getName().toLowerCase() + " §7wurde besiegt."); - Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Benötigte Zeit: §2§l" + plugin.getTimer().formatTime(ChatColor.GREEN) + "§7!"); - Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Seed: §2§l" + Bukkit.getWorlds().get(0).getSeed()); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX); - Bukkit.broadcastMessage(Challenges.PREFIX + ChatColor.GREEN + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.GREEN + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " §8>> §7Der §2§l" + e.getEntity().getName().toLowerCase() + " §7wurde besiegt."); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " §8>> §7Benötigte Zeit: §2§l" + plugin.getTimer().formatTime(ChatColor.GREEN) + "§7!"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " §8>> §7Seed: §2§l" + Bukkit.getWorlds().get(0).getSeed()); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + ChatColor.GREEN + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); } } } diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index 2820343..3358c8c 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -28,7 +28,7 @@ Bukkit.getScheduler().cancelTask(resetTaskId); resetTaskId = -1; } - if (plugin.getConfig().getBoolean("nether.enabled")) { + if (plugin.getConfig().getBoolean("nether.enabled") && !p.hasPlayedBefore()) { Location netherspawn = Bukkit.getWorlds().get(1).getSpawnLocation(); p.teleport(netherspawn); } @@ -36,8 +36,7 @@ ChatUtil.sendNormalMessage(p, "Du bist im Vanish, niemand weiß, dass du in der Lobby bist."); return; } - Bukkit.broadcastMessage( - Challenges.PREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setJoinMessage(null); if (plugin.getConfig().getBoolean("sharedmg")) { int rnd = new Random().nextInt(Bukkit.getOnlinePlayers().size()); @@ -85,7 +84,7 @@ } Bukkit.broadcastMessage( - Challenges.PREFIX + " " + ChatColor.of("#3D98DC") + player.getName() + ChatColor.of("#C45B3D") + " hat die Lobby verlassen! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1) + "/" + Bukkit.getServer() + Challenges.CHALLENGESPREFIX + " " + ChatColor.of("#3D98DC") + player.getName() + ChatColor.of("#C45B3D") + " hat die Lobby verlassen! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1) + "/" + Bukkit.getServer() .getMaxPlayers() + "]"); e.setQuitMessage(null); diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index c6f6829..d8fdd3f 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -18,7 +18,7 @@ } public static void sendMessage(CommandSender sender, String colors, Object message, Object... messageParts) { - ChatUtilBukkit.sendMessage(sender, Challenges.PREFIX, colors, message, messageParts); + ChatUtilBukkit.sendMessage(sender, Challenges.CHALLENGESPREFIX, colors, message, messageParts); } public static void sendNormalMessage(CommandSender sender, Object message, Object... messageParts) { @@ -34,6 +34,6 @@ } public static void sendBrodcastMessage(Object message) { - Bukkit.broadcastMessage(Challenges.PREFIX + " " + GREEN + message); + Bukkit.broadcastMessage(Challenges.CHALLENGESPREFIX + " " + GREEN + message); } } diff --git a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java index 8425058..6c610b4 100644 --- a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java +++ b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java @@ -18,6 +18,9 @@ public static void saveWorld(UUID uuid) { Challenges.getPlugin().getConfig().set("timertime", Challenges.getPlugin().getTimer().getTime()); Challenges.getPlugin().saveConfig(); + Challenges.getPlugin().getConfig().set("backpack_size", Challenges.getPlugin().getBackpack().getSize() / 9); + Challenges.getPlugin().saveConfig(); + Challenges.getPlugin().getBackpack().saveInventoryToConfig(); World world_world = Bukkit.getWorlds().get(0); World world_nether = Bukkit.getWorlds().get(1); World world_end = Bukkit.getWorlds().get(2); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 28a6202..b09019c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -24,6 +24,10 @@ challenges: description: Main Command usage: Benutze /Challenges + aliases: + - adventure + - c + - a backpack: description: Oeffne ein Backpack usage: Benutze /backpack oder /bp @@ -31,6 +35,8 @@ reset: description: Setzte die Welt zurueck usage: Benutze /Reset + aliases: + - stop forcemlg: description: Triggert einen MLG usage: Use /forcemlg @@ -40,7 +46,8 @@ leave: description: Spiel verlassen usage: Use /leave - aliases: [l] + aliases: + - l kick: description: Spieler Kicken usage: Use /kick @@ -53,7 +60,8 @@ village: description: Village usage: /village - aliases: [dorf] + aliases: + - dorf nether: description: Spiele die Challenge vom Nether ins End durch usage: Use /nether \ No newline at end of file