diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java index 1926e5a..15991d8 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java @@ -38,7 +38,7 @@ String x = plugin.getConfig().getString("Saved_Locations." + next + ".BlockX"); String y = plugin.getConfig().getString("Saved_Locations." + next + ".BlockY"); String z = plugin.getConfig().getString("Saved_Locations." + next + ".BlockZ"); - ChatUtil.sendNormalMessage(player, "§aPosition §8>> §2" + player.getName() + " §7- " + next + " §7[§2" + x + "§7/§2" + y + "§7/§2" + z + " " + w + "§7]"); + ChatUtil.sendNormalMessage(player, ChatUtil.NORMAL + "Position " + ChatUtil.WARNING + next + ChatUtil.NORMAL + ": " + ChatUtil.WARNING + "[" + x + "/" + y + "/" + z + " " + w + "]"); } else { ChatUtil.sendWarningMessage(player, "§cDiese Position existiert nicht!"); } diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java index f5f5deb..3588e9a 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java @@ -5,6 +5,7 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; +import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -28,11 +29,15 @@ if (args.hasNext()) { String next = args.getNext(); if (!plugin.getConfig().contains("Saved_Locations." + next)) { - Bukkit.broadcastMessage(Challenges.PREFIX + " §7| §aPosition §8>> §2" + player.getName() + " §7- " + next + " §7[§2" + player.getLocation().getBlockX() + "§7/§2" + player.getLocation().getBlockY() + "§7/§2" + player.getLocation().getBlockZ() + "§7]"); - plugin.getConfig().set("Saved_Locations." + next + ".World", player.getWorld().getName()); - plugin.getConfig().set("Saved_Locations." + next + ".BlockX", player.getLocation().getBlockX()); - plugin.getConfig().set("Saved_Locations." + next + ".BlockY", player.getLocation().getBlockY()); - plugin.getConfig().set("Saved_Locations." + next + ".BlockZ", player.getLocation().getBlockZ()); + String w = player.getLocation().getWorld().getName().toLowerCase(); + int x = player.getLocation().getBlockX(); + int y = player.getLocation().getBlockY(); + int z = player.getLocation().getBlockZ(); + ChatUtil.sendNormalMessage(player, ChatUtil.NORMAL + "Position " + ChatUtil.WARNING + next + ChatUtil.NORMAL + ": " + ChatUtil.WARNING + "[" + x + "/" + y + "/" + z + " " + w + "]"); + plugin.getConfig().set("Saved_Locations." + next + ".World", w); + plugin.getConfig().set("Saved_Locations." + next + ".BlockX", x); + plugin.getConfig().set("Saved_Locations." + next + ".BlockY", y); + plugin.getConfig().set("Saved_Locations." + next + ".BlockZ", z); plugin.saveConfig(); } else { ChatUtil.sendWarningMessage(player, "Diese Position existiert bereits! Benutze einen anderen Namen oder lösche die alte zuerst mit /coords delete " + next); 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 b9c02b8..8d3076e 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java @@ -5,6 +5,7 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; +import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -23,7 +24,12 @@ ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); return true; } - Bukkit.broadcastMessage(Challenges.PREFIX + " §c" + sender.getName() + " §6ist bei §c" + ((Player) sender).getLocation().getBlockX() + " " + ((Player) sender).getLocation().getBlockY() + " " + ((Player) sender).getLocation().getBlockZ() + " §6in Welt §6" + ((Player) sender).getWorld().getName()); + Player player = (Player) sender; + String w = player.getLocation().getWorld().getName().toLowerCase(); + int x = player.getLocation().getBlockX(); + int y = player.getLocation().getBlockY(); + int z = player.getLocation().getBlockZ(); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + sender.getName() + ChatUtil.NORMAL + " ist bei " + ChatUtil.WARNING + x + "/" + y + "/" + z + " " + ChatUtil.WARNING + w); return true; } } diff --git a/src/main/java/de/fanta/challenges/guis/ResetGui.java b/src/main/java/de/fanta/challenges/guis/ResetGui.java index d51aaea..91f4e93 100644 --- a/src/main/java/de/fanta/challenges/guis/ResetGui.java +++ b/src/main/java/de/fanta/challenges/guis/ResetGui.java @@ -9,17 +9,18 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; public class ResetGui implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final int RESET_INDEX = 2; - public static final int INVENTORY_SIZE = 9; - public static final Inventory RESET_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Reset"); + public static final int INVENTORY_SIZE = 5; + public static final Inventory RESET_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, Challenges.GUIPREFIX + " >> Reset"); public static void createResetGUI(Player p) { - RESET_GUI.setItem(4, 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!")); + 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!")); for (int i = 0; i < INVENTORY_SIZE; i++) { if (RESET_GUI.getItem(i) == null || RESET_GUI.getItem(i).getType() == Material.AIR) { RESET_GUI.setItem(i, GUIUtils.EMPTY_ICON); @@ -32,9 +33,9 @@ public void onInventoryClick(InventoryClickEvent e) { int slot = e.getRawSlot(); Player p = (Player) e.getWhoClicked(); - if (e.getInventory() == RESET_GUI) { - if (slot == 4) { - Bukkit.dispatchCommand(Bukkit.getConsoleSender() ,"reset confirm"); + if (RESET_GUI.equals(e.getClickedInventory())) { + if (slot == RESET_INDEX) { + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"); p.closeInventory(); } e.setCancelled(true); diff --git a/src/main/java/de/fanta/challenges/listeners/DamageListener.java b/src/main/java/de/fanta/challenges/listeners/DamageListener.java index cec3a4c..f56f5a6 100644 --- a/src/main/java/de/fanta/challenges/listeners/DamageListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DamageListener.java @@ -34,7 +34,7 @@ if (e.getCause() == DamageCause.FALL) { if (plugin.getConfig().getBoolean("deathonfall")) { if (plugin.getConfig().getBoolean("dmginchat")) { - Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + p.getHealth() + " §cHP Schaden genommen durch §4" + e.getCause()); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat " + ChatUtil.WARNING + dmg + ChatUtil.NORMAL + " HP Schaden genommen durch " + ChatUtil.WARNING + e.getCause()); } Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { @Override @@ -43,16 +43,16 @@ } }, 1); } else if (plugin.getConfig().getBoolean("dmginchat") && (plugin.getTimer().isRunning())) { - Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getCause()); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat " + ChatUtil.WARNING + dmg + ChatUtil.NORMAL + " HP Schaden genommen durch " + ChatUtil.WARNING + e.getCause()); } } else if (e.getCause() == DamageCause.CUSTOM) { if (!p.isSneaking() && (plugin.getConfig().getBoolean("dmginchat"))) { - Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + plugin.getConfig().getDouble("sneakdmg") + " §cHP Schaden genommen durch §4SNEAKING"); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat " + ChatUtil.WARNING + plugin.getConfig().getDouble("sneakdmg") + ChatUtil.NORMAL + " HP Schaden genommen durch" + ChatUtil.WARNING + " 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 + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getCause()); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat " + ChatUtil.WARNING + dmg + ChatUtil.NORMAL + " HP Schaden genommen durch " + ChatUtil.WARNING + e.getCause()); } if (plugin.getConfig().getBoolean("sharedmg") && plugin.getTimer().isRunning()) { for (Player pp : Bukkit.getOnlinePlayers()) { @@ -84,7 +84,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 + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getDamager().getName()); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat " + ChatUtil.WARNING + dmg + ChatUtil.NORMAL + " HP Schaden genommen durch " + ChatUtil.WARNING + e.getDamager().getName()); } } if (!plugin.getTimer().isRunning()) { @@ -174,7 +174,7 @@ if (plugin.getTimer().isRunning() && p.getGameMode() == GameMode.SURVIVAL) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().clear(); - ChatUtil.sendNormalMessage(pp, p.getName() + " hat Schaden bekommen! Alle Inventare wurden gelöscht!"); + ChatUtil.sendNormalMessage(pp, ChatUtil.PLAYER + p.getName() + ChatUtil.WARNING + " hat Schaden bekommen! Alle Inventare wurden gelöscht!"); } } diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index 9c19910..2fdec15 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -27,12 +27,12 @@ for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } - e.setDeathMessage("§6" + e.getEntity().getName() + " §cist gestorben!"); + e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + e.getEntity().getName() + ChatUtil.NORMAL + " ist gestorben!"); Bukkit.broadcastMessage("§cVerschwendete Zeit §6" + plugin.getTimer().formatTime(ChatColor.GOLD)); Bukkit.broadcastMessage("§aWelt Seed: §b" + Bukkit.getWorlds().get(0).getSeed()); Bukkit.broadcastMessage("§6Um alle wiederzubeleben benutze §c/revive ALL"); } else { - e.setDeathMessage("§6" + e.getEntity().getName() + " §cist gestorben! §6(" + e.getEntity().getWorld().getName() + " " + e.getEntity().getLocation().getBlockX() + " " + e.getEntity().getLocation().getBlockY() + " " + e.getEntity().getLocation().getBlockZ() + "§c)"); + e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + e.getEntity().getName() + ChatUtil.NORMAL + " ist gestorben! " + ChatUtil.WARNING + "(" + e.getEntity().getLocation().getBlockX() + " " + e.getEntity().getLocation().getBlockY() + " " + e.getEntity().getLocation().getBlockZ() + ")"); if (!plugin.getConfig().getBoolean("respawn")) { Player editor = plugin.getCurrentEditor(); ChatUtil.sendNormalMessage(editor, "§6Benutze §c/revive " + e.getEntity().getName() + " [world] [x] [y] [z] §6um ihn wiederzubeleben!"); @@ -43,7 +43,7 @@ @EventHandler public void onPlayerRespawn(PlayerRespawnEvent e) { if (!plugin.getConfig().getBoolean("respawn")) { - e.getPlayer().sendTitle("§cDu bist gestorben!", "§4Du bist nun Zuschauer", 10, 80, 10); + e.getPlayer().sendTitle(ChatUtil.NORMAL + "Du bist gestorben!", ChatUtil.ERROR + "Du bist nun Zuschauer", 10, 80, 10); Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { @Override public void run() { diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index b0f8217..7ece023 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -33,7 +33,7 @@ } Player p = e.getPlayer(); - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.of("#3D98DC") + p.getName() + ChatUtil.NORMAL + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]"); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setJoinMessage(null); if (plugin.getConfig().getBoolean("sharedmg")) { int rnd = new Random().nextInt(Bukkit.getOnlinePlayers().size()); diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index 45339e8..2561da5 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -10,6 +10,7 @@ public static final ChatColor NORMAL = ChatColor.of("#1FFF00"); public static final ChatColor WARNING = ChatColor.of("#ffe100"); public static final ChatColor ERROR = ChatColor.of("#a30202"); + public static final ChatColor PLAYER = ChatColor.of("#3D98DC"); private ChatUtil() { // prevent instances