diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index e66a313..1e0d7b1 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -451,7 +451,7 @@ List onlinePlayersWithPermission = Bukkit.getOnlinePlayers().stream().filter(p -> p.hasPermission("Challenges.editor")).distinct().collect(Collectors.toList()); onlinePlayersWithPermission.remove(oldEditor); - if (onlinePlayersWithPermission.size() > 0) { + if (!onlinePlayersWithPermission.isEmpty()) { int rnd = random.nextInt(onlinePlayersWithPermission.size()); randomPlayer = onlinePlayersWithPermission.get(rnd); } else { @@ -460,7 +460,7 @@ onlinePlayers.removeAll(vanishPlayers); onlinePlayers.remove(oldEditor.getName()); - if (onlinePlayers.size() > 0) { + if (!onlinePlayers.isEmpty()) { int rnd = random.nextInt(onlinePlayers.size()); randomPlayer = Bukkit.getPlayer(onlinePlayers.get(rnd)); } diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java index c6cf0cf..32aca12 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java @@ -226,7 +226,7 @@ playerMaterials.put(uuid, items); plugin.getScoreManager().updateScore(new ChallengePlayer(player.getUniqueId()), 1); - ChatUtil.sendNormalMessage(player, "Item: " + ChatUtil.BLUE + itemStack.getI18NDisplayName() + ChatUtil.GREEN + " wurde Registriert"); + ChatUtil.sendMessage(player, Component.text("Item: ", ChatUtil.GREEN).append(Component.translatable(itemStack.getType().translationKey(), ChatUtil.BLUE).append(Component.text(" wurde Registriert", ChatUtil.GREEN)))); player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, player, 50, ChatUtil.GREEN); @@ -257,7 +257,7 @@ plugin.getScoreManager().updateScore(TeamUtils.getPlayerTeam(onlinePlayer), 1); scoreset = true; } - ChatUtil.sendNormalMessage(onlinePlayer, "Item: " + ChatUtil.BLUE + itemStack.getI18NDisplayName() + ChatUtil.GREEN + " wurde Registriert"); + ChatUtil.sendMessage(onlinePlayer, Component.text("Item: ", ChatUtil.GREEN).append(Component.translatable(itemStack.getType().translationKey(), ChatUtil.BLUE).append(Component.text(" wurde Registriert", ChatUtil.GREEN)))); onlinePlayer.playSound(onlinePlayer.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, onlinePlayer, 50, ChatUtil.GREEN); diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java index be6c8f0..f14b21e 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java @@ -15,7 +15,6 @@ import net.kyori.adventure.text.format.TextDecoration; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; -import org.bukkit.Difficulty; import org.bukkit.GameMode; import org.bukkit.GameRule; import org.bukkit.Location; diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DifferentItemsChallenge.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DifferentItemsChallenge.java index 46c43dc..83942e4 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DifferentItemsChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DifferentItemsChallenge.java @@ -8,6 +8,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.CubesideModUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; @@ -162,7 +163,7 @@ playerMaterialList.add(itemStack.getType()); playerMaterials.put(player.getUniqueId(), playerMaterialList); plugin.getScoreManager().updateScore(new ChallengePlayer(player.getUniqueId()), 1); - ChatUtil.sendNormalMessage(player, "Item: " + ChatUtil.BLUE + itemStack.getI18NDisplayName() + ChatUtil.GREEN + " wurde Registriert"); + ChatUtil.sendMessage(player, Component.text("Item: ", ChatUtil.GREEN).append(Component.translatable(itemStack.getType().translationKey(), ChatUtil.BLUE).append(Component.text(" wurde Registriert", ChatUtil.GREEN)))); player.playSound(player, Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, player, 50, ChatUtil.GREEN); updateBossBar(); diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java index f2f8f98..c5abaec 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java @@ -19,7 +19,6 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; -import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -892,7 +891,7 @@ ArrayList damageCauseList = playerDamageCauses.get(player.getUniqueId()); damageCauseList.remove(damageCause); playerDamageCauses.put(player.getUniqueId(), damageCauseList); - ChatUtil.sendNormalMessage(player, "Death: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(damageCause.name(), true) + ChatUtil.GREEN + " wurde Registriert"); + ChatUtil.sendMessage(player, Component.text("Death: ", ChatUtil.GREEN).append(Component.text(StringUtil.capitalizeFirstLetter(damageCause.name(), true), ChatUtil.BLUE).append(Component.text(" wurde Registriert", ChatUtil.GREEN)))); finishQuest(player); } } @@ -902,7 +901,7 @@ if (location.clone().toCenterLocation().distance(playerLocation.clone().toCenterLocation()) <= 1) { Block block = location.getBlock(); String locationString = "X: " + block.getX() + ", Y: " + block.getY() + ", Z: " + block.getZ(); - ChatUtil.sendNormalMessage(player, "Location: " + ChatUtil.BLUE + locationString + ChatUtil.GREEN + " wurde Registriert"); + ChatUtil.sendMessage(player, Component.text("Location: ", ChatUtil.GREEN).append(Component.text(locationString, ChatUtil.BLUE).append(Component.text(" wurde Registriert", ChatUtil.GREEN)))); CoordsTargeter.removeLocation(player.getUniqueId()); finishQuest(player); } diff --git a/src/main/java/de/fanta/challenges/challenges/ClearInventoryByDamageChallenge.java b/src/main/java/de/fanta/challenges/challenges/ClearInventoryByDamageChallenge.java index 526e3bc..e7954c5 100644 --- a/src/main/java/de/fanta/challenges/challenges/ClearInventoryByDamageChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/ClearInventoryByDamageChallenge.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.CubesideModUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -23,7 +24,7 @@ for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().clear(); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, pp, 50, ChatUtil.RED); - ChatUtil.sendNormalMessage(pp, ChatUtil.BLUE + p.getName() + ChatUtil.ORANGE + " hat Schaden bekommen! Alle Inventare wurden geleert!"); + ChatUtil.sendMessage(pp, p.name().color(ChatUtil.BLUE).append(Component.text(" hat Schaden bekommen! Alle Inventare wurden geleert!", ChatUtil.ORANGE))); } } } diff --git a/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java b/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java index 626999c..82d2e8e 100644 --- a/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java @@ -202,7 +202,7 @@ if (!dead) { p.setInvulnerable(true); mlgBack(p, loc, content); - ChatUtil.sendNormalMessage(p, ChatUtil.GREEN + "Du hast den " + ChatUtil.BLUE + "MLG " + ChatUtil.GREEN + "erfolgreich absolviert! " + ChatUtil.ORANGE + "Weitere folgen..."); + ChatUtil.sendNormalMessage(p, "Du hast den MLG erfolgreich absolviert! Weitere folgen..."); } else { p.getInventory().clear(); if (Bukkit.getWorlds().get(0).getGameRuleValue(GameRule.KEEP_INVENTORY)) { diff --git a/src/main/java/de/fanta/challenges/commands/VillageCommand.java b/src/main/java/de/fanta/challenges/commands/VillageCommand.java index a527727..597ba2a 100644 --- a/src/main/java/de/fanta/challenges/commands/VillageCommand.java +++ b/src/main/java/de/fanta/challenges/commands/VillageCommand.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.HeightMap; import org.bukkit.Location; @@ -60,7 +61,7 @@ Location villagetop = village.getWorld().getHighestBlockAt(x, z, HeightMap.MOTION_BLOCKING).getLocation().add(0, 1, 0); int y = villagetop.getBlockY(); Bukkit.getWorlds().get(0).setSpawnLocation(villagetop); - ChatUtil.sendNormalMessage(player, "Dorf: " + ChatUtil.BLUE + x + " " + y + " " + z); + ChatUtil.sendMessage(player, Component.text("Dorf: ", ChatUtil.GREEN).append(Component.text(x + " " + y + " " + z, ChatUtil.BLUE))); for (Player pp : Bukkit.getOnlinePlayers()) { pp.teleportAsync(villagetop); ChatUtil.sendNormalMessage(pp, "Dorfspawn gesetzt!"); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengeMaxPlayersCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengeMaxPlayersCommand.java index cf6bfa6..c088183 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengeMaxPlayersCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengeMaxPlayersCommand.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -24,7 +25,7 @@ int playeCount = Integer.parseInt(args.getNext()); Bukkit.getServer().setMaxPlayers(playeCount); Bukkit.getPluginManager().callEvent(new PlayerCountChangedEvent(Challenges.getPlugin().getVanish().getPlayerListWithoutVanishPlayers().size())); - ChatUtil.sendNormalMessage(player, "Du hast die maximale Spieleranzahl vom server auf " + ChatUtil.BLUE + playeCount + ChatUtil.GREEN + " gesetzt!"); + ChatUtil.sendMessage(player, Component.text("Du hast die maximale Spieleranzahl vom server auf ", ChatUtil.GREEN).append(Component.text(playeCount, ChatUtil.BLUE).append(Component.text(" gesetzt!", ChatUtil.GREEN)))); } catch (NumberFormatException ex) { ChatUtil.sendErrorMessage(player, "Du musst eine Zahl angeben!"); } diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesBanCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesBanCommand.java index 2fff3a9..a1fe357 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesBanCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesBanCommand.java @@ -4,8 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; -import de.speedy64.globalport.GlobalApi; -import org.bukkit.BanList; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -44,10 +43,10 @@ return true; } - ChatUtil.sendWarningMessage(punishedPlayer, "Du wurdest vom Editor gebannt!"); + ChatUtil.sendErrorMessage(punishedPlayer, "Du wurdest vom Editor gebannt!"); plugin.addBannedPlayer(punishedPlayer.getUniqueId(), true); plugin.portPlayerToLobby(punishedPlayer); - ChatUtil.sendNormalMessage(player, "Du hast " + ChatUtil.BLUE + punishedPlayer.getName() + ChatUtil.GREEN + " gebannt."); + ChatUtil.sendMessage(player, Component.text("Du hast ", ChatUtil.GREEN).append(punishedPlayer.name().color(ChatUtil.BLUE)).append(Component.text(" gebannt.", ChatUtil.GREEN))); return true; } else { ChatUtil.sendWarningMessage(player, "/challenge ban [Player]"); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java index 7c1d4fb..1711ccc 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java @@ -4,15 +4,8 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; -import org.bukkit.Color; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Particle; -import org.bukkit.World; -import org.bukkit.block.Block; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class ChallengesCommand extends SubCommand { diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesEnderSeeCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesEnderSeeCommand.java index 314d180..2348a81 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesEnderSeeCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesEnderSeeCommand.java @@ -32,7 +32,7 @@ player.openInventory(enderSeePlayer.getEnderChest()); } else { - ChatUtil.sendWarningMessage(player, "/challenges endersee "); + ChatUtil.sendErrorMessage(player, "/challenges endersee "); return true; } return true; diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesHelpCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesHelpCommand.java index 2f88c80..a6eee1d 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesHelpCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesHelpCommand.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -28,7 +29,7 @@ ChatUtil.sendNormalMessage(sender, "Hier Klicken --> https://wiki.cubeside.de/Challenge"); return true; } else if (plugin.getCurrentEditor() != null) { - ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! " + ChatUtil.BLUE + plugin.getCurrentEditor().getName() + ChatUtil.GREEN + " muss die Map bearbeiten!"); + ChatUtil.sendMessage(sender, Component.text("Du bist kein Editor! ", ChatUtil.RED).append(plugin.getCurrentEditor().name().color(ChatUtil.BLUE).append(Component.text(" muss die Map bearbeiten!", ChatUtil.RED)))); return true; } else { ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java index 3973b55..0c13c24 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -46,7 +47,7 @@ ChatUtil.sendWarningMessage(punishedPlayer, "Du kannst in einer Minute wieder joinen"); plugin.addBannedPlayer(punishedPlayer.getUniqueId(), false); plugin.portPlayerToLobby(punishedPlayer); - ChatUtil.sendNormalMessage(player, "Du hast " + ChatUtil.BLUE + punishedPlayer.getName() + ChatUtil.GREEN + " gekickt. Der Spieler kann in einer Minute wieder Joinen"); + ChatUtil.sendMessage(player, Component.text("Du hast ", ChatUtil.GREEN).append(punishedPlayer.name().color(ChatUtil.BLUE).append(Component.text(" gekickt. Der Spieler kann in einer Minute wieder Joinen", ChatUtil.GREEN)))); plugin.getScheduler().runGlobalDelayed(() -> { if (plugin.isPlayerBanned(punishedPlayer.getUniqueId())) { plugin.removeBannedPlayer(punishedPlayer.getUniqueId(), false); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesUnBanCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesUnBanCommand.java index 0b86515..5f0ea08 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesUnBanCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesUnBanCommand.java @@ -5,6 +5,8 @@ import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import de.iani.playerUUIDCache.CachedPlayer; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; @@ -31,15 +33,20 @@ if (plugin.isEditor(player) || player.hasPermission("Challenges.editor.override")) { if (args.hasNext()) { String playerName = args.getNext(); - OfflinePlayer punishedPlayer = Bukkit.getOfflinePlayer(playerName); + CachedPlayer punishedPlayer = plugin.playerUUIDCache.getPlayer(playerName); + + if (punishedPlayer == null) { + ChatUtil.sendErrorMessage(player, "Player " + playerName + " nicht gefunden"); + return true; + } if (!plugin.isPlayerBanned(punishedPlayer.getUniqueId())) { - ChatUtil.sendWarningMessage(player, ChatUtil.BLUE + punishedPlayer.getName() + ChatUtil.GREEN + " ist nicht gebannt."); + ChatUtil.sendMessage(player, Component.text(punishedPlayer.getName(), ChatUtil.BLUE).append(Component.text(" ist nicht gebannt.", ChatUtil.GREEN))); return true; } plugin.removeBannedPlayer(punishedPlayer.getUniqueId(), true); - ChatUtil.sendNormalMessage(player, "Du hast " + ChatUtil.BLUE + punishedPlayer.getName() + ChatUtil.GREEN + " entbannt."); + ChatUtil.sendMessage(player, Component.text("Du hast ", ChatUtil.GREEN).append(Component.text(punishedPlayer.getName(), ChatUtil.BLUE).append(Component.text(" entbannt.", ChatUtil.GREEN)))); return true; } else { ChatUtil.sendWarningMessage(player, "/challenge unban [Player]"); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java index 0252583..a0b676c 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; @@ -44,11 +45,11 @@ new CheckItemsGUI(player).open(); return true; } - + if (args.getNext().equals("additemtoblacklist")) { ItemStack stack = player.getInventory().getItemInMainHand(); CheckItemsGUI.addItem(stack.getType()); - ChatUtil.sendNormalMessage(player, "Item " + ChatUtil.BLUE + stack.getI18NDisplayName() + ChatUtil.GREEN + " hinzugefügt"); + ChatUtil.sendMessage(player, Component.text("Item ", ChatUtil.GREEN).append(Component.text(stack.getType().translationKey(), ChatUtil.BLUE).append(Component.text(" hinzugefügt", ChatUtil.GREEN)))); } else { ChatUtil.sendErrorMessage(player, "/checkitems "); } 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 c3c2a5e..b1e4c45 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -37,7 +38,7 @@ String x = Config.getString("Saved_Locations." + next + ".BlockX"); String y = Config.getString("Saved_Locations." + next + ".BlockY"); String z = Config.getString("Saved_Locations." + next + ".BlockZ"); - ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); + ChatUtil.sendMessage(player, Component.text("Position ", ChatUtil.GREEN).append(Component.text(next, ChatUtil.ORANGE).append(Component.text(": ", ChatUtil.GREEN).append(Component.text("[" + x + "/" + y + "/" + z + " " + w + "]", ChatUtil.ORANGE))))); } 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 d1e1739..ec7cc3a 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.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -37,7 +38,7 @@ int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); + ChatUtil.sendMessage(player, Component.text("Position ", ChatUtil.GREEN).append(Component.text(next, ChatUtil.ORANGE).append(Component.text(": ", ChatUtil.GREEN).append(Component.text("[" + x + "/" + y + "/" + z + " " + w + "]", ChatUtil.ORANGE))))); Config.setValue("Saved_Locations." + next + ".World", w, false); Config.setValue("Saved_Locations." + next + ".BlockX", x, false); Config.setValue("Saved_Locations." + next + ".BlockY", y, false); diff --git a/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java b/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java index 7e57a3d..562edf7 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java @@ -20,7 +20,7 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player)) { - ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); + ChatUtil.sendWarningMessage(sender, "You are not a Player :>"); return true; } if (plugin.getCurrentEditor() != null) { @@ -29,8 +29,8 @@ ChatSkull.sendPlayer(plugin.getCurrentEditor(), (Player) sender, lines); ChatUtil.sendNormalMessage(sender, "-------- Editor --------"); } else { - ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); - ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP kaufen!"); + ChatUtil.sendWarningMessage(sender, "Aktuell gibt es keinen Editor!"); + ChatUtil.sendWarningMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP kaufen!"); } 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 426e526..06ff492 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java @@ -21,7 +21,7 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player)) { - ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); + ChatUtil.sendWarningMessage(sender, "You are not a Player :>"); return true; } if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { @@ -30,7 +30,7 @@ Player player = Bukkit.getPlayer(playerName); if (player == null) { - ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); + ChatUtil.sendWarningMessage(sender, "Dieser Spieler ist nicht online!"); return true; } else if (!plugin.isEditor(player)) { plugin.setCurrentEditor(player); @@ -44,11 +44,11 @@ } return true; } else if (plugin.getCurrentEditor() != null) { - ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + ChatUtil.BLUE + plugin.getCurrentEditor().getName() + ChatUtil.RED + " kann einen neuen Editor bestimmen!"); + ChatUtil.sendMessage(sender, Component.text("Du bist kein Editor! Nur ", ChatUtil.RED).append(plugin.getCurrentEditor().name().color(ChatUtil.BLUE).append(Component.text(" kann einen neuen Editor bestimmen!", ChatUtil.RED)))); return true; } else { - ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); - ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP kaufen!"); + ChatUtil.sendWarningMessage(sender, "Aktuell gibt es keinen Editor!"); + ChatUtil.sendWarningMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP kaufen!"); return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java index faa58bb..aee89c3 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -44,7 +45,7 @@ forceplayername = args.getNext(); forceplayer = Bukkit.getPlayer(forceplayername); if (forceplayer == null) { - ChatUtil.sendErrorMessage(player, "Spieler " + ChatUtil.BLUE + forceplayername + ChatUtil.RED + " nicht gefunden."); + ChatUtil.sendMessage(player, Component.text("Spieler ", ChatUtil.RED).append(Component.text(forceplayername, ChatUtil.BLUE).append(Component.text(" nicht gefunden.", ChatUtil.RED)))); return true; } } @@ -53,13 +54,13 @@ teamname = args.getNext(); team = TeamUtils.getTeam(teamname); if (team == null) { - ChatUtil.sendErrorMessage(player, "Team " + ChatUtil.BLUE + teamname + ChatUtil.RED + " nicht gefunden."); + ChatUtil.sendMessage(player, Component.text("Team ", ChatUtil.RED).append(Component.text(teamname, ChatUtil.BLUE).append(Component.text(" nicht gefunden.", ChatUtil.RED)))); return true; } } TeamUtils.selectTeam(forceplayer, team); - ChatUtil.sendNormalMessage(player, ChatUtil.BLUE + forceplayer.getName() + ChatUtil.GREEN + " ist nun in Team " + team.getChatColor() + team.getName()); + ChatUtil.sendMessage(player, forceplayer.name().color(ChatUtil.BLUE).append(Component.text(" ist nun in Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor())))); } else { ChatUtil.sendErrorMessage(sender, "Keine Berechtigung!"); diff --git a/src/main/java/de/fanta/challenges/commands/event/EventTeamsSetTeamSpawnCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventTeamsSetTeamSpawnCommand.java index 5eee2f7..89403dd 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventTeamsSetTeamSpawnCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventTeamsSetTeamSpawnCommand.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -27,9 +28,9 @@ ChallengeTeam team = TeamUtils.getTeam(teamname); if (team != null) { team.setSpawn(player.getLocation()); - ChatUtil.sendNormalMessage(player, "Spawn für Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " wurde gesetzt."); + ChatUtil.sendMessage(player, Component.text("Spawn für Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()).append(Component.text(" wurde gesetzt.", ChatUtil.GREEN)))); } else { - ChatUtil.sendErrorMessage(player, "Team " + ChatUtil.BLUE + teamname + ChatUtil.RED + " nicht gefunden."); + ChatUtil.sendMessage(player, Component.text("Team ", ChatUtil.RED).append(Component.text(teamname, ChatUtil.BLUE).append(Component.text(" nicht gefunden.", ChatUtil.RED)))); } } else { ChatUtil.sendErrorMessage(sender, "/event setTeamSpawn "); diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerGetCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerGetCommand.java index d31d1a7..51a2113 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerGetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerGetCommand.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; +import net.kyori.adventure.text.Component; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -18,7 +19,7 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { - ChatUtil.sendNormalMessage(sender, "Timer: " + plugin.getTimer().formatTime() + " Speedrun: " + (Config.getBoolean("editsettings") ? "Nein" : "Ja")); + ChatUtil.sendMessage(sender, Component.text("Timer: ", ChatUtil.GREEN).append(plugin.getTimer().formatTime(ChatUtil.BLUE).append(Component.text(" Speedrun: " + (Config.getBoolean("editsettings") ? "Nein" : "Ja"), ChatUtil.ORANGE)))); return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java index 73514cc..3c50902 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java @@ -7,9 +7,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.GameRule; -import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; 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 bbe0cce..015eee9 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java @@ -7,8 +7,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; 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 f1df929..52f0a50 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java @@ -7,7 +7,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; 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 ea5ce51..cf949f0 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java @@ -7,8 +7,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import net.kyori.adventure.text.Component; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java index 06fc7b5..886c03f 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java @@ -1,15 +1,11 @@ package de.fanta.challenges.commands.timer; import de.fanta.challenges.Challenges; -import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; -import org.bukkit.GameRule; -import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/de/fanta/challenges/gravestones/GravestoneUtils.java b/src/main/java/de/fanta/challenges/gravestones/GravestoneUtils.java index dac4c97..6ee8f8b 100644 --- a/src/main/java/de/fanta/challenges/gravestones/GravestoneUtils.java +++ b/src/main/java/de/fanta/challenges/gravestones/GravestoneUtils.java @@ -3,6 +3,7 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.items.ItemGroups; +import net.kyori.adventure.text.Component; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -115,7 +116,7 @@ world.spawn(new Location(world, block.getX() + 0.5, placeableY, block.getZ() + 0.5, player.getLocation().getYaw(), 0), ArmorStand.class, t -> { t.setVisible(false); t.setGravity(false); - t.setCustomName(ChatUtil.RED + "R.I.P. " + ChatUtil.BLUE + player.getName()); + t.customName(Component.text("R.I.P. ", ChatUtil.RED).append(player.name().color(ChatUtil.BLUE))); t.setCustomNameVisible(true); ItemStack itemStack = new ItemStack(Material.PLAYER_HEAD, 1); SkullMeta meta = (SkullMeta) itemStack.getItemMeta(); @@ -126,7 +127,7 @@ container.set(UUIDKey, PersistentDataType.STRING, player.getUniqueId().toString()); container.set(inventoryKey, PersistentDataType.BYTE_ARRAY, inventoryBytes); }); - ChatUtil.sendNormalMessage(player, "Dein Grabschstein steht bei:" + ChatUtil.ORANGE + " (" + player.getLocation().getBlockX() + "/" + player.getLocation().getBlockY() + "/" + player.getLocation().getBlockZ() + ")"); + ChatUtil.sendMessage(player, Component.text("Dein Grabschstein steht bei:", ChatUtil.GREEN).append(Component.text(" (" + player.getLocation().getBlockX() + "/" + player.getLocation().getBlockY() + "/" + player.getLocation().getBlockZ() + ")", ChatUtil.ORANGE))); } } diff --git a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java index a8e7bb2..c412493 100644 --- a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java +++ b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java @@ -61,7 +61,7 @@ if (slot == ACCEPT_INDEX) { Config.setValue("Saved_Locations." + waypointName, null, false); - ChatUtil.sendNormalMessage(player, ChatUtil.BLUE + waypointName + ChatUtil.GREEN + " wurde gelöscht!"); + ChatUtil.sendMessage(player, Component.text(waypointName, ChatUtil.BLUE).append(Component.text(" wurde gelöscht!", ChatUtil.GREEN))); player.closeInventory(); } else if (slot == DENY_INDEX) { CoordsGUI.buildCoordsInventory(player); diff --git a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java index 5a1bc4a..954600d 100644 --- a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java @@ -15,9 +15,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -53,17 +51,8 @@ Location waypointlocation = new Location(world, x, y, z); - ArrayList metalore = new ArrayList<>(); - if (world != null) { - ItemStack stack = new ItemStack(getBlock(world.getName())); - ItemMeta itemMeta = stack.getItemMeta(); - itemMeta.displayName(Component.text(waypoint, ChatUtil.BLUE)); - metalore.add(Component.text("X: ", ChatUtil.BLUE).append(Component.text(x, ChatUtil.GREEN).append(Component.text(" Y: ", ChatUtil.BLUE).append(Component.text(y, ChatUtil.GREEN).append(Component.text(" Z: ", ChatUtil.BLUE)).append(Component.text(z, ChatUtil.GREEN)))))); - metalore.add(Component.text("Linksklick: Zeigt Coords im Chat.", ChatUtil.GREEN)); - metalore.add(Component.text("Rechtsklick: Waypoint Löschen.", ChatUtil.RED)); - itemMeta.lore(metalore); - stack.setItemMeta(itemMeta); + ItemStack stack = ItemUtils.createGuiItem(getBlock(world.getName()), Component.text(waypoint, ChatUtil.BLUE), Component.text("X: ", ChatUtil.BLUE).append(Component.text(x, ChatUtil.GREEN).append(Component.text(" Y: ", ChatUtil.BLUE).append(Component.text(y, ChatUtil.GREEN).append(Component.text(" Z: ", ChatUtil.BLUE)).append(Component.text(z, ChatUtil.GREEN))))), Component.text("Linksklick: Zeigt Coords im Chat.", ChatUtil.GREEN), Component.text("Rechtsklick: Waypoint Löschen.", ChatUtil.RED)); COORDS_UI.setItem(slot, stack); wayPointPerSlot.put(waypoint, waypointlocation); if (cat < 6) { @@ -110,7 +99,7 @@ if (location != null) { if (e.isLeftClick()) { - ChatUtil.sendNormalMessage(p, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + waypointName + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + location.getX() + "/" + location.getY() + "/" + location.getZ() + " " + location.getWorld().getName() + "]"); + ChatUtil.sendMessage(p, Component.text("Position ", ChatUtil.GREEN).append(Component.text(waypointName, ChatUtil.ORANGE).append(Component.text(": ", ChatUtil.GREEN).append(Component.text("[" + location.getX() + "/" + location.getY() + "/" + location.getZ() + " " + location.getWorld().getName() + "]", ChatUtil.ORANGE))))); p.closeInventory(); } else if (e.isRightClick()) { CoordsDeleteGUI.createCoordsDeleteGUI(p, waypointName, stack); diff --git a/src/main/java/de/fanta/challenges/listeners/ContainerListener.java b/src/main/java/de/fanta/challenges/listeners/ContainerListener.java index c72f270..5e1fe16 100644 --- a/src/main/java/de/fanta/challenges/listeners/ContainerListener.java +++ b/src/main/java/de/fanta/challenges/listeners/ContainerListener.java @@ -5,6 +5,7 @@ import de.fanta.challenges.teams.TeamUtils; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.block.BlockState; @@ -75,7 +76,7 @@ if (valueOptional.isPresent()) { UUID uuid = UUID.fromString(valueOptional.get().asString()); if (!e.getPlayer().getUniqueId().equals(uuid)) { - ChatUtil.sendNormalMessage(e.getPlayer(), "Diese/r " + new ItemStack(container.getType()).getI18NDisplayName() + " gehört: " + Bukkit.getOfflinePlayer(uuid).getName()); + ChatUtil.sendMessage(e.getPlayer(), Component.text("Diese/r ", ChatUtil.GREEN).append(Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" gehört: ", ChatUtil.GREEN).append(Component.text(plugin.getPlayerUUIDCache().getPlayer(uuid).getName(), ChatUtil.GREEN))))); e.setCancelled(true); return; } @@ -83,18 +84,18 @@ if (unlockList.contains(e.getPlayer().getUniqueId())) { container.removeMetadata(META_PLACED_BY_PLAYER, plugin); unlockList.remove(e.getPlayer().getUniqueId()); - ChatUtil.sendNormalMessage(e.getPlayer(), new ItemStack(container.getType()).getI18NDisplayName() + " entsichert."); + ChatUtil.sendMessage(e.getPlayer(), Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" entsichert.", ChatUtil.GREEN))); return; } - ChatUtil.sendNormalMessage(e.getPlayer(), "Diese/r " + new ItemStack(container.getType()).getI18NDisplayName() + " gehört: " + Bukkit.getOfflinePlayer(uuid).getName()); + ChatUtil.sendMessage(e.getPlayer(), Component.text("Diese/r ", ChatUtil.GREEN).append(Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" gehört: " + plugin.getPlayerUUIDCache().getPlayer(uuid).getName(), ChatUtil.GREEN)))); } } else if (state instanceof Container container && container.hasMetadata(META_PLACED_BY_TEAM)) { Optional valueOptional = container.getMetadata(META_PLACED_BY_TEAM).stream().filter(metadataValue -> metadataValue.getOwningPlugin().equals(plugin)).findFirst(); if (valueOptional.isPresent()) { ChallengeTeam team = TeamUtils.getTeam(valueOptional.get().asString()); if (TeamUtils.getPlayerTeam(e.getPlayer()) != team) { - ChatUtil.sendNormalMessage(e.getPlayer(), "Diese/r " + new ItemStack(container.getType()).getI18NDisplayName() + " gehört: Team " + team.getChatColor() + team.getName()); + ChatUtil.sendMessage(e.getPlayer(), Component.text("Diese/r ", ChatUtil.GREEN).append(Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" gehört: Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()))))); e.setCancelled(true); return; } @@ -102,11 +103,11 @@ if (unlockList.contains(e.getPlayer().getUniqueId())) { container.removeMetadata(META_PLACED_BY_TEAM, plugin); unlockList.remove(e.getPlayer().getUniqueId()); - ChatUtil.sendNormalMessage(e.getPlayer(), new ItemStack(container.getType()).getI18NDisplayName() + " entsichert."); + ChatUtil.sendMessage(e.getPlayer(), Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" entsichert.", ChatUtil.GREEN))); return; } - ChatUtil.sendNormalMessage(e.getPlayer(), "Diese/r " + new ItemStack(container.getType()).getI18NDisplayName() + " gehört: Team " + team.getChatColor() + team.getName()); + ChatUtil.sendMessage(e.getPlayer(), Component.text("Diese/r ", ChatUtil.GREEN).append(Component.translatable(container.getType().translationKey(), ChatUtil.GREEN).append(Component.text(" gehört: Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()))))); } } } diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index 46a4f42..8217009 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -5,7 +5,6 @@ import de.fanta.challenges.utils.Config; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.format.TextColor; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -38,7 +37,7 @@ } if (!Config.getBoolean("respawn")) { Player editor = plugin.getCurrentEditor(); - ChatUtil.sendNormalMessage(editor, "Benutze " + ChatUtil.BLUE + "/revive " + e.getEntity().getName() + " [world] [x] [y] [z] " + ChatUtil.GREEN + "um ihn wiederzubeleben!"); + ChatUtil.sendMessage(editor, Component.text("Benutze ", ChatUtil.GREEN).append(Component.text("/revive " + e.getEntity().getName() + " [world] [x] [y] [z] ", ChatUtil.BLUE).append(Component.text("um ihn wiederzubeleben!", ChatUtil.GREEN)))); } } } diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index 6a2904a..f45c408 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -39,7 +39,7 @@ } if (!plugin.getVanish().isVanish(p)) { - e.joinMessage(p.name().color(ChatUtil.BLUE).append(Component.text( " hat die Lobby betreten! ", ChatUtil.GREEN).append(Component.text("[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]", ChatUtil.YELLOW)))); + e.joinMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat die Lobby betreten! ", ChatUtil.GREEN).append(Component.text("[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]", ChatUtil.YELLOW)))); plugin.addstatisticPlayers(p.getUniqueId()); if (plugin.getServerType() != ServerType.ADVENTURE) { if (!DeathrunChallengeEvent.getDeadPlayer().contains(p.getUniqueId())) { @@ -64,7 +64,7 @@ } }, 1L); } else { - ChatUtil.sendNormalMessage(p, ChatUtil.BLUE + plugin.getCurrentEditor().getName() + ChatUtil.GREEN + " ist der Editor dieser Lobby!"); + ChatUtil.sendMessage(p, plugin.getCurrentEditor().name().color(ChatUtil.BLUE).append(Component.text(" ist der Editor dieser Lobby!", ChatUtil.GREEN))); } } else { ChatUtil.sendNormalMessage(p, "Du bist im Vanish, niemand weiß, dass du in der Lobby bist."); diff --git a/src/main/java/de/fanta/challenges/teams/TeamListener.java b/src/main/java/de/fanta/challenges/teams/TeamListener.java index cbe4625..10e7fb5 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamListener.java +++ b/src/main/java/de/fanta/challenges/teams/TeamListener.java @@ -5,7 +5,6 @@ import de.fanta.challenges.guis.eventgui.TeamSelectGUI; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/de/fanta/challenges/teams/TeamUtils.java b/src/main/java/de/fanta/challenges/teams/TeamUtils.java index 0f86589..b3c2432 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamUtils.java +++ b/src/main/java/de/fanta/challenges/teams/TeamUtils.java @@ -124,7 +124,7 @@ public static ItemStack selctItem() { ItemStack stack = new ItemStack(Material.LIME_BED); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(ChatUtil.GREEN + "Team Auswahl"); + meta.displayName(Component.text("Team Auswahl", ChatUtil.GREEN)); meta.getPersistentDataContainer().set(selectKey, PersistentDataType.STRING, "SelectTool"); stack.setItemMeta(meta); @@ -173,7 +173,7 @@ scoreboard = currentScore; if (teamscoreboardObjective == null) { teamscoreboardObjective = scoreboard.registerNewObjective("teams", "dummy", "Event"); - teamscoreboardObjective.setDisplayName("Event"); + teamscoreboardObjective.displayName(Component.text("Event")); teamscoreboardObjective.setDisplaySlot(DisplaySlot.SIDEBAR); } Team[] scoreboardTeams = new Team[teams.length]; @@ -199,23 +199,22 @@ return; } if (team != null && oldteam == team) { - ChatUtil.sendNormalMessage(player, "Du bist bereits in Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + "."); + ChatUtil.sendMessage(player, Component.text("Du bist bereits in Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()).append(Component.text(".", ChatUtil.GREEN)))); if (Challenges.getPlugin().getSBManager().getScoreboard() instanceof Scoreboard scoreboard) { Team scoreboardteam = scoreboard.getTeam(team.getName()); if (scoreboardteam != null && !scoreboardteam.getEntries().contains(player)) { scoreboardteam.addPlayer(player); } } - return; } int count = Collections.frequency(new ArrayList<>(playerTeams.values()), team); if (team != null && count >= teamSize) { - ChatUtil.sendNormalMessage(player, "Das Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " ist voll."); + ChatUtil.sendMessage(player, Component.text("Das Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()).append(Component.text(" ist voll.", ChatUtil.GREEN)))); return; } playerTeams.put(player.getUniqueId(), team); - ChatUtil.sendNormalMessage(player, "Du bist nun in Team " + team.getChatColor() + team.getName()); + ChatUtil.sendMessage(player, Component.text("Du bist nun in Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()))); if (oldteam != null) { scoreboard.getTeam(oldteam.getName()).removePlayer(player); diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index 843da57..f722a2d 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -1,20 +1,16 @@ package de.fanta.challenges.utils; import de.fanta.challenges.Challenges; -import de.iani.cubesideutils.bukkit.ChatUtilBukkit; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.title.Title; import net.kyori.adventure.util.Ticks; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import javax.annotation.Nullable; -import java.time.Duration; public class ChatUtil { diff --git a/src/main/java/de/fanta/challenges/utils/ItemUtils.java b/src/main/java/de/fanta/challenges/utils/ItemUtils.java index 79ad64b..f8c059a 100644 --- a/src/main/java/de/fanta/challenges/utils/ItemUtils.java +++ b/src/main/java/de/fanta/challenges/utils/ItemUtils.java @@ -27,15 +27,14 @@ name = name.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE); } - Collection tempLore = new ArrayList<>(); - for (Component component : lore) { + for (int i = 0; i < lore.length; i++) { + Component component = lore[i]; if (!component.style().hasDecoration(TextDecoration.ITALIC)) { component = component.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE); } - tempLore.add(component); + lore[i] = component; } - - + ItemBuilder builder = ItemBuilder.fromMaterial(material).displayName(name).lore(lore); if (glowing) { builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS);