diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 5a6c12c..e66a313 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -29,7 +29,6 @@ import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.translation.TranslationRegistry; import org.apache.commons.io.FileUtils; import org.bukkit.BanList; @@ -75,7 +74,7 @@ public boolean reset = false; private String PREFIX; private TextComponent prefixComponent; - private String GUIPREFIX; + private TextComponent guiPrefix; private File backpackConfigFile; private FileConfiguration BackpackConfig; private File AllItemsConfigFile; @@ -160,8 +159,8 @@ String prefix = serverType.getPrefix(); PREFIX = ChatUtil.BLUE + "[" + ChatUtil.GREEN + prefix + ChatUtil.BLUE + "]"; - prefixComponent = Component.text("[").color(TextColor.color(ChatUtil.BLUE.getColor().getRGB())).append(Component.text(prefix).color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))).append(Component.text("] ").color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))); - GUIPREFIX = ChatUtil.GREEN + prefix; + prefixComponent = Component.text("[").color(ChatUtil.BLUE).append(Component.text(prefix).color(ChatUtil.GREEN)).append(Component.text("] ").color(ChatUtil.BLUE)); + guiPrefix = Component.text(prefix).color(ChatUtil.GREEN); createRndDropsConfig(); createAllItemsConfig(); @@ -431,7 +430,7 @@ ChatUtil.sendNormalMessage(currentEditor, "Du bist nun der Editor dieser Lobby!"); ChatUtil.sendNormalMessage(currentEditor, "Alle Befehle und Funktionen vom Challenge Plugin findest du in unserem Wiki."); ChatUtil.sendNormalMessage(currentEditor, "Hier Klicken --> https://wiki.cubeside.de/Challenge"); - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + currentEditor.getName() + ChatUtil.GREEN + " ist nun der Editor dieser Lobby!"); + ChatUtil.sendBrodcastMessage(Component.text(currentEditor.getName(), ChatUtil.BLUE).append(Component.text(" ist nun der Editor dieser Lobby!", ChatUtil.GREEN))); } } @@ -605,8 +604,8 @@ return prefixComponent; } - public String getGUIPREFIX() { - return GUIPREFIX; + public TextComponent getGuiPrefix() { + return guiPrefix; } public int getProtocolVersion() { diff --git a/src/main/java/de/fanta/challenges/Timer.java b/src/main/java/de/fanta/challenges/Timer.java index 7ec507d..29357e5 100644 --- a/src/main/java/de/fanta/challenges/Timer.java +++ b/src/main/java/de/fanta/challenges/Timer.java @@ -6,13 +6,21 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.SaveWorldUtils; import de.iani.cubesideutils.StringUtil; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextColor; +import net.kyori.adventure.text.format.TextDecoration; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.GameMode; +import org.bukkit.World; import org.bukkit.entity.Creature; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; +import org.bukkit.entity.Wolf; + +import java.util.Optional; public class Timer { @@ -48,14 +56,17 @@ for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } - ChatUtil.sendTitleToAll("Event", "Die Zeit ist abgelaufen!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Die Zeit ist abgelaufen!", ChatUtil.GREEN)); } else { for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); - p.sendTitle(ChatUtil.RED + "ZEIT ABGELAUFEN!", ChatUtil.RED + "Challenge fehlgeschlagen", 10, 60, 10); } - ChatUtil.sendBrodcastMessage(ChatUtil.RED + "Die Zeit ist abgelaufen und die Challenge somit fehlgeschlagen!"); - ChatUtil.sendBrodcastMessage("Seed: " + ChatUtil.BLUE + Bukkit.getWorlds().get(0).getSeed()); + ChatUtil.sendTitleToAll(Component.text("ZEIT ABGELAUFEN!", ChatUtil.RED), Component.text("Challenge fehlgeschlagen", ChatUtil.RED)); + + ChatUtil.sendBrodcastMessage(Component.text("Die Zeit ist abgelaufen und die Challenge somit fehlgeschlagen!", ChatUtil.RED)); + Optional optionalWorld = Bukkit.getWorlds().stream().findFirst(); + optionalWorld.ifPresent(world -> ChatUtil.sendBrodcastMessage(Component.text("Seed: ", ChatUtil.GREEN).append(Component.text(world.getSeed(), ChatUtil.BLUE)))); + } stopTimer(); } else { @@ -99,7 +110,7 @@ idleActionBarTaskId = plugin.getScheduler().runGlobalAtFixedRate(() -> { for (Player p : Bukkit.getOnlinePlayers()) { if (!plugin.getVanish().isVanish(p)) { - sendFormatedTimerActionBarToPlayer(p, ChatUtil.RED + "" + ChatColor.BOLD + "Der Timer ist pausiert."); + sendFormatedTimerActionBarToPlayer(p, Component.text("Der Timer ist pausiert.", Style.style(ChatUtil.RED, TextDecoration.BOLD))); if (p.getGameMode() != GameMode.SPECTATOR) { p.getWorld().playEffect(p.getLocation(), Effect.ENDER_SIGNAL, 2); } @@ -120,27 +131,27 @@ } } - private void sendFormatedTimerActionBarToPlayer(Player player, String text) { - player.sendActionBar(text + (SaveWorldUtils.isCopyWorld ? ChatUtil.GREEN + " Save: " + SaveWorldUtils.getProgressBar(SaveWorldUtils.progress) : "")); + private void sendFormatedTimerActionBarToPlayer(Player player, Component text) { + player.sendActionBar(text.append(SaveWorldUtils.isCopyWorld ? Component.text(" Save: ", ChatUtil.GREEN).append(SaveWorldUtils.getProgressBar(SaveWorldUtils.progress)) : Component.empty())); } - public String formatTime(ChatColor color) { - return color + formatTime(); + public Component formatTime(TextColor color) { + return Component.text(formatTime()).color(color); } public String formatTime() { - String formattime = StringUtil.formatTimespan((time / 1000) * 1000, " Tage, ", ":", "", "", "", ":", false, true); - if (formattime.startsWith("1 Tage")) { + String formatTime = StringUtil.formatTimespan((time / 1000) * 1000, " Tage, ", ":", "", "", "", ":", false, true); + if (formatTime.startsWith("1 Tage")) { return StringUtil.formatTimespan((time / 1000) * 1000, " Tag, ", ":", "", "", "", ":", false, true); } - return formattime; + return formatTime; } - public String formateRainbowTime() { + public Component formateRainbowTime() { return formateRainbowTime(false); } - public String formateRainbowTime(boolean speedRun) { + public Component formateRainbowTime(boolean speedRun) { return plugin.getColorUtils().addChatColorToString((speedRun ? "SpeedRun " : "") + formatTime(), mode == TimerMode.UP ? baseColorsTimer : baseColorsReserveTimer, 1.5); } diff --git a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java index 9f44af2..ff50ee8 100644 --- a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.CubesideModUtils; import de.iani.cubesideutils.StringUtil; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; @@ -86,7 +87,7 @@ bossBar.setProgress(progress); } else { bossBar.setTitle(ChatUtil.GREEN + "Alle Items gesammelt!"); - ChatUtil.sendBrodcastMessage("Alle Items gesammelt!"); + ChatUtil.sendBrodcastMessage(Component.text("Alle Items gesammelt!", ChatUtil.GREEN)); Challenges.getPlugin().getTimer().stopTimer(); for (Player pl : Bukkit.getOnlinePlayers()) { pl.playSound(pl.getLocation(), Sound.UI_TOAST_CHALLENGE_COMPLETE, 0.2f, 1); @@ -109,11 +110,11 @@ item = itemsToSearch.get(r.nextInt((itemsToSearch.size() - 1) + 1)); Config.setValue("allitemscurrentitem", new ItemStack(item)); if (skipped) { - ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(old.toString(), true) + ChatUtil.GREEN + " wurde von " + p.getName() + " übersprungen."); + ChatUtil.sendBrodcastMessage(Component.text("Item: ", ChatUtil.GREEN).append(Component.translatable(old.translationKey(), ChatUtil.BLUE).append(Component.text(" wurde von " + p.getName() + " übersprungen.", ChatUtil.GREEN)))); } else { - ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(old.toString(), true) + ChatUtil.GREEN + " wurde von " + p.getName() + " Registriert."); + ChatUtil.sendBrodcastMessage(Component.text("Item: ", ChatUtil.GREEN).append(Component.translatable(old.translationKey(), ChatUtil.BLUE).append(Component.text(" wurde von " + p.getName() + " Registriert.", ChatUtil.GREEN)))); } - ChatUtil.sendBrodcastMessage("Neues Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(item.toString(), true) + ChatUtil.GREEN + " (Es fehlen noch " + ChatUtil.BLUE + (itemcount - foundItems.size()) + ChatUtil.GREEN + " Items)"); + ChatUtil.sendBrodcastMessage(Component.text("Neues Item: " , ChatUtil.GREEN).append(Component.translatable(item.translationKey(), ChatUtil.BLUE).append(Component.text(" (Es fehlen noch ", ChatUtil.GREEN).append(Component.text((itemcount - foundItems.size()), ChatUtil.BLUE).append(Component.text(" Items)", ChatUtil.GREEN)))))); for (Player pp : Bukkit.getOnlinePlayers()) { pp.playSound(pp.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1, 1); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, pp, 50, ChatUtil.GREEN); 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 7d1bbb7..c6cf0cf 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java @@ -10,6 +10,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.Material; @@ -231,7 +232,7 @@ if (plugin.getScoreManager().getScore(new ChallengePlayer(player.getUniqueId())) == materials.size()) { plugin.getTimer().stopTimer(); - ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); + ChatUtil.sendTitleToAll(Component.text("Event"), player.name().color(ChatUtil.GREEN).append(Component.text(" hat alle Items gefunden!", ChatUtil.BLUE))); String[] lines = {"", "", "", " " + ChatUtil.BLUE + player.getName(), ChatUtil.GREEN + " hat alle Items gefunden!", "", "", ""}; ChatSkull.sendAll(player, lines); for (Player pp : Bukkit.getOnlinePlayers()) { @@ -266,7 +267,7 @@ } eventend = true; plugin.getTimer().stopTimer(); - ChatUtil.sendTitleToAll("Event", ChatUtil.GREEN + "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()).append(Component.text(" hat alle Items gefunden!", ChatUtil.GREEN)))); for (OfflinePlayer offlinePlayer : TeamUtils.getPlayersInTeam(team)) { if (offlinePlayer instanceof Player onPlayer) { String[] lines = {"", "", "", " " + ChatUtil.BLUE + onPlayer.getName(), ChatUtil.GREEN + " hat alle Items gefunden!", "", "", ""}; diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java index c2bf40e..208429f 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java @@ -10,6 +10,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.world.EmptyChunkGenerator; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; @@ -93,7 +94,7 @@ String[] lines = {"", "", "", " " + ChatUtil.BLUE + p.getName() + "'s", ChatUtil.GREEN + " Brücke ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke lang", ChatUtil.GREEN + " und hat damit gewonnen!", "", ""}; ChatSkull.sendAll((Player) p, lines); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + scorable.getName() + "'s" + ChatUtil.GREEN + " Brücke ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke lang und hat damit gewonnen!", ChatUtil.BLUE); + ChatUtil.sendBrodcastMessage(Component.text(scorable.getName() + "'s", ChatUtil.BLUE).append(Component.text(" Brücke ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke lang und hat damit gewonnen!", 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 3e6ecea..be6c8f0 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java @@ -10,6 +10,9 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.CoordsTargeter; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextDecoration; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Difficulty; @@ -84,7 +87,7 @@ int BARRIER_POS = 15; int BARRIER_SIZE = 6; if (distanceToCenter >= BARRIER_POS) { //Outside border - ChatUtil.sendTitleToPlayer(p, "" + ChatUtil.RED + ChatColor.BOLD + "⟲ ⟲ ⟲ ⟲", "Kehre zurück auf die Strecke!", ChatUtil.RED, 0, 20, 0, true); + ChatUtil.sendTitleToPlayer(p, Component.text("⟲ ⟲ ⟲ ⟲", Style.style(ChatUtil.RED, TextDecoration.BOLD)), Component.text("Kehre zurück auf die Strecke!", ChatUtil.RED), 0, 20, 0, true); resetBarrier(p, world, barrierLocations); CoordsTargeter.addLocation(p.getUniqueId(), new Location(p.getWorld(), p.getLocation().getX(), p.getLocation().getY(), spawnLocation.getZ())); if (distanceToCenter >= BARRIER_POS + 3) { @@ -138,7 +141,7 @@ plugin.getSBManager().removeScoreboard(p); if (plugin.getSBManager().countScoreboardPlayers() == 0) { plugin.getTimer().stopTimer(); - ChatUtil.sendBrodcastMessage("Das Event wurde beendet, da alle Spieler gestorben sind!"); + ChatUtil.sendBrodcastMessage(Component.text("Das Event wurde beendet, da alle Spieler gestorben sind!", ChatUtil.GREEN)); } } } @@ -172,7 +175,7 @@ String[] lines = {"", "", "", " " + ChatUtil.BLUE + p.getName(), ChatUtil.GREEN + " ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke gelaufen und", ChatUtil.GREEN + " hat damit gewonnen!", "", ""}; ChatSkull.sendAll((Player) p, lines); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + scorable.getName() + ChatUtil.GREEN + " ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke gelaufen und hat damit gewonnen!", ChatUtil.BLUE); + ChatUtil.sendBrodcastMessage(Component.text(scorable.getName(), ChatUtil.BLUE).append(Component.text(" ist " + plugin.getScoreManager().getScore(scorable) + " Blöcke gelaufen und hat damit gewonnen!", ChatUtil.GREEN))); } } } else { diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java index 74b6c1f..80cf6d8 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java @@ -9,6 +9,7 @@ import de.fanta.challenges.utils.ChatSkullAPI.ChatSkull; 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.GameMode; import org.bukkit.Material; @@ -82,16 +83,16 @@ String[] lines = {"", "", "", " " + ChatUtil.BLUE + p.getName(), ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Punkte und", ChatUtil.GREEN + " hat damit gewonnen!", "", ""}; ChatSkull.sendAll((Player) p, lines); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + scorable.getName() + ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Punkte und hat damit gewonnen!", ChatUtil.BLUE); + ChatUtil.sendBrodcastMessage(Component.text(scorable.getName(), ChatUtil.BLUE).append(Component.text(" hat " + plugin.getScoreManager().getScore(scorable) + " Punkte und hat damit gewonnen!", ChatUtil.GREEN))); } - ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN)); } } else { for (Scorable scorable : plugin.getScoreManager().getByPositon(1)) { ChallengeTeam team = TeamUtils.getTeam(scorable.getName()); if (team != null) { - ChatUtil.sendTitleToAll("Event", "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Team ", ChatUtil.GREEN).append(Component.text(team.getName(), team.getChatColor()).append(Component.text(" gewinnt mit ", ChatUtil.GREEN).append(Component.text(plugin.getScoreManager().getScore(scorable), ChatUtil.BLUE).append(Component.text(" Punkten", ChatUtil.GREEN)))))); String[] lines = {"", "", "", " " + ChatUtil.BLUE + "Team " + team.getChatColor() + team.getName(), ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Punkte und", ChatUtil.GREEN + " hat damit gewonnen!", "", ""}; for (OfflinePlayer pp : TeamUtils.getPlayersInTeam(team)) if (pp.isOnline()) { @@ -113,7 +114,7 @@ } else { plugin.getScoreManager().updateScore(TeamUtils.getPlayerTeam(e.getPlayer()), blocklist.get(e.getBlock().getType())); } - ChatUtil.sendTitleToPlayer(e.getPlayer(), "", ChatUtil.BLUE + new ItemStack(e.getBlock().getType()).getI18NDisplayName() + ChatUtil.GREEN + " +" + blocklist.get(e.getBlock().getType()), ChatUtil.GREEN, 3, 20, 3, false); + ChatUtil.sendTitleToPlayer(e.getPlayer(), Component.empty(), Component.translatable(e.getBlock().getType().translationKey(), ChatUtil.BLUE).append(Component.text(" +" + blocklist.get(e.getBlock().getType()), ChatUtil.GREEN)), 3, 20, 3, false); } } } @@ -127,7 +128,7 @@ } else { plugin.getScoreManager().updateScore(TeamUtils.getPlayerTeam(e.getPlayer()), -blocklist.get(e.getBlock().getType())); } - ChatUtil.sendTitleToPlayer(e.getPlayer(), "", ChatUtil.BLUE + new ItemStack(e.getBlock().getType()).getI18NDisplayName() + ChatUtil.RED + " -" + blocklist.get(e.getBlock().getType()), ChatUtil.GREEN, 3, 20, 3, false); + ChatUtil.sendTitleToPlayer(e.getPlayer(), Component.empty(), Component.translatable(e.getBlock().getType().translationKey(), ChatUtil.BLUE).append(Component.text(" -" + blocklist.get(e.getBlock().getType()), ChatUtil.RED)), 3, 20, 3, false); } } } 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 da5af98..f2f8f98 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 @@ -183,7 +183,7 @@ String[] lines = {"", "", "", " " + ChatUtil.BLUE + p.getName(), ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Aufgaben erledigt", ChatUtil.GREEN + " und hat damit gewonnen!", "", ""}; ChatSkull.sendAll((Player) p, lines); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + scorable.getName() + ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Aufgaben erledigt und hat damit gewonnen!", ChatUtil.BLUE); + ChatUtil.sendBrodcastMessage(Component.text(scorable.getName(), ChatUtil.BLUE).append(Component.text(" hat ", ChatUtil.GREEN).append(Component.text(plugin.getScoreManager().getScore(scorable), ChatUtil.BLUE).append(Component.text(" Aufgaben erledigt und hat damit gewonnen!", ChatUtil.GREEN))))); } } @@ -508,9 +508,7 @@ meta = stack.getItemMeta(); } - if (stackInHand != null) { - metaInHand = stackInHand.getItemMeta(); - } + metaInHand = stackInHand.getItemMeta(); if (e.getClick() == ClickType.NUMBER_KEY) { int slot = e.getHotbarButton(); @@ -529,7 +527,8 @@ if (meta != null && meta.getPersistentDataContainer().has(skipKey) || metaInHand != null && metaInHand.getPersistentDataContainer().has(skipKey)) { switch (e.getAction()) { - case NOTHING, PICKUP_ALL, PICKUP_HALF, PICKUP_ONE, PICKUP_SOME, PLACE_ALL, PLACE_ONE, PLACE_SOME, SWAP_WITH_CURSOR, COLLECT_TO_CURSOR, HOTBAR_SWAP -> { + case NOTHING, PICKUP_ALL, PICKUP_HALF, PICKUP_ONE, PICKUP_SOME, PLACE_ALL, PLACE_ONE, PLACE_SOME, + SWAP_WITH_CURSOR, COLLECT_TO_CURSOR, HOTBAR_SWAP -> { if (e.getClickedInventory() != player.getInventory()) { e.setCancelled(true); } @@ -839,8 +838,8 @@ ArrayList itemList = playerMaterials.get(player.getUniqueId()); itemList.remove(pickupItem); playerMaterials.put(player.getUniqueId(), itemList); - TextComponent textComponent = Component.text("Item: ").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB())).append(Component.translatable(pickupItem.translationKey()).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))).append(Component.text(" wurde Registriert").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))); - ChatUtil.sendComponentMessage(player, textComponent); + TextComponent textComponent = Component.text("Item: ").color(ChatUtil.GREEN).append(Component.translatable(pickupItem.translationKey()).color(ChatUtil.BLUE)).append(Component.text(" wurde Registriert").color(ChatUtil.GREEN)); + ChatUtil.sendMessage(player, textComponent); finishQuest(player); return true; } @@ -854,8 +853,8 @@ ArrayList biomeList = playerBiomes.get(player.getUniqueId()); biomeList.remove(biome); playerBiomes.put(player.getUniqueId(), biomeList); - TextComponent textComponent = Component.text("Biom: ").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB())).append(Component.translatable(biome.translationKey()).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))).append(Component.text(" wurde Registriert").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))); - ChatUtil.sendComponentMessage(player, textComponent); + TextComponent textComponent = Component.text("Biom: ").color(ChatUtil.GREEN).append(Component.translatable(biome.translationKey()).color(ChatUtil.BLUE)).append(Component.text(" wurde Registriert").color(ChatUtil.GREEN)); + ChatUtil.sendMessage(player, textComponent); finishQuest(player); } } @@ -867,8 +866,8 @@ ArrayList entityTypeList = playerEntityTypes.get(player.getUniqueId()); entityTypeList.remove(entityType); playerEntityTypes.put(player.getUniqueId(), entityTypeList); - TextComponent textComponent = Component.text("Mob: ").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB())).append(Component.translatable(entityType.translationKey()).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))).append(Component.text(" wurde Registriert").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))); - ChatUtil.sendComponentMessage(player, textComponent); + TextComponent textComponent = Component.text("Mob: ").color(ChatUtil.GREEN).append(Component.translatable(entityType.translationKey()).color(ChatUtil.BLUE)).append(Component.text(" wurde Registriert").color(ChatUtil.GREEN)); + ChatUtil.sendMessage(player, textComponent); finishQuest(player); } } @@ -880,8 +879,8 @@ ArrayList potionEffectTypeList = playerPotionEffectTypes.get(player.getUniqueId()); potionEffectTypeList.remove(potionEffectType); playerPotionEffectTypes.put(player.getUniqueId(), potionEffectTypeList); - TextComponent textComponent = Component.text("Effect: ").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB())).append(Component.translatable(potionEffectType.translationKey()).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))).append(Component.text(" wurde Registriert").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))); - ChatUtil.sendComponentMessage(player, textComponent); + TextComponent textComponent = Component.text("Effect: ").color(ChatUtil.GREEN).append(Component.translatable(potionEffectType.translationKey()).color(ChatUtil.BLUE)).append(Component.text(" wurde Registriert").color(ChatUtil.GREEN)); + ChatUtil.sendMessage(player, textComponent); finishQuest(player); } } @@ -922,7 +921,7 @@ private static void updateBossBar() { ScoreManager scoreManager = plugin.getScoreManager(); for (Player player : plugin.getVanish().getPlayerListWithoutVanishPlayers()) { - TextComponent bossBarTitle = Component.text("Es ist ein Fehler aufgetreten :(").color(TextColor.color(ChatUtil.RED.getColor().getRGB())).decoration(TextDecoration.ITALIC, false); + TextComponent bossBarTitle = Component.text("Es ist ein Fehler aufgetreten :(").color(ChatUtil.RED).decoration(TextDecoration.ITALIC, false); QuestType questType = playerQuest.get(player.getUniqueId()); switch (questType) { case ForceItem -> { @@ -986,7 +985,7 @@ } private static TextComponent getBossBarTitle(String title, TranslatableComponent name, int pos) { - return Component.text(title).color(TextColor.color(ChatUtil.GREEN.getColor().getRGB())).append(name.color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))).append(Component.text(" << | Position: ").color(TextColor.color(ChatUtil.GREEN.getColor().getRGB()))).append(Component.text(pos).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB()))); + return Component.text(title).color(ChatUtil.GREEN).append(name.color(ChatUtil.BLUE).append(Component.text(" << | Position: ").color(ChatUtil.GREEN)).append(Component.text(pos).color(ChatUtil.BLUE))); } public void removeArmorStand(Player player) { @@ -1011,11 +1010,11 @@ public ItemStack createSkipItem() { ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, skipQuestCount); ItemMeta meta = stack.getItemMeta(); - List lorelist = new ArrayList<>(); - meta.setDisplayName(ChatUtil.GREEN + "Skip Quest"); + List lorelist = new ArrayList<>(); + meta.displayName(Component.text("Skip Quest", ChatUtil.GREEN)); meta.getPersistentDataContainer().set(skipKey, PersistentDataType.STRING, "SkipQuest"); - lorelist.add(ChatUtil.GREEN + "Rechtsklick um die Aktuelle Quest zu Skippen."); - meta.setLore(lorelist); + lorelist.add(Component.text("Rechtsklick um die Aktuelle Quest zu Skippen.", ChatUtil.GREEN)); + meta.lore(lorelist); meta.addEnchant(Enchantment.VANISHING_CURSE, 1, true); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); stack.setItemMeta(meta); @@ -1042,7 +1041,7 @@ public static final int INVENTORY_SIZE = 5; public AcceptGUI(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Skip Quest?")); + super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> Skip Quest?")))); } @Override @@ -1066,8 +1065,8 @@ Material playerItem = itemByPlayerList.get(player.getUniqueId()); List stackList = new ArrayList<>(); stackList.add(new ItemStack(playerItem)); - Collection droplist = player.getInventory().addItem(stackList.toArray(new ItemStack[0])).values(); - for (ItemStack itemStack : droplist) { + Collection dropList = player.getInventory().addItem(stackList.toArray(new ItemStack[0])).values(); + for (ItemStack itemStack : dropList) { player.getLocation().getWorld().dropItem(player.getLocation(), itemStack); } selectItem(player, playerItem); @@ -1111,8 +1110,9 @@ ItemStack item; switch (i) { case YES_INDEX -> - item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, ChatUtil.GREEN + "Ja", true); - case NO_INDEX -> item = ItemUtils.createGuiItem(Material.RED_CONCRETE, ChatUtil.RED + "Nein", true); + item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", ChatUtil.GREEN), true); + case NO_INDEX -> + item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", ChatUtil.RED), true); default -> item = ItemUtils.EMPTY_ICON; } diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeGoals.java b/src/main/java/de/fanta/challenges/challenges/ChallengeGoals.java index 02d7066..fb8d2f4 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeGoals.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeGoals.java @@ -5,6 +5,11 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.StringUtil; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.event.ClickEvent; +import net.kyori.adventure.text.event.HoverEvent; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextDecoration; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.entity.EntityType; @@ -24,17 +29,17 @@ EntityType entityType = EntityType.valueOf(Config.getString("goal").toUpperCase()); if (e.getEntity().getType() == entityType) { plugin.getTimer().stopTimer(); - ChatUtil.sendBrodcastMessage(String.valueOf(ChatUtil.GREEN) + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); - ChatUtil.sendBrodcastMessage(""); - ChatUtil.sendBrodcastMessage(""); - ChatUtil.sendBrodcastMessage(""); - if (e.getEntity().getCustomName() != null) { - ChatUtil.sendBrodcastMessage(ChatUtil.ORANGE + " >> " + ChatUtil.BLUE + ChatColor.BOLD + e.getEntity().getCustomName() + ChatUtil.GREEN + " wurde besiegt."); + ChatUtil.sendBrodcastMessage(Component.text("ABCDEFGHIJKLMNOPQRSTUVWXYZ", Style.style(ChatUtil.GREEN, TextDecoration.BOLD, TextDecoration.OBFUSCATED))); + ChatUtil.sendBrodcastMessage(Component.empty()); + ChatUtil.sendBrodcastMessage(Component.empty()); + ChatUtil.sendBrodcastMessage(Component.empty()); + if (e.getEntity().customName() != null) { + ChatUtil.sendBrodcastMessage(Component.text(" >> ", ChatUtil.ORANGE).append(e.getEntity().name().style(Style.style(ChatUtil.BLUE, TextDecoration.BOLD)).append(Component.text(" wurde besiegt.", ChatUtil.GREEN)))); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.ORANGE + " >> " + ChatUtil.GREEN + "Der " + ChatUtil.BLUE + ChatColor.BOLD + StringUtil.capitalizeFirstLetter(e.getEntity().getName().toLowerCase(), false) + ChatUtil.GREEN + " wurde besiegt."); + ChatUtil.sendBrodcastMessage(Component.text(" >> ", ChatUtil.ORANGE).append(Component.text("Der ", ChatUtil.GREEN).append(Component.translatable(e.getEntityType().translationKey(), Style.style(ChatUtil.BLUE, TextDecoration.BOLD)).append(Component.text(" wurde besiegt.", ChatUtil.GREEN))))); } - ChatUtil.sendBrodcastMessage(ChatUtil.ORANGE + " >> " + ChatUtil.GREEN + "Benötigte Zeit: " + plugin.getTimer().formatTime(ChatUtil.BLUE) + ChatUtil.GREEN + "!"); - ChatUtil.sendBrodcastMessage(ChatUtil.ORANGE + " >> " + ChatUtil.GREEN + "Seed: " + ChatUtil.BLUE + ChatColor.BOLD + Bukkit.getWorlds().get(0).getSeed()); + ChatUtil.sendBrodcastMessage(Component.text(" >> ", ChatUtil.ORANGE).append(Component.text("Benötigte Zeit: ", ChatUtil.GREEN).append(plugin.getTimer().formatTime(ChatUtil.BLUE).append(Component.text("!", ChatUtil.GREEN))))); + ChatUtil.sendBrodcastMessage(Component.text(" >> ", ChatUtil.ORANGE).append(Component.text("Seed: ", ChatUtil.GREEN).append(Component.text(Bukkit.getWorlds().get(0).getSeed(), Style.style(ChatUtil.BLUE, TextDecoration.BOLD)).hoverEvent(HoverEvent.showText(Component.text("Klicken zum Kopieren"))).clickEvent(ClickEvent.copyToClipboard(String.valueOf(Bukkit.getWorlds().get(0).getSeed())))))); if (e.getEntity().getType() == EntityType.ENDER_DRAGON) { if (!Config.getBoolean("editsettings")) { if (!Config.getBoolean("editsettings")) { @@ -42,15 +47,15 @@ return; } plugin.getStatistics().saveSpeedRun(); - ChatUtil.sendBrodcastMessage(ChatUtil.ORANGE + " >> " + ChatUtil.GREEN + "SpeedRun wurde gespeichert. Deine Zeit: " + plugin.getTimer().formatTime(ChatUtil.BLUE)); + ChatUtil.sendBrodcastMessage(Component.text(" >> ", ChatUtil.ORANGE).append(Component.text("SpeedRun wurde gespeichert. Deine Zeit: ", ChatUtil.GREEN).append(plugin.getTimer().formatTime(ChatUtil.BLUE)))); } } } - ChatUtil.sendBrodcastMessage(""); - ChatUtil.sendBrodcastMessage(""); - ChatUtil.sendBrodcastMessage(""); - ChatUtil.sendBrodcastMessage(String.valueOf(ChatUtil.GREEN) + ChatColor.BOLD + ChatColor.MAGIC + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + ChatUtil.sendBrodcastMessage(Component.empty()); + ChatUtil.sendBrodcastMessage(Component.empty()); + ChatUtil.sendBrodcastMessage(Component.empty()); + ChatUtil.sendBrodcastMessage(Component.text("ABCDEFGHIJKLMNOPQRSTUVWXYZ", Style.style(ChatUtil.GREEN, TextDecoration.BOLD, TextDecoration.OBFUSCATED))); } } } diff --git a/src/main/java/de/fanta/challenges/challenges/XPChallenge.java b/src/main/java/de/fanta/challenges/challenges/XPChallenge.java index 6ebece3..53ea29a 100644 --- a/src/main/java/de/fanta/challenges/challenges/XPChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/XPChallenge.java @@ -3,6 +3,7 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; +import net.kyori.adventure.text.Component; import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -19,7 +20,7 @@ if (plugin.getTimer().isRunning() && e.getPlayer().getGameMode() == GameMode.SURVIVAL && !plugin.getVanish().isVanish(p)) { if (Config.getBoolean("xpdeath")) { p.setHealth(0); - ChatUtil.sendBrodcastMessage(e.getPlayer().getName() + " hat XP eingesammelt!"); + ChatUtil.sendBrodcastMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat XP eingesammelt!", ChatUtil.RED))); } } } diff --git a/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java b/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java index 905ede8..861af40 100644 --- a/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java +++ b/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.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.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -57,7 +58,7 @@ } }, 1L); - ChatUtil.sendTitleToAll("Nether Challenge", "Nether-Modus aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Nether Challenge"), Component.text("Nether-Modus aktiviert", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Die Nether Challenge läuft bereits!"); return true; @@ -65,7 +66,7 @@ } else { if (Config.getBoolean("nether.enabled")) { Config.setValue("nether.enabled", false); - ChatUtil.sendTitleToAll("Nether Challenge", "Nether-Modus deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Nether Challenge"), Component.text("Nether-Modus deaktiviert", ChatUtil.RED)); } else { ChatUtil.sendErrorMessage(p, "Aktuell läuft keine Nether Challenge!"); return true; diff --git a/src/main/java/de/fanta/challenges/commands/ReviveCommand.java b/src/main/java/de/fanta/challenges/commands/ReviveCommand.java index 4e11fb8..3ab3762 100644 --- a/src/main/java/de/fanta/challenges/commands/ReviveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/ReviveCommand.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.GameMode; import org.bukkit.OfflinePlayer; @@ -36,14 +37,14 @@ p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); p.setGameMode(GameMode.SURVIVAL); } - ChatUtil.sendBrodcastMessage("Alle Spieler wurden wiederbelebt! Es kann weiter gehen!"); + ChatUtil.sendBrodcastMessage(Component.text("Alle Spieler wurden wiederbelebt! Es kann weiter gehen!", ChatUtil.GREEN)); } else { OfflinePlayer other = (Bukkit.getServer().getOfflinePlayer(next)); if (other.isOnline()) { Player p = (Player) other; p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); p.setGameMode(GameMode.SURVIVAL); - ChatUtil.sendBrodcastMessage(p.getName() + " wurde von " + sender.getName() + " wiederbelebt!"); + ChatUtil.sendBrodcastMessage(p.name().append(Component.text(" wurde von ").append(sender.name()).append(Component.text(" wiederbelebt!"))).color(ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); } 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 5959105..7997beb 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java @@ -3,6 +3,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; @@ -19,7 +20,7 @@ int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + sender.getName() + ChatUtil.GREEN + " ist bei " + ChatUtil.ORANGE + x + "/" + y + "/" + z + " " + ChatUtil.ORANGE + w); + ChatUtil.sendBrodcastMessage(player.name().color(ChatUtil.BLUE).append(Component.text(" ist bei ", ChatUtil.GREEN).append(Component.text(x + "/" + y + "/" + z + " " + w, ChatUtil.ORANGE)))); 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 9530b09..426e526 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.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; @@ -33,7 +34,7 @@ return true; } else if (!plugin.isEditor(player)) { plugin.setCurrentEditor(player); - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " wurde von " + ChatUtil.BLUE + sender.getName() + ChatUtil.GREEN + " zum Editor ernannt"); + ChatUtil.sendBrodcastMessage(player.name().color(ChatUtil.BLUE).append(Component.text(" wurde von ", ChatUtil.GREEN).append(sender.name().color(ChatUtil.BLUE).append(Component.text(" zum Editor ernannt", ChatUtil.GREEN))))); 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/event/EventStartCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java index 728d8ef..7f02a9a 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java @@ -9,6 +9,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.OfflinePlayer; import org.bukkit.command.Command; @@ -36,7 +37,7 @@ plugin.getScheduler().runGlobalAtFixedRate(task -> { int j = i.decrementAndGet(); - ChatUtil.sendTitleToAll("Event", j > 0 ? "" + j : "Go", ChatUtil.BLUE); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text(j > 0 ? "" + j : "Go", ChatUtil.BLUE)); if (j <= 0) { task.cancel(); diff --git a/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java index 5720294..90e0b1c 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java @@ -7,6 +7,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; @@ -33,7 +34,7 @@ if (!Config.getBoolean("event.enabled")) { Config.setValue("event.enabled", true); Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(true)); - ChatUtil.sendTitleToAll("Event", "Event-Modus aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Event-Modus aktiviert", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Das Event läuft bereits!"); return true; @@ -44,7 +45,7 @@ Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); Bukkit.getPluginManager().callEvent(new ChallengeEventStatusChangedEvent(false)); plugin.getTimer().stopTimer(); - ChatUtil.sendTitleToAll("Event", "Event-Modus deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Event-Modus deaktiviert", ChatUtil.RED)); } else { ChatUtil.sendErrorMessage(p, "Aktuell läuft kein Event!"); 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 b409896..73514cc 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.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.GameRule; import org.bukkit.World; @@ -31,7 +32,7 @@ if (plugin.getTimer().isRunning()) { plugin.setDayLightCircle(false); plugin.getTimer().stopTimer(); - ChatUtil.sendBrodcastMessage(ChatUtil.RED + "Der Timer wurde angehalten"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer wurde angehalten", ChatUtil.RED)); if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { Config.setValue("editsettings", true, false); 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 49325c4..bbe0cce 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerResetCommand.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.ChatColor; import org.bukkit.command.Command; @@ -28,7 +29,7 @@ } if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().setTime(0); - ChatUtil.sendBrodcastMessage("Der Timer wurde zurückgesetzt!"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer wurde zurückgesetzt!", ChatUtil.GREEN)); if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { Config.setValue("editsettings", true, false); 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 d4087f2..f1df929 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerReverseCommand.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; @@ -28,9 +29,9 @@ if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().reverseTimer(); if (plugin.getTimer().isReverse()) { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + "Der Timer läuft nun rückwärts!"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer läuft nun rückwärts!", ChatUtil.BLUE)); } else { - ChatUtil.sendBrodcastMessage("Der Timer läuft nun vorwärts!"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer läuft nun vorwärts!", ChatUtil.GREEN)); } if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { 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 56c336c..ea5ce51 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerSetCommand.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 net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -31,7 +32,7 @@ if (time >= 0) { if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { plugin.getTimer().setTime(time); - ChatUtil.sendBrodcastMessage("Der Timer wurde auf " + plugin.getTimer().formatTime(ChatUtil.GREEN) + " gesetzt!"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer wurde auf ", ChatUtil.GREEN).append(plugin.getTimer().formatTime(ChatUtil.GREEN)).append(Component.text(" gesetzt!", ChatUtil.GREEN))); if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { Config.setValue("editsettings", true, false); 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 645d028..06fc7b5 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.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.GameRule; import org.bukkit.World; @@ -37,7 +38,7 @@ } plugin.getStatistics().addSpeedRunPlayed(); } - ChatUtil.sendBrodcastMessage(ChatUtil.GREEN + "Der Timer wird fortgesetzt!"); + ChatUtil.sendBrodcastMessage(Component.text("Der Timer wird fortgesetzt!", ChatUtil.GREEN)); } else { ChatUtil.sendWarningMessage(sender, "Der Timer läuft bereits!"); } diff --git a/src/main/java/de/fanta/challenges/guis/BackpackGui.java b/src/main/java/de/fanta/challenges/guis/BackpackGui.java index 7d43e82..e2c1155 100644 --- a/src/main/java/de/fanta/challenges/guis/BackpackGui.java +++ b/src/main/java/de/fanta/challenges/guis/BackpackGui.java @@ -2,6 +2,7 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.MemorySection; @@ -16,14 +17,14 @@ public class BackpackGui { - public static final String TITLE = Challenges.getPlugin().getGUIPREFIX() + " >> Backpack"; + public static final Component TITLE = Challenges.getPlugin().getGuiPrefix().append(Component.text(" >> Backpack")); private Inventory backpack; public BackpackGui(int size) { this.backpack = Bukkit.createInventory(null, size, TITLE); } - public BackpackGui(int size, String title) { + public BackpackGui(int size, Component title) { this.backpack = Bukkit.createInventory(null, size, title); } @@ -46,7 +47,7 @@ ItemStack item = backpack.getItem(i); if (item != null && item.getType() != Material.AIR) { if (!newBackpack.addItem(item).isEmpty()) { - ChatUtil.sendBrodcastMessage(ChatUtil.RED + "Backpack kann nicht verkleinert werden. Zu wenig Platz!"); + ChatUtil.sendBrodcastMessage(Component.text("Backpack kann nicht verkleinert werden. Zu wenig Platz!", ChatUtil.RED)); return; } } diff --git a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java index bcd82ca..12ed4ac 100644 --- a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; @@ -27,7 +28,7 @@ public static final int INVENTORY_SIZE = 5; public CheckItemsGUI(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> geht das?? (" + plugin.getMaterials().size() + ")")); + super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> geht das?? (" + plugin.getMaterials().size() + ")")))); } @@ -42,9 +43,11 @@ ItemStack item; ItemStack stack = new ItemStack(plugin.getMaterials().get(0)); switch (i) { - case JA_INDEX -> item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, ChatUtil.GREEN + "Ja", true); + case JA_INDEX -> + item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", ChatUtil.GREEN), true); case ITEM_INDEX -> item = stack; - case NEIN_INDEX -> item = ItemUtils.createGuiItem(Material.RED_CONCRETE, ChatUtil.RED + "Nein", true); + case NEIN_INDEX -> + item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", ChatUtil.RED), true); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/ResetGui.java b/src/main/java/de/fanta/challenges/guis/ResetGui.java index 8e5734f..a3631bb 100644 --- a/src/main/java/de/fanta/challenges/guis/ResetGui.java +++ b/src/main/java/de/fanta/challenges/guis/ResetGui.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -22,7 +23,7 @@ public static final int INVENTORY_SIZE = 5; public ResetGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Reset")); + super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> Reset")))); } @Override @@ -48,9 +49,9 @@ ItemStack item; if (i == RESET_INDEX) { if (plugin.getServerType() == ServerType.CHALLENGE && !Config.getBoolean("editsettings")) { - item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, ChatUtil.RED + "Server resetten", ChatUtil.RED + "Wenn du denn Server resettest,", ChatUtil.RED + "wird der Server komplett zurückgesetzt.", "", ChatUtil.GREEN + "Die Map wird als AutoSave gespeichert.", ChatUtil.GREEN + "und kann in der Lobby wieder geladen werden.", "", ChatUtil.ORANGE + "Die Challenge zählt nicht mehr als SpeedRun"); + item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, Component.text("Server resetten", ChatUtil.RED), Component.text("Wenn du denn Server resettest,", ChatUtil.RED), Component.text("wird der Server komplett zurückgesetzt.", ChatUtil.RED), Component.empty(), Component.text("Die Map wird als AutoSave gespeichert.", ChatUtil.GREEN), Component.text("und kann in der Lobby wieder geladen werden.", ChatUtil.GREEN), Component.empty(), Component.text("Die Challenge zählt nicht mehr als SpeedRun", ChatUtil.ORANGE)); } else { - item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, ChatUtil.RED + "Server resetten", ChatUtil.RED + "Wenn du denn Server resettest,", ChatUtil.RED + "wird der Server komplett zurückgesetzt.", "", ChatUtil.GREEN + "Die Map wird als AutoSave gespeichert.", ChatUtil.GREEN + "und kann in der Lobby wieder geladen werden."); + item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, Component.text("Server resetten", ChatUtil.RED), Component.text("Wenn du denn Server resettest,", ChatUtil.RED), Component.text("wird der Server komplett zurückgesetzt.", ChatUtil.RED), Component.empty(), Component.text("Die Map wird als AutoSave gespeichert.", ChatUtil.GREEN), Component.text("und kann in der Lobby wieder geladen werden.", ChatUtil.GREEN)); } } else { diff --git a/src/main/java/de/fanta/challenges/guis/TeleportGUI.java b/src/main/java/de/fanta/challenges/guis/TeleportGUI.java index 0edbd2b..cf81ebb 100644 --- a/src/main/java/de/fanta/challenges/guis/TeleportGUI.java +++ b/src/main/java/de/fanta/challenges/guis/TeleportGUI.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -23,7 +24,7 @@ private static final int CLOSE_IDEX = INVENTORY_SIZE - 9; public TeleportGUI(Player player) { - super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Event Settings")); + super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Event Settings")))); } @Override @@ -58,7 +59,7 @@ cat = 0; } - getInventory().setItem(CLOSE_IDEX, CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen")); + getInventory().setItem(CLOSE_IDEX, CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED))); for (int i = 0; i < getInventory().getSize(); i++) { if (getInventory().getItem(i) == null || getInventory().getItem(i).getType() == Material.AIR) { diff --git a/src/main/java/de/fanta/challenges/guis/TimerGui.java b/src/main/java/de/fanta/challenges/guis/TimerGui.java index 0eb7472..a502933 100644 --- a/src/main/java/de/fanta/challenges/guis/TimerGui.java +++ b/src/main/java/de/fanta/challenges/guis/TimerGui.java @@ -8,7 +8,9 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; -import net.md_5.bungee.api.ChatColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -34,7 +36,7 @@ private static final int SHOW_TIMER_INDEX = 16; public TimerGui(Player player) { - super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Timer")); + super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Timer")))); } @Override @@ -54,10 +56,10 @@ case DIRECTION_INDEX -> { if (plugin.getTimer().isReverse()) { plugin.getTimer().reverseTimer(); - ChatUtil.sendTitleToAll("Timer", "Der Timer läuft jetzt vorwärts.", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer läuft jetzt vorwärts.", ChatUtil.GREEN)); } else { plugin.getTimer().reverseTimer(); - ChatUtil.sendTitleToAll("Timer", "Der Timer läuft jetzt rückwärts.", ChatUtil.BLUE); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer läuft jetzt rückwärts.", ChatUtil.BLUE)); } if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { @@ -73,10 +75,10 @@ case SHOW_TIMER_INDEX -> { if (Config.getBoolean("showtimer")) { Config.setValue("showtimer", false, false); - ChatUtil.sendTitleToAll("Timer", "Der Timer wird jetzt nicht mehr angezeigt!", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer wird jetzt nicht mehr angezeigt!", ChatUtil.RED)); } else { Config.setValue("showtimer", true, false); - ChatUtil.sendTitleToAll("Timer", "Der Timer wird jetzt wieder angezeigt!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer wird jetzt wieder angezeigt!", ChatUtil.GREEN)); } rebuildInventory(); } @@ -92,7 +94,7 @@ ChatUtil.sendWarningMessage(plugin.getCurrentEditor(), "Diese Challenge wird nicht mehr als Speed Run gezählt, da du etwas am Timer geändert hast."); } } - ChatUtil.sendTitleToAll("Timer", ChatUtil.RED + "Der Timer wurde pausiert.", ChatUtil.BLUE, 10, 60, 10, true); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer wurde pausiert.", ChatUtil.RED), 10, 60, 10, true); } else { plugin.getTimer().startTimer(); if (!Config.getBoolean("editsettings")) { @@ -102,7 +104,7 @@ plugin.getStatistics().addSpeedRunPlayed(); } plugin.setDayLightCircle(true); - ChatUtil.sendTitleToAll("Timer", ChatUtil.GREEN + "Der Timer wurde gestartet.", ChatUtil.BLUE, 10, 60, 10, true); + ChatUtil.sendTitleToAll(Component.text("Timer"), Component.text("Der Timer wurde gestartet.", ChatUtil.GREEN), 10, 60, 10, true); } player.closeInventory(); } @@ -157,8 +159,8 @@ } } - switch (slot) { - case CLOSE_INDEX -> player.closeInventory(); + if (slot == CLOSE_INDEX) { + player.closeInventory(); } } @@ -169,40 +171,39 @@ switch (i) { case DIRECTION_INDEX -> { if (plugin.getTimer().isReverse()) { - item = ItemUtils.createGuiItem(Material.MAGENTA_GLAZED_TERRACOTTA, ChatUtil.BLUE + "Timer Richtung - rückwärts"); + item = ItemUtils.createGuiItem(Material.MAGENTA_GLAZED_TERRACOTTA, Component.text("Timer Richtung - rückwärts", ChatUtil.BLUE)); } else { - item = ItemUtils.createGuiItem(Material.MAGENTA_GLAZED_TERRACOTTA, ChatUtil.GREEN + "Timer Richtung - vorwärts"); + item = ItemUtils.createGuiItem(Material.MAGENTA_GLAZED_TERRACOTTA, Component.text("Timer Richtung - vorwärts", ChatUtil.GREEN)); } } case SHOW_TIMER_INDEX -> { if (Config.getBoolean("showtimer")) { - item = ItemUtils.createGuiItem(Material.OBSERVER, ChatUtil.GREEN + "Timer wird angezeigt!", true); + item = ItemUtils.createGuiItem(Material.OBSERVER, Component.text("Timer wird angezeigt!", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.OBSERVER, ChatUtil.RED + "Timer wird nicht angezeigt!", false); + item = ItemUtils.createGuiItem(Material.OBSERVER, Component.text("Timer wird nicht angezeigt!", ChatUtil.RED), false); } } case TIMER_TOGGLE_INDEX -> { if (plugin.getTimer().isRunning()) { - item = ItemUtils.createGuiItem(Material.CLOCK, ChatUtil.GREEN + "Timer gestartet", true); + item = ItemUtils.createGuiItem(Material.CLOCK, Component.text("Timer gestartet", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.CLOCK, ChatUtil.RED + "Timer pausiert"); + item = ItemUtils.createGuiItem(Material.CLOCK, Component.text("Timer pausiert", ChatUtil.RED)); } } case TIME_DAYS_INDEX -> - item = ItemUtils.createGuiItem(Material.GOLD_BLOCK, ChatUtil.GREEN + "Tage", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Tag" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "+10 Tage" + ChatUtil.BLUE + " ‣ Shift-Links-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Tag" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Tage" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + item = ItemUtils.createGuiItem(Material.GOLD_BLOCK, Component.text("Tage", ChatUtil.GREEN), Component.text(">> ", ChatUtil.ORANGE).append(plugin.getTimer().formatTime(ChatUtil.BLUE)), Component.empty(), Component.text("+1 Tag", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("+10 Tage", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE)), Component.text(" ", Style.style(ChatUtil.BLUE, TextDecoration.STRIKETHROUGH)), Component.text("-1 Tag", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("-10 Tage", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE))); case TIME_HOURS_INDEX -> - item = ItemUtils.createGuiItem(Material.GOLD_INGOT, ChatUtil.GREEN + "Stunden", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Stunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "+10 Stunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Stunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Stunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); - case TIME_MINUTES_INDEX -> - { + item = ItemUtils.createGuiItem(Material.GOLD_INGOT, Component.text("Stunden", ChatUtil.GREEN), Component.text(">> ", ChatUtil.ORANGE).append(plugin.getTimer().formatTime(ChatUtil.BLUE)), Component.empty(), Component.text("+1 Stunde", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("+10 Stunden", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE)), Component.text(" ", Style.style(ChatUtil.BLUE, TextDecoration.STRIKETHROUGH)), Component.text("-1 Stunde", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("-10 Stunden", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE))); + case TIME_MINUTES_INDEX -> { try { - item = ItemUtils.createGuiItem(Material.RAW_GOLD, ChatUtil.GREEN + "Minuten", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Minute" + ChatUtil.BLUE + " ‣ Rechts-Klick", ChatUtil.GREEN + "+10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Rechts-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Minute" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + item = ItemUtils.createGuiItem(Material.RAW_GOLD, Component.text("Minuten", ChatUtil.GREEN), Component.text(">> ", ChatUtil.ORANGE).append(plugin.getTimer().formatTime(ChatUtil.BLUE)), Component.empty(), Component.text("+1 Minute", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("+10 Minuten", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE)), Component.text(" ", Style.style(ChatUtil.BLUE, TextDecoration.STRIKETHROUGH)), Component.text("-1 Minute", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("-10 Minuten", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE))); } catch (NoSuchFieldError ex) { - item = ItemUtils.createGuiItem(Material.DANDELION, ChatUtil.GREEN + "Minuten", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Minute" + ChatUtil.BLUE + " ‣ Rechts-Klick", ChatUtil.GREEN + "+10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Rechts-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Minute" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + item = ItemUtils.createGuiItem(Material.DANDELION, Component.text("Minuten", ChatUtil.GREEN), Component.text(">> ", ChatUtil.ORANGE).append(plugin.getTimer().formatTime(ChatUtil.BLUE)), Component.empty(), Component.text("+1 Minute", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("+10 Minuten", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE)), Component.text(" ", Style.style(ChatUtil.BLUE, TextDecoration.STRIKETHROUGH)), Component.text("-1 Minute", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("-10 Minuten", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE))); } } case TIME_SECONDS_INDEX -> - item = ItemUtils.createGuiItem(Material.GOLD_NUGGET, ChatUtil.GREEN + "Sekunden", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Sekunde" + ChatUtil.BLUE + " ‣ Rechts-Klick", ChatUtil.GREEN + "+10 Sekunden" + ChatUtil.BLUE + " ‣ Shift-Rechts-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Sekunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Sekunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); - case CLOSE_INDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + item = ItemUtils.createGuiItem(Material.GOLD_NUGGET, Component.text("Sekunden", ChatUtil.GREEN), Component.text(">> ", ChatUtil.ORANGE).append(plugin.getTimer().formatTime(ChatUtil.BLUE)), Component.empty(), Component.text("+1 Sekunde", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("+10 Sekunden", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE)), Component.text(" ", Style.style(ChatUtil.BLUE, TextDecoration.STRIKETHROUGH)), Component.text("-1 Sekunde", ChatUtil.GREEN).append(Component.text(" ‣ Links-Klick", ChatUtil.BLUE)), Component.text("-10 Sekunden", ChatUtil.GREEN).append(Component.text(" ‣ Shift-Links-Klick", ChatUtil.BLUE))); + case CLOSE_INDEX -> item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BackPackSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BackPackSettingsGui.java index 60e2875..b53bce2 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BackPackSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BackPackSettingsGui.java @@ -9,6 +9,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -27,7 +28,7 @@ private static final int BACK_INDEX = 6; public BackPackSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Backpack Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> Backpack Settings")))); } @Override @@ -79,17 +80,20 @@ ItemStack item; int size = plugin.getBackpack().getSize() / 9; switch (i) { - case ADD_SIZE_INDEX -> item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Größe +1"); - case REMOVE_SIZE_INDEX -> item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Größe -1"); + case ADD_SIZE_INDEX -> + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Größe +1", ChatUtil.GREEN)); + case REMOVE_SIZE_INDEX -> + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Größe -1", ChatUtil.RED)); case SIZE_INDEX -> { ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, size); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(ChatUtil.GREEN + "Rucksack größe: " + size + "/6"); + meta.displayName(Component.text("Rucksack größe: " + size + "/6", ChatUtil.GREEN)); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BedrockWallSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BedrockWallSettingsGui.java index 4fd96b4..bb2f1d0 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BedrockWallSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/BedrockWallSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -25,7 +26,7 @@ private static final int BACK_INDEX = 6; public BedrockWallSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Bedrock Wand Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> Bedrock Wand Settings")))); } @Override @@ -68,17 +69,20 @@ ItemStack item; int time = Config.getInt("bedrockwalltime"); switch (i) { - case ADD_TIME_INDEX -> item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "+1 Sekunde"); - case REMOVE_TIME_INDEX -> item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "-1 Sekunde"); + case ADD_TIME_INDEX -> + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("+1 Sekunde", ChatUtil.GREEN)); + case REMOVE_TIME_INDEX -> + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("-1 Sekunde", ChatUtil.RED)); case TIME_INDEX -> { ItemStack stack = new ItemStack(Material.CLOCK, time); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName("" + ChatUtil.BLUE + time + " Sekunden"); + meta.displayName(Component.text(time + " Sekunden", ChatUtil.BLUE)); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/LevelBorderSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/LevelBorderSettingsGui.java index 9e0dc4b..2cbbfd2 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/LevelBorderSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/LevelBorderSettingsGui.java @@ -8,6 +8,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -26,7 +27,7 @@ private static final int BACK_INDEX = 6; public LevelBorderSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> World Border Level Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> World Border Level Settings")))); } @Override @@ -76,18 +77,19 @@ int multiplayer = Config.getInt("worldborderlevelbordermultiplier"); switch (i) { case ADD_MULTIPLAYER_INDEX -> - item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Multiplier +1"); + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Multiplier +1", ChatUtil.GREEN)); case REMOVE_MULTIPLAYER_INDEX -> - item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Multiplier -1"); + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Multiplier -1", ChatUtil.RED)); case MULTIPLAYER_INDEX -> { ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, multiplayer); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(ChatUtil.GREEN + "World Boarder Multiplier: " + ChatUtil.BLUE + multiplayer); + meta.displayName(Component.text("World Boarder Multiplier: ", ChatUtil.GREEN).append(Component.text(multiplayer, ChatUtil.BLUE))); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/MLGSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/MLGSettingsGui.java index 23a9d56..1c02cea 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/MLGSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/MLGSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -25,7 +26,7 @@ private static final int BACK_INDEX = 6; public MLGSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> MLG Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> MLG Settings")))); } @Override @@ -45,10 +46,10 @@ case RANDOM_BLOCK_INDEX -> { if (Config.getBoolean("mlg.randommlgblock")) { Config.setValue("mlg.randommlgblock", false); - ChatUtil.sendTitleToAll("MLG Challenge", "Wassereimer MLG", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("MLG Challenge"), Component.text("Wassereimer MLG", ChatUtil.GREEN)); } else { Config.setValue("mlg.randommlgblock", true); - ChatUtil.sendTitleToAll("MLG Challenge", "Zufälliger MLG Block", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("MLG Challenge"), Component.text("Zufälliger MLG Block", ChatUtil.GREEN)); } rebuildInventory(); } @@ -86,24 +87,25 @@ switch (i) { case RANDOM_BLOCK_INDEX -> { if (Config.getBoolean("mlg.randommlgblock")) { - item = ItemUtils.createGuiItem(Material.SLIME_BLOCK, ChatUtil.GREEN + "Zufälliger MLG Block", true, ChatUtil.GREEN + "Du bekommst ein Zufälligen Block."); + item = ItemUtils.createGuiItem(Material.SLIME_BLOCK, Component.text("Zufälliger MLG Block", ChatUtil.GREEN), true, Component.text("Du bekommst ein Zufälligen Block.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.WATER_BUCKET, ChatUtil.GREEN + "Wasser MLG", true, ChatUtil.GREEN + "Du bekommst einen Wassereimer."); + item = ItemUtils.createGuiItem(Material.WATER_BUCKET, Component.text("Wasser MLG", ChatUtil.GREEN), true, Component.text("Du bekommst einen Wassereimer.", ChatUtil.GREEN)); } } case ADD_TIME_INDEX -> - item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Zeit hinzufügen", ChatUtil.GREEN + "Klick = +100 Sekunden", ChatUtil.GREEN + "Shift + Klick = +10 Sekunden"); + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Zeit hinzufügen", ChatUtil.GREEN), Component.text("Klick = +100 Sekunden", ChatUtil.GREEN), Component.text("Shift + Klick = +10 Sekunden", ChatUtil.GREEN)); case REMOVE_TIME_INDEX -> - item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Zeit entfernen", ChatUtil.RED + "Klick = -100 Sekunden", ChatUtil.RED + "Shift + Klick = -10 Sekunden"); + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Zeit entfernen", ChatUtil.RED), Component.text("Klick = -100 Sekunden", ChatUtil.RED), Component.text("Shift + Klick = -10 Sekunden", ChatUtil.RED)); case TIME_INDEX -> { ItemStack stack = new ItemStack(Material.CLOCK, Math.min(time, 64)); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName("" + ChatUtil.BLUE + time + " Sekunden"); + meta.displayName(Component.text(time + " Sekunden", ChatUtil.BLUE)); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/NoSneakSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/NoSneakSettingsGui.java index ccaa14a..2b87884 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/NoSneakSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/NoSneakSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.attribute.Attribute; @@ -26,7 +27,7 @@ private static final int BACK_INDEX = 6; public NoSneakSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> No Sneak Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> No Sneak Settings")))); } @Override @@ -75,17 +76,20 @@ ItemStack item; int damage = Config.getInt("sneakdmg"); switch (i) { - case ADD_DAMAGE_INDEX -> item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Damage +1"); - case REMOVE_DAMAGE_INDEX -> item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Damage -1"); + case ADD_DAMAGE_INDEX -> + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Damage +1", ChatUtil.GREEN)); + case REMOVE_DAMAGE_INDEX -> + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Damage -1", ChatUtil.RED)); case DAMAGE_INDEX -> { ItemStack stack = new ItemStack(Material.SMOOTH_STONE_SLAB, Math.min(damage, 64)); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(ChatUtil.GREEN + "Damage: " + ChatUtil.BLUE + damage); + meta.displayName(Component.text("Damage: ", ChatUtil.GREEN).append(Component.text(damage, ChatUtil.BLUE))); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/TiedTogetherSettingsGui.java b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/TiedTogetherSettingsGui.java index fda60c5..04157ea 100644 --- a/src/main/java/de/fanta/challenges/guis/challengesettingsguis/TiedTogetherSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/challengesettingsguis/TiedTogetherSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -25,7 +26,7 @@ private static final int BACK_INDEX = 6; public TiedTogetherSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Zusammengebunden Settings")); + super(player, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> Zusammengebunden Settings")))); } @Override @@ -75,18 +76,19 @@ int range = Config.getInt("playerrange"); switch (i) { case ADD_RANGE_INDEX -> - item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Range hinzufügen", ChatUtil.GREEN + "Klick = Range +100", ChatUtil.GREEN + "Shift + Klick = Range +10"); + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Range hinzufügen", ChatUtil.GREEN), Component.text("Klick = Range +100", ChatUtil.GREEN), Component.text("Shift + Klick = Range +10", ChatUtil.GREEN)); case REMOVE_RANGE_INDEX -> - item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Range entfernen", ChatUtil.RED + "Klick = Range -100", ChatUtil.RED + "Shift + Klick = Range -10"); + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Range entfernen", ChatUtil.RED), Component.text("Klick = Range -100", ChatUtil.RED), Component.text("Shift + Klick = Range -10", ChatUtil.RED)); case RANGE_INDEX -> { ItemStack stack = new ItemStack(Material.COMPASS, Math.min(range, 64)); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(ChatUtil.GREEN + "Maximale Range: " + ChatUtil.BLUE + range); + meta.displayName(Component.text("Maximale Range: ", ChatUtil.GREEN).append(Component.text(range, ChatUtil.GREEN))); stack.setItemMeta(meta); item = stack; } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); 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 d441823..a8e7bb2 100644 --- a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java +++ b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsDeleteGUI.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -22,18 +23,18 @@ private static final int ITEM_INDEX = 2; public static final int INVENTORY_SIZE = 5; - public static final Inventory COORDS_DELETE_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Waypoint Löschen"); + public static final Inventory COORDS_DELETE_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> Waypoint Löschen"))); public static void createCoordsDeleteGUI(Player p, String waypointName, ItemStack stack) { - COORDS_DELETE_GUI.setItem(ACCEPT_INDEX, ItemUtils.createGuiItem(Material.LIME_CONCRETE, ChatUtil.GREEN + "Löschen bestätigen", ChatUtil.GREEN + "Wegpunkt: " + ChatUtil.BLUE + waypointName)); + COORDS_DELETE_GUI.setItem(ACCEPT_INDEX, ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Löschen bestätigen", ChatUtil.GREEN), Component.text("Wegpunkt: ", ChatUtil.GREEN).append(Component.text(waypointName, ChatUtil.BLUE)))); if (stack != null) { - COORDS_DELETE_GUI.setItem(ITEM_INDEX, ItemUtils.createGuiItem(stack.getType(), ChatUtil.BLUE + waypointName)); + COORDS_DELETE_GUI.setItem(ITEM_INDEX, ItemUtils.createGuiItem(stack.getType(), Component.text(waypointName, ChatUtil.BLUE))); } else { - COORDS_DELETE_GUI.setItem(ITEM_INDEX, ItemUtils.createGuiItem(Material.GRAY_BANNER, ChatUtil.BLUE + waypointName)); + COORDS_DELETE_GUI.setItem(ITEM_INDEX, ItemUtils.createGuiItem(Material.GRAY_BANNER, Component.text(waypointName, ChatUtil.BLUE))); } - COORDS_DELETE_GUI.setItem(DENY_INDEX, ItemUtils.createGuiItem(Material.RED_CONCRETE, ChatUtil.RED + "Löschen abbrechen", ChatUtil.GREEN + "Wegpunkt: " + ChatUtil.BLUE + waypointName)); + COORDS_DELETE_GUI.setItem(DENY_INDEX, ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Löschen abbrechen", ChatUtil.RED), Component.text("Wegpunkt: ", ChatUtil.GREEN).append(Component.text(waypointName, ChatUtil.BLUE)))); for (int i = 0; i < INVENTORY_SIZE; i++) { ItemStack item = COORDS_DELETE_GUI.getItem(i); 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 64b7b26..5a1bc4a 100644 --- a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java @@ -4,6 +4,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -36,7 +37,7 @@ return; } - Inventory COORDS_UI = Bukkit.createInventory(p, 9 * (waypoints.size() / 7 + ((waypoints.size() % 7 > 0) ? 1 : 0)) + 18, plugin.getGUIPREFIX() + " >> Waypoints"); + Inventory COORDS_UI = Bukkit.createInventory(p, 9 * (waypoints.size() / 7 + ((waypoints.size() % 7 > 0) ? 1 : 0)) + 18, plugin.getGuiPrefix().append(Component.text(" >> Waypoints"))); InventoryperPlayer.put(p, COORDS_UI); CLOSE_IDEX = COORDS_UI.getSize() - 9; int row = 0; @@ -52,16 +53,16 @@ Location waypointlocation = new Location(world, x, y, z); - ArrayList metalore = new ArrayList<>(); + ArrayList metalore = new ArrayList<>(); if (world != null) { ItemStack stack = new ItemStack(getBlock(world.getName())); ItemMeta itemMeta = stack.getItemMeta(); - itemMeta.setDisplayName(ChatUtil.BLUE + waypoint); - metalore.add(ChatUtil.BLUE + "X: " + ChatUtil.GREEN + x + ChatUtil.BLUE + " Y: " + ChatUtil.GREEN + y + ChatUtil.BLUE + " Z: " + ChatUtil.GREEN + z); - metalore.add(ChatUtil.GREEN + "Linksklick: Zeigt Coords im Chat."); - metalore.add(ChatUtil.RED + "Rechtsklick: Waypoint Löschen."); - itemMeta.setLore(metalore); + 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); COORDS_UI.setItem(slot, stack); wayPointPerSlot.put(waypoint, waypointlocation); @@ -75,7 +76,7 @@ } - COORDS_UI.setItem(CLOSE_IDEX, ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Menü verlassen!")); + COORDS_UI.setItem(CLOSE_IDEX, ItemUtils.createGuiItem(Material.BARRIER, Component.text("Menü verlassen!", ChatUtil.RED))); for (int i = 0; i < COORDS_UI.getSize(); i++) { if (COORDS_UI.getItem(i) == null || COORDS_UI.getItem(i).getType() == Material.AIR) { COORDS_UI.setItem(i, ItemUtils.EMPTY_ICON); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/BingoItemsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/BingoItemsGui.java index 2550275..2858795 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/BingoItemsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/BingoItemsGui.java @@ -2,6 +2,7 @@ import de.fanta.challenges.challenges.ChallengeEvents.BingoChallengeEvent; import de.fanta.challenges.Challenges; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -27,7 +28,7 @@ private static final Challenges plugin = Challenges.getPlugin(); - public static final String TITLE = plugin.getGUIPREFIX() + " >> Event Items"; + public static final Component TITLE = plugin.getGuiPrefix().append(Component.text(" >> Event Items")); private static final Inventory event_items = Bukkit.createInventory(null, InventoryType.DISPENSER, TITLE); private static final Map playerInvs = new HashMap<>(); @@ -45,7 +46,7 @@ } public static void openPlayerInv(Player player, Player sender) { - Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Bingo"); + Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> Bingo"))); List playerMaterials = BingoChallengeEvent.getPlayerMaterials().getOrDefault(player.getUniqueId(), new ArrayList<>()); BingoChallengeEvent.getMaterials().forEach(material -> { ItemStack itemStack = new ItemStack(material); 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 2422e62..99562f4 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java @@ -8,6 +8,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -42,7 +43,7 @@ private static final int CLOSE_IDEX = 54; public EventGui(Player player) { - super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Event Settings")); + super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Event Settings")))); } @Override @@ -52,100 +53,102 @@ switch (i) { case NULL_EVENT_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "nix")) { - item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Event beenden"); + item = CustomHeads.RAINBOW_X.getHead(Component.text("Event beenden", ChatUtil.RED)); } else { item = ItemUtils.EMPTY_ICON; } } - case TEAM_INDEX -> item = ItemUtils.createGuiItem(Material.GRAY_BED, ChatUtil.BLUE + "Team Settings"); + case TEAM_INDEX -> + item = ItemUtils.createGuiItem(Material.GRAY_BED, Component.text("Team Settings", ChatUtil.BLUE)); case BINGO_EVENT_INDEX -> { if (Objects.equals(Config.getString("event.type"), "bingo")) { - item = ItemUtils.createGuiItem(Material.GRAY_SHULKER_BOX, ChatUtil.GREEN + "Bingo Event", true, ChatUtil.GREEN + "Sammle Vorgegebene Items", ChatUtil.GREEN + "Items kann man mit /bingo sehen"); + item = ItemUtils.createGuiItem(Material.GRAY_SHULKER_BOX, Component.text("Bingo Event", ChatUtil.GREEN), true, Component.text("Sammle Vorgegebene Items", ChatUtil.GREEN), Component.text("Items kann man mit /bingo sehen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.GRAY_SHULKER_BOX, ChatUtil.RED + "Bingo Event", ChatUtil.GREEN + "Sammle Vorgegebene Items", ChatUtil.GREEN + "Items kann man mit /bingo sehen"); + item = ItemUtils.createGuiItem(Material.GRAY_SHULKER_BOX, Component.text("Bingo Event", ChatUtil.RED), Component.text("Sammle Vorgegebene Items", ChatUtil.GREEN), Component.text("Items kann man mit /bingo sehen", ChatUtil.GREEN)); } } case DEATHRUN_EVENT_INDEX -> { if (Objects.equals(Config.getString("event.type"), "deathrun")) { - item = ItemUtils.createGuiItem(Material.LEATHER_BOOTS, ChatUtil.GREEN + "Deathrun Event", true, ChatUtil.GREEN + "Laufe so weit wie möglich ohne zu sterben"); + item = ItemUtils.createGuiItem(Material.LEATHER_BOOTS, Component.text("Deathrun Event", ChatUtil.GREEN), true, Component.text("Laufe so weit wie möglich ohne zu sterben", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.LEATHER_BOOTS, ChatUtil.RED + "Deathrun Event", ChatUtil.GREEN + "Laufe so weit wie möglich ohne zu sterben"); + item = ItemUtils.createGuiItem(Material.LEATHER_BOOTS, Component.text("Deathrun Event", ChatUtil.RED), Component.text("Laufe so weit wie möglich ohne zu sterben", ChatUtil.GREEN)); } } case FORCE_ITEM_INDEX -> { if (Objects.equals(Config.getString("event.type"), "forcequest")) { - item = ItemUtils.createGuiItem(Material.DIAMOND_PICKAXE, ChatUtil.GREEN + "Force Quest Event", true, ChatUtil.GREEN + "Erledige so viele Aufgaben wie möglich."); + item = ItemUtils.createGuiItem(Material.DIAMOND_PICKAXE, Component.text("Force Quest Event", ChatUtil.GREEN), true, Component.text("Erledige so viele Aufgaben wie möglich.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.DIAMOND_PICKAXE, ChatUtil.RED + "Force Quest Event", ChatUtil.GREEN + "Erledige so viele Aufgaben wie möglich."); + item = ItemUtils.createGuiItem(Material.DIAMOND_PICKAXE, Component.text("Force Quest Event", ChatUtil.RED), Component.text("Erledige so viele Aufgaben wie möglich.", ChatUtil.GREEN)); } } case SAMMEL_FIEBER_INDEX -> { if (Objects.equals(Config.getString("event.type"), "sammelfieber")) { - item = ItemUtils.createGuiItem(Material.HOPPER, ChatUtil.GREEN + "Sammel Fieber Event", true, ChatUtil.GREEN + "Sammle so viel Items wie möglich!"); + item = ItemUtils.createGuiItem(Material.HOPPER, Component.text("Sammel Fieber Event", ChatUtil.GREEN), true, Component.text("Sammle so viel Items wie möglich!", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.HOPPER, ChatUtil.RED + "Sammel Fieber Event", ChatUtil.GREEN + "Sammle so viel Items wie möglich!"); + item = ItemUtils.createGuiItem(Material.HOPPER, Component.text("Sammel Fieber Event", ChatUtil.RED), Component.text("Sammle so viel Items wie möglich!", ChatUtil.GREEN)); } } case BRIDGE_RACE_INDEX -> { if (Objects.equals(Config.getString("event.type"), "bridgerace")) { - item = ItemUtils.createGuiItem(Material.SCAFFOLDING, ChatUtil.GREEN + "Bridge Race Event", true, ChatUtil.GREEN + "Komme so weit wie möglich."); + item = ItemUtils.createGuiItem(Material.SCAFFOLDING, Component.text("Bridge Race Event", ChatUtil.GREEN), true, Component.text("Komme so weit wie möglich.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.SCAFFOLDING, ChatUtil.RED + "Bridge Race Event", ChatUtil.GREEN + "Komme so weit wie möglich."); + item = ItemUtils.createGuiItem(Material.SCAFFOLDING, Component.text("Bridge Race Event", ChatUtil.RED), Component.text("Komme so weit wie möglich.", ChatUtil.GREEN)); } } case ORE_BATTLE_INDEX -> { if (Objects.equals(Config.getString("event.type"), "orebattle")) { - item = ItemUtils.createGuiItem(Material.DEEPSLATE_IRON_ORE, ChatUtil.GREEN + "Ore Battle Event", true, ChatUtil.GREEN + "Baue so viele erze ab wie möglich."); + item = ItemUtils.createGuiItem(Material.DEEPSLATE_IRON_ORE, Component.text("Ore Battle Event", ChatUtil.GREEN), true, Component.text("Baue so viele erze ab wie möglich.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.DEEPSLATE_IRON_ORE, ChatUtil.RED + "Ore Battle Event", ChatUtil.GREEN + "Baue so viele erze ab wie möglich."); + item = ItemUtils.createGuiItem(Material.DEEPSLATE_IRON_ORE, Component.text("Ore Battle Event", ChatUtil.RED), Component.text("Baue so viele erze ab wie möglich.", ChatUtil.GREEN)); } } case DEATH_COUNTER_INDEX -> { if (Objects.equals(Config.getString("event.type"), "deathcounter")) { - item = ItemUtils.createGuiItem(Material.DAMAGED_ANVIL, ChatUtil.GREEN + "Death Counter Event", true, ChatUtil.GREEN + "Zeigt Tode bei einem Event.", ChatUtil.GREEN + "Kann nicht mit anderen Events verbunden Werden."); + item = ItemUtils.createGuiItem(Material.DAMAGED_ANVIL, Component.text("Death Counter Event", ChatUtil.GREEN), true, Component.text("Zeigt Tode bei einem Event.", ChatUtil.GREEN), Component.text("Kann nicht mit anderen Events verbunden Werden.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.DAMAGED_ANVIL, ChatUtil.RED + "Death Counter Event", ChatUtil.GREEN + "Zeigt Tode bei einem Event.", ChatUtil.GREEN + "Kann nicht mit anderen Events verbunden Werden."); + item = ItemUtils.createGuiItem(Material.DAMAGED_ANVIL, Component.text("Death Counter Event", ChatUtil.RED), Component.text("Zeigt Tode bei einem Event.", ChatUtil.GREEN), Component.text("Kann nicht mit anderen Events verbunden Werden.", ChatUtil.GREEN)); } } case BINGO_ITEMS_INDEX -> { if (Objects.equals(Config.getString("event.type"), "bingo")) { - item = ItemUtils.createGuiItem(Material.CHEST, ChatUtil.GREEN + "Items", ChatUtil.GREEN + "Anklicken um Items Hinzuzufügen"); + item = ItemUtils.createGuiItem(Material.CHEST, Component.text("Items", ChatUtil.GREEN), Component.text("Anklicken um Items Hinzuzufügen", ChatUtil.GREEN)); } else { item = ItemUtils.EMPTY_ICON; } } case FORCE_ITEM_SETTINGS_INDEX -> { if (Objects.equals(Config.getString("event.type"), "forcequest")) { - item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, ChatUtil.GREEN + "Force Item Event Settings"); + item = ItemUtils.createGuiItem(Material.REPEATING_COMMAND_BLOCK, Component.text("Force Item Event Settings", ChatUtil.GREEN)); } else { item = ItemUtils.EMPTY_ICON; } } case SAMMEL_FIEBER_SETTINGS_INDEX -> { if (Objects.equals(Config.getString("event.type"), "sammelfieber")) { - item = ItemUtils.createGuiItem(Material.NETHER_STAR, ChatUtil.GREEN + "Sammel Fieber Event Settings"); + item = ItemUtils.createGuiItem(Material.NETHER_STAR, Component.text("Sammel Fieber Event Settings", ChatUtil.GREEN)); } else { item = ItemUtils.EMPTY_ICON; } } case DIFFERENT_ITEMS_INDEX -> { if (Objects.equals(Config.getString("event.type"), "differentitems")) { - item = ItemUtils.createGuiItem(Material.CRAFTING_TABLE, ChatUtil.GREEN + "DifferentItems", true, ChatUtil.GREEN + "Sammel so viele verschiedene Items wie möglich."); + item = ItemUtils.createGuiItem(Material.CRAFTING_TABLE, Component.text("DifferentItems", ChatUtil.GREEN), true, Component.text("Sammel so viele verschiedene Items wie möglich.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.CRAFTING_TABLE, ChatUtil.RED + "DifferentItems", ChatUtil.GREEN + "Sammel so viele verschiedene Items wie möglich."); + item = ItemUtils.createGuiItem(Material.CRAFTING_TABLE, Component.text("DifferentItems", ChatUtil.RED), Component.text("Sammel so viele verschiedene Items wie möglich.", ChatUtil.GREEN)); } } case TIME_EVENT_INDEX -> { if (Objects.equals(Config.getString("event.type"), "time")) { - item = ItemUtils.createGuiItem(Material.CLOCK, ChatUtil.GREEN + "Time", true, ChatUtil.GREEN + "Zeigt wie lang ein Spieler mitgespielt hat."); + item = ItemUtils.createGuiItem(Material.CLOCK, Component.text("Time", ChatUtil.GREEN), true, Component.text("Zeigt wie lang ein Spieler mitgespielt hat.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.CLOCK, ChatUtil.RED + "Time", ChatUtil.GREEN + "Zeigt wie lang ein Spieler mitgespielt hat."); + item = ItemUtils.createGuiItem(Material.CLOCK, Component.text("Time", ChatUtil.RED), Component.text("Zeigt wie lang ein Spieler mitgespielt hat.", ChatUtil.GREEN)); } } case EVENT_SETTINGS_INDEX -> - item = ItemUtils.createGuiItem(Material.CHAIN_COMMAND_BLOCK, ChatUtil.BLUE + "Event Settings"); + item = ItemUtils.createGuiItem(Material.CHAIN_COMMAND_BLOCK, Component.text("Event Settings", ChatUtil.BLUE)); - case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen!"); + case CLOSE_IDEX -> + item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen!", ChatUtil.RED)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); @@ -170,13 +173,13 @@ if (!Objects.equals(Config.getString("event.type"), "nix")) { plugin.getScoreManager().resetScores(); Config.setValue("event.type", "nix"); - ChatUtil.sendTitleToAll("Event", "Event beendet", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Event beendet", ChatUtil.RED)); } } case BINGO_EVENT_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "bingo")) { Config.setValue("event.type", "bingo"); - ChatUtil.sendTitleToAll("Event", "Sammle Vorgegebene Items! (/bingo)", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Sammle Vorgegebene Items! (/bingo)", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -184,7 +187,7 @@ case DEATHRUN_EVENT_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "deathrun")) { Config.setValue("event.type", "deathrun"); - ChatUtil.sendTitleToAll("Event", "Laufe so weit wie möglich ohne zu sterben!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Laufe so weit wie möglich ohne zu sterben!", ChatUtil.GREEN)); DeathrunChallengeEvent.load(p); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); @@ -193,7 +196,7 @@ case DEATH_COUNTER_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "deathcounter")) { Config.setValue("event.type", "deathcounter"); - ChatUtil.sendTitleToAll("Event", "Death Counter", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Death Counter", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -201,7 +204,7 @@ case SAMMEL_FIEBER_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "sammelfieber")) { Config.setValue("event.type", "sammelfieber"); - ChatUtil.sendTitleToAll("Event", "SammelFieber", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("SammelFieber", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -209,7 +212,7 @@ case ORE_BATTLE_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "orebattle")) { Config.setValue("event.type", "orebattle"); - ChatUtil.sendTitleToAll("Event", "Ore Battle", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Ore Battle", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -217,7 +220,7 @@ case FORCE_ITEM_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "forcequest")) { Config.setValue("event.type", "forcequest"); - ChatUtil.sendTitleToAll("Event", "Force Quest", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Force Quest", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -226,7 +229,7 @@ if (!Objects.equals(Config.getString("event.type"), "bridgerace")) { if (BridgeRaceChallengeEvent.load(p)) { Config.setValue("event.type", "bridgerace"); - ChatUtil.sendTitleToAll("Event", "Bridge Race", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Bridge Race", ChatUtil.GREEN)); } } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); @@ -235,7 +238,7 @@ case DIFFERENT_ITEMS_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "differentitems")) { Config.setValue("event.type", "differentitems"); - ChatUtil.sendTitleToAll("Event", "Different Items", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Different Items", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } @@ -243,7 +246,7 @@ case TIME_EVENT_INDEX -> { if (!Objects.equals(Config.getString("event.type"), "time")) { Config.setValue("event.type", "time"); - ChatUtil.sendTitleToAll("Event", "Time", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Time", ChatUtil.GREEN)); } else { ChatUtil.sendErrorMessage(p, "Diese Event läuft bereits"); } diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventSettingsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventSettingsGui.java index 2402726..d57368d 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventSettingsGui.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -20,7 +21,7 @@ private static final int TOURNAMENT_INDEX = 11; public EventSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Event Settings")); + super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Event Settings")))); } @Override @@ -40,20 +41,20 @@ case MINI_LWC_INDEX -> { if (Config.getBoolean("event.minilwc")) { Config.setValue("event.minilwc", false); - ChatUtil.sendTitleToAll("Event", "Mini LWC deaktiviert.", ChatUtil.RED, true); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Mini LWC deaktiviert.", ChatUtil.RED), true); } else { Config.setValue("event.minilwc", true); - ChatUtil.sendTitleToAll("Event", "Mini LWC aktiviert.", ChatUtil.GREEN, true); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Mini LWC aktiviert.", ChatUtil.GREEN), true); } player.closeInventory(); } case TOURNAMENT_INDEX -> { if (Config.getBoolean("event.tournament")) { Config.setValue("event.tournament", false); - ChatUtil.sendTitleToAll("Event", "Turnier Modus deaktiviert.", ChatUtil.RED, true); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Turnier Modus deaktiviert.", ChatUtil.RED), true); } else { Config.setValue("event.tournament", true); - ChatUtil.sendTitleToAll("Event", "Turnier Modus aktiviert.", ChatUtil.GREEN, true); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Turnier Modus aktiviert.", ChatUtil.GREEN), true); } player.closeInventory(); } @@ -69,16 +70,16 @@ switch (i) { case MINI_LWC_INDEX -> { if (Config.getBoolean("event.minilwc")) { - item = ItemUtils.createGuiItem(Material.BARREL, ChatUtil.GREEN + "Mini LWC aktiviert."); + item = ItemUtils.createGuiItem(Material.BARREL, Component.text("Mini LWC aktiviert.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.BARREL, ChatUtil.RED + "Mini LWC deaktiviert."); + item = ItemUtils.createGuiItem(Material.BARREL, Component.text("Mini LWC deaktiviert.", ChatUtil.RED)); } } case TOURNAMENT_INDEX -> { if (Config.getBoolean("event.tournament")) { - item = ItemUtils.createGuiItem(Material.TARGET, ChatUtil.GREEN + "Turnier Modus aktiviert."); + item = ItemUtils.createGuiItem(Material.TARGET, Component.text("Turnier Modus aktiviert.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.TARGET, ChatUtil.RED + "Turnier Modus deaktiviert."); + item = ItemUtils.createGuiItem(Material.TARGET, Component.text("Turnier Modus deaktiviert.", ChatUtil.RED)); } } default -> item = ItemUtils.EMPTY_ICON; diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/ForceQuestSettingsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/ForceQuestSettingsGui.java index a954089..28faf8c 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/ForceQuestSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/ForceQuestSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -30,7 +31,7 @@ private static final int BACK_INDEX = 18; public ForceQuestSettingsGui(Player player) { - super(player, Bukkit.createInventory(player, 27, plugin.getGUIPREFIX() + " >> Force Quest Settings")); + super(player, Bukkit.createInventory(player, 27, plugin.getGuiPrefix().append(Component.text(" >> Force Quest Settings")))); } @Override @@ -117,59 +118,62 @@ for (int i = 0; i < 27; i++) { ItemStack item; switch (i) { - case ADD_SKIP_INDEX -> item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Add Skip"); - case REMOVE_SKIP_INDEX -> item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Remove Skip"); + case ADD_SKIP_INDEX -> + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Add Skip", ChatUtil.GREEN)); + case REMOVE_SKIP_INDEX -> + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Remove Skip", ChatUtil.RED)); case SKIP_COUNT_INDEX -> { ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, ForceQuestChallengeEvent.skipQuestCount); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName("" + ChatUtil.BLUE + ForceQuestChallengeEvent.skipQuestCount + "x " + ChatUtil.GREEN + "Skip Item"); + meta.displayName(Component.text(ForceQuestChallengeEvent.skipQuestCount + "x ", ChatUtil.BLUE).append(Component.text("Skip Item", ChatUtil.GREEN))); stack.setItemMeta(meta); item = stack; } case FORCE_ITEM_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceItem)) { - item = ItemUtils.createGuiItem(Material.CHEST, ChatUtil.GREEN + "Force Item", true); + item = ItemUtils.createGuiItem(Material.CHEST, Component.text("Force Item", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.CHEST, ChatUtil.RED + "Force Item", false); + item = ItemUtils.createGuiItem(Material.CHEST, Component.text("Force Item", ChatUtil.RED), false); } } case FORCE_BIOME_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceBiome)) { - item = ItemUtils.createGuiItem(Material.GRASS_BLOCK, ChatUtil.GREEN + "Force Biome", true); + item = ItemUtils.createGuiItem(Material.GRASS_BLOCK, Component.text("Force Biome", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.GRASS_BLOCK, ChatUtil.RED + "Force Biome", false); + item = ItemUtils.createGuiItem(Material.GRASS_BLOCK, Component.text("Force Biome", ChatUtil.RED), false); } } case FORCE_MOB_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceMob)) { - item = ItemUtils.createGuiItem(Material.PIG_SPAWN_EGG, ChatUtil.GREEN + "Force Mob", true); + item = ItemUtils.createGuiItem(Material.PIG_SPAWN_EGG, Component.text("Force Mob", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.PIG_SPAWN_EGG, ChatUtil.RED + "Force Mob", false); + item = ItemUtils.createGuiItem(Material.PIG_SPAWN_EGG, Component.text("Force Mob", ChatUtil.RED), false); } } case FORCE_EFFECT_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceEffect)) { - item = ItemUtils.createGuiItem(Material.POTION, ChatUtil.GREEN + "Force Effect", true); + item = ItemUtils.createGuiItem(Material.POTION, Component.text("Force Effect", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.POTION, ChatUtil.RED + "Force Effect", false); + item = ItemUtils.createGuiItem(Material.POTION, Component.text("Force Effect", ChatUtil.RED), false); } } case FORCE_DEATH_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceDeath)) { - item = ItemUtils.createGuiItem(Material.NETHERITE_AXE, ChatUtil.GREEN + "Force Death", true); + item = ItemUtils.createGuiItem(Material.NETHERITE_AXE, Component.text("Force Death", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.NETHERITE_AXE, ChatUtil.RED + "Force Death", false); + item = ItemUtils.createGuiItem(Material.NETHERITE_AXE, Component.text("Force Death", ChatUtil.RED), false); } } case FORCE_LOCATION_INDEX -> { if (ForceQuestChallengeEvent.activeQuestTypes.contains(QuestType.ForceLocation)) { - item = ItemUtils.createGuiItem(Material.COMPASS, ChatUtil.GREEN + "Force Location", true); + item = ItemUtils.createGuiItem(Material.COMPASS, Component.text("Force Location", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.COMPASS, ChatUtil.RED + "Force Location", false); + item = ItemUtils.createGuiItem(Material.COMPASS, Component.text("Force Location", ChatUtil.RED), false); } } - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java index 25a2d34..8d78d8c 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java @@ -8,6 +8,7 @@ import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.inventory.Window; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.FluidCollisionMode; import org.bukkit.Location; @@ -38,7 +39,7 @@ public static ItemStack eventItem = null; public SammelFieberSettingsGui(Window parentWindow, Player player) { - super(parentWindow, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Sammel Fieber Settings")); + super(parentWindow, Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGuiPrefix().append(Component.text(" >> Sammel Fieber Settings")))); } @Override @@ -146,16 +147,17 @@ ItemStack item; switch (i) { case SET_HOPPER_INDEX -> - item = ItemUtils.createGuiItem(Material.HOPPER, ChatUtil.GREEN + "Set Hopper", ChatUtil.GREEN + "Du musst auf einen Hopper schauen."); + item = ItemUtils.createGuiItem(Material.HOPPER, Component.text("Set Hopper", ChatUtil.GREEN), Component.text("Du musst auf einen Hopper schauen.", ChatUtil.GREEN)); case ADD_MONEY_INDEX -> - item = CustomHeads.RAINBOW_ARROW_UP.getHead(ChatUtil.GREEN + "Add Money", ChatUtil.GREEN + "Klick = +10", ChatUtil.GREEN + "Shift + Klick = +1"); + item = CustomHeads.RAINBOW_ARROW_UP.getHead(Component.text("Add Money", ChatUtil.GREEN), Component.text("Klick = +10", ChatUtil.GREEN), Component.text("Shift + Klick = +1", ChatUtil.GREEN)); case MONEY_INDEX -> - item = ItemUtils.createGuiItem(Material.GOLD_INGOT, ChatUtil.GREEN + "Money: " + MONEY); + item = ItemUtils.createGuiItem(Material.GOLD_INGOT, Component.text("Money: " + MONEY, ChatUtil.GREEN)); case SINGLEPLAYER_INDEX -> - item = singlePlayer ? ItemUtils.createGuiItem(Material.EMERALD, ChatUtil.GREEN + "SiglePlayer", true) : ItemUtils.createGuiItem(Material.EMERALD, ChatUtil.RED + "SiglePlayer", false); - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.GREEN + "Zurück"); + item = singlePlayer ? ItemUtils.createGuiItem(Material.EMERALD, Component.text("SiglePlayer", ChatUtil.GREEN), true) : ItemUtils.createGuiItem(Material.EMERALD, Component.text("SiglePlayer", ChatUtil.RED), false); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.GREEN)); case REMOVE_MONEY_INDEX -> - item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(ChatUtil.RED + "Remove Money", ChatUtil.RED + "Klick = -10", ChatUtil.RED + "Shift + Klick = -1"); + item = CustomHeads.RAINBOW_ARROW_DOWN.getHead(Component.text("Remove Money", ChatUtil.RED), Component.text("Klick = -10", ChatUtil.RED), Component.text("Shift + Klick = -1", ChatUtil.RED)); case ITEM_INDEX -> item = Objects.requireNonNullElseGet(eventItem, () -> new ItemStack(Material.AIR)); default -> item = ItemUtils.EMPTY_ICON; } diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/TeamSelectGUI.java b/src/main/java/de/fanta/challenges/guis/eventgui/TeamSelectGUI.java index 2ce2389..7362863 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/TeamSelectGUI.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/TeamSelectGUI.java @@ -5,6 +5,7 @@ import de.fanta.challenges.teams.TeamUtils; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.ItemUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -29,7 +30,7 @@ private static Inventory TEAM_SELECT_UI; public static void buildTeamSelectInventory() { - TEAM_SELECT_UI = Bukkit.createInventory(null, 9 * (TeamUtils.getTeams().length / 7 + ((TeamUtils.getTeams().length % 7 > 0) ? 1 : 0)) + 18, plugin.getGUIPREFIX() + " >> Select Team..."); + TEAM_SELECT_UI = Bukkit.createInventory(null, 9 * (TeamUtils.getTeams().length / 7 + ((TeamUtils.getTeams().length % 7 > 0) ? 1 : 0)) + 18, plugin.getGuiPrefix().append(Component.text(" >> Select Team..."))); CLOSE_IDEX = TEAM_SELECT_UI.getSize() - 9; int row = 0; int cat = 0; @@ -52,7 +53,7 @@ cat = 0; } - TEAM_SELECT_UI.setItem(CLOSE_IDEX, ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Menü verlassen!")); + TEAM_SELECT_UI.setItem(CLOSE_IDEX, ItemUtils.createGuiItem(Material.BARRIER, Component.text("Menü verlassen!", ChatUtil.RED))); for (int i = 0; i < TEAM_SELECT_UI.getSize(); i++) { if (TEAM_SELECT_UI.getItem(i) == null || TEAM_SELECT_UI.getItem(i).getType() == Material.AIR) { TEAM_SELECT_UI.setItem(i, ItemUtils.EMPTY_ICON); @@ -66,17 +67,17 @@ public static void updateTeamSelectGui() { for (ChallengeTeam challengeTeam : TeamUtils.getTeams()) { - ArrayList lore = new ArrayList(); + ArrayList lore = new ArrayList<>(); if (challengeTeam == null) { - lore.add(""); + lore.add(Component.empty()); } else { int slot = slotbyTeam.get(challengeTeam); ItemStack stack = TEAM_SELECT_UI.getItem(slot); ItemMeta meta = stack.getItemMeta(); for (OfflinePlayer pp : TeamUtils.getScoreboard().getTeam(challengeTeam.getName()).getPlayers()) { - lore.add(ChatUtil.BLUE + pp.getName()); + lore.add(Component.text(pp.getName(), ChatUtil.BLUE)); } - meta.setLore(lore); + meta.lore(lore); stack.setItemMeta(meta); TEAM_SELECT_UI.setItem(slot, stack); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java b/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java index 7a510a4..ce8c963 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -23,7 +24,7 @@ public static final int INVENTORY_SIZE = 5; public TeamSettingsGUI(Player player) { - super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Team Settings")); + super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> Team Settings")))); } @Override @@ -33,23 +34,23 @@ switch (i) { case TEAM_INDEX -> { if (!Config.getBoolean("event.teams")) { - item = ItemUtils.createGuiItem(Material.RED_BED, ChatUtil.RED + "Teams deaktiviert"); + item = ItemUtils.createGuiItem(Material.RED_BED, Component.text("Teams deaktiviert", ChatUtil.RED)); } else { - item = ItemUtils.createGuiItem(Material.LIME_BED, ChatUtil.GREEN + "Teams aktiviert", true); + item = ItemUtils.createGuiItem(Material.LIME_BED, Component.text("Teams aktiviert", ChatUtil.GREEN), true); } } case TEAM_SELECT_INDEX -> { if (!Config.getBoolean("event.teamselect")) { - item = ItemUtils.createGuiItem(Material.RED_CONCRETE_POWDER, ChatUtil.RED + "Team auswahl deaktiviert"); + item = ItemUtils.createGuiItem(Material.RED_CONCRETE_POWDER, Component.text("Team auswahl deaktiviert", ChatUtil.RED)); } else { - item = ItemUtils.createGuiItem(Material.LIME_CONCRETE_POWDER, ChatUtil.GREEN + "Team auswahl aktiviert", true); + item = ItemUtils.createGuiItem(Material.LIME_CONCRETE_POWDER, Component.text("Team auswahl aktiviert", ChatUtil.GREEN), true); } } case AUTOTEAM_BY_JOIN_INDEX -> { if (!Config.getBoolean("event.autoteams")) { - item = ItemUtils.createGuiItem(Material.RED_CONCRETE_POWDER, ChatUtil.RED + "Autoteams by Join deaktiviert"); + item = ItemUtils.createGuiItem(Material.RED_CONCRETE_POWDER, Component.text("Autoteams by Join deaktiviert", ChatUtil.RED)); } else { - item = ItemUtils.createGuiItem(Material.LIME_CONCRETE_POWDER, ChatUtil.GREEN + "Autoteams by Join aktiviert", true); + item = ItemUtils.createGuiItem(Material.LIME_CONCRETE_POWDER, Component.text("Autoteams by Join aktiviert", ChatUtil.GREEN), true); } } default -> item = ItemUtils.EMPTY_ICON; @@ -76,12 +77,12 @@ if (TeamUtils.getTeams() != null && TeamUtils.getTeamSize() != 0) { if (!Config.getBoolean("event.teams")) { Config.setValue("event.teams", true); - ChatUtil.sendTitleToAll("Event", "Teams aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Teams aktiviert", ChatUtil.GREEN)); plugin.getScoreManager().resetScores(); plugin.getSBManager().updateEventScoreboard(); } else { Config.setValue("event.teams", false); - ChatUtil.sendTitleToAll("Event", "Teams deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Teams deaktiviert", ChatUtil.RED)); for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().removeItem(TeamUtils.selctItem()); } @@ -94,14 +95,14 @@ if (TeamUtils.getTeams() != null && TeamUtils.getTeamSize() != 0) { if (!Config.getBoolean("event.teamselect")) { Config.setValue("event.teamselect", true); - ChatUtil.sendTitleToAll("Event", "Team auswahl aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Team auswahl aktiviert", ChatUtil.GREEN)); for (Player pp : Bukkit.getOnlinePlayers()) { plugin.getSBManager().removeScoreboard(pp); pp.getInventory().setItem(8, TeamUtils.selctItem()); } } else { Config.setValue("event.teamselect", false); - ChatUtil.sendTitleToAll("Event", "Team auswahl deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Team auswahl deaktiviert", ChatUtil.RED)); for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().removeItem(TeamUtils.selctItem()); } @@ -114,10 +115,10 @@ if (TeamUtils.getTeams() != null && TeamUtils.getTeamSize() != 0) { if (Config.getBoolean("event.autoteams")) { Config.setValue("event.autoteams", false); - ChatUtil.sendTitleToAll("Event", "Autoteams by Join deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Autoteams by Join deaktiviert", ChatUtil.RED)); } else { Config.setValue("event.autoteams", true); - ChatUtil.sendTitleToAll("Event", "Autoteams by Join aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Event"), Component.text("Autoteams by Join aktiviert", ChatUtil.GREEN)); } } else { ChatUtil.sendErrorMessage(player, "Du musst erst teams anlegen! /event createteams "); diff --git a/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveConfirmGui.java b/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveConfirmGui.java index 4a494c2..c1aa1f0 100644 --- a/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveConfirmGui.java +++ b/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveConfirmGui.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.SaveWorldUtils; import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -29,7 +30,7 @@ private static final HashMap saveSlotList = new HashMap<>(); public ChallengeSaveConfirmGui(Player player, UUID savePlayerID, SaveSlot saveSlot, ItemStack displayItem) { - super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Save überschreiben?")); + super(player, Bukkit.createInventory(player, InventoryType.HOPPER, plugin.getGuiPrefix().append(Component.text(" >> Save überschreiben?")))); playerItemList.put(player.getUniqueId(), displayItem); savePlayerList.put(player.getUniqueId(), savePlayerID); saveSlotList.put(player.getUniqueId(), saveSlot); @@ -40,9 +41,11 @@ for (int i = 0; i < INVENTORY_SIZE; i++) { ItemStack item; switch (i) { - case JA_INDEX -> item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, ChatUtil.GREEN + "Ja", true); + case JA_INDEX -> + item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", ChatUtil.GREEN), true); case ITEM_INDEX -> item = playerItemList.get(getPlayer().getUniqueId()); - case NEIN_INDEX -> item = ItemUtils.createGuiItem(Material.RED_CONCRETE, ChatUtil.RED + "Nein", true); + case NEIN_INDEX -> + item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", ChatUtil.RED), true); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveGui.java b/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveGui.java index 6714613..570e41a 100644 --- a/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveGui.java +++ b/src/main/java/de/fanta/challenges/guis/savegui/ChallengeSaveGui.java @@ -9,6 +9,7 @@ import de.iani.cubesideutils.StringUtil; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.playerUUIDCache.CachedPlayer; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.InvalidConfigurationException; @@ -38,7 +39,7 @@ private static final HashMap savePlayerList = new HashMap<>(); public ChallengeSaveGui(Player player, CachedPlayer savePlayer) { - super(player, Bukkit.createInventory(null, WINDOW_SIZE, plugin.getGUIPREFIX() + " >> Map speichern")); + super(player, Bukkit.createInventory(null, WINDOW_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Map speichern")))); savePlayerList.put(player.getUniqueId(), savePlayer.getUniqueId()); } @@ -183,12 +184,12 @@ ItemStack stack = new ItemStack(displayItem != null ? displayItem : Material.MAP); ItemMeta meta = stack.getItemMeta(); - meta.setDisplayName(displayName != null ? displayName : ChatUtil.GREEN + "Save " + saveSlot.getSlot()); + meta.displayName(displayName != null ? Component.text(displayName) : Component.text("Save " + saveSlot.getSlot(), ChatUtil.GREEN)); if (saveSlot == SaveSlot.SLOT_AUTO) { - meta.setLore(List.of(ChatUtil.RED + "AutoSave kann nicht überschrieben werden!", ChatUtil.GREEN + "Gespeichert am " + getFileDate(save))); + meta.lore(List.of(Component.text("AutoSave kann nicht überschrieben werden!", ChatUtil.RED), Component.text("Gespeichert am " + getFileDate(save), ChatUtil.GREEN))); } else { - meta.setLore(List.of(ChatUtil.GREEN + "Gespeichert am " + getFileDate(save))); + meta.lore(List.of(Component.text("Gespeichert am " + getFileDate(save), ChatUtil.GREEN))); } stack.setItemMeta(meta); @@ -196,10 +197,10 @@ } else { - item = ItemUtils.createGuiItem(Material.LIME_STAINED_GLASS_PANE, ChatUtil.GREEN + "Frei"); + item = ItemUtils.createGuiItem(Material.LIME_STAINED_GLASS_PANE, Component.text("Frei", ChatUtil.GREEN)); } } else { - item = ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Für diesen Slot brauchst du VIP"); + item = ItemUtils.createGuiItem(Material.BARRIER, Component.text("Für diesen Slot brauchst du VIP", ChatUtil.RED)); } return item; } diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java index 708527c..a4e1cf5 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java @@ -16,6 +16,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -59,7 +60,7 @@ private static final int MANHUNT_INDEX = 42; public ChallengesGui(Player player) { - super(player, Bukkit.createInventory(player, WINDOW_SIZE, plugin.getGUIPREFIX() + " >> Challenges")); + super(player, Bukkit.createInventory(player, WINDOW_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Challenges")))); } @Override @@ -79,57 +80,57 @@ case GOAL_INDEX -> { EntityType entityType = EntityType.valueOf(Config.getString("goal").toUpperCase()); if (entityType == EntityType.ENDER_DRAGON) { - Config.setValue("goal", EntityType.WITHER.getName()); - ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Wither", ChatUtil.GREEN); + Config.setValue("goal", EntityType.WITHER.name()); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Ziel: Töte den Wither", ChatUtil.GREEN)); } else if (entityType == EntityType.WITHER) { - Config.setValue("goal", EntityType.WARDEN.getName()); - ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Warden", ChatUtil.GREEN); + Config.setValue("goal", EntityType.WARDEN.name()); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Ziel: Töte den Warden", ChatUtil.GREEN)); } else if (entityType == EntityType.WARDEN) { - Config.setValue("goal", EntityType.ENDER_DRAGON.getName()); - ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Enderdrachen", ChatUtil.GREEN); + Config.setValue("goal", EntityType.ENDER_DRAGON.name()); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Ziel: Töte den Enderdrachen", ChatUtil.GREEN)); } } case SHUFFLE_RANDOM_DROP_INDEX -> { plugin.rndDrops.shuffleItems(); plugin.rndDrops.saveItems(); - ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Zufällige Drops neu gemischt!", ChatUtil.GREEN)); } case SHARED_DAMAGE_INDEX -> { if (Config.getBoolean("sharedmg")) { Config.setValue("sharedmg", false); - ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Geteielter Schaden deaktiviert", ChatUtil.RED)); } else { Config.setValue("sharedmg", true); - ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Geteielter Schaden aktiviert", ChatUtil.GREEN)); } } case FLOOR_IS_LAVA_INDEX -> { if (Config.getBoolean("lavafloor")) { Config.setValue("lavafloor", false); - ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Der Boden ist Lava deaktiviert", ChatUtil.RED)); } else { Config.setValue("lavafloor", true); - ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Der Boden ist Lava aktiviert", ChatUtil.GREEN)); } } case CHUNK_RANDOM_EFFECT_INDEX -> { if (Config.getBoolean("randomeffect")) { Config.setValue("randomeffect", false); - ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Chunk Random Effekt deaktiviert", ChatUtil.RED)); } else { Config.setValue("randomeffect", true); - ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Chunk Random Effekt aktiviert", ChatUtil.GREEN)); } } case BEDROCK_WALL_INDEX -> { if (event.isLeftClick()) { if (Config.getBoolean("bedrockwall")) { Config.setValue("bedrockwall", false); - ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Bedrock Wand deaktiviert", ChatUtil.RED)); } else { Config.setValue("bedrockwall", true); - ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Bedrock Wand aktiviert", ChatUtil.GREEN)); } } else if (event.isRightClick()) { new BedrockWallSettingsGui(player).open(); @@ -141,12 +142,12 @@ Config.setValue("mlg.enabled", false); MLGChallenge.setRunning(false); MLGChallenge.stopTask(); - ChatUtil.sendTitleToAll("Challenge", "MLG deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("MLG deaktiviert", ChatUtil.RED)); } else { Config.setValue("mlg.enabled", true); MLGChallenge.setRunning(true); MLGChallenge.startTask(); - ChatUtil.sendTitleToAll("Challenge", "MLG aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("MLG aktiviert", ChatUtil.GREEN)); } } else if (event.isRightClick()) { new MLGSettingsGui(player).open(); @@ -165,7 +166,7 @@ pp.getWorldBorder().reset(); } } - ChatUtil.sendTitleToAll("Challenge", "World Border Level deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("World Border Level deaktiviert", ChatUtil.RED)); } else { Config.setValue("worldborderlevel", true); new WorldBorderLevelChallenge(); @@ -173,7 +174,7 @@ for (Player pp : Bukkit.getOnlinePlayers()) { pp.teleportAsync(pp.getWorld().getSpawnLocation()); } - ChatUtil.sendTitleToAll("Challenge", "World Border Level aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("World Border Level aktiviert", ChatUtil.GREEN)); } } else if (event.isRightClick()) { new LevelBorderSettingsGui(player).open(); @@ -183,10 +184,10 @@ case ALL_ITEMS_INDEX -> { if (Config.getBoolean("allitems")) { Config.setValue("allitems", false); - ChatUtil.sendTitleToAll("Challenge", "All Items deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("All Items deaktiviert", ChatUtil.RED)); } else { Config.setValue("allitems", true); - ChatUtil.sendTitleToAll("Challenge", "All Items aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("All Items aktiviert", ChatUtil.GREEN)); AllItemsChallenge.start(); } } @@ -194,73 +195,73 @@ case DEATH_ON_XP_INDEX -> { if (Config.getBoolean("xpdeath")) { Config.setValue("xpdeath", false); - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED)); } else { Config.setValue("xpdeath", true); - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN)); } } case DEATH_ON_FALLDAMAGE_INDEX -> { if (Config.getBoolean("deathonfall")) { Config.setValue("deathonfall", false); - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Fallschaden deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Fallschaden aktiviert", ChatUtil.GREEN)); Config.setValue("deathonfall", true); } } case DEATH_ON_SPRINT_INDEX -> { if (Config.getBoolean("deathonsprint")) { Config.setValue("deathonsprint", false); - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Sprinten deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Sprinten aktiviert", ChatUtil.GREEN)); Config.setValue("deathonsprint", true); } } case DEATH_ON_JUMP_INDEX -> { if (Config.getBoolean("deathonjump")) { Config.setValue("deathonjump", false); - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Springen deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Sterben durch Springen aktiviert", ChatUtil.GREEN)); Config.setValue("deathonjump", true); } } case CLEAR_INVENTAR_ON_DAMAGE_INDEX -> { if (Config.getBoolean("clinvdmg")) { Config.setValue("clinvdmg", false); - ChatUtil.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Inventar von allen löschen wenn einer Schaden bekommt aktiviert", ChatUtil.GREEN)); Config.setValue("clinvdmg", true); } } case ICE_RUNNER_INDEX -> { if (Config.getBoolean("icerunner")) { Config.setValue("icerunner", false); - ChatUtil.sendTitleToAll("Challenge", "Ice-Runner deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Ice-Runner deaktiviert", ChatUtil.RED)); } else { Config.setValue("icerunner", true); - ChatUtil.sendTitleToAll("Challenge", "Ice-Runner aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Ice-Runner aktiviert", ChatUtil.GREEN)); } } case RANDOM_MOBS_INDEX -> { if (Config.getBoolean("randommobs")) { Config.setValue("randommobs", false); - ChatUtil.sendTitleToAll("Challenge", "Random Mobs deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Random Mobs deaktiviert", ChatUtil.RED)); } else { Config.setValue("randommobs", true); - ChatUtil.sendTitleToAll("Challenge", "Random Mobs aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Random Mobs aktiviert", ChatUtil.GREEN)); } } case RANDOM_DROPS_INDEX -> { if (Config.getBoolean("rnddrops")) { Config.setValue("rnddrops", false); - ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Zufällige Drops deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Zufällige Drops aktiviert", ChatUtil.GREEN)); Config.setValue("rnddrops", true); } } @@ -268,9 +269,9 @@ if (event.isLeftClick()) { if (Config.getBoolean("damageonsneak")) { Config.setValue("damageonsneak", false); - ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED)); } else { - ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN)); Config.setValue("damageonsneak", true); } } else if (event.isRightClick()) { @@ -281,10 +282,10 @@ if (event.isLeftClick()) { if (Config.getBoolean("tiedtogether")) { Config.setValue("tiedtogether", false); - ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Zusammengebunden deaktiviert", ChatUtil.RED)); } else { Config.setValue("tiedtogether", true); - ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Zusammengebunden aktiviert", ChatUtil.GREEN)); } } else if (event.isRightClick()) { new TiedTogetherSettingsGui(player).open(); @@ -293,32 +294,32 @@ case MOB_REMOVE_WORLD_INDEX -> { if (Config.getBoolean("mobremoveworld")) { Config.setValue("mobremoveworld", false); - ChatUtil.sendTitleToAll("Challenge", "Mobs entfernen Welt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Mobs entfernen Welt deaktiviert", ChatUtil.RED)); } else { Config.setValue("mobremoveworld", true); - ChatUtil.sendTitleToAll("Challenge", "Mobs entfernen Welt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Mobs entfernen Welt aktiviert", ChatUtil.GREEN)); } } case ALL_ADVANCEMENT_INDEX -> { if (Config.getBoolean("alladvancements")) { AllAdvancementsChallenge.stop(); Config.setValue("alladvancements", false); - ChatUtil.sendTitleToAll("Challenge", "All Advancement deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("All Advancement deaktiviert", ChatUtil.RED)); } else { AllAdvancementsChallenge.start(); Config.setValue("alladvancements", true); - ChatUtil.sendTitleToAll("Challenge", "All Advancement aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("All Advancement aktiviert", ChatUtil.GREEN)); } } case MANHUNT_INDEX -> { if (Config.getBoolean("manhunt")) { ManHunt.stop(); Config.setValue("manhunt", false); - ChatUtil.sendTitleToAll("Challenge", "Manhunt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Manhunt deaktiviert", ChatUtil.RED)); } else { ManHunt.start(); Config.setValue("manhunt", true); - ChatUtil.sendTitleToAll("Challenge", "Manhunt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Challenge"), Component.text("Manhunt aktiviert", ChatUtil.GREEN)); } } default -> { @@ -340,161 +341,163 @@ case GOAL_INDEX -> { EntityType entityType = EntityType.valueOf(Config.getString("goal").toUpperCase()); if (entityType == EntityType.ENDER_DRAGON) { - item = ItemUtils.createGuiItem(Material.DRAGON_HEAD, ChatUtil.GREEN + "Ziel: Enderdrachen töten"); + item = ItemUtils.createGuiItem(Material.DRAGON_HEAD, Component.text("Ziel: Enderdrachen töten", ChatUtil.GREEN)); } else if (entityType == EntityType.WITHER) { - item = ItemUtils.createGuiItem(Material.WITHER_SKELETON_SKULL, ChatUtil.GREEN + "Ziel: Wither töten"); + item = ItemUtils.createGuiItem(Material.WITHER_SKELETON_SKULL, Component.text("Ziel: Wither töten", ChatUtil.GREEN)); } else if (entityType == EntityType.WARDEN) { - item = ItemUtils.createGuiItem(Material.SCULK_SHRIEKER, ChatUtil.GREEN + "Ziel: Warden töten"); + item = ItemUtils.createGuiItem(Material.SCULK_SHRIEKER, Component.text("Ziel: Warden töten", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.DRAGON_HEAD, ChatUtil.GREEN + "Ziel: Enderdrachen töten"); + item = ItemUtils.createGuiItem(Material.DRAGON_HEAD, Component.text("Ziel: Enderdrachen töten", ChatUtil.GREEN)); } } case SHUFFLE_RANDOM_DROP_INDEX -> - item = ItemUtils.createGuiItem(Material.CHORUS_FLOWER, ChatUtil.GREEN + "Zufällige Drops neu mischen"); - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.RED + "Zurück"); - case CLOSE_INDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + item = ItemUtils.createGuiItem(Material.CHORUS_FLOWER, Component.text("Zufällige Drops neu mischen", ChatUtil.GREEN)); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.RED)); + case CLOSE_INDEX -> + item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED)); case SHARED_DAMAGE_INDEX -> { if (Config.getBoolean("sharedmg")) { - item = ItemUtils.createGuiItem(Material.MELON_SLICE, ChatUtil.GREEN + "Geteilter Schaden aktiviert", true); + item = ItemUtils.createGuiItem(Material.MELON_SLICE, Component.text("Geteilter Schaden aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.MELON_SLICE, ChatUtil.RED + "Geteilter Schaden deaktiviert"); + item = ItemUtils.createGuiItem(Material.MELON_SLICE, Component.text("Geteilter Schaden deaktiviert", ChatUtil.RED)); } } case FLOOR_IS_LAVA_INDEX -> { if (Config.getBoolean("lavafloor")) { - item = ItemUtils.createGuiItem(Material.MAGMA_BLOCK, ChatUtil.GREEN + "Der Boden ist Lava aktiviert", true); + item = ItemUtils.createGuiItem(Material.MAGMA_BLOCK, Component.text("Der Boden ist Lava aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.MAGMA_BLOCK, ChatUtil.RED + "Der Boden ist Lava deaktiviert"); + item = ItemUtils.createGuiItem(Material.MAGMA_BLOCK, Component.text("Der Boden ist Lava deaktiviert", ChatUtil.RED)); } } case CHUNK_RANDOM_EFFECT_INDEX -> { if (Config.getBoolean("randomeffect")) { - item = ItemUtils.createGuiItem(Material.SPLASH_POTION, ChatUtil.GREEN + "Chunk Random Effekt aktiviert", true); + item = ItemUtils.createGuiItem(Material.SPLASH_POTION, Component.text("Chunk Random Effekt aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.SPLASH_POTION, ChatUtil.RED + "Chunk Random Effekt deaktiviert"); + item = ItemUtils.createGuiItem(Material.SPLASH_POTION, Component.text("Chunk Random Effekt deaktiviert", ChatUtil.RED)); } } case BEDROCK_WALL_INDEX -> { if (Config.getBoolean("bedrockwall")) { - item = ItemUtils.createGuiItem(Material.BEDROCK, ChatUtil.GREEN + "Bedrock Wand aktiviert", true, ChatUtil.GREEN + "Linksklick = " + ChatUtil.RED + "Deaktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.BEDROCK, Component.text("Bedrock Wand aktiviert", ChatUtil.GREEN), true, Component.text("Linksklick = ", ChatUtil.GREEN).append(Component.text("Deaktivieren", ChatUtil.RED)), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.BEDROCK, ChatUtil.RED + "Bedrock Wand deaktiviert", ChatUtil.GREEN + "Linksklick = Aktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.BEDROCK, Component.text("Bedrock Wand deaktiviert", ChatUtil.RED), Component.text("Linksklick = Aktivieren", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case MLG_INDEX -> { if (Config.getBoolean("mlg.enabled")) { - item = ItemUtils.createGuiItem(Material.WATER_BUCKET, ChatUtil.GREEN + "MLG aktiviert", true, ChatUtil.GREEN + "Linksklick = " + ChatUtil.RED + "Deaktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.WATER_BUCKET, Component.text("MLG aktiviert", ChatUtil.GREEN), true, Component.text("Linksklick = ", ChatUtil.GREEN).append(Component.text("Deaktivieren", ChatUtil.RED)), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.WATER_BUCKET, ChatUtil.RED + "MLG deaktiviert", ChatUtil.GREEN + "Linksklick = Aktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.WATER_BUCKET, Component.text("MLG deaktiviert", ChatUtil.RED), Component.text("Linksklick = Aktivieren", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case WORLD_BORDER_LEVEL_INDEX -> { if (Config.getBoolean("worldborderlevel")) { - item = ItemUtils.createGuiItem(Material.STRUCTURE_VOID, ChatUtil.GREEN + "World Border Level aktiviert", true, ChatUtil.GREEN + "Linksklick = " + ChatUtil.RED + "Deaktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.STRUCTURE_VOID, Component.text("World Border Level aktiviert", ChatUtil.GREEN), true, Component.text("Linksklick = ", ChatUtil.GREEN).append(Component.text("Deaktivieren", ChatUtil.RED)), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.STRUCTURE_VOID, ChatUtil.RED + "World Border Level deaktiviert", ChatUtil.GREEN + "Linksklick = Aktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.STRUCTURE_VOID, Component.text("World Border Level deaktiviert", ChatUtil.RED), Component.text("Linksklick = Aktivieren", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case ALL_ITEMS_INDEX -> { if (Config.getBoolean("allitems")) { - item = ItemUtils.createGuiItem(Material.ITEM_FRAME, ChatUtil.GREEN + "All Items aktiviert", true, ChatUtil.GREEN + "/skipitem um ein Item zu überspringen"); + item = ItemUtils.createGuiItem(Material.ITEM_FRAME, Component.text("All Items aktiviert", ChatUtil.GREEN), true, Component.text("/skipitem um ein Item zu überspringen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.ITEM_FRAME, ChatUtil.RED + "All Items deaktiviert", ChatUtil.GREEN + "/skipitem um ein Item zu überspringen"); + item = ItemUtils.createGuiItem(Material.ITEM_FRAME, Component.text("All Items deaktiviert", ChatUtil.RED), Component.text("/skipitem um ein Item zu überspringen", ChatUtil.GREEN)); } } case DEATH_ON_XP_INDEX -> { if (Config.getBoolean("xpdeath")) { - item = ItemUtils.createGuiItem(Material.ENCHANTING_TABLE, ChatUtil.GREEN + "Sterben durch XP aktiviert", true, ChatUtil.GREEN + "Wenn ein Spieler XP einsammelt wird er sterben"); + item = ItemUtils.createGuiItem(Material.ENCHANTING_TABLE, Component.text("Sterben durch XP aktiviert", ChatUtil.GREEN), true, Component.text("Wenn ein Spieler XP einsammelt wird er sterben", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.ENCHANTING_TABLE, ChatUtil.RED + "Sterben durch XP deaktiviert", ChatUtil.RED + "Wenn ein Spieler XP einsammelt wird er sterben"); + item = ItemUtils.createGuiItem(Material.ENCHANTING_TABLE, Component.text("Sterben durch XP deaktiviert", ChatUtil.RED), Component.text("Wenn ein Spieler XP einsammelt wird er sterben", ChatUtil.RED)); } } case DEATH_ON_FALLDAMAGE_INDEX -> { if (Config.getBoolean("deathonfall")) { - item = ItemUtils.createGuiItem(Material.NETHERITE_BOOTS, ChatUtil.GREEN + "Tod bei Fallschaden aktiviert", true); + item = ItemUtils.createGuiItem(Material.NETHERITE_BOOTS, Component.text("Tod bei Fallschaden aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.NETHERITE_BOOTS, ChatUtil.RED + "Tod bei Fallschaden deaktiviert"); + item = ItemUtils.createGuiItem(Material.NETHERITE_BOOTS, Component.text("Tod bei Fallschaden deaktiviert", ChatUtil.RED)); } } case DEATH_ON_SPRINT_INDEX -> { if (Config.getBoolean("deathonsprint")) { - item = ItemUtils.createGuiItem(Material.POTION, ChatUtil.GREEN + "Tod beim Sprinten aktiviert", true); + item = ItemUtils.createGuiItem(Material.POTION, Component.text("Tod beim Sprinten aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.GLASS_BOTTLE, ChatUtil.RED + "Tod beim Sprinten deaktiviert"); + item = ItemUtils.createGuiItem(Material.GLASS_BOTTLE, Component.text("Tod beim Sprinten deaktiviert", ChatUtil.RED)); } } case DEATH_ON_JUMP_INDEX -> { if (Config.getBoolean("deathonjump")) { - item = ItemUtils.createGuiItem(Material.RABBIT_FOOT, ChatUtil.GREEN + "Tod beim Springen aktiviert", true); + item = ItemUtils.createGuiItem(Material.RABBIT_FOOT, Component.text("Tod beim Springen aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.RABBIT_FOOT, ChatUtil.RED + "Tod beim Springen deaktiviert"); + item = ItemUtils.createGuiItem(Material.RABBIT_FOOT, Component.text("Tod beim Springen deaktiviert", ChatUtil.RED)); } } case CLEAR_INVENTAR_ON_DAMAGE_INDEX -> { if (Config.getBoolean("clinvdmg")) { - item = ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.GREEN + "Alle Inventare löschen wenn ein Spieler Schaden bekommt aktiviert", true); + item = ItemUtils.createGuiItem(Material.BARRIER, Component.text("Alle Inventare löschen wenn ein Spieler Schaden bekommt aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Alle Inventare löschen wenn ein Spieler Schaden bekommt deaktiviert"); + item = ItemUtils.createGuiItem(Material.BARRIER, Component.text("Alle Inventare löschen wenn ein Spieler Schaden bekommt deaktiviert", ChatUtil.RED)); } } case ICE_RUNNER_INDEX -> { if (Config.getBoolean("icerunner")) { - item = ItemUtils.createGuiItem(Material.BLUE_ICE, ChatUtil.GREEN + "Ice-Runner aktiviert", true); + item = ItemUtils.createGuiItem(Material.BLUE_ICE, Component.text("Ice-Runner aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.BLUE_ICE, ChatUtil.RED + "Ice-Runner deaktiviert"); + item = ItemUtils.createGuiItem(Material.BLUE_ICE, Component.text("Ice-Runner deaktiviert", ChatUtil.RED)); } } case RANDOM_MOBS_INDEX -> { if (Config.getBoolean("randommobs")) { - item = ItemUtils.createGuiItem(Material.PARROT_SPAWN_EGG, ChatUtil.GREEN + "Random Mobs aktiviert", true); + item = ItemUtils.createGuiItem(Material.PARROT_SPAWN_EGG, Component.text("Random Mobs aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.PARROT_SPAWN_EGG, ChatUtil.RED + "Random Mobs deaktiviert"); + item = ItemUtils.createGuiItem(Material.PARROT_SPAWN_EGG, Component.text("Random Mobs deaktiviert", ChatUtil.RED)); } } case RANDOM_DROPS_INDEX -> { if (Config.getBoolean("rnddrops")) { - item = ItemUtils.createGuiItem(Material.NETHERITE_PICKAXE, ChatUtil.GREEN + "Zufällige Drops aktiviert", true); + item = ItemUtils.createGuiItem(Material.NETHERITE_PICKAXE, Component.text("Zufällige Drops aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.NETHERITE_PICKAXE, ChatUtil.RED + "Zufällige Drops deaktiviert"); + item = ItemUtils.createGuiItem(Material.NETHERITE_PICKAXE, Component.text("Zufällige Drops deaktiviert", ChatUtil.RED)); } } case DAMAGE_ON_SNEAK_INDEX -> { if (Config.getBoolean("damageonsneak")) { - item = ItemUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, ChatUtil.GREEN + "Schaden beim Schleichen aktiviert", true, ChatUtil.GREEN + "Schaden beim Schleichen: " + Config.getDouble("sneakdmg"), ChatUtil.GREEN + "Linksklick = " + ChatUtil.RED + "Deaktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, Component.text("Schaden beim Schleichen aktiviert", ChatUtil.GREEN), true, Component.text("Schaden beim Schleichen: " + Config.getDouble("sneakdmg"), ChatUtil.GREEN), Component.text("Linksklick = ", ChatUtil.GREEN).append(Component.text("Deaktivieren", ChatUtil.RED)), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, ChatUtil.RED + "Schaden beim Schleichen deaktiviert", ChatUtil.GREEN + "Linksklick = " + ChatUtil.GREEN + "Aktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, Component.text("Schaden beim Schleichen deaktiviert", ChatUtil.RED), Component.text("Linksklick = Aktivieren", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case TIED_TOGETHER_INDEX -> { if (Config.getBoolean("tiedtogether")) { - item = ItemUtils.createGuiItem(Material.DIAMOND_BOOTS, ChatUtil.GREEN + "Zusammengebunden aktiviert", true, ChatUtil.GREEN + "Maximale Entfernung der Spieler: " + Config.getDouble("playerrange"), ChatUtil.GREEN + "Linksklick = " + ChatUtil.RED + "Deaktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.DIAMOND_BOOTS, Component.text("Zusammengebunden aktiviert", ChatUtil.GREEN), true, Component.text("Maximale Entfernung der Spieler: " + Config.getDouble("playerrange"), ChatUtil.GREEN), Component.text("Linksklick = ", ChatUtil.GREEN).append(Component.text("Deaktivieren", ChatUtil.RED)), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.DIAMOND_BOOTS, ChatUtil.RED + "Zusammengebunden deaktiviert", ChatUtil.GREEN + "Linksklick = " + ChatUtil.GREEN + "Aktivieren", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.DIAMOND_BOOTS, Component.text("Zusammengebunden deaktiviert", ChatUtil.RED), Component.text("Linksklick = Aktivieren", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case MOB_REMOVE_WORLD_INDEX -> { if (Config.getBoolean("mobremoveworld")) { - item = ItemUtils.createGuiItem(Material.BLACK_CONCRETE, ChatUtil.GREEN + "Mobs entfernen Welt aktiviert", true, ChatUtil.GREEN + "Monster und Tiere löschen hinter sich die Welt."); + item = ItemUtils.createGuiItem(Material.BLACK_CONCRETE, Component.text("Mobs entfernen Welt aktiviert", ChatUtil.GREEN), true, Component.text("Monster und Tiere löschen hinter sich die Welt.", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.BLACK_CONCRETE, ChatUtil.RED + "Mobs entfernen Welt deaktiviert", ChatUtil.GREEN + "Monster und Tiere löschen hinter sich die Welt."); + item = ItemUtils.createGuiItem(Material.BLACK_CONCRETE, Component.text("Mobs entfernen Welt deaktiviert", ChatUtil.RED), Component.text("Monster und Tiere löschen hinter sich die Welt.", ChatUtil.GREEN)); } } case ALL_ADVANCEMENT_INDEX -> { if (Config.getBoolean("alladvancements")) { - item = ItemUtils.createGuiItem(Material.KNOWLEDGE_BOOK, ChatUtil.GREEN + "All Advancement aktiviert", true); + item = ItemUtils.createGuiItem(Material.KNOWLEDGE_BOOK, Component.text("All Advancement aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.KNOWLEDGE_BOOK, ChatUtil.RED + "All Advancement deaktiviert"); + item = ItemUtils.createGuiItem(Material.KNOWLEDGE_BOOK, Component.text("All Advancement deaktiviert", ChatUtil.RED)); } } case MANHUNT_INDEX -> { if (Config.getBoolean("manhunt")) { - item = ItemUtils.createGuiItem(Material.COMPASS, ChatUtil.GREEN + "ManHunt aktiviert", true); + item = ItemUtils.createGuiItem(Material.COMPASS, Component.text("ManHunt aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.COMPASS, ChatUtil.RED + "ManHunt deaktiviert"); + item = ItemUtils.createGuiItem(Material.COMPASS, Component.text("ManHunt deaktiviert", ChatUtil.RED)); } } default -> item = ItemUtils.EMPTY_ICON; 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 7e8b056..eef2e5d 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java @@ -6,6 +6,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -24,7 +25,7 @@ private static final int SERVER_SETTINGS_INDEX = 16; public MainGui(Player player) { - super(player, Bukkit.createInventory(null, WINDOW_SIZE, plugin.getGUIPREFIX() + " >> Settings")); + super(player, Bukkit.createInventory(null, WINDOW_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Settings")))); } @Override @@ -61,16 +62,16 @@ switch (i) { case CHALLENGES_INDEX -> { if (plugin.getServerType() != ServerType.ADVENTURE) { - item = ItemUtils.createGuiItem(Material.REPEATER, ChatUtil.GREEN + "Challenges"); + item = ItemUtils.createGuiItem(Material.REPEATER, Component.text("Challenges", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Challenges sind nur bei /tt challenge verfügbar"); + item = ItemUtils.createGuiItem(Material.BARRIER, Component.text("Challenges sind nur bei /tt challenge verfügbar", ChatUtil.RED)); } } case OTHER_SETTINGS_INDEX -> - item = ItemUtils.createGuiItem(Material.COMPARATOR, ChatUtil.GREEN + "Andere Einstellungen"); + item = ItemUtils.createGuiItem(Material.COMPARATOR, Component.text("Andere Einstellungen", ChatUtil.GREEN)); case SERVER_SETTINGS_INDEX -> - item = ItemUtils.createGuiItem(Material.COMMAND_BLOCK, ChatUtil.GREEN + "Server Einstellungen"); - case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + item = ItemUtils.createGuiItem(Material.COMMAND_BLOCK, Component.text("Server Einstellungen", ChatUtil.GREEN)); + case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED)); default -> item = ItemUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); 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 875ca35..9989034 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java @@ -7,6 +7,7 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -33,7 +34,7 @@ private static final int GRAVESTONE_INDEX = 28; public OtherSettingsGui(Player player) { - super(player, Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Other Settings")); + super(player, Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Other Settings")))); } @Override @@ -52,56 +53,56 @@ switch (slot) { case VILLAGER_TRADE_LIMITS_INDEX -> { if (Config.getBoolean("disablevillagertradelimits")) { - ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Villager Trade Limits aktiviert", ChatUtil.RED)); Config.setValue("disablevillagertradelimits", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN)); Config.setValue("disablevillagertradelimits", true); } } case DAMAGE_IN_CHAT_INDEX -> { if (Config.getBoolean("dmginchat")) { - ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Schaden im Chat anzeigen deaktiviert", ChatUtil.RED)); Config.setValue("dmginchat", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN)); Config.setValue("dmginchat", true); } } case TELEPORT_COMMAND_INDEX -> { if (Config.getBoolean("teleportcommand")) { - ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Teleport Command deaktiviert", ChatUtil.RED)); Config.setValue("teleportcommand", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Teleport Command aktiviert", ChatUtil.GREEN)); Config.setValue("teleportcommand", true); } } case HP_ON_TAB_INDEX -> { if (Config.getBoolean("tabhp")) { - ChatUtil.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED)); Config.setValue("tabhp", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN)); Config.setValue("tabhp", true); } plugin.getSBManager().updateTabHP(); } case SMELT_ORES_ON_BREAK_INDEX -> { if (Config.getBoolean("silkore")) { - ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED)); Config.setValue("silkore", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN)); Config.setValue("silkore", true); } } case FAST_FURNACE_INDEX -> { if (Config.getBoolean("speedfurnace")) { - ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Schneller Ofen deaktiviert", ChatUtil.RED)); Config.setValue("speedfurnace", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Schneller Ofen aktiviert", ChatUtil.GREEN)); Config.setValue("speedfurnace", true); } } @@ -113,10 +114,10 @@ case GRAVESTONE_INDEX -> { if (Config.getBoolean("gravestone")) { - ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Grabsteine deaktiviert", ChatUtil.RED)); Config.setValue("gravestone", false); } else { - ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Einstellungen"), Component.text("Grabsteine aktiviert", ChatUtil.GREEN)); Config.setValue("gravestone", true); } } @@ -136,65 +137,66 @@ for (int i = 0; i < INVENTORY_SIZE; i++) { ItemStack item; switch (i) { - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.RED + "Zurück"); - case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.RED)); + case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED)); case VILLAGER_TRADE_LIMITS_INDEX -> { if (Config.getBoolean("disablevillagertradelimits")) { - item = ItemUtils.createGuiItem(Material.EMERALD, ChatUtil.GREEN + "Villager Trade Limits aktiviert ", true); + item = ItemUtils.createGuiItem(Material.EMERALD, Component.text("Villager Trade Limits aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.EMERALD, ChatUtil.RED + "Villager Trade Limits deaktiviert (Default)"); + item = ItemUtils.createGuiItem(Material.EMERALD, Component.text("Villager Trade Limits deaktiviert (Default)", ChatUtil.RED)); } } case DAMAGE_IN_CHAT_INDEX -> { if (Config.getBoolean("dmginchat")) { - item = ItemUtils.createGuiItem(Material.PAPER, ChatUtil.GREEN + "Schaden im Chat anzeigen aktiviert", true); + item = ItemUtils.createGuiItem(Material.PAPER, Component.text("Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.PAPER, ChatUtil.RED + "Schaden im Chat anzeigen deaktiviert"); + item = ItemUtils.createGuiItem(Material.PAPER, Component.text("Schaden im Chat anzeigen deaktiviert", ChatUtil.RED)); } } case TELEPORT_COMMAND_INDEX -> { if (Config.getBoolean("teleportcommand")) { - item = ItemUtils.createGuiItem(Material.ENDER_PEARL, ChatUtil.GREEN + "Teleport Command aktiviert", true, ChatUtil.GREEN + "Deaktiviert den \"/challenges tp\" command"); + item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command aktiviert", ChatUtil.GREEN), true, Component.text("Deaktiviert den \"/challenges tp\" command", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.ENDER_PEARL, ChatUtil.RED + "Teleport Command deaktiviert", ChatUtil.RED + "Aktiviert den \"/challenges tp\" command"); + item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command deaktiviert", ChatUtil.RED), Component.text("Aktiviert den \"/challenges tp\" command", ChatUtil.RED)); } } case HP_ON_TAB_INDEX -> { if (Config.getBoolean("tabhp")) { - item = ItemUtils.createGuiItem(Material.HEART_OF_THE_SEA, ChatUtil.GREEN + "Herzen in der Tablist anzeigen aktiviert", true); + item = ItemUtils.createGuiItem(Material.HEART_OF_THE_SEA, Component.text("Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.HEART_OF_THE_SEA, ChatUtil.RED + "Herzen in der Tablist anzeigen deaktiviert"); + item = ItemUtils.createGuiItem(Material.HEART_OF_THE_SEA, Component.text("Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED)); } } case SMELT_ORES_ON_BREAK_INDEX -> { if (Config.getBoolean("silkore")) { - item = ItemUtils.createGuiItem(Material.IRON_INGOT, ChatUtil.GREEN + "Abgebaute Erze droppen Barren aktiviert", true); + item = ItemUtils.createGuiItem(Material.IRON_INGOT, Component.text("Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.IRON_INGOT, ChatUtil.RED + "Abgebaute Erze droppen Barren deaktiviert"); + item = ItemUtils.createGuiItem(Material.IRON_INGOT, Component.text("Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED)); } } case FAST_FURNACE_INDEX -> { if (Config.getBoolean("speedfurnace")) { - item = ItemUtils.createGuiItem(Material.FURNACE, ChatUtil.GREEN + "Schneller Ofen aktiviert", true); + item = ItemUtils.createGuiItem(Material.FURNACE, Component.text("Schneller Ofen aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.FURNACE, ChatUtil.RED + "Schneller Ofen deaktiviert"); + item = ItemUtils.createGuiItem(Material.FURNACE, Component.text("Schneller Ofen deaktiviert", ChatUtil.RED)); } } case BACKPACK_INDEX -> { if (plugin.getProtocolVersion() > 754) { - item = ItemUtils.createGuiItem(Material.BUNDLE, ChatUtil.GREEN + "Rucksack Größe: " + plugin.getBackpack().getSize() / 9 + "/6", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.BUNDLE, Component.text("Rucksack Größe: " + plugin.getBackpack().getSize() / 9 + "/6", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.CHEST, ChatUtil.GREEN + "Rucksack Größe: " + plugin.getBackpack().getSize() / 9 + "/6", ChatUtil.GREEN + "Rechtsklick = Einstellungen"); + item = ItemUtils.createGuiItem(Material.CHEST, Component.text("Rucksack Größe: " + plugin.getBackpack().getSize() / 9 + "/6", ChatUtil.GREEN), Component.text("Rechtsklick = Einstellungen", ChatUtil.GREEN)); } } case GRAVESTONE_INDEX -> { if (Config.getBoolean("gravestone")) { - item = ItemUtils.createGuiItem(Material.HOPPER, ChatUtil.GREEN + "Grabstein aktiviert", true); + item = ItemUtils.createGuiItem(Material.HOPPER, Component.text("Grabstein aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.HOPPER, ChatUtil.RED + "Grabstein deaktiviert"); + item = ItemUtils.createGuiItem(Material.HOPPER, Component.text("Grabstein deaktiviert", ChatUtil.RED)); } } default -> item = ItemUtils.EMPTY_ICON; 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 89a7255..ff6ba06 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java @@ -6,9 +6,11 @@ import de.fanta.challenges.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Difficulty; import org.bukkit.Material; +import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; @@ -31,7 +33,7 @@ private static final int PVP_INDEX = 25; public ServerSettingsGui(Player player) { - super(player, Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Server Settings")); + super(player, Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGuiPrefix().append(Component.text(" >> Server Settings")))); } @Override @@ -51,27 +53,27 @@ case DIFFICULTY_INDEX -> { if (plugin.getDifficulty() == Difficulty.EASY) { plugin.setDifficulty(Difficulty.NORMAL); - ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Mittel", ChatUtil.ORANGE); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Schwierigkeitsgrad Mittel", ChatUtil.ORANGE)); } else if (plugin.getDifficulty() == Difficulty.NORMAL) { plugin.setDifficulty(Difficulty.HARD); - ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Schwer", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Schwierigkeitsgrad Schwer", ChatUtil.RED)); } else if (plugin.getDifficulty() == Difficulty.HARD) { plugin.setDifficulty(Difficulty.PEACEFUL); - ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Friedlich", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Schwierigkeitsgrad Friedlich", ChatUtil.GREEN)); Config.setValue("editsettings", true); ChatUtil.sendWarningMessage(plugin.getCurrentEditor(), "Diese Challenge wird nicht mehr als Speed Run gezählt, da die Difficulty auf Friedlich gesetzt wurde."); } else if (plugin.getDifficulty() == Difficulty.PEACEFUL) { plugin.setDifficulty(Difficulty.EASY); - ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Leicht", ChatUtil.BLUE); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Schwierigkeitsgrad Leicht", ChatUtil.BLUE)); } } case KEEP_INVENTORY_INDEX -> { if (plugin.getKeepInventory()) { plugin.setKeepInventory(false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Keep Inventory deaktiviert", ChatUtil.RED)); } else { plugin.setKeepInventory(true); - ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Keep Inventory aktiviert", ChatUtil.GREEN)); Config.setValue("editsettings", true); ChatUtil.sendWarningMessage(plugin.getCurrentEditor(), "Diese Challenge wird nicht mehr als Speed Run gezählt, da du KeepInventory aktiviert hast."); } @@ -79,49 +81,49 @@ case NATURAL_REGENERATION_INDEX -> { if (plugin.getNaturalRegeneration()) { plugin.setNaturalRegeneration(false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Natürliche Regeneration aktiviert", ChatUtil.GREEN)); } else { plugin.setNaturalRegeneration(true); - ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Natürliche Regeneration deaktiviert", ChatUtil.RED)); } Config.setValue("editsettings", true); } case ULTRA_HARDCORE_INDEX -> { if (Config.getBoolean("ultrahardcore")) { Config.setValue("ultrahardcore", false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Ultra Hardcore deaktiviert", ChatUtil.RED)); } else { Config.setValue("ultrahardcore", true); - ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Ultra Hardcore aktiviert", ChatUtil.GREEN)); } } case ONE_LIFE_INDEX -> { if (Config.getBoolean("onelife")) { Config.setValue("onelife", false, false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Ein Leben für alle deaktiviert", ChatUtil.RED)); } else { Config.setValue("onelife", true, false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Ein Leben für alle aktiviert", ChatUtil.GREEN)); } } case RESPAWN_INDEX -> { if (Config.getBoolean("respawn")) { Config.setValue("respawn", false); - ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Wiederbeleben deaktiviert", ChatUtil.RED)); } else { Config.setValue("respawn", true); - ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("Wiederbeleben aktiviert", ChatUtil.GREEN)); } } case PVP_INDEX -> { if (plugin.getPvP()) { plugin.setPvP(false); Config.setValue("pvp", false, false); - ChatUtil.sendTitleToAll("Server Einstellungen", "PVP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("PVP deaktiviert", ChatUtil.RED)); } else { plugin.setPvP(true); Config.setValue("pvp", true, false); - ChatUtil.sendTitleToAll("Server Einstellungen", "PVP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll(Component.text("Server Einstellungen"), Component.text("PVP aktiviert", ChatUtil.GREEN)); } } default -> { @@ -140,60 +142,65 @@ for (int i = 0; i < INVENTORY_SIZE; i++) { ItemStack item; switch (i) { - case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.RED + "Zurück"); - case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + case BACK_INDEX -> + item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(Component.text("Zurück", ChatUtil.RED)); + case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(Component.text("Menü verlassen", ChatUtil.RED)); case DIFFICULTY_INDEX -> { if (plugin.getDifficulty() == Difficulty.EASY) { - item = ItemUtils.createGuiItem(Material.IRON_SWORD, ChatUtil.BLUE + "Schwierigkeitsgrad Leicht"); + item = ItemUtils.createGuiItem(Material.IRON_SWORD, Component.text("Schwierigkeitsgrad Leicht", ChatUtil.BLUE)); } else if (plugin.getDifficulty() == Difficulty.NORMAL) { - item = ItemUtils.createGuiItem(Material.DIAMOND_SWORD, ChatUtil.ORANGE + "Schwierigkeitsgrad Mittel"); + item = ItemUtils.createGuiItem(Material.DIAMOND_SWORD, Component.text("Schwierigkeitsgrad Mittel", ChatUtil.ORANGE)); } else if (plugin.getDifficulty() == Difficulty.HARD) { - item = ItemUtils.createGuiItem(Material.NETHERITE_SWORD, ChatUtil.RED + "Schwierigkeitsgrad Schwer"); + item = ItemUtils.createGuiItem(Material.NETHERITE_SWORD, Component.text("Schwierigkeitsgrad Schwer", ChatUtil.RED)); } else { - item = ItemUtils.createGuiItem(Material.POPPY, ChatUtil.GREEN + "Schwierigkeitsgrad Friedlich"); + item = ItemUtils.createGuiItem(Material.POPPY, Component.text("Schwierigkeitsgrad Friedlich", ChatUtil.GREEN)); } } case KEEP_INVENTORY_INDEX -> { if (plugin.getKeepInventory()) { - item = ItemUtils.createGuiItem(Material.CHEST_MINECART, ChatUtil.GREEN + "Keep Inventory aktiviert", true); + item = ItemUtils.createGuiItem(Material.CHEST_MINECART, Component.text("Keep Inventory aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.CHEST_MINECART, ChatUtil.RED + "Keep Inventory deaktiviert"); + item = ItemUtils.createGuiItem(Material.CHEST_MINECART, Component.text("Keep Inventory deaktiviert", ChatUtil.RED)); } } case NATURAL_REGENERATION_INDEX -> { if (plugin.getNaturalRegeneration()) { - item = ItemUtils.createGuiItem(Material.GOLDEN_APPLE, ChatUtil.GREEN + "Natürliche Regeneration aktiviert", true); + item = ItemUtils.createGuiItem(Material.GOLDEN_APPLE, Component.text("Natürliche Regeneration aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.GOLDEN_APPLE, ChatUtil.RED + "Natürliche Regeneration deaktiviert"); + item = ItemUtils.createGuiItem(Material.GOLDEN_APPLE, Component.text("Natürliche Regeneration deaktiviert", ChatUtil.RED)); } } case ULTRA_HARDCORE_INDEX -> { if (Config.getBoolean("ultrahardcore")) { - item = ItemUtils.createGuiItem(Material.SUSPICIOUS_STEW, ChatUtil.GREEN + "Ultra Hardcore aktiviert", true); + item = ItemUtils.createGuiItem(Material.SUSPICIOUS_STEW, Component.text("Ultra Hardcore aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.SUSPICIOUS_STEW, ChatUtil.RED + "Ultra Hardcore deaktiviert"); + item = ItemUtils.createGuiItem(Material.SUSPICIOUS_STEW, Component.text("Ultra Hardcore deaktiviert", ChatUtil.RED)); } } case ONE_LIFE_INDEX -> { if (Config.getBoolean("onelife")) { - item = ItemUtils.createGuiItem(Material.SUNFLOWER, ChatUtil.GREEN + "Ein Leben für alle aktiviert", true); + item = ItemUtils.createGuiItem(Material.SUNFLOWER, Component.text("Ein Leben für alle aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.SUNFLOWER, ChatUtil.RED + "Ein Leben für alle deaktiviert"); + item = ItemUtils.createGuiItem(Material.SUNFLOWER, Component.text("Ein Leben für alle deaktiviert", ChatUtil.RED)); } } case RESPAWN_INDEX -> { if (Config.getBoolean("respawn")) { - item = ItemUtils.createGuiItem(Material.TOTEM_OF_UNDYING, ChatUtil.GREEN + "Wiederbeleben aktiviert", true); + item = ItemUtils.createGuiItem(Material.TOTEM_OF_UNDYING, Component.text("Wiederbeleben aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.TOTEM_OF_UNDYING, ChatUtil.RED + "Wiederbeleben deaktiviert"); + item = ItemUtils.createGuiItem(Material.TOTEM_OF_UNDYING, Component.text("Wiederbeleben deaktiviert", ChatUtil.RED)); } } case PVP_INDEX -> { - if (plugin.getServer().getWorld("world").getPVP()) { - item = ItemUtils.createGuiItem(Material.WOODEN_SWORD, ChatUtil.GREEN + "PVP aktiviert", true); + World world = plugin.getServer().getWorld("world"); + if (world == null) { + return; + } + if (world.getPVP()) { + item = ItemUtils.createGuiItem(Material.WOODEN_SWORD, Component.text("PVP aktiviert", ChatUtil.GREEN), true); } else { - item = ItemUtils.createGuiItem(Material.WOODEN_SWORD, ChatUtil.RED + "PVP deaktiviert"); + item = ItemUtils.createGuiItem(Material.WOODEN_SWORD, Component.text("PVP deaktiviert", ChatUtil.RED)); } } default -> item = ItemUtils.EMPTY_ICON; diff --git a/src/main/java/de/fanta/challenges/listeners/DamageListener.java b/src/main/java/de/fanta/challenges/listeners/DamageListener.java index 5f7a441..c941d85 100644 --- a/src/main/java/de/fanta/challenges/listeners/DamageListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DamageListener.java @@ -3,6 +3,8 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; +import de.iani.cubesideutils.StringUtil; +import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -25,9 +27,9 @@ if ((e.getFinalDamage() > 0) && (e.getFinalDamage() < 10000)) { if (!e.getCause().name().startsWith("ENTITY_")) { if (e.getCause() == DamageCause.CUSTOM) { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + Config.getDouble("sneakdmg") + ChatUtil.GREEN + " HP Schaden genommen durch" + ChatUtil.ORANGE + " Server"); + ChatUtil.sendBrodcastMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat ", ChatUtil.GREEN).append(Component.text(Config.getDouble("sneakdmg"), ChatUtil.ORANGE).append(Component.text(" HP Schaden genommen durch", ChatUtil.GREEN).append(Component.text(" Server", ChatUtil.ORANGE)))))); } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getCause().toString().replace("_", " ").toLowerCase()); + ChatUtil.sendBrodcastMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat ", ChatUtil.GREEN).append(Component.text(dmg, ChatUtil.ORANGE).append(Component.text(" HP Schaden genommen durch ", ChatUtil.GREEN).append(Component.text(StringUtil.capitalizeFirstLetter(e.getCause().toString(), true), ChatUtil.ORANGE)))))); } } } @@ -49,10 +51,10 @@ if ((e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) && Config.getBoolean("dmginchat")) { if (e.getDamager() instanceof Player damager) { if (!plugin.getVanish().isVanish(damager)) { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getDamager().getName()); + ChatUtil.sendBrodcastMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat ", ChatUtil.GREEN).append(Component.text(dmg, ChatUtil.ORANGE)).append(Component.text(" HP Schaden genommen durch ", ChatUtil.GREEN)).append(e.getDamager().name()).color(ChatUtil.ORANGE))); } } else { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat " + ChatUtil.ORANGE + dmg + ChatUtil.GREEN + " HP Schaden genommen durch " + ChatUtil.ORANGE + e.getDamager().getName()); + ChatUtil.sendBrodcastMessage(p.name().color(ChatUtil.BLUE).append(Component.text(" hat ", ChatUtil.GREEN).append(Component.text(dmg, ChatUtil.ORANGE)).append(Component.text(" HP Schaden genommen durch ", ChatUtil.GREEN)).append(e.getDamager().name()).color(ChatUtil.ORANGE))); } } diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index 9fb5bb2..46a4f42 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -19,21 +19,21 @@ @EventHandler public void onPlayerDeath(PlayerDeathEvent e) { - TextComponent component = plugin.getPrefixComponent().append(e.deathMessage()).color(TextColor.color(ChatUtil.BLUE.getColor().getRGB())); + TextComponent component = plugin.getPrefixComponent().append(e.deathMessage().color(ChatUtil.BLUE)); if (Config.getBoolean("onelife")) { plugin.getTimer().stopTimer(); for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } e.deathMessage(component); - ChatUtil.sendBrodcastMessage("Verschwendete Zeit " + plugin.getTimer().formatTime(ChatUtil.ORANGE)); - ChatUtil.sendBrodcastMessage("Welt Seed: " + Bukkit.getWorlds().get(0).getSeed()); - ChatUtil.sendBrodcastMessage("Um alle wiederzubeleben benutze §c/revive ALL"); + ChatUtil.sendBrodcastMessage(Component.text("Verschwendete Zeit ", ChatUtil.GREEN).append(plugin.getTimer().formatTime(ChatUtil.ORANGE))); + ChatUtil.sendBrodcastMessage(Component.text("Welt Seed: " + Bukkit.getWorlds().get(0).getSeed(), ChatUtil.GREEN)); + ChatUtil.sendBrodcastMessage(Component.text("Um alle wiederzubeleben benutze §c/revive ALL", ChatUtil.GREEN)); } else { if (Config.getBoolean("event.enabled")) { e.deathMessage(component); } else { - component = component.append(Component.text(" (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")").color(TextColor.color(ChatUtil.ORANGE.getColor().getRGB()))); + component = component.append(Component.text(" (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")").color(ChatUtil.ORANGE)); e.deathMessage(component); } if (!Config.getBoolean("respawn")) { diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index cf31d11..6a2904a 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -10,6 +10,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.SaveWorldUtils; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -38,8 +39,7 @@ } if (!plugin.getVanish().isVanish(p)) { - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat die Lobby betreten! " + ChatUtil.YELLOW + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); - e.setJoinMessage(null); + 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())) { @@ -86,16 +86,16 @@ @EventHandler public void onPlayerLogin(PlayerLoginEvent e) { if (plugin.getServerType() == ServerType.CHALLENGE_EVENT) { - if (!Config.getBoolean("firsttimerstart") && Bukkit.getOnlinePlayers().size() == 0) { + if (!Config.getBoolean("firsttimerstart") && Bukkit.getOnlinePlayers().isEmpty()) { if (!e.getPlayer().hasPermission("challenges.event")) { e.setResult(PlayerLoginEvent.Result.KICK_OTHER); - e.setKickMessage("Aktuell läuft kein Event."); + e.kickMessage(Component.text("Aktuell läuft kein Event.")); } } else { if (!plugin.getTimer().isRunning() && Config.getBoolean("firsttimerstart")) { if (!e.getPlayer().hasPermission("challenges.event")) { e.setResult(PlayerLoginEvent.Result.KICK_OTHER); - e.setKickMessage("Das Event wurde pausiert."); + e.kickMessage(Component.text("Das Event wurde pausiert.")); } } } @@ -104,12 +104,12 @@ if (plugin.isPlayerBanned(e.getPlayer().getUniqueId())) { e.setResult(PlayerLoginEvent.Result.KICK_OTHER); - e.setKickMessage("Du wurdest von dieser Lobby gebannt."); + e.kickMessage(Component.text("Du wurdest von dieser Lobby gebannt.")); } if (plugin.isWaitingForShutdown()) { e.setResult(PlayerLoginEvent.Result.KICK_OTHER); - e.setKickMessage("Der Server wird gerade neu gestartet."); + e.kickMessage(Component.text("Der Server wird gerade neu gestartet.")); } } @@ -139,8 +139,7 @@ } } if (!plugin.getVanish().isVanish(player)) { - e.setQuitMessage(null); - ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + player.getName() + ChatUtil.RED + " hat die Lobby verlassen! " + ChatUtil.YELLOW + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); + e.quitMessage(player.name().color(ChatUtil.BLUE).append(Component.text(" hat die Lobby verlassen! ", ChatUtil.RED).append(Component.text("[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]", ChatUtil.YELLOW)))); this.plugin.getSBManager().removeScoreboard(player); Bukkit.getPluginManager().callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1)); diff --git a/src/main/java/de/fanta/challenges/teams/ChallengeTeam.java b/src/main/java/de/fanta/challenges/teams/ChallengeTeam.java index 4febffc..81796b2 100644 --- a/src/main/java/de/fanta/challenges/teams/ChallengeTeam.java +++ b/src/main/java/de/fanta/challenges/teams/ChallengeTeam.java @@ -4,6 +4,9 @@ import de.fanta.challenges.guis.BackpackGui; import de.fanta.challenges.scoreboard.Scorable; import de.fanta.challenges.utils.Config; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -15,7 +18,7 @@ public class ChallengeTeam implements Scorable { private String name; - private ChatColor chatColor; + private NamedTextColor chatColor; private Location spawn; @@ -25,20 +28,20 @@ private int score; - private BackpackGui backpack; + private final BackpackGui backpack; - public ChallengeTeam(String name, ChatColor chatColor, ItemStack displayItem) { + public ChallengeTeam(String name, NamedTextColor chatColor, ItemStack displayItem) { this.name = name; this.chatColor = chatColor; this.displayItem = displayItem; - this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9, Challenges.getPlugin().getGUIPREFIX() + " >> " + name); + this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9, Challenges.getPlugin().getGuiPrefix().append(Component.text(" >> " + name))); } public String getName() { return name; } - public ChatColor getChatColor() { + public NamedTextColor getChatColor() { return chatColor; } @@ -58,7 +61,7 @@ this.name = name; } - public void setChatColor(ChatColor chatColor) { + public void setChatColor(NamedTextColor chatColor) { this.chatColor = chatColor; } diff --git a/src/main/java/de/fanta/challenges/teams/TeamUtils.java b/src/main/java/de/fanta/challenges/teams/TeamUtils.java index 7319f81..0f86589 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamUtils.java +++ b/src/main/java/de/fanta/challenges/teams/TeamUtils.java @@ -3,7 +3,8 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.eventgui.TeamSelectGUI; import de.fanta.challenges.utils.ChatUtil; -import org.bukkit.ChatColor; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Color; import org.bukkit.GameMode; import org.bukkit.Material; @@ -32,59 +33,58 @@ private static final HashMap playerTeams = new HashMap<>(); private static final NamespacedKey selectKey = new NamespacedKey(Challenges.getPlugin(), "selectitem"); private static ChallengeTeam[] teams; - private static int teamsize; + private static int teamSize; private static Scoreboard scoreboard; private static Objective teamscoreboardObjective; - private static final Challenges plugin = Challenges.getPlugin(); private static ChallengeTeam createDefaultTeam(int nr) { if (nr == 0) { - return new ChallengeTeam("Schwarz", ChatColor.BLACK, createDisplayItem(Color.fromRGB(0, 0, 0), ChatColor.BLACK, "Schwarz")); + return new ChallengeTeam("Schwarz", NamedTextColor.BLACK, createDisplayItem(Color.fromRGB(0, 0, 0), NamedTextColor.BLACK, "Schwarz")); } if (nr == 1) { - return new ChallengeTeam("Dunkel-Blau", ChatColor.DARK_BLUE, createDisplayItem(Color.fromRGB(0, 0, 170), ChatColor.DARK_BLUE, "Dunkel-Blau")); + return new ChallengeTeam("Dunkel-Blau", NamedTextColor.DARK_BLUE, createDisplayItem(Color.fromRGB(0, 0, 170), NamedTextColor.DARK_BLUE, "Dunkel-Blau")); } if (nr == 2) { - return new ChallengeTeam("Dunkel-Grün", ChatColor.DARK_GREEN, createDisplayItem(Color.fromRGB(0, 170, 0), ChatColor.DARK_GREEN, "Dunkel-Grün")); + return new ChallengeTeam("Dunkel-Grün", NamedTextColor.DARK_GREEN, createDisplayItem(Color.fromRGB(0, 170, 0), NamedTextColor.DARK_GREEN, "Dunkel-Grün")); } if (nr == 3) { - return new ChallengeTeam("Türkis", ChatColor.DARK_AQUA, createDisplayItem(Color.fromRGB(0, 170, 170), ChatColor.DARK_AQUA, "Türkis")); + return new ChallengeTeam("Türkis", NamedTextColor.DARK_AQUA, createDisplayItem(Color.fromRGB(0, 170, 170), NamedTextColor.DARK_AQUA, "Türkis")); } if (nr == 4) { - return new ChallengeTeam("Dunkel-Rot", ChatColor.DARK_RED, createDisplayItem(Color.fromRGB(170, 0, 0), ChatColor.DARK_RED, "Dunkel-Rot")); + return new ChallengeTeam("Dunkel-Rot", NamedTextColor.DARK_RED, createDisplayItem(Color.fromRGB(170, 0, 0), NamedTextColor.DARK_RED, "Dunkel-Rot")); } if (nr == 5) { - return new ChallengeTeam("Lila", ChatColor.DARK_PURPLE, createDisplayItem(Color.fromRGB(170, 0, 170), ChatColor.DARK_PURPLE, "Lila")); + return new ChallengeTeam("Lila", NamedTextColor.DARK_PURPLE, createDisplayItem(Color.fromRGB(170, 0, 170), NamedTextColor.DARK_PURPLE, "Lila")); } if (nr == 6) { - return new ChallengeTeam("Gold", ChatColor.GOLD, createDisplayItem(Color.fromRGB(255, 170, 0), ChatColor.GOLD, "Gold")); + return new ChallengeTeam("Gold", NamedTextColor.GOLD, createDisplayItem(Color.fromRGB(255, 170, 0), NamedTextColor.GOLD, "Gold")); } if (nr == 7) { - return new ChallengeTeam("Grau", ChatColor.GRAY, createDisplayItem(Color.fromRGB(170, 170, 170), ChatColor.GRAY, "Grau")); + return new ChallengeTeam("Grau", NamedTextColor.GRAY, createDisplayItem(Color.fromRGB(170, 170, 170), NamedTextColor.GRAY, "Grau")); } if (nr == 8) { - return new ChallengeTeam("Dunkel-Grau", ChatColor.DARK_GRAY, createDisplayItem(Color.fromRGB(85, 85, 85), ChatColor.DARK_GRAY, "Dunkel-Grau")); + return new ChallengeTeam("Dunkel-Grau", NamedTextColor.DARK_GRAY, createDisplayItem(Color.fromRGB(85, 85, 85), NamedTextColor.DARK_GRAY, "Dunkel-Grau")); } if (nr == 9) { - return new ChallengeTeam("Blau", ChatColor.BLUE, createDisplayItem(Color.fromRGB(85, 85, 255), ChatColor.BLUE, "Blau")); + return new ChallengeTeam("Blau", NamedTextColor.BLUE, createDisplayItem(Color.fromRGB(85, 85, 255), NamedTextColor.BLUE, "Blau")); } if (nr == 10) { - return new ChallengeTeam("Grün", ChatColor.GREEN, createDisplayItem(Color.fromRGB(85, 255, 85), ChatColor.GREEN, "Grün")); + return new ChallengeTeam("Grün", NamedTextColor.GREEN, createDisplayItem(Color.fromRGB(85, 255, 85), NamedTextColor.GREEN, "Grün")); } if (nr == 11) { - return new ChallengeTeam("Hell-Blau", ChatColor.AQUA, createDisplayItem(Color.fromRGB(85, 255, 255), ChatColor.AQUA, "Hell-Blau")); + return new ChallengeTeam("Hell-Blau", NamedTextColor.AQUA, createDisplayItem(Color.fromRGB(85, 255, 255), NamedTextColor.AQUA, "Hell-Blau")); } if (nr == 12) { - return new ChallengeTeam("Rot", ChatColor.RED, createDisplayItem(Color.fromRGB(255, 85, 85), ChatColor.RED, "Rot")); + return new ChallengeTeam("Rot", NamedTextColor.RED, createDisplayItem(Color.fromRGB(255, 85, 85), NamedTextColor.RED, "Rot")); } if (nr == 13) { - return new ChallengeTeam("Pink", ChatColor.LIGHT_PURPLE, createDisplayItem(Color.fromRGB(255, 85, 255), ChatColor.LIGHT_PURPLE, "Pink")); + return new ChallengeTeam("Pink", NamedTextColor.LIGHT_PURPLE, createDisplayItem(Color.fromRGB(255, 85, 255), NamedTextColor.LIGHT_PURPLE, "Pink")); } if (nr == 14) { - return new ChallengeTeam("Gelb", ChatColor.YELLOW, createDisplayItem(Color.fromRGB(255, 255, 85), ChatColor.YELLOW, "Gelb")); + return new ChallengeTeam("Gelb", NamedTextColor.YELLOW, createDisplayItem(Color.fromRGB(255, 255, 85), NamedTextColor.YELLOW, "Gelb")); } - return new ChallengeTeam("Team_" + nr, ChatColor.WHITE, createDisplayItem(Color.WHITE, ChatColor.WHITE, "Team " + nr)); + return new ChallengeTeam("Team_" + nr, NamedTextColor.WHITE, createDisplayItem(Color.WHITE, NamedTextColor.WHITE, "Team " + nr)); } public static void setTeamCount(int teamcount) { @@ -98,11 +98,11 @@ TeamSelectGUI.updateTeamSelectGui(); } - private static ItemStack createDisplayItem(Color color, ChatColor chatColor, String teamName) { + private static ItemStack createDisplayItem(Color color, NamedTextColor chatColor, String teamName) { ItemStack displayItem = new ItemStack(Material.LEATHER_HELMET, 1); LeatherArmorMeta meta = (LeatherArmorMeta) displayItem.getItemMeta(); meta.setColor(color); - meta.setDisplayName(chatColor + teamName); + meta.displayName(Component.text(teamName, chatColor)); meta.addItemFlags(ItemFlag.HIDE_DYE); displayItem.setItemMeta(meta); return displayItem; @@ -110,11 +110,11 @@ public static int getTeamSize() { - return teamsize; + return teamSize; } public static void setTeamSize(int size) { - teamsize = size; + teamSize = size; } public static ChallengeTeam[] getTeams() { @@ -182,8 +182,8 @@ if (scoreboardTeams[i] == null) { if (scoreboard.getTeam(t.getName()) == null) { scoreboardTeams[i] = scoreboard.registerNewTeam(t.getName()); - scoreboardTeams[i].setPrefix(t.getChatColor().toString()); - scoreboardTeams[i].setColor(t.getChatColor()); + scoreboardTeams[i].prefix(Component.empty().color(t.getChatColor())); + scoreboardTeams[i].color(t.getChatColor()); scoreboardTeams[i].setAllowFriendlyFire(false); scoreboardTeams[i].setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.FOR_OWN_TEAM); } @@ -210,7 +210,7 @@ return; } int count = Collections.frequency(new ArrayList<>(playerTeams.values()), team); - if (team != null && count >= teamsize) { + if (team != null && count >= teamSize) { ChatUtil.sendNormalMessage(player, "Das Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " ist voll."); return; } diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index 23541a8..843da57 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -2,7 +2,11 @@ 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; @@ -10,82 +14,72 @@ import org.bukkit.entity.Player; import javax.annotation.Nullable; +import java.time.Duration; public class ChatUtil { - public static final ChatColor GREEN = ChatColor.of("#52ff9d"); - public static final ChatColor YELLOW = ChatColor.of("#E4E737"); - public static final ChatColor ORANGE = ChatColor.of("#ffac4d"); - public static final ChatColor RED = ChatColor.of("#ff6b6b"); - public static final ChatColor PINK = ChatColor.of("#FF04F7"); - public static final ChatColor BLUE = ChatColor.of("#87f7ea"); + public static final TextColor GREEN = TextColor.fromHexString("#52ff9d"); + public static final TextColor YELLOW = TextColor.fromHexString("#E4E737"); + public static final TextColor ORANGE = TextColor.fromHexString("#ffac4d"); + public static final TextColor RED = TextColor.fromHexString("#ff6b6b"); + public static final TextColor PINK = TextColor.fromHexString("#FF04F7"); + public static final TextColor BLUE = TextColor.fromHexString("#87f7ea"); private ChatUtil() { // prevent instances } - public static void sendMessage(CommandSender sender, String colors, Object... messageParts) { - ChatUtilBukkit.sendMessage(sender, Challenges.getPlugin().getPREFIX(), colors, messageParts); + public static void sendMessage(CommandSender sender, Component component) { + Component message = Challenges.getPlugin().getPrefixComponent().append(component); + sender.sendMessage(message); } - public static void sendNormalMessage(CommandSender sender, Object... messageParts) { - sendMessage(sender, GREEN.toString(), messageParts); + public static void sendNormalMessage(CommandSender sender, String string) { + sendMessage(sender, Component.text(string).color(GREEN)); } - public static void sendWarningMessage(CommandSender sender, Object... messageParts) { - sendMessage(sender, ORANGE.toString(), messageParts); + public static void sendWarningMessage(CommandSender sender, String string) { + sendMessage(sender, Component.text(string).color(ORANGE)); } - public static void sendErrorMessage(CommandSender sender, Object... messageParts) { - sendMessage(sender, RED.toString(), messageParts); + public static void sendErrorMessage(CommandSender sender, String string) { + sendMessage(sender, Component.text(string).color(RED)); } - public static void sendDebugMessage(CommandSender sender, Object... messageParts) { - if (sender.hasPermission("fanta.debug")) { - if (sender != null) { - sendMessage(sender, PINK.toString(), messageParts); + public static void sendDebugMessage(CommandSender sender, String string) { + if (sender != null) { + if (sender.hasPermission("fanta.debug")) { + sendMessage(sender, Component.text(string).color(PINK)); } } } - public static void sendComponentMessage(CommandSender sender, TextComponent component) { - //ChatUtilBukkit.sendMessageToPlayers(sender, component); - sender.sendMessage(Challenges.getPlugin().getPrefixComponent().append(component)); - } - - public static void sendBrodcastMessage(Object... messageParts) { + public static void sendBrodcastMessage(Component component) { for (Player player : Bukkit.getOnlinePlayers()) { - sendMessage(player, GREEN.toString(), messageParts); + sendMessage(player, component); } } - public static void sendTitleToAll(String headline, String text, ChatColor textColor, int in, int time, int out, boolean pling) { + public static void sendTitleToAll(Component headline, Component text, int in, int time, int out, boolean pling) { for (Player p : Bukkit.getOnlinePlayers()) { - sendTitleToPlayer(p, headline, text, textColor, in, time, out, pling); + sendTitleToPlayer(p, headline, text, in, time, out, pling); } } - public static void sendTitleToAll(String headline, String text, ChatColor textColor, boolean pling) { - sendTitleToAll(headline, text, textColor, 10, 60, 10, pling); + public static void sendTitleToAll(Component headline, Component text, boolean pling) { + sendTitleToAll(headline, text, 10, 60, 10, pling); } - public static void sendTitleToAll(String headline, String text, ChatColor textColor) { - sendTitleToAll(headline, text, textColor, 10, 60, 10, true); + public static void sendTitleToAll(Component headline, Component text) { + sendTitleToAll(headline, text, 10, 60, 10, true); } - public static void sendTitleToPlayer(Player player, @Nullable String headline, @Nullable String text, ChatColor textColor, int in, int time, int out, boolean pling) { - String tempheadline = headline; - String temptext = text; + public static void sendTitleToPlayer(Player player, @Nullable Component headline, @Nullable Component text, int in, int time, int out, boolean pling) { + Component headLine = headline != null ? headline.color(BLUE) : Component.empty(); + Component textComponent = text != null ? text : Component.empty(); - if (headline == null || headline.equals("")) { - tempheadline = " "; - } - - if (temptext == null || temptext.equals("")) { - temptext = " "; - } - - player.sendTitle(ChatUtil.BLUE + tempheadline, textColor + temptext, in, time, out); + Title title = Title.title(headLine, textComponent, Title.Times.times(Ticks.duration(in), Ticks.duration(time), Ticks.duration(out))); + player.showTitle(title); if (pling) { player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); } diff --git a/src/main/java/de/fanta/challenges/utils/ColorUtils.java b/src/main/java/de/fanta/challenges/utils/ColorUtils.java index 7c26310..2715b58 100644 --- a/src/main/java/de/fanta/challenges/utils/ColorUtils.java +++ b/src/main/java/de/fanta/challenges/utils/ColorUtils.java @@ -3,10 +3,12 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.Timer; import de.fanta.challenges.schedular.CancellableTask; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextColor; +import net.kyori.adventure.text.format.TextDecoration; import net.md_5.bungee.api.ChatColor; -import java.awt.*; - public class ColorUtils { private final Challenges plugin; @@ -18,7 +20,7 @@ restartTask(1); } - public static ChatColor getColorGradient(int[] baseColors, long time, double extraTime, double speed) { + public static TextColor getColorGradient(int[] baseColors, long time, double extraTime, double speed) { int v = Math.floorMod((int) (time * speed + extraTime * 21), baseColors.length * 100); int step = v / 100; double ratio = (v % 100) * 0.01; @@ -168,7 +170,7 @@ int c = (rFinal << 16) | (gFinal << 8) | (bFinal); - return ChatColor.of(new Color(c)); + return TextColor.color(c); } public void restartTask(long l) { @@ -183,13 +185,13 @@ return this.time; } - public String addChatColorToString(String input, int[] baseColors, double speed) { - StringBuilder output = new StringBuilder(); + public Component addChatColorToString(String input, int[] baseColors, double speed) { + Component output = Component.empty(); double extraTime = 0.0; for (char c : input.toCharArray()) { extraTime = plugin.getTimer().getMode() == Timer.TimerMode.UP ? extraTime - 0.40 : extraTime + 0.40; - output.append(getColorGradient(baseColors, getTime(), extraTime, speed)).append(ChatColor.BOLD).append(c); + output = output.append(Component.text(c, Style.style(getColorGradient(baseColors, getTime(), extraTime, speed), TextDecoration.BOLD))); } - return output.toString(); + return output; } } diff --git a/src/main/java/de/fanta/challenges/utils/CubesideModUtils.java b/src/main/java/de/fanta/challenges/utils/CubesideModUtils.java index 6a2b58d..120b8f3 100644 --- a/src/main/java/de/fanta/challenges/utils/CubesideModUtils.java +++ b/src/main/java/de/fanta/challenges/utils/CubesideModUtils.java @@ -2,6 +2,7 @@ import de.fanta.challenges.Challenges; import de.iani.cubesideutils.MinecraftDataOutputStream; +import net.kyori.adventure.text.format.TextColor; import net.md_5.bungee.api.ChatColor; import org.bukkit.entity.Player; @@ -12,7 +13,7 @@ - public static void sendFlashScreenToCubesideMod(Challenges plugin, Player player, int duration, ChatColor color) { + public static void sendFlashScreenToCubesideMod(Challenges plugin, Player player, int duration, TextColor color) { plugin.getScheduler().runDelayedOnEntity(player, () -> { if (player == null) { return; @@ -28,7 +29,7 @@ try { dataOut.writeByte(cubesideDateChannel); dataOut.writeByte(cubesideDateChannelVersion); - dataOut.writeInt(color.getColor().getRGB()); + dataOut.writeInt(color.value()); dataOut.writeInt(duration); dataOut.flush(); } catch (IOException e) { diff --git a/src/main/java/de/fanta/challenges/utils/ItemUtils.java b/src/main/java/de/fanta/challenges/utils/ItemUtils.java index d75db25..79ad64b 100644 --- a/src/main/java/de/fanta/challenges/utils/ItemUtils.java +++ b/src/main/java/de/fanta/challenges/utils/ItemUtils.java @@ -1,20 +1,41 @@ package de.fanta.challenges.utils; import de.iani.cubesideutils.bukkit.items.ItemBuilder; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.Style; +import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; + public class ItemUtils { - public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, " ", true, false); + public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, Component.empty(), true, false); - public static ItemStack createGuiItem(Material material, String name, String... lore) { + public static ItemStack createGuiItem(Material material, Component name, Component... lore) { return createGuiItem(material, name, false, lore); } - public static ItemStack createGuiItem(Material material, String name, boolean glowing, boolean showTooltip, String... lore) { + public static ItemStack createGuiItem(Material material, Component name, boolean glowing, boolean showTooltip, Component... lore) { + if (!name.style().hasDecoration(TextDecoration.ITALIC)) { + name = name.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE); + } + + Collection tempLore = new ArrayList<>(); + for (Component component : lore) { + if (!component.style().hasDecoration(TextDecoration.ITALIC)) { + component = component.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE); + } + tempLore.add(component); + } + + ItemBuilder builder = ItemBuilder.fromMaterial(material).displayName(name).lore(lore); if (glowing) { builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS); @@ -25,7 +46,7 @@ return builder.build(); } - public static ItemStack createGuiItem(Material material, String name, boolean glowing, String... lore) { + public static ItemStack createGuiItem(Material material, Component name, boolean glowing, Component... lore) { return createGuiItem(material, name, glowing, true, lore); } } diff --git a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java index bd05d44..6066b57 100644 --- a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java +++ b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java @@ -7,6 +7,7 @@ import de.fanta.challenges.events.ChallengeEventStatusChangedEvent; import de.fanta.challenges.events.EventStatusChangedEvent; import de.fanta.challenges.events.ServerStatusChangedEvent; +import net.kyori.adventure.text.Component; import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.World; @@ -119,7 +120,7 @@ moveFolderWithProgress(copyMap); return true; } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, "Could not save world ", ex); + plugin.getLogger().log(Level.SEVERE, "Could not save world ", ex); return false; } }); @@ -146,11 +147,11 @@ try { FileUtils.deleteDirectory(dir); } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, "Could not delete tempFolder ", ex); + plugin.getLogger().log(Level.SEVERE, "Could not delete tempFolder ", ex); } }); } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, "Could not save world ", ex); + plugin.getLogger().log(Level.SEVERE, "Could not save world ", ex); } isSavingWorld = false; done.get(); @@ -251,20 +252,20 @@ isCopyWorld = false; } - public static String getProgressBar(double value) { + public static Component getProgressBar(double value) { int progress = (int) (value / 100 * 40); - StringBuilder progressBar = new StringBuilder(); - progressBar.append(ChatUtil.RED).append("["); + Component progressBar = Component.empty(); + progressBar = progressBar.append(Component.text("[", ChatUtil.RED)); for (int i = 0; i < 40; i++) { if (i < progress) { - progressBar.append(ChatUtil.PINK).append("|"); + progressBar = progressBar.append(Component.text("|", ChatUtil.PINK)); } else { - progressBar.append(ChatUtil.GREEN).append("|"); + progressBar = progressBar.append(Component.text("|", ChatUtil.GREEN)); } } - progressBar.append(ChatUtil.RED).append("] ").append(ChatUtil.PINK).append(String.format("%.2f", value)).append("%"); + progressBar = progressBar.append(Component.text("] ", ChatUtil.RED).append(Component.text(String.format("%.2f", value) + "%", ChatUtil.PINK))); - return progressBar.toString(); + return progressBar; } }