diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 7176425..761a9ac 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -453,7 +453,7 @@ public void delteTexturePack() { if (texturepackid != null) { - File texturepackdownload = new File("/home/web/fanta/AdventureMap-TexturePacks/" + texturepackid.toString()); + File texturepackdownload = new File("/home/web/fanta/AdventureMap-TexturePacks/" + texturepackid); if (texturepackdownload.isDirectory()) { try { FileUtils.deleteDirectory(texturepackdownload); diff --git a/src/main/java/de/fanta/challenges/Timer.java b/src/main/java/de/fanta/challenges/Timer.java index 84d007b..dd39f1c 100644 --- a/src/main/java/de/fanta/challenges/Timer.java +++ b/src/main/java/de/fanta/challenges/Timer.java @@ -4,7 +4,6 @@ import de.fanta.challenges.events.TimerChangedEvent; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.StringUtil; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; @@ -56,7 +55,7 @@ for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } - GUIUtils.sendTitleToAll("Event", "Die Zeit ist abgelaufen!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Die Zeit ist abgelaufen!", ChatUtil.GREEN); } else { for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); @@ -180,7 +179,7 @@ private enum TimerMode { UP, - DOWN; + DOWN } } \ No newline at end of file diff --git a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java index 14b8242..6a64b29 100644 --- a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java @@ -3,7 +3,6 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; 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 44ef8c4..99b4ba9 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java @@ -9,7 +9,6 @@ import de.fanta.challenges.utils.ChatSkullAPI.ChatSkull; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; @@ -199,7 +198,7 @@ if (plugin.getScoreManager().getScore(new ChallengePlayer(player.getUniqueId())) == materials.size()) { plugin.getTimer().stopTimer(); - GUIUtils.sendTitleToAll("Event", ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " 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()) { @@ -233,7 +232,7 @@ } eventend = true; plugin.getTimer().stopTimer(); - GUIUtils.sendTitleToAll("Event", ChatUtil.GREEN + "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Event", ChatUtil.GREEN + "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); 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/ForceItemChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java index 2976d70..2bc8215 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java @@ -479,7 +479,7 @@ if (itemList.isEmpty()) { plugin.getTimer().stopTimer(); setRunning(false); - GUIUtils.sendTitleToAll("Event", ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + player.getName() + ChatUtil.GREEN + " hat alle Items gefunden!", ChatUtil.BLUE); String[] lines = {"", "", "", " " + ChatUtil.BLUE + player.getName(), ChatUtil.GREEN + " hat alle Items gefunden!", "", "", ""}; ChatSkull.sendAll(player, lines); ChatUtil.sendNormalMessage(player, "Du hast alle Items gesammelt und damit gewonnen!"); diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattle.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattle.java index c54cc18..23ac226 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattle.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattle.java @@ -9,7 +9,6 @@ import de.fanta.challenges.utils.ChatSkullAPI.ChatSkull; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; @@ -107,7 +106,7 @@ } else { ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + scorable.getName() + ChatUtil.GREEN + " hat " + plugin.getScoreManager().getScore(scorable) + " Punkte und hat damit gewonnen!", ChatUtil.BLUE); } - GUIUtils.sendTitleToAll("Event", ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); } @@ -115,7 +114,7 @@ for (Scorable scorable : plugin.getScoreManager().getByPositon(1)) { ChallengeTeam team = TeamUtils.getTeam(scorable.getName()); if (team != null) { - GUIUtils.sendTitleToAll("Event", "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " 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()) { diff --git a/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java b/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java index c1686b7..25fd763 100644 --- a/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/MLGChallenge.java @@ -22,11 +22,11 @@ private static final Challenges plugin = Challenges.getPlugin(); - private static final Random random = new Random();; + private static final Random random = new Random(); private static boolean mlgActive; public static int timeSinceMLG; // seconds - public static int maxMLGTime = Config.getInt("mlg.maxtime");; // seconds + public static int maxMLGTime = Config.getInt("mlg.maxtime"); // seconds public static void checkMLGWorld() { World mlgWorld = Bukkit.getWorld("mlg_challenge"); diff --git a/src/main/java/de/fanta/challenges/challenges/RandomDropsChallenge.java b/src/main/java/de/fanta/challenges/challenges/RandomDropsChallenge.java index 2ad47be..66060d3 100644 --- a/src/main/java/de/fanta/challenges/challenges/RandomDropsChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/RandomDropsChallenge.java @@ -1,18 +1,8 @@ package de.fanta.challenges.challenges; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Random; -import java.util.stream.Collectors; - -import com.destroystokyo.paper.event.block.BlockDestroyEvent; import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.Config; import io.papermc.paper.event.block.BlockBreakBlockEvent; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.configuration.file.FileConfiguration; @@ -23,6 +13,14 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.inventory.ItemStack; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Random; +import java.util.stream.Collectors; + public class RandomDropsChallenge implements Listener { private final ArrayList BLOCKS; @@ -78,8 +76,8 @@ public void onEntityExplode(EntityExplodeEvent e) { if (Config.getBoolean("rnddrops") && plugin.getTimer().isRunning()) { e.blockList().forEach(block -> { - if(!block.getType().isAir()) { - block.getWorld().dropItem(block.getLocation().add(0.5D, 0.5D, 0.5D),new ItemStack(this.plugin.getRandomDropsManager().getMaterialFromBlock(block))); + if (!block.getType().isAir()) { + block.getWorld().dropItem(block.getLocation().add(0.5D, 0.5D, 0.5D), new ItemStack(this.plugin.getRandomDropsManager().getMaterialFromBlock(block))); block.setType(Material.AIR); } }); diff --git a/src/main/java/de/fanta/challenges/challenges/RandomEffectChallenge.java b/src/main/java/de/fanta/challenges/challenges/RandomEffectChallenge.java index fedbda6..b4d39d3 100644 --- a/src/main/java/de/fanta/challenges/challenges/RandomEffectChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/RandomEffectChallenge.java @@ -34,10 +34,10 @@ if (chunkPotionEffectMap.get(chunkkey) != playerPotionEffectMap.get(p)) { if (playerPotionEffectMap.get(p) != null) { p.removePotionEffect(playerPotionEffectMap.get(p).getType()); - } - p.addPotionEffect(chunkPotionEffectMap.get(chunkkey)); - playerPotionEffectMap.put(p, chunkPotionEffectMap.get(chunkkey)); } + p.addPotionEffect(chunkPotionEffectMap.get(chunkkey)); + playerPotionEffectMap.put(p, chunkPotionEffectMap.get(chunkkey)); + } } } } diff --git a/src/main/java/de/fanta/challenges/challenges/WorldBorderLevelChallenge.java b/src/main/java/de/fanta/challenges/challenges/WorldBorderLevelChallenge.java index b5c1677..288dcbe 100644 --- a/src/main/java/de/fanta/challenges/challenges/WorldBorderLevelChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/WorldBorderLevelChallenge.java @@ -20,7 +20,6 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.world.SpawnChangeEvent; import org.bukkit.generator.structure.Structure; -import org.bukkit.generator.structure.StructureType; import java.util.Objects; diff --git a/src/main/java/de/fanta/challenges/commands/BingoCommand.java b/src/main/java/de/fanta/challenges/commands/BingoCommand.java index 5615560..e00dad1 100644 --- a/src/main/java/de/fanta/challenges/commands/BingoCommand.java +++ b/src/main/java/de/fanta/challenges/commands/BingoCommand.java @@ -28,14 +28,14 @@ } if (Config.getBoolean("event.enabled") && Objects.equals(Config.getString("event.type"), "bingo") && plugin.getTimer().isRunning()) { if (args.hasNext()) { - String playerName = args.getNext(); - Player player = Bukkit.getPlayer(playerName); + String playerName = args.getNext(); + Player player = Bukkit.getPlayer(playerName); - if (player == null) { - ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); - return true; - } - EventItemsGui.openPlayerInv(player, (Player) sender); + if (player == null) { + ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); + return true; + } + EventItemsGui.openPlayerInv(player, (Player) sender); } else { EventItemsGui.openPlayerInv((Player) sender, (Player) sender); diff --git a/src/main/java/de/fanta/challenges/commands/ChestUnlockCommand.java b/src/main/java/de/fanta/challenges/commands/ChestUnlockCommand.java index b57abb9..1e81b3a 100644 --- a/src/main/java/de/fanta/challenges/commands/ChestUnlockCommand.java +++ b/src/main/java/de/fanta/challenges/commands/ChestUnlockCommand.java @@ -17,6 +17,7 @@ public ChestUnlockCommand(Challenges plugin) { this.plugin = plugin; } + @Override public boolean onCommand(CommandSender sender, Command command, String s, String s1, ArgsParser args) { if (!(sender instanceof Player player)) { diff --git a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java index 13e3e6e..6ce3f65 100644 --- a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java +++ b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java @@ -36,7 +36,6 @@ import de.fanta.challenges.commands.hp.HPSetCommand; import de.fanta.challenges.commands.reset.ResetCommand; import de.fanta.challenges.commands.reset.ResetConfirmCommand; -import de.fanta.challenges.commands.revive.ReviveCommand; import de.fanta.challenges.commands.settings.SettingsCommand; import de.fanta.challenges.commands.timer.TimerCommand; import de.fanta.challenges.commands.timer.TimerGetCommand; @@ -60,7 +59,7 @@ challengesRouter.addCommandMapping(new ChallengesPingCommand(), "ping"); challengesRouter.addCommandMapping(new ChallengesMemoryCommand(), "mem"); challengesRouter.addCommandMapping(new ChallengesSpeedCommand(), "speed"); - challengesRouter.addCommandMapping(new TeleportCommand(plugin), "tp"); + challengesRouter.addCommandMapping(new TeleportCommand(), "tp"); challengesRouter.addCommandMapping(new ChallengeMaxPlayersCommand(), "maxplayer"); challengesRouter.addCommandMapping(new CheckItemsCommand(), "checkitems"); challengesRouter.addCommandMapping(new ChallengesInvSeeCommand(), "invsee"); @@ -75,8 +74,8 @@ CommandRouter coordsRouter = new CommandRouter(plugin.getCommand("coords")); coordsRouter.addCommandMapping(new CoordsCommand()); - coordsRouter.addCommandMapping(new CoordsShareCommand(plugin), "share"); - coordsRouter.addCommandMapping(new CoordsGetCommand(plugin), "get"); + coordsRouter.addCommandMapping(new CoordsShareCommand(), "share"); + coordsRouter.addCommandMapping(new CoordsGetCommand(), "get"); coordsRouter.addCommandMapping(new CoordsSaveCommand(plugin), "save"); coordsRouter.addCommandMapping(new CoordsDeleteCommand(), "delete"); if (plugin.getProtocolVersion() >= 759) { @@ -110,15 +109,15 @@ leaveRouter.addCommandMapping(new LeaveCommand(plugin)); CommandRouter eventRouter = new CommandRouter(plugin.getCommand("event")); - eventRouter.addCommandMapping(new EventCommand(plugin)); + eventRouter.addCommandMapping(new EventCommand()); eventRouter.addCommandMapping(new EventToggleCommand(plugin, true), "enable"); eventRouter.addCommandMapping(new EventToggleCommand(plugin, false), "disable"); - eventRouter.addCommandMapping(new EventSettingsCommand(plugin), "settings"); + eventRouter.addCommandMapping(new EventSettingsCommand(), "settings"); eventRouter.addCommandMapping(new EventGetScoreCommand(plugin), "getscore"); eventRouter.addCommandMapping(new EventStartCommand(plugin), "start"); eventRouter.addCommandMapping(new CreateTeamsCommand(), "createteams"); eventRouter.addCommandMapping(new EventTeamsSetTeamSpawnCommand(), "setteamspawn"); - eventRouter.addCommandMapping(new EventForceTeamCommand(plugin), "forceteam"); + eventRouter.addCommandMapping(new EventForceTeamCommand(), "forceteam"); CommandRouter bingoRouter = new CommandRouter(plugin.getCommand("bingo")); bingoRouter.addCommandMapping(new BingoCommand(plugin)); @@ -131,8 +130,8 @@ netherRouter.addCommandMapping(new NetherToggleCommand(plugin, false), "disable"); CommandRouter voidRouter = new CommandRouter(plugin.getCommand("void")); - voidRouter.addCommandMapping(new VoidToggleCommand(plugin, true), "enable"); - voidRouter.addCommandMapping(new VoidToggleCommand(plugin, false), "disable"); + voidRouter.addCommandMapping(new VoidToggleCommand(true), "enable"); + voidRouter.addCommandMapping(new VoidToggleCommand(false), "disable"); CommandRouter settingsRouter = new CommandRouter(plugin.getCommand("settings")); settingsRouter.addCommandMapping(new SettingsCommand(plugin)); diff --git a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java index 526f80e..5763438 100644 --- a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java @@ -6,8 +6,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import de.speedy64.globalport.GlobalApi; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java b/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java index 1d0b5a6..2e7b371 100644 --- a/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java +++ b/src/main/java/de/fanta/challenges/commands/NetherToggleCommand.java @@ -3,7 +3,6 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; @@ -53,7 +52,7 @@ } pp.teleport(spawn); } - GUIUtils.sendTitleToAll("Nether Challenge", "Nether-Modus aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Nether Challenge", "Nether-Modus aktiviert", ChatUtil.GREEN); } else { ChatUtil.sendErrorMessage(p, "Die Nether Challenge läuft bereits!"); return true; @@ -61,7 +60,7 @@ } else { if (Config.getBoolean("nether.enabled")) { Config.setValue("nether.enabled", false); - GUIUtils.sendTitleToAll("Nether Challenge", "Nether-Modus deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Nether Challenge", "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 new file mode 100644 index 0000000..f8b4e5f --- /dev/null +++ b/src/main/java/de/fanta/challenges/commands/ReviveCommand.java @@ -0,0 +1,63 @@ +package de.fanta.challenges.commands; + +import de.fanta.challenges.Challenges; +import de.fanta.challenges.challenges.MLGChallenge; +import de.fanta.challenges.utils.ChatUtil; +import de.iani.cubesideutils.bukkit.commands.SubCommand; +import de.iani.cubesideutils.commands.ArgsParser; +import org.bukkit.Bukkit; +import org.bukkit.GameMode; +import org.bukkit.OfflinePlayer; +import org.bukkit.attribute.Attribute; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class ReviveCommand extends SubCommand { + + private final Challenges plugin; + + public ReviveCommand(Challenges plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String lable, String s1, ArgsParser args) { + if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { + if (!args.hasNext()) { + ChatUtil.sendWarningMessage(sender, "Benutze: /revive "); + return true; + } + + String next = args.next(); + if (next.equalsIgnoreCase("all")) { + MLGChallenge.setMlgActive(false); + for (Player p : Bukkit.getOnlinePlayers()) { + p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + p.setGameMode(GameMode.SURVIVAL); + } + ChatUtil.sendBrodcastMessage("Alle Spieler wurden wiederbelebt! Es kann weiter gehen!"); + } 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!"); + } else { + ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); + } + } + } else { + if (plugin.getCurrentEditor() != null) { + if (plugin.getCurrentEditor() != sender) { + ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + plugin.getCurrentEditor().getName() + " kann Spieler wiederbeleben!"); + } + } else { + ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); + ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden, musst du dir im Freebuild VIP kaufen!"); + } + } + return true; + } +} \ No newline at end of file diff --git a/src/main/java/de/fanta/challenges/commands/VoidToggleCommand.java b/src/main/java/de/fanta/challenges/commands/VoidToggleCommand.java index 3afdd30..09ec71a 100644 --- a/src/main/java/de/fanta/challenges/commands/VoidToggleCommand.java +++ b/src/main/java/de/fanta/challenges/commands/VoidToggleCommand.java @@ -1,13 +1,10 @@ package de.fanta.challenges.commands; -import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.bukkit.world.EmptyChunkGenerator; import de.iani.cubesideutils.commands.ArgsParser; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -19,12 +16,9 @@ import org.bukkit.entity.Player; public class VoidToggleCommand extends SubCommand { - - private final Challenges plugin; private final boolean enable; - public VoidToggleCommand(Challenges plugin, boolean enable) { - this.plugin = plugin; + public VoidToggleCommand(boolean enable) { this.enable = enable; } @@ -54,7 +48,7 @@ pp.teleport(spawn); } Config.setValue("void.enabled", true); - GUIUtils.sendTitleToAll("Void Challenge", "Void-Modus aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Void Challenge", "Void-Modus aktiviert", ChatUtil.GREEN); } else { ChatUtil.sendErrorMessage(p, "Die Void Challenge läuft bereits!"); return true; @@ -62,7 +56,7 @@ } else { if (Config.getBoolean("void.enabled")) { Config.setValue("void.enabled", false); - GUIUtils.sendTitleToAll("Void Challenge", "Void-Modus deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Void Challenge", "Void-Modus deaktiviert", ChatUtil.RED); } else { ChatUtil.sendErrorMessage(p, "Aktuell läuft keine Void Challenge!"); return true; diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesMemoryCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesMemoryCommand.java index eb482c8..8f7b6a8 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesMemoryCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesMemoryCommand.java @@ -8,20 +8,19 @@ public class ChallengesMemoryCommand extends SubCommand { - private static final long MB = 1024L * 1024L; + private static final long MB = 1024L * 1024L; @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (sender.hasPermission("Challenges.editor.override")) { - ChatUtil.sendNormalMessage(sender, "Speichernutzung: " + KBToMB(Runtime.getRuntime().totalMemory()) + " MB / " + KBToMB(Runtime.getRuntime().maxMemory()) + " MB (Freier Speicher: " + KBToMB(Runtime.getRuntime().freeMemory()) + "MB)"); + ChatUtil.sendNormalMessage(sender, "Speichernutzung: " + KBToMB(Runtime.getRuntime().totalMemory()) + " MB / " + KBToMB(Runtime.getRuntime().maxMemory()) + " MB (Freier Speicher: " + KBToMB(Runtime.getRuntime().freeMemory()) + "MB)"); } else { ChatUtil.sendErrorMessage(sender, "Keine Rechte!"); } return true; } - public static long KBToMB(long KB) - { + public static long KBToMB(long KB) { return KB / MB; } } diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesPingCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesPingCommand.java index 02e34d3..623978a 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesPingCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesPingCommand.java @@ -20,18 +20,18 @@ return true; } - if (args.hasNext()) { - String playerName = args.getNext(); - Player player = Bukkit.getPlayer(playerName); + if (args.hasNext()) { + String playerName = args.getNext(); + Player player = Bukkit.getPlayer(playerName); - if (player == null) { - ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); - return true; - } - ChatUtil.sendNormalMessage(sender, "Ping von " + player.getName() + ": " + player.getPing()); - } else { - ChatUtil.sendNormalMessage(sender, "Ping: " + ((Player) sender).getPing()); + if (player == null) { + ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); + return true; } + ChatUtil.sendNormalMessage(sender, "Ping von " + player.getName() + ": " + player.getPing()); + } else { + ChatUtil.sendNormalMessage(sender, "Ping: " + ((Player) sender).getPing()); + } return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSpeedCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSpeedCommand.java index de61796..731cbbc 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSpeedCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesSpeedCommand.java @@ -28,15 +28,17 @@ if (Doubles.tryParse(next) != null) { float speed; if (!next.equals("10")) { - speed = Doubles.tryParse("0." + next).floatValue(); + speed = Doubles.tryParse("0." + next).floatValue(); } else { speed = Doubles.tryParse("1").floatValue(); } if (p.isFlying()) { p.setFlySpeed(speed); + ChatUtil.sendNormalMessage(p, "Dein fly Speed ist nun " + next); } else { p.setWalkSpeed(speed); + ChatUtil.sendNormalMessage(p, "Dein lauf Speed ist nun " + next); } } diff --git a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java index bb32978..6384bd2 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java @@ -2,7 +2,6 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.CheckItemsGUI; -import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.command.Command; diff --git a/src/main/java/de/fanta/challenges/commands/challenges/TeleportCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/TeleportCommand.java index f2f7a50..b14ba9f 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/TeleportCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/TeleportCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.challenges; -import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.TeleportGUI; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; @@ -12,12 +11,6 @@ public class TeleportCommand extends SubCommand { - private final Challenges plugin; - - public TeleportCommand(Challenges plugin) { - this.plugin = plugin; - } - @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player player)) { diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsCommand.java index f8212d8..0637698 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsCommand.java @@ -10,9 +10,6 @@ public class CoordsCommand extends SubCommand { - public CoordsCommand() { - } - @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player player)) { @@ -20,7 +17,6 @@ return true; } CoordsGUI.buildCoordsInventory(player); - return true; } } \ No newline at end of file diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsDeleteCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsDeleteCommand.java index 4c1a367..c71d20c 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsDeleteCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsDeleteCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.coords; -import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.coordsgui.CoordsDeleteGUI; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; @@ -13,10 +12,6 @@ import java.util.Collection; public class CoordsDeleteCommand extends SubCommand { - private static final Challenges plugin = Challenges.getPlugin(); - - public CoordsDeleteCommand() { - } @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java index 3e1f3b5..c3c2a5e 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsGetCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.coords; -import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -13,12 +12,6 @@ public class CoordsGetCommand extends SubCommand { - private final Challenges plugin; - - public CoordsGetCommand(Challenges plugin) { - this.plugin = plugin; - } - @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player player)) { @@ -44,7 +37,7 @@ String x = Config.getString("Saved_Locations." + next + ".BlockX"); String y = Config.getString("Saved_Locations." + next + ".BlockY"); String z = Config.getString("Saved_Locations." + next + ".BlockZ"); - ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); + ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); } else { ChatUtil.sendWarningMessage(player, "§cDiese Position existiert nicht!"); } diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java index 28c102e..d1e1739 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsSaveCommand.java @@ -37,7 +37,7 @@ int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); + ChatUtil.sendNormalMessage(player, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + next + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + x + "/" + y + "/" + z + " " + w + "]"); Config.setValue("Saved_Locations." + next + ".World", w, false); Config.setValue("Saved_Locations." + next + ".BlockX", x, false); Config.setValue("Saved_Locations." + next + ".BlockY", y, false); diff --git a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java index 191d67b..5959105 100644 --- a/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java +++ b/src/main/java/de/fanta/challenges/commands/coords/CoordsShareCommand.java @@ -1,22 +1,14 @@ package de.fanta.challenges.commands.coords; -import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; -import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; public class CoordsShareCommand extends SubCommand { - private final Challenges plugin; - - public CoordsShareCommand(Challenges plugin) { - this.plugin = plugin; - } - @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player player)) { @@ -27,7 +19,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(ChatUtil.BLUE + sender.getName() + ChatUtil.GREEN + " ist bei " + ChatUtil.ORANGE + x + "/" + y + "/" + z + " " + ChatUtil.ORANGE + w); return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java b/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java index 0545338..7e57a3d 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorCommand.java @@ -2,11 +2,9 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatSkullAPI.ChatSkull; -import de.fanta.challenges.utils.ChatSkullAPI.Message; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -26,7 +24,7 @@ return true; } if (plugin.getCurrentEditor() != null) { - String[] lines = {"","",""," " + ChatUtil.BLUE + plugin.getCurrentEditor().getName(),ChatUtil.GREEN + " ist der aktuelle Editor","","",""}; + String[] lines = {"", "", "", " " + ChatUtil.BLUE + plugin.getCurrentEditor().getName(), ChatUtil.GREEN + " ist der aktuelle Editor", "", "", ""}; ChatUtil.sendNormalMessage(sender, "-------- Editor --------"); ChatSkull.sendPlayer(plugin.getCurrentEditor(), (Player) sender, lines); ChatUtil.sendNormalMessage(sender, "-------- Editor --------"); 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 b458166..9530b09 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java @@ -5,7 +5,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -32,7 +31,7 @@ if (player == null) { ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); return true; - } else if (!plugin.isEditor(player)){ + } 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.sendNormalMessage(player, "Du bist jetzt Editor und kannst diese Lobby bearbeiten. (/challenges)"); diff --git a/src/main/java/de/fanta/challenges/commands/event/EventCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java index 6586d70..77bb917 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.event; -import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -9,11 +8,6 @@ import org.bukkit.entity.Player; public class EventCommand extends SubCommand { - private final Challenges plugin; - - public EventCommand(Challenges plugin) { - this.plugin = plugin; - } @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { diff --git a/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java index 259ec45..faa58bb 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventForceTeamCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.event; -import de.fanta.challenges.Challenges; import de.fanta.challenges.teams.ChallengeTeam; import de.fanta.challenges.teams.TeamUtils; import de.fanta.challenges.utils.ChatUtil; @@ -18,12 +17,6 @@ public class EventForceTeamCommand extends SubCommand { - private final Challenges plugin; - - public EventForceTeamCommand(Challenges plugin) { - this.plugin = plugin; - } - @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if (!(sender instanceof Player player)) { diff --git a/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java index 64e4b21..c591180 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java @@ -1,6 +1,5 @@ package de.fanta.challenges.commands.event; -import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.eventgui.EventGui; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; @@ -11,11 +10,6 @@ import org.bukkit.entity.Player; public class EventSettingsCommand extends SubCommand { - private final Challenges plugin; - - public EventSettingsCommand(Challenges plugin) { - this.plugin = plugin; - } @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { 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 0cd688f..439187e 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java @@ -7,7 +7,6 @@ import de.fanta.challenges.teams.TeamUtils; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; @@ -39,7 +38,7 @@ Bukkit.getScheduler().runTaskTimer(plugin, bukkitTask -> { int j = i.decrementAndGet(); - GUIUtils.sendTitleToAll("Event", j > 0 ? "" + j : "Go", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Event", j > 0 ? "" + j : "Go", ChatUtil.BLUE); if (j <= 0) { bukkitTask.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 3ce30bf..8b3fa95 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java @@ -4,7 +4,6 @@ import de.fanta.challenges.events.EventStatusChangedEvent; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.Bukkit; @@ -33,7 +32,7 @@ if (!Config.getBoolean("event.enabled")) { Config.setValue("event.enabled", true); Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(true)); - GUIUtils.sendTitleToAll("Event", "Event-Modus aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Event-Modus aktiviert", ChatUtil.GREEN); } else { ChatUtil.sendErrorMessage(p, "Das Event läuft bereits!"); return true; @@ -43,7 +42,7 @@ Config.setValue("event.enabled", false); Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); plugin.getTimer().stopTimer(); - GUIUtils.sendTitleToAll("Event", "Event-Modus deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Event", "Event-Modus deaktiviert", ChatUtil.RED); plugin.getScoreManager().saveScores(p); } else { ChatUtil.sendErrorMessage(p, "Aktuell läuft kein Event!"); diff --git a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java index 1020a5d..9bfe2a6 100644 --- a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java +++ b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java @@ -9,7 +9,6 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import de.speedy64.globalport.GlobalApi; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -21,7 +20,6 @@ import java.io.FileReader; import java.io.IOException; import java.util.Properties; -import java.util.logging.Level; public class ResetConfirmCommand extends SubCommand { diff --git a/src/main/java/de/fanta/challenges/commands/revive/ReviveCommand.java b/src/main/java/de/fanta/challenges/commands/revive/ReviveCommand.java deleted file mode 100644 index a82eeac..0000000 --- a/src/main/java/de/fanta/challenges/commands/revive/ReviveCommand.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.fanta.challenges.commands.revive; - -import de.fanta.challenges.Challenges; -import de.fanta.challenges.challenges.MLGChallenge; -import de.fanta.challenges.utils.ChatUtil; -import de.iani.cubesideutils.bukkit.commands.SubCommand; -import de.iani.cubesideutils.commands.ArgsParser; -import org.bukkit.Bukkit; -import org.bukkit.GameMode; -import org.bukkit.OfflinePlayer; -import org.bukkit.attribute.Attribute; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class ReviveCommand extends SubCommand { - - private final Challenges plugin; - - public ReviveCommand(Challenges plugin) { - this.plugin = plugin; - } - - @Override - public boolean onCommand(CommandSender sender, Command cmd, String lable, String s1, ArgsParser args) { - if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { - if (!args.hasNext()) { - ChatUtil.sendWarningMessage(sender, "Benutze: /revive "); - return true; - } - - String next = args.next(); - if (next.equalsIgnoreCase("all")) { - MLGChallenge.setMlgActive(false); - for (Player p : Bukkit.getOnlinePlayers()) { - p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); - p.setGameMode(GameMode.SURVIVAL); - } - ChatUtil.sendBrodcastMessage("Alle Spieler wurden wiederbelebt! Es kann weiter gehen!"); - } 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!"); - } else { - ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); - } - } - } else { - if (plugin.getCurrentEditor() != null) { - if (plugin.getCurrentEditor() != sender) { - ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + plugin.getCurrentEditor().getName() + " kann Spieler wiederbeleben!"); - } - } else { - ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); - ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden, musst du dir im Freebuild VIP kaufen!"); - } - } - return true; - } -} \ No newline at end of file diff --git a/src/main/java/de/fanta/challenges/events/EventStatusChangedEvent.java b/src/main/java/de/fanta/challenges/events/EventStatusChangedEvent.java index 19500ac..b1e543b 100644 --- a/src/main/java/de/fanta/challenges/events/EventStatusChangedEvent.java +++ b/src/main/java/de/fanta/challenges/events/EventStatusChangedEvent.java @@ -1,6 +1,5 @@ package de.fanta.challenges.events; -import de.fanta.challenges.Challenges; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/de/fanta/challenges/guis/BackpackGui.java b/src/main/java/de/fanta/challenges/guis/BackpackGui.java index b5eb941..b34da27 100644 --- a/src/main/java/de/fanta/challenges/guis/BackpackGui.java +++ b/src/main/java/de/fanta/challenges/guis/BackpackGui.java @@ -2,7 +2,6 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.MemorySection; diff --git a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java index 206049c..f5cfcfb 100644 --- a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java @@ -42,11 +42,11 @@ InventoryperPlayer.put(p, TEMP_GUI); ItemStack stack = new ItemStack(plugin.getMaterials().get(0)); try { - TEMP_GUI.setItem(JA_INDEX, GUIUtils.createGuiItem(Material.LIME_CONCRETE, "Ja",true)); + TEMP_GUI.setItem(JA_INDEX, GUIUtils.createGuiItem(Material.LIME_CONCRETE, "Ja", true)); Bukkit.getLogger().info("" + stack); - TEMP_GUI.setItem(ITEM_INDEX, GUIUtils.createGuiItem(stack.getType(), stack.getI18NDisplayName(),false)); - TEMP_GUI.setItem(NEIN_INDEX, GUIUtils.createGuiItem(Material.RED_CONCRETE, "Nein",true)); + TEMP_GUI.setItem(ITEM_INDEX, GUIUtils.createGuiItem(stack.getType(), stack.getI18NDisplayName(), false)); + TEMP_GUI.setItem(NEIN_INDEX, GUIUtils.createGuiItem(Material.RED_CONCRETE, "Nein", true)); for (int i = 0; i < INVENTORY_SIZE; i++) { ItemStack item = TEMP_GUI.getItem(i); if (item == null || item.getType() == Material.AIR) { diff --git a/src/main/java/de/fanta/challenges/guis/ResetGui.java b/src/main/java/de/fanta/challenges/guis/ResetGui.java index 9f4e4a5..cb6d679 100644 --- a/src/main/java/de/fanta/challenges/guis/ResetGui.java +++ b/src/main/java/de/fanta/challenges/guis/ResetGui.java @@ -6,15 +6,11 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.guiutils.AbstractWindow; import de.fanta.challenges.utils.guiutils.GUIUtils; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; public class ResetGui extends AbstractWindow { diff --git a/src/main/java/de/fanta/challenges/guis/TimerGui.java b/src/main/java/de/fanta/challenges/guis/TimerGui.java index ccf937c..76d1e1d 100644 --- a/src/main/java/de/fanta/challenges/guis/TimerGui.java +++ b/src/main/java/de/fanta/challenges/guis/TimerGui.java @@ -6,17 +6,12 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.guiutils.AbstractWindow; import de.fanta.challenges.utils.guiutils.GUIUtils; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.GameRule; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; public class TimerGui extends AbstractWindow { @@ -50,10 +45,10 @@ case DIRECTION_INDEX -> { if (plugin.getTimer().isReverse()) { plugin.getTimer().reverseTimer(); - GUIUtils.sendTitleToAll("Timer", "Der Timer läuft jetzt vorwärts.", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Timer", "Der Timer läuft jetzt vorwärts.", ChatUtil.GREEN); } else { plugin.getTimer().reverseTimer(); - GUIUtils.sendTitleToAll("Timer", "Der Timer läuft jetzt rückwärts.", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Timer", "Der Timer läuft jetzt rückwärts.", ChatUtil.BLUE); } if (plugin.getServerType() == ServerType.CHALLENGE) { if (!Config.getBoolean("editsettings")) { @@ -69,10 +64,10 @@ case SHOWTIMER_INDEX -> { if (Config.getBoolean("showtimer")) { Config.setValue("showtimer", false, false); - GUIUtils.sendTitleToAll("Timer", "Der Timer wird jetzt nicht mehr angezeigt!", ChatUtil.RED); + ChatUtil.sendTitleToAll("Timer", "Der Timer wird jetzt nicht mehr angezeigt!", ChatUtil.RED); } else { Config.setValue("showtimer", true, false); - GUIUtils.sendTitleToAll("Timer", "Der Timer wird jetzt wieder angezeigt!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Timer", "Der Timer wird jetzt wieder angezeigt!", ChatUtil.GREEN); } new TimerGui(player).open(); } 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 48f8212..b8d0d39 100644 --- a/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/coordsgui/CoordsGUI.java @@ -109,7 +109,7 @@ if (location != null) { if (e.isLeftClick()) { - ChatUtil.sendNormalMessage(p, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + waypointName + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + location.getX() + "/" + location.getY() + "/" + location.getZ() + " " + location.getWorld().getName() + "]"); + ChatUtil.sendNormalMessage(p, ChatUtil.GREEN + "Position " + ChatUtil.ORANGE + waypointName + ChatUtil.GREEN + ": " + ChatUtil.ORANGE + "[" + location.getX() + "/" + location.getY() + "/" + location.getZ() + " " + location.getWorld().getName() + "]"); p.closeInventory(); } else if (e.isRightClick()) { CoordsDeleteGUI.createCoordsDeleteGUI(p, waypointName, stack); 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 5faefda..f1d0806 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java @@ -112,41 +112,41 @@ plugin.getScoreManager().saveScores(p); plugin.getScoreManager().resetScores(); Config.setValue("event.type", "nix"); - GUIUtils.sendTitleToAll("Event", "Event beendet", ChatUtil.RED); + ChatUtil.sendTitleToAll("Event", "Event beendet", ChatUtil.RED); } } case BUILD_EVENT_INDEX -> { Config.setValue("event.type", "build"); - GUIUtils.sendTitleToAll("Event", "Baue die meisten Blöcke ab!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Baue die meisten Blöcke ab!", ChatUtil.GREEN); } case XP_EVENT_INDEX -> { Config.setValue("event.type", "xp"); - GUIUtils.sendTitleToAll("Event", "Sammle so viel XP wie möglich ein!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Sammle so viel XP wie möglich ein!", ChatUtil.GREEN); } case BINGO_EVENT_INDEX -> { Config.setValue("event.type", "bingo"); - GUIUtils.sendTitleToAll("Event", "Sammle Vorgegebene Items! (/bingo)", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Sammle Vorgegebene Items! (/bingo)", ChatUtil.GREEN); } case DEATHRUN_EVENT_INDEX -> { Config.setValue("event.type", "deathrun"); - GUIUtils.sendTitleToAll("Event", "Laufe so weit wie möglich ohne zu sterben!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Laufe so weit wie möglich ohne zu sterben!", ChatUtil.GREEN); DeathrunChallengeEvent.load(); } case DEATH_COUNTER_INDEX -> { Config.setValue("event.type", "deathcounter"); - GUIUtils.sendTitleToAll("Event", "Death Counter", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Death Counter", ChatUtil.GREEN); } case SAMMEL_FIEBER_INDEX -> { Config.setValue("event.type", "sammelfieber"); - GUIUtils.sendTitleToAll("Event", "SammelFieber", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "SammelFieber", ChatUtil.GREEN); } case ORE_BATTLE_INDEX -> { Config.setValue("event.type", "orebattle"); - GUIUtils.sendTitleToAll("Event", "Ore Battle", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Ore Battle", ChatUtil.GREEN); } case FORCE_ITEM_INDEX -> { Config.setValue("event.type", "forceitem"); - GUIUtils.sendTitleToAll("Event", "Force Item", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Force Item", ChatUtil.GREEN); } } createEventGUI(p); 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 39e9aca..80c3c00 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/TeamSettingsGUI.java @@ -65,12 +65,12 @@ if (TeamUtils.getTeams() != null && TeamUtils.getTeamSize() != 0) { if (!Config.getBoolean("event.teams")) { Config.setValue("event.teams", true); - GUIUtils.sendTitleToAll("Event", "Teams aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Teams aktiviert", ChatUtil.GREEN); plugin.getScoreManager().resetScores(); plugin.getSBManager().updateEventScoreboard(); } else { Config.setValue("event.teams", false); - GUIUtils.sendTitleToAll("Event", "Teams deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Event", "Teams deaktiviert", ChatUtil.RED); for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().removeItem(TeamUtils.selctItem()); } @@ -84,14 +84,14 @@ if (TeamUtils.getTeams() != null && TeamUtils.getTeamSize() != 0) { if (!Config.getBoolean("event.teamselect")) { Config.setValue("event.teamselect", true); - GUIUtils.sendTitleToAll("Event", "Team auswahl aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "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); - GUIUtils.sendTitleToAll("Event", "Team auswahl deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Event", "Team auswahl deaktiviert", ChatUtil.RED); for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().removeItem(TeamUtils.selctItem()); } @@ -104,10 +104,10 @@ case AUTOTEAM_BY_JOIN_INDEX -> { if (Config.getBoolean("event.autoteams")) { Config.setValue("event.autoteams", false); - GUIUtils.sendTitleToAll("Event", "Autoteams by Join deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Event", "Autoteams by Join deaktiviert", ChatUtil.RED); } else { Config.setValue("event.autoteams", true); - GUIUtils.sendTitleToAll("Event", "Autoteams by Join aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Event", "Autoteams by Join aktiviert", ChatUtil.GREEN); } } } 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 e4c6949..f02707c 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java @@ -73,63 +73,63 @@ EntityType entityType = EntityType.valueOf(Config.getString("goal").toUpperCase()); if (entityType == EntityType.ENDER_DRAGON) { Config.setValue("goal", EntityType.WITHER.getName()); - GUIUtils.sendTitleToAll("Challenge", "Ziel: Töte den Wither", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Wither", ChatUtil.GREEN); } else if (entityType == EntityType.WITHER) { Config.setValue("goal", EntityType.WARDEN.getName()); - GUIUtils.sendTitleToAll("Challenge", "Ziel: Töte den Warden", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Warden", ChatUtil.GREEN); } else if (entityType == EntityType.WARDEN) { Config.setValue("goal", EntityType.ENDER_DRAGON.getName()); - GUIUtils.sendTitleToAll("Challenge", "Ziel: Töte den Enderdrachen", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Enderdrachen", ChatUtil.GREEN); } } case SHUFFLE_RANDOM_DROP_INDEX -> { plugin.rndDrops.shuffleItems(); plugin.rndDrops.saveItems(); - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN); } case SHARED_DAMAGE_INDEX -> { if (Config.getBoolean("sharedmg")) { Config.setValue("sharedmg", false); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatUtil.RED); } else { Config.setValue("sharedmg", true); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatUtil.GREEN); } } case FLOOR_IS_LAVA_INDEX -> { if (Config.getBoolean("lavafloor")) { Config.setValue("lavafloor", false); - GUIUtils.sendTitleToAll("Challenge", "Der Boden ist Lava deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava deaktiviert", ChatUtil.RED); } else { Config.setValue("lavafloor", true); - GUIUtils.sendTitleToAll("Challenge", "Der Boden ist Lava aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava aktiviert", ChatUtil.GREEN); } } case CHUNK_RANDOM_EFFECT_INDEX -> { if (Config.getBoolean("randomeffect")) { Config.setValue("randomeffect", false); - GUIUtils.sendTitleToAll("Challenge", "Chunk Random Effekt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt deaktiviert", ChatUtil.RED); } else { Config.setValue("randomeffect", true); - GUIUtils.sendTitleToAll("Challenge", "Chunk Random Effekt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt aktiviert", ChatUtil.GREEN); } } case BEDROCK_WALL_INDEX -> { if (Config.getBoolean("bedrockwall")) { Config.setValue("bedrockwall", false); - GUIUtils.sendTitleToAll("Challenge", "Bedrock Wand deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand deaktiviert", ChatUtil.RED); } else { Config.setValue("bedrockwall", true); - GUIUtils.sendTitleToAll("Challenge", "Bedrock Wand aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand aktiviert", ChatUtil.GREEN); } } case MLG_INDEX -> { if (Config.getBoolean("mlg.enabled")) { Config.setValue("mlg.enabled", false); - GUIUtils.sendTitleToAll("Challenge", "MLG deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "MLG deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "MLG aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "MLG aktiviert", ChatUtil.GREEN); Config.setValue("mlg.enabled", true); } } @@ -144,7 +144,7 @@ pp.getWorldBorder().reset(); } } - GUIUtils.sendTitleToAll("Challenge", "World Border Level deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "World Border Level deaktiviert", ChatUtil.RED); } else { Config.setValue("worldborderlevel", true); new WorldBorderLevelChallenge(); @@ -152,16 +152,16 @@ for (Player pp : Bukkit.getOnlinePlayers()) { pp.teleport(pp.getWorld().getSpawnLocation()); } - GUIUtils.sendTitleToAll("Challenge", "World Border Level aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "World Border Level aktiviert", ChatUtil.GREEN); } } case ALL_ITEMS_INDEX -> { if (Config.getBoolean("allitems")) { Config.setValue("allitems", false); - GUIUtils.sendTitleToAll("Challenge", "All Items deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "All Items deaktiviert", ChatUtil.RED); } else { Config.setValue("allitems", true); - GUIUtils.sendTitleToAll("Challenge", "All Items aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "All Items aktiviert", ChatUtil.GREEN); AllItemsChallenge.start(); } } @@ -169,73 +169,73 @@ case DEATH_ON_XP_INDEX -> { if (Config.getBoolean("xpdeath")) { Config.setValue("xpdeath", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED); } else { Config.setValue("xpdeath", true); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN); } } case DEATH_ON_FALLDAMAGE_INDEX -> { if (Config.getBoolean("deathonfall")) { Config.setValue("deathonfall", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Fallschaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Fallschaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden aktiviert", ChatUtil.GREEN); Config.setValue("deathonfall", true); } } case DEATH_ON_SPRINT_INDEX -> { if (Config.getBoolean("deathonsprint")) { Config.setValue("deathonsprint", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Sprinten deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Sprinten aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten aktiviert", ChatUtil.GREEN); Config.setValue("deathonsprint", true); } } case DEATH_ON_JUMP_INDEX -> { if (Config.getBoolean("deathonjump")) { Config.setValue("deathonjump", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Springen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Springen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen aktiviert", ChatUtil.GREEN); Config.setValue("deathonjump", true); } } case CLEAR_INVENTAR_ON_DAMAGE_INDEX -> { if (Config.getBoolean("clinvdmg")) { Config.setValue("clinvdmg", false); - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "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); - GUIUtils.sendTitleToAll("Challenge", "Ice-Runner deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Ice-Runner deaktiviert", ChatUtil.RED); } else { Config.setValue("icerunner", true); - GUIUtils.sendTitleToAll("Challenge", "Ice-Runner aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ice-Runner aktiviert", ChatUtil.GREEN); } } case RANDOM_MOBS_INDEX -> { if (Config.getBoolean("randommobs")) { Config.setValue("randommobs", false); - GUIUtils.sendTitleToAll("Challenge", "Random Mobs deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Random Mobs deaktiviert", ChatUtil.RED); } else { Config.setValue("randommobs", true); - GUIUtils.sendTitleToAll("Challenge", "Random Mobs aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Random Mobs aktiviert", ChatUtil.GREEN); } } case RANDOM_DROPS_INDEX -> { if (Config.getBoolean("rnddrops")) { Config.setValue("rnddrops", false); - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops aktiviert", ChatUtil.GREEN); Config.setValue("rnddrops", true); } } @@ -245,39 +245,39 @@ //TODO: INV ÖFFNEN } Config.setValue("damageonsneak", false); - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN); Config.setValue("damageonsneak", true); } } case TIED_TOGETHER_INDEX -> { if (Config.getBoolean("tiedtogether")) { Config.setValue("tiedtogether", false); - GUIUtils.sendTitleToAll("Challenge", "Zusammengebunden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden deaktiviert", ChatUtil.RED); } else { Config.setValue("tiedtogether", true); - GUIUtils.sendTitleToAll("Challenge", "Zusammengebunden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden aktiviert", ChatUtil.GREEN); } } case MOB_REMOVE_WORLD_INDEX -> { if (Config.getBoolean("mobremoveworld")) { Config.setValue("mobremoveworld", false); - GUIUtils.sendTitleToAll("Challenge", "Mobs entfernen Welt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Mobs entfernen Welt deaktiviert", ChatUtil.RED); } else { Config.setValue("mobremoveworld", true); - GUIUtils.sendTitleToAll("Challenge", "Mobs entfernen Welt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Mobs entfernen Welt aktiviert", ChatUtil.GREEN); } } case ALL_ADVANCEMENT_INDEX -> { if (Config.getBoolean("alladvancements")) { AllAdvancementsChallenge.stop(); Config.setValue("alladvancements", false); - GUIUtils.sendTitleToAll("Challenge", "All Advancement deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "All Advancement deaktiviert", ChatUtil.RED); } else { AllAdvancementsChallenge.start(); Config.setValue("alladvancements", true); - GUIUtils.sendTitleToAll("Challenge", "All Advancement aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "All Advancement aktiviert", ChatUtil.GREEN); } } default -> { @@ -636,105 +636,105 @@ case CRAFTING_TABLE_INDEX: if (Config.getBoolean("craftingtable")) { Config.setValue("craftingtable", false); - GUIUtils.sendTitleToAll("Challenge", "Werkbank deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Werkbank deaktiviert", ChatUtil.RED); } else { Config.setValue("craftingtable", true); - GUIUtils.sendTitleToAll("Challenge", "Werkbank aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Werkbank aktiviert", ChatUtil.GREEN); } break; case TRADING_INDEX: if (Config.getBoolean("allowtrading")) { Config.setValue("allowtrading", false); - GUIUtils.sendTitleToAll("Challenge", "Handeln deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Handeln deaktiviert", ChatUtil.RED); } else { Config.setValue("allowtrading", true); - GUIUtils.sendTitleToAll("Challenge", "Handeln aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Handeln aktiviert", ChatUtil.GREEN); } break; case XP_DEATH_INDEX: if (Config.getBoolean("xpdeath")) { Config.setValue("xpdeath", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP deaktiviert", ChatUtil.RED); } else { Config.setValue("xpdeath", true); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Einsammeln von XP aktiviert", ChatUtil.GREEN); } break; case DEATH_ON_FALL_INDEX: if (Config.getBoolean("deathonfall")) { Config.setValue("deathonfall", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Fallschaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Fallschaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Fallschaden aktiviert", ChatUtil.GREEN); Config.setValue("deathonfall", true); } break; case RANDOM_DROP_INDEX: if (Config.getBoolean("rnddrops")) { Config.setValue("rnddrops", false); - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops aktiviert", ChatUtil.GREEN); Config.setValue("rnddrops", true); } break; case SHUFFLE_RANDOM_DROP_INDEX: plugin.rndDrops.shuffleItems(); plugin.rndDrops.saveItems(); - GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN); break; case DEATH_ON_SPRINT_INDEX: if (Config.getBoolean("deathonsprint")) { Config.setValue("deathonsprint", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Sprinten deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Sprinten aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Sprinten aktiviert", ChatUtil.GREEN); Config.setValue("deathonsprint", true); } break; case DEATH_ON_JUMP_INDEX: if (Config.getBoolean("deathonjump")) { Config.setValue("deathonjump", false); - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Springen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Sterben durch Springen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Sterben durch Springen aktiviert", ChatUtil.GREEN); Config.setValue("deathonjump", true); } break; case TARGET_INDEX: if (Config.getBoolean("target")) { Config.setValue("target", false); - GUIUtils.sendTitleToAll("Challenge", "Ziel: Töte den Wither", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Wither", ChatUtil.GREEN); } else { - GUIUtils.sendTitleToAll("Challenge", "Ziel: Töte den Enderdrachen", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ziel: Töte den Enderdrachen", ChatUtil.GREEN); Config.setValue("target", true); } break; case CLEANR_INV_BY_DAMAGE_INDEX: if (Config.getBoolean("clinvdmg")) { Config.setValue("clinvdmg", false); - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Inventar von allen löschen wenn einer Schaden bekommt aktiviert", ChatUtil.GREEN); Config.setValue("clinvdmg", true); } break; case DMG_ON_SNEAK_INDEX: if (Config.getBoolean("damageonsneak")) { Config.setValue("damageonsneak", false); - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatUtil.GREEN); Config.setValue("damageonsneak", true); } break; case MLG_INDEX: if (Config.getBoolean("mlg.enabled")) { Config.setValue("mlg.enabled", false); - GUIUtils.sendTitleToAll("Challenge", "MLG deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "MLG deaktiviert", ChatUtil.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "MLG aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "MLG aktiviert", ChatUtil.GREEN); Config.setValue("mlg.enabled", true); } break; @@ -749,37 +749,37 @@ case SHARE_DMG_INDEX: if (Config.getBoolean("sharedmg")) { Config.setValue("sharedmg", false); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatUtil.RED); } else { Config.setValue("sharedmg", true); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatUtil.GREEN); } break; case LAVA_FLOOR_INDEX: if (Config.getBoolean("lavafloor")) { Config.setValue("lavafloor", false); - GUIUtils.sendTitleToAll("Challenge", "Der Boden ist Lava deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava deaktiviert", ChatUtil.RED); } else { Config.setValue("lavafloor", true); - GUIUtils.sendTitleToAll("Challenge", "Der Boden ist Lava aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Der Boden ist Lava aktiviert", ChatUtil.GREEN); } break; case CHUNK_RANDOM_EFFEKT_INDEX: if (Config.getBoolean("randomeffect")) { Config.setValue("randomeffect", false); - GUIUtils.sendTitleToAll("Challenge", "Chunk Random Effekt deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt deaktiviert", ChatUtil.RED); } else { Config.setValue("randomeffect", true); - GUIUtils.sendTitleToAll("Challenge", "Chunk Random Effekt aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Chunk Random Effekt aktiviert", ChatUtil.GREEN); } break; case TIED_TOGETHER_INDEX: if (Config.getBoolean("tiedtogether")) { Config.setValue("tiedtogether", false); - GUIUtils.sendTitleToAll("Challenge", "Zusammengebunden deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden deaktiviert", ChatUtil.RED); } else { Config.setValue("tiedtogether", true); - GUIUtils.sendTitleToAll("Challenge", "Zusammengebunden aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Zusammengebunden aktiviert", ChatUtil.GREEN); } break; case RANGE_ON_TIED_TOGETHER_ADD_INDEX: @@ -793,28 +793,28 @@ case ICE_RUNNER_INDEX: if (Config.getBoolean("icerunner")) { Config.setValue("icerunner", false); - GUIUtils.sendTitleToAll("Challenge", "Ice-Runner deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Ice-Runner deaktiviert", ChatUtil.RED); } else { Config.setValue("icerunner", true); - GUIUtils.sendTitleToAll("Challenge", "Ice-Runner aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Ice-Runner aktiviert", ChatUtil.GREEN); } break; case RANDOM_MOB_INDEX: if (Config.getBoolean("randommobs")) { Config.setValue("randommobs", false); - GUIUtils.sendTitleToAll("Challenge", "Random Mobs deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Random Mobs deaktiviert", ChatUtil.RED); } else { Config.setValue("randommobs", true); - GUIUtils.sendTitleToAll("Challenge", "Random Mobs aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Random Mobs aktiviert", ChatUtil.GREEN); } break; case BEDROCK_WALL_INDEX: if (Config.getBoolean("bedrockwall")) { Config.setValue("bedrockwall", false); - GUIUtils.sendTitleToAll("Challenge", "Bedrock Wand deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand deaktiviert", ChatUtil.RED); } else { Config.setValue("bedrockwall", true); - GUIUtils.sendTitleToAll("Challenge", "Bedrock Wand aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "Bedrock Wand aktiviert", ChatUtil.GREEN); } break; case WORLD_BORDER_LEVEL_INDEX: @@ -830,7 +830,7 @@ for (Player pp : Bukkit.getOnlinePlayers()) { worldBorderAPI.getProvider().resetWorldBorderToGlobal(pp); } - GUIUtils.sendTitleToAll("Challenge", "World Border Level deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "World Border Level deaktiviert", ChatUtil.RED); } else { Config.setValue("worldborderlevel", true); for (Player pp : Bukkit.getOnlinePlayers()) { @@ -840,16 +840,16 @@ for (Player pp : Bukkit.getOnlinePlayers()) { pp.teleport(pp.getWorld().getSpawnLocation()); } - GUIUtils.sendTitleToAll("Challenge", "World Border Level aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "World Border Level aktiviert", ChatUtil.GREEN); } break; case ALL_ITEMS_INDEX: if (Config.getBoolean("allitems")) { Config.setValue("allitems", false); - GUIUtils.sendTitleToAll("Challenge", "All Items deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Challenge", "All Items deaktiviert", ChatUtil.RED); } else { Config.setValue("allitems", true); - GUIUtils.sendTitleToAll("Challenge", "All Items aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Challenge", "All Items aktiviert", ChatUtil.GREEN); AllItemsChallenge.start(); } break; 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 08540f8..3aeb5ec 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java @@ -67,8 +67,10 @@ item = GUIUtils.createGuiItem(Material.BARRIER, ChatUtil.RED + "Challenges sind nur bei /tt challenge verfügbar"); } } - case OTHER_SETTINGS_INDEX -> item = GUIUtils.createGuiItem(Material.COMPARATOR, ChatUtil.GREEN + "Andere Einstellungen"); - case SERVER_SETTINGS_INDEX -> item = GUIUtils.createGuiItem(Material.COMMAND_BLOCK, ChatUtil.GREEN + "Server Einstellungen"); + case OTHER_SETTINGS_INDEX -> + item = GUIUtils.createGuiItem(Material.COMPARATOR, ChatUtil.GREEN + "Andere Einstellungen"); + case SERVER_SETTINGS_INDEX -> + item = GUIUtils.createGuiItem(Material.COMMAND_BLOCK, ChatUtil.GREEN + "Server Einstellungen"); case CLOSE_IDEX -> { item = CustomHeads.QUARTZ_X.getHead(); ItemMeta quartzArrowLeftMeta = item.getItemMeta(); 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 305184d..1ee3dea 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java @@ -52,56 +52,56 @@ switch (slot) { case VILLAGER_TRADE_LIMITS_INDEX -> { if (Config.getBoolean("disablevillagertradelimits")) { - GUIUtils.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED); Config.setValue("disablevillagertradelimits", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN); Config.setValue("disablevillagertradelimits", true); } } case DAMAGE_IN_CHAT_INDEX -> { if (Config.getBoolean("dmginchat")) { - GUIUtils.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen deaktiviert", ChatUtil.RED); Config.setValue("dmginchat", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN); Config.setValue("dmginchat", true); } } case TELEPORT_COMMAND_INDEX -> { if (Config.getBoolean("teleportcommand")) { - GUIUtils.sendTitleToAll("Einstellungen", "Teleport Command deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command deaktiviert", ChatUtil.RED); Config.setValue("teleportcommand", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Teleport Command aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command aktiviert", ChatUtil.GREEN); Config.setValue("teleportcommand", true); } } case HP_ON_TAB_INDEX -> { if (Config.getBoolean("tabhp")) { - GUIUtils.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED); Config.setValue("tabhp", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "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")) { - GUIUtils.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED); Config.setValue("silkore", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN); Config.setValue("silkore", true); } } case FAST_FURNACE_INDEX -> { if (Config.getBoolean("speedfurnace")) { - GUIUtils.sendTitleToAll("Einstellungen", "Schneller Ofen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen deaktiviert", ChatUtil.RED); Config.setValue("speedfurnace", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Schneller Ofen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen aktiviert", ChatUtil.GREEN); Config.setValue("speedfurnace", true); } } @@ -113,10 +113,10 @@ case GRAVESTONE_INDEX -> { if (Config.getBoolean("gravestone")) { - GUIUtils.sendTitleToAll("Einstellungen", "Grabsteine deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine deaktiviert", ChatUtil.RED); Config.setValue("gravestone", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Grabsteine aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine aktiviert", ChatUtil.GREEN); Config.setValue("gravestone", true); } } @@ -312,65 +312,65 @@ break; case DMG_INCHAT_INDEX: if (Config.getBoolean("dmginchat")) { - GUIUtils.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen deaktiviert", ChatUtil.RED); Config.setValue("dmginchat", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Schaden im Chat anzeigen aktiviert", ChatUtil.GREEN); Config.setValue("dmginchat", true); } break; case TELEPORT_COMMAND_INDEX: if (Config.getBoolean("teleportcommand")) { - GUIUtils.sendTitleToAll("Einstellungen", "Teleport Command deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command deaktiviert", ChatUtil.RED); Config.setValue("teleportcommand", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Teleport Command aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Teleport Command aktiviert", ChatUtil.GREEN); Config.setValue("teleportcommand", true); } break; case TAB_HP_INDEX: if (Config.getBoolean("tabhp")) { - GUIUtils.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen deaktiviert", ChatUtil.RED); Config.setValue("tabhp", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Herzen in der Tablist anzeigen aktiviert", ChatUtil.GREEN); Config.setValue("tabhp", true); } plugin.getSBManager().updateTabHP(); break; case DIREKT_SMLET_INDEX: if (Config.getBoolean("silkore")) { - GUIUtils.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren deaktiviert", ChatUtil.RED); Config.setValue("silkore", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Abgebaute Erze droppen Barren aktiviert", ChatUtil.GREEN); Config.setValue("silkore", true); } break; case FAST_FURNACE_INDEX: if (Config.getBoolean("speedfurnace")) { - GUIUtils.sendTitleToAll("Einstellungen", "Schneller Ofen deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen deaktiviert", ChatUtil.RED); Config.setValue("speedfurnace", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Schneller Ofen aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Schneller Ofen aktiviert", ChatUtil.GREEN); Config.setValue("speedfurnace", true); } break; case DISABLE_VILLAGER_TRADE_LIMITS_INDEX: if (Config.getBoolean("disablevillagertradelimits")) { - GUIUtils.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED); Config.setValue("disablevillagertradelimits", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Villager Trade Limits deaktiviert (Default)", ChatUtil.GREEN); Config.setValue("disablevillagertradelimits", true); } break; case GRAVESTONE_INDEX: if (Config.getBoolean("gravestone")) { - GUIUtils.sendTitleToAll("Einstellungen", "Grabsteine deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine deaktiviert", ChatUtil.RED); Config.setValue("gravestone", false); } else { - GUIUtils.sendTitleToAll("Einstellungen", "Grabsteine aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Einstellungen", "Grabsteine aktiviert", ChatUtil.GREEN); Config.setValue("gravestone", true); } break; 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 f556175..8c6d43a 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java @@ -52,75 +52,75 @@ case DIFFICULTY_INDEX -> { if (plugin.getDifficulty() == Difficulty.EASY) { plugin.setDifficulty(Difficulty.NORMAL); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Mittel", ChatUtil.ORANGE); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Mittel", ChatUtil.ORANGE); } else if (plugin.getDifficulty() == Difficulty.NORMAL) { plugin.setDifficulty(Difficulty.HARD); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Schwer", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Schwer", ChatUtil.RED); } else if (plugin.getDifficulty() == Difficulty.HARD) { plugin.setDifficulty(Difficulty.PEACEFUL); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Friedlich", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Friedlich", ChatUtil.GREEN); } else if (plugin.getDifficulty() == Difficulty.PEACEFUL) { plugin.setDifficulty(Difficulty.EASY); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Leicht", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Leicht", ChatUtil.BLUE); Config.setValue("editsettings", true); } } case KEEP_INVENTORY_INDEX -> { if (plugin.getKeepInventory()) { plugin.setKeepInventory(false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatUtil.RED); } else { plugin.setKeepInventory(true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatUtil.GREEN); } Config.setValue("editsettings", true); } case NATURAL_REGENERATION_INDEX -> { if (plugin.getNaturalRegeneration()) { plugin.setNaturalRegeneration(false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration aktiviert", ChatUtil.GREEN); } else { plugin.setNaturalRegeneration(true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration deaktiviert", ChatUtil.RED); } Config.setValue("editsettings", true); } case ULTRA_HARDCORE_INDEX -> { if (Config.getBoolean("ultrahardcore")) { Config.setValue("ultrahardcore", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ultra Hardcore deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore deaktiviert", ChatUtil.RED); } else { Config.setValue("ultrahardcore", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ultra Hardcore aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore aktiviert", ChatUtil.GREEN); } } case ONE_LIFE_INDEX -> { if (Config.getBoolean("onelife")) { Config.setValue("onelife", false, false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ein Leben für alle deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle deaktiviert", ChatUtil.RED); } else { Config.setValue("onelife", true, false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ein Leben für alle aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle aktiviert", ChatUtil.GREEN); } } case RESPAWN_INDEX -> { if (Config.getBoolean("respawn")) { Config.setValue("respawn", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Wiederbeleben deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben deaktiviert", ChatUtil.RED); } else { Config.setValue("respawn", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Wiederbeleben aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben aktiviert", ChatUtil.GREEN); } } case PVP_INDEX -> { if (plugin.getPvP()) { plugin.setPvP(false); Config.setValue("pvp", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "PVP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "PVP deaktiviert", ChatUtil.RED); } else { plugin.setPvP(true); Config.setValue("pvp", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "PVP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "PVP aktiviert", ChatUtil.GREEN); } } default -> { @@ -165,16 +165,16 @@ } case KEEP_INVENTORY_INDEX -> { if (plugin.getKeepInventory()) { - item = GUIUtils.createGuiItem(Material.CHEST_MINECART,ChatUtil.GREEN + "Keep Inventory aktiviert", true); + item = GUIUtils.createGuiItem(Material.CHEST_MINECART, ChatUtil.GREEN + "Keep Inventory aktiviert", true); } else { - item = GUIUtils.createGuiItem(Material.CHEST_MINECART,ChatUtil.RED + "Keep Inventory deaktiviert"); + item = GUIUtils.createGuiItem(Material.CHEST_MINECART, ChatUtil.RED + "Keep Inventory deaktiviert"); } } case NATURAL_REGENERATION_INDEX -> { if (plugin.getNaturalRegeneration()) { - item = GUIUtils.createGuiItem(Material.GOLDEN_APPLE,ChatUtil.GREEN + "Natürliche Regeneration aktiviert", true); + item = GUIUtils.createGuiItem(Material.GOLDEN_APPLE, ChatUtil.GREEN + "Natürliche Regeneration aktiviert", true); } else { - item = GUIUtils.createGuiItem(Material.GOLDEN_APPLE,ChatUtil.RED + "Natürliche Regeneration deaktiviert"); + item = GUIUtils.createGuiItem(Material.GOLDEN_APPLE, ChatUtil.RED + "Natürliche Regeneration deaktiviert"); } } case ULTRA_HARDCORE_INDEX -> { @@ -289,72 +289,72 @@ case DIFFICULTY_INDEX: if (plugin.getDifficulty() == Difficulty.EASY) { plugin.setDifficulty(Difficulty.NORMAL); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Mittel", ChatUtil.ORANGE); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Mittel", ChatUtil.ORANGE); } else if (plugin.getDifficulty() == Difficulty.NORMAL) { plugin.setDifficulty(Difficulty.HARD); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Schwer", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Schwer", ChatUtil.RED); } else if (plugin.getDifficulty() == Difficulty.HARD) { plugin.setDifficulty(Difficulty.PEACEFUL); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Friedlich", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Friedlich", ChatUtil.GREEN); } else if (plugin.getDifficulty() == Difficulty.PEACEFUL) { plugin.setDifficulty(Difficulty.EASY); - GUIUtils.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Leicht", ChatUtil.BLUE); + ChatUtil.sendTitleToAll("Server Einstellungen", "Schwierigkeitsgrad Leicht", ChatUtil.BLUE); } break; case PVP_INDEX: if (plugin.getPvP()) { plugin.setPvP(false); Config.setValue("pvp", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "PVP deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "PVP deaktiviert", ChatUtil.RED); } else { plugin.setPvP(true); Config.setValue("pvp", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "PVP aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "PVP aktiviert", ChatUtil.GREEN); } break; case ONE_LIFE_INDEX: if (Config.getBoolean("onelife")) { Config.setValue("onelife", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ein Leben für alle deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle deaktiviert", ChatUtil.RED); } else { Config.setValue("onelife", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ein Leben für alle aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ein Leben für alle aktiviert", ChatUtil.GREEN); } break; case RESPAWN_INDEX: if (Config.getBoolean("respawn")) { Config.setValue("respawn", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Wiederbeleben deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben deaktiviert", ChatUtil.RED); } else { Config.setValue("respawn", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Wiederbeleben aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Wiederbeleben aktiviert", ChatUtil.GREEN); } break; case ULTRA_HARDCORE_INDEX: if (Config.getBoolean("ultrahardcore")) { Config.setValue("ultrahardcore", false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ultra Hardcore deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore deaktiviert", ChatUtil.RED); } else { Config.setValue("ultrahardcore", true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Ultra Hardcore aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Ultra Hardcore aktiviert", ChatUtil.GREEN); } break; case KEEP_INVENTORY_INDEX: if (plugin.getKeepInventory()) { plugin.setKeepInventory(false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatUtil.RED); } else { plugin.setKeepInventory(true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatUtil.GREEN); } break; case NATURAL_REGENERATION_INDEX: if (plugin.getNaturalRegeneration()) { plugin.setNaturalRegeneration(false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration aktiviert", ChatUtil.GREEN); + ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration aktiviert", ChatUtil.GREEN); } else { plugin.setNaturalRegeneration(true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration deaktiviert", ChatUtil.RED); + ChatUtil.sendTitleToAll("Server Einstellungen", "Natürliche Regeneration deaktiviert", ChatUtil.RED); } break; } diff --git a/src/main/java/de/fanta/challenges/listeners/BlockCreateListener.java b/src/main/java/de/fanta/challenges/listeners/BlockCreateListener.java index 176d965..1015794 100644 --- a/src/main/java/de/fanta/challenges/listeners/BlockCreateListener.java +++ b/src/main/java/de/fanta/challenges/listeners/BlockCreateListener.java @@ -18,10 +18,10 @@ if (!plugin.getTimer().isRunning() && e.getPlayer().getGameMode() == GameMode.SURVIVAL) { e.setCancelled(true); } - if (Config.getString("event.type").equals("build")) { - plugin.getScoreManager().updateScore(new ChallengePlayer(e.getPlayer().getUniqueId()), -1); - } + if (Config.getString("event.type").equals("build")) { + plugin.getScoreManager().updateScore(new ChallengePlayer(e.getPlayer().getUniqueId()), -1); } + } @EventHandler public void onBucketPlace(PlayerBucketEmptyEvent e) { diff --git a/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java b/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java index a808823..6e693a1 100644 --- a/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java +++ b/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java @@ -5,7 +5,6 @@ import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.ItemTypeListUtil; import de.iani.cubesideutils.bukkit.items.ItemGroups; -import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index dd902cb..d85cdc5 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -3,19 +3,13 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.GameMode; -import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Player; -import org.bukkit.entity.Wither; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent; -import java.util.Objects; - public class DeathListener implements Listener { private final Challenges plugin = Challenges.getPlugin(); diff --git a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java index 4ce6697..791bd29 100644 --- a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java +++ b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java @@ -44,6 +44,7 @@ public record EventRegistration(Challenges plugin) { public static final PluginManager pM = Bukkit.getPluginManager(); + public void registerEvents() { pM.registerEvents(new QuitJoinListener(), plugin); pM.registerEvents(new BlockDestroyListener(), plugin); diff --git a/src/main/java/de/fanta/challenges/listeners/InteractListener.java b/src/main/java/de/fanta/challenges/listeners/InteractListener.java index daf9992..740b4d3 100644 --- a/src/main/java/de/fanta/challenges/listeners/InteractListener.java +++ b/src/main/java/de/fanta/challenges/listeners/InteractListener.java @@ -7,37 +7,36 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; -import org.bukkit.event.inventory.TradeSelectEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.MerchantRecipe; public class InteractListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenges plugin = Challenges.getPlugin(); - @EventHandler - public void onBlockClick(PlayerInteractEvent e) { - if (e.getAction() == Action.RIGHT_CLICK_BLOCK) { - if (!plugin.getTimer().isRunning() && e.getPlayer().getGameMode() != GameMode.CREATIVE) { - e.setCancelled(true); - } - } - } + @EventHandler + public void onBlockClick(PlayerInteractEvent e) { + if (e.getAction() == Action.RIGHT_CLICK_BLOCK) { + if (!plugin.getTimer().isRunning() && e.getPlayer().getGameMode() != GameMode.CREATIVE) { + e.setCancelled(true); + } + } + } - @EventHandler - public void onEntityClick(PlayerInteractEntityEvent e) { - if (!plugin.getTimer().isRunning() && e.getPlayer().getGameMode() != GameMode.CREATIVE) { - e.setCancelled(true); - } + @EventHandler + public void onEntityClick(PlayerInteractEntityEvent e) { + if (!plugin.getTimer().isRunning() && e.getPlayer().getGameMode() != GameMode.CREATIVE) { + e.setCancelled(true); + } - if (Config.getBoolean("disablevillagertradelimits")) { - if (e.getRightClicked() instanceof Villager villager) { - for (MerchantRecipe trade : villager.getRecipes()) { - trade.setMaxUses(Integer.MAX_VALUE); - } - } - } - } + if (Config.getBoolean("disablevillagertradelimits")) { + if (e.getRightClicked() instanceof Villager villager) { + for (MerchantRecipe trade : villager.getRecipes()) { + trade.setMaxUses(Integer.MAX_VALUE); + } + } + } + } } diff --git a/src/main/java/de/fanta/challenges/listeners/PlayerListener.java b/src/main/java/de/fanta/challenges/listeners/PlayerListener.java index 6170f69..ff5e5ab 100644 --- a/src/main/java/de/fanta/challenges/listeners/PlayerListener.java +++ b/src/main/java/de/fanta/challenges/listeners/PlayerListener.java @@ -43,55 +43,6 @@ private final Challenges plugin = Challenges.getPlugin(); - public static int romanToDecimal(String romanNumber) { - int decimal = 0; - int lastNumber = 0; - String romanNumeral = romanNumber.toUpperCase(); - for (int x = romanNumeral.length() - 1; x >= 0; x--) { - char convertToDecimal = romanNumeral.charAt(x); - - switch (convertToDecimal) { - case 'M' -> { - decimal = processDecimal(1000, lastNumber, decimal); - lastNumber = 1000; - } - case 'D' -> { - decimal = processDecimal(500, lastNumber, decimal); - lastNumber = 500; - } - case 'C' -> { - decimal = processDecimal(100, lastNumber, decimal); - lastNumber = 100; - } - case 'L' -> { - decimal = processDecimal(50, lastNumber, decimal); - lastNumber = 50; - } - case 'X' -> { - decimal = processDecimal(10, lastNumber, decimal); - lastNumber = 10; - } - case 'V' -> { - decimal = processDecimal(5, lastNumber, decimal); - lastNumber = 5; - } - case 'I' -> { - decimal = processDecimal(1, lastNumber, decimal); - lastNumber = 1; - } - } - } - return decimal; - } - - public static int processDecimal(int decimal, int lastNumber, int lastDecimal) { - if (lastNumber > decimal) { - return lastDecimal - decimal; - } else { - return lastDecimal + decimal; - } - } - @EventHandler public void onEntityTarget(EntityTargetLivingEntityEvent e) { if (!plugin.getTimer().isRunning()) { @@ -275,11 +226,53 @@ } } } - /*@EventHandler - public void move(PlayerMoveEvent e) { - Player p = e.getPlayer(); - int distance = (int) p.getLocation().toVector().subtract(p.getWorld().getSpawnLocation().toVector()).length(); - Vibration vibration = new Vibration(p.getLocation(), new Vibration.Destination.BlockDestination(p.getWorld().getSpawnLocation().getBlock()), 10 + distance); - p.getWorld().spawnParticle(Particle.VIBRATION, p.getLocation(), 1, vibration); - }*/ + + private static int romanToDecimal(String romanNumber) { + int decimal = 0; + int lastNumber = 0; + String romanNumeral = romanNumber.toUpperCase(); + for (int x = romanNumeral.length() - 1; x >= 0; x--) { + char convertToDecimal = romanNumeral.charAt(x); + + switch (convertToDecimal) { + case 'M' -> { + decimal = processDecimal(1000, lastNumber, decimal); + lastNumber = 1000; + } + case 'D' -> { + decimal = processDecimal(500, lastNumber, decimal); + lastNumber = 500; + } + case 'C' -> { + decimal = processDecimal(100, lastNumber, decimal); + lastNumber = 100; + } + case 'L' -> { + decimal = processDecimal(50, lastNumber, decimal); + lastNumber = 50; + } + case 'X' -> { + decimal = processDecimal(10, lastNumber, decimal); + lastNumber = 10; + } + case 'V' -> { + decimal = processDecimal(5, lastNumber, decimal); + lastNumber = 5; + } + case 'I' -> { + decimal = processDecimal(1, lastNumber, decimal); + lastNumber = 1; + } + } + } + return decimal; + } + + private static int processDecimal(int decimal, int lastNumber, int lastDecimal) { + if (lastNumber > decimal) { + return lastDecimal - decimal; + } else { + return lastDecimal + decimal; + } + } } diff --git a/src/main/java/de/fanta/challenges/scoreboard/Scorable.java b/src/main/java/de/fanta/challenges/scoreboard/Scorable.java index fb7ac2f..0421533 100644 --- a/src/main/java/de/fanta/challenges/scoreboard/Scorable.java +++ b/src/main/java/de/fanta/challenges/scoreboard/Scorable.java @@ -4,10 +4,10 @@ public interface Scorable { - public abstract void setScoreboard(Scoreboard scoreboard); + void setScoreboard(Scoreboard scoreboard); - public abstract String getIdentifier(); + String getIdentifier(); - public abstract String getName(); + String getName(); } diff --git a/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java b/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java index be601b8..a9a91a5 100644 --- a/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java +++ b/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java @@ -7,7 +7,6 @@ import de.fanta.challenges.utils.Config; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; diff --git a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java index 4b2da7f..44ce148 100644 --- a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java +++ b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java @@ -8,7 +8,6 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.HastebinUtil; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.scoreboard.Team; @@ -136,7 +135,7 @@ lastScore = curr.getScore(); i++; } else { - curr = positions.get(i-1); + curr = positions.get(i - 1); lastPosition = curr.getPostition(); lastScore = curr.getScore(); } @@ -144,7 +143,7 @@ for (; i < positions.size(); i++) { curr = positions.get(i); int correctPosition = (curr.getScore() == lastScore) ? lastPosition : lastPosition + 1; - if (curr.getPostition() == correctPosition && i > Math.max(startingIndex,endIndex)) + if (curr.getPostition() == correctPosition && i > Math.max(startingIndex, endIndex)) break; curr.setPosition(correctPosition); diff --git a/src/main/java/de/fanta/challenges/teams/TeamUtils.java b/src/main/java/de/fanta/challenges/teams/TeamUtils.java index 08d7a76..4bc12e7 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamUtils.java +++ b/src/main/java/de/fanta/challenges/teams/TeamUtils.java @@ -38,7 +38,7 @@ private static Scoreboard scoreboard; private static Score[] scoreboardScores; private static Objective teamscoreboardObjective; - private static Challenges plugin = Challenges.getPlugin(); + private static final Challenges plugin = Challenges.getPlugin(); private static ChallengeTeam createDefaultTeam(int nr) { if (nr == 0) { diff --git a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/ChatSkull.java b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/ChatSkull.java index 3f5a98b..cf30f87 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/ChatSkull.java +++ b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/ChatSkull.java @@ -5,14 +5,14 @@ import org.bukkit.plugin.java.JavaPlugin; public class ChatSkull extends JavaPlugin implements Listener { - - public static void sendAll(Player head, String[] lines) { - SkullClass cs = new SkullClass(head, lines); - cs.sendAll(); - } - - public static void sendPlayer(Player head, Player target, String[] lines) { - SkullClass cs = new SkullClass(head, lines); - cs.sendPlayer(target); - } + + public static void sendAll(Player head, String[] lines) { + SkullClass cs = new SkullClass(head, lines); + cs.sendAll(); + } + + public static void sendPlayer(Player head, Player target, String[] lines) { + SkullClass cs = new SkullClass(head, lines); + cs.sendPlayer(target); + } } diff --git a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/Message.java b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/Message.java index cfc7aa6..3795fcb 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/Message.java +++ b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/Message.java @@ -1,83 +1,82 @@ package de.fanta.challenges.utils.ChatSkullAPI; +import net.md_5.bungee.api.ChatColor; +import org.bukkit.entity.Player; + import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; -import de.fanta.challenges.utils.ChatUtil; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.entity.Player; - public class Message { - - private String[] lines; - - public Message(BufferedImage image, int height, char imgChar) { - ChatColor[][] chatColors = toChatColorArray(image, height); - this.lines = toImgMessage(chatColors, imgChar); - } - - public Message appendText(String[] text) { - for (int y = 0; y < this.lines.length; y++) { - if (text.length > y) { - String[] tmp16_12 = this.lines; - tmp16_12[y] = tmp16_12[y] + " " + text[y]; - } - } - return this; - } - private ChatColor[][] toChatColorArray(BufferedImage image, int height) { - double ratio = (image.getHeight() / image.getWidth()); - BufferedImage resized = resizeImage(image, (int)(height / ratio), height); - ChatColor[][] chatImg = new ChatColor[resized.getWidth()][resized.getHeight()]; - for (int x = 0; x < resized.getWidth(); x++) { - for (int y = 0; y < resized.getHeight(); y++) { - int rgb = resized.getRGB(x, y); - String hex = "#" + Integer.toHexString(rgb).substring(2); - ChatColor closest = getClosestChatColor(ChatColor.of(hex)); - chatImg[x][y] = closest; - } - } - return chatImg; - } - - private String[] toImgMessage(ChatColor[][] colors, char imgchar) { - String[] lines = new String[(colors[0]).length]; - for (int y = 0; y < (colors[0]).length; y++) { - StringBuilder line = new StringBuilder(); - for (ChatColor[] chatColors : colors) { - ChatColor color = chatColors[y]; - line.append((color != null) ? (chatColors[y].toString() + imgchar) : Character.valueOf(' ')); - } - lines[y] = line.toString() + ChatColor.RESET; - } - return lines; - } - - private BufferedImage resizeImage(BufferedImage originalImage, int width, int height) { - AffineTransform af = new AffineTransform(); - af.scale((width / originalImage.getWidth()), (height / originalImage.getHeight())); - AffineTransformOp operation = new AffineTransformOp(af, 1); - return operation.filter(originalImage, null); - } - - public String[] getLines() { - return this.lines; - } - - public void sendToPlayer(Player player) { - byte b; - int i; - String[] arrayOfString; - for (i = (arrayOfString = this.lines).length, b = 0; b < i; ) { - String line = arrayOfString[b]; - player.sendMessage(line); - b++; - } - } + private final String[] lines; - private ChatColor getClosestChatColor(ChatColor color) { - return color; - } + public Message(BufferedImage image, int height, char imgChar) { + ChatColor[][] chatColors = toChatColorArray(image, height); + this.lines = toImgMessage(chatColors, imgChar); + } + + public Message appendText(String[] text) { + for (int y = 0; y < this.lines.length; y++) { + if (text.length > y) { + String[] tmp16_12 = this.lines; + tmp16_12[y] = tmp16_12[y] + " " + text[y]; + } + } + return this; + } + + private ChatColor[][] toChatColorArray(BufferedImage image, int height) { + double ratio = (image.getHeight() / image.getWidth()); + BufferedImage resized = resizeImage(image, (int) (height / ratio), height); + ChatColor[][] chatImg = new ChatColor[resized.getWidth()][resized.getHeight()]; + for (int x = 0; x < resized.getWidth(); x++) { + for (int y = 0; y < resized.getHeight(); y++) { + int rgb = resized.getRGB(x, y); + String hex = "#" + Integer.toHexString(rgb).substring(2); + ChatColor closest = getClosestChatColor(ChatColor.of(hex)); + chatImg[x][y] = closest; + } + } + return chatImg; + } + + private String[] toImgMessage(ChatColor[][] colors, char imgchar) { + String[] lines = new String[(colors[0]).length]; + for (int y = 0; y < (colors[0]).length; y++) { + StringBuilder line = new StringBuilder(); + for (ChatColor[] chatColors : colors) { + ChatColor color = chatColors[y]; + line.append((color != null) ? (chatColors[y].toString() + imgchar) : Character.valueOf(' ')); + } + lines[y] = line.toString() + ChatColor.RESET; + } + return lines; + } + + private BufferedImage resizeImage(BufferedImage originalImage, int width, int height) { + AffineTransform af = new AffineTransform(); + af.scale((width / originalImage.getWidth()), (height / originalImage.getHeight())); + AffineTransformOp operation = new AffineTransformOp(af, 1); + return operation.filter(originalImage, null); + } + + public String[] getLines() { + return this.lines; + } + + public void sendToPlayer(Player player) { + byte b; + int i; + String[] arrayOfString; + for (i = (arrayOfString = this.lines).length, b = 0; b < i; ) { + String line = arrayOfString[b]; + player.sendMessage(line); + b++; + } + } + + private ChatColor getClosestChatColor(ChatColor color) { + return color; + } } diff --git a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/SkullClass.java b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/SkullClass.java index cf03af5..d5983f8 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/SkullClass.java +++ b/src/main/java/de/fanta/challenges/utils/ChatSkullAPI/SkullClass.java @@ -1,43 +1,41 @@ package de.fanta.challenges.utils.ChatSkullAPI; -import java.awt.image.BufferedImage; -import java.net.URL; -import javax.imageio.ImageIO; - -import de.fanta.challenges.utils.ChatUtil; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -public class SkullClass { - Player player; - - String[] lines; - - SkullClass(Player head, String[] lines) { - this.player = head; - this.lines = lines; - } +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.net.URL; - public void sendAll() { - for (Player player : Bukkit.getOnlinePlayers()) - sendPlayer(player); - } - - public void sendPlayer(Player player) { - String name = this.player.getPlayer().getName(); - BufferedImage imageToSend = null; - try { - imageToSend = ImageIO.read(newURL(name)); - } catch (Exception e) { - e.printStackTrace(); - } - (new Message(imageToSend, 8, '█')).appendText(this.lines).sendToPlayer(player); - } - - private static URL newURL(String name) throws Exception { - String url = "https://mineskin.de/helm/%pname%/8.png"; - url = url.replace("%pname%", name); - return new URL(url); - } +public class SkullClass { + Player player; + + String[] lines; + + SkullClass(Player head, String[] lines) { + this.player = head; + this.lines = lines; + } + + public void sendAll() { + for (Player player : Bukkit.getOnlinePlayers()) + sendPlayer(player); + } + + public void sendPlayer(Player player) { + String name = this.player.getPlayer().getName(); + BufferedImage imageToSend = null; + try { + imageToSend = ImageIO.read(newURL(name)); + } catch (Exception e) { + e.printStackTrace(); + } + (new Message(imageToSend, 8, '█')).appendText(this.lines).sendToPlayer(player); + } + + private static URL newURL(String name) throws Exception { + String url = "https://mineskin.de/helm/%pname%/8.png"; + url = url.replace("%pname%", name); + return new URL(url); + } } diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index c0bdf71..51dcd35 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -60,7 +60,11 @@ } public static void sendTitleToAll(String headline, String text, ChatColor textColor, boolean pling) { - sendTitleToAll(headline, text, textColor, 10, 60 , 10, pling); + sendTitleToAll(headline, text, textColor, 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 sendTitleToPlayer(Player player, @Nullable String headline, @Nullable String text, ChatColor textColor, int in, int time, int out, boolean pling) { diff --git a/src/main/java/de/fanta/challenges/utils/guiutils/AbstractWindow.java b/src/main/java/de/fanta/challenges/utils/guiutils/AbstractWindow.java index 4ae03e5..253a11b 100644 --- a/src/main/java/de/fanta/challenges/utils/guiutils/AbstractWindow.java +++ b/src/main/java/de/fanta/challenges/utils/guiutils/AbstractWindow.java @@ -9,8 +9,8 @@ public abstract class AbstractWindow implements Window { - private Player player; - private Inventory inventory; + private final Player player; + private final Inventory inventory; private Window parentWindow; public AbstractWindow(Player player, Inventory inventory) { @@ -50,14 +50,10 @@ return event.getAction() != InventoryAction.NOTHING; } - switch (event.getAction()) { - case COLLECT_TO_CURSOR: - case MOVE_TO_OTHER_INVENTORY: - case UNKNOWN: - return true; - default: - return false; - } + return switch (event.getAction()) { + case COLLECT_TO_CURSOR, MOVE_TO_OTHER_INVENTORY, UNKNOWN -> true; + default -> false; + }; } @Override diff --git a/src/main/java/de/fanta/challenges/utils/guiutils/GUIUtils.java b/src/main/java/de/fanta/challenges/utils/guiutils/GUIUtils.java index 00d7f5d..96fbb7d 100644 --- a/src/main/java/de/fanta/challenges/utils/guiutils/GUIUtils.java +++ b/src/main/java/de/fanta/challenges/utils/guiutils/GUIUtils.java @@ -1,13 +1,7 @@ package de.fanta.challenges.utils.guiutils; -import de.fanta.challenges.Challenges; -import de.fanta.challenges.utils.ChatUtil; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -16,8 +10,6 @@ public class GUIUtils { - private static final Challenges plugin = Challenges.getPlugin(); - public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, "§1", true); public static ItemStack createGuiItem(Material material, String name, String... lore) { @@ -36,8 +28,4 @@ item.setItemMeta(meta); return item; } - - public static void sendTitleToAll(String headline, String text, ChatColor textColor) { - ChatUtil.sendTitleToAll(headline, text, textColor, 10, 60, 10, true); - } } diff --git a/src/main/java/de/fanta/challenges/utils/guiutils/Window.java b/src/main/java/de/fanta/challenges/utils/guiutils/Window.java index 95280fd..91ef727 100644 --- a/src/main/java/de/fanta/challenges/utils/guiutils/Window.java +++ b/src/main/java/de/fanta/challenges/utils/guiutils/Window.java @@ -8,27 +8,27 @@ public interface Window { - public abstract Player getPlayer(); + Player getPlayer(); - public abstract Inventory getInventory(); + Inventory getInventory(); - public abstract Window getParent(); + Window getParent(); - public abstract void open(); + void open(); - public default void closed() { + default void closed() { } - public default void onItemClicked(InventoryClickEvent event) { + default void onItemClicked(InventoryClickEvent event) { event.setCancelled(true); } - public default void onItemDraged(InventoryDragEvent event) { + default void onItemDraged(InventoryDragEvent event) { event.setCancelled(true); } - public default void onInventoryClose(InventoryCloseEvent event) { + default void onInventoryClose(InventoryCloseEvent event) { } } diff --git a/src/main/java/de/fanta/challenges/utils/guiutils/WindowManager.java b/src/main/java/de/fanta/challenges/utils/guiutils/WindowManager.java index 8819e48..577df21 100644 --- a/src/main/java/de/fanta/challenges/utils/guiutils/WindowManager.java +++ b/src/main/java/de/fanta/challenges/utils/guiutils/WindowManager.java @@ -16,7 +16,7 @@ public class WindowManager implements Listener { private static final WindowManager INSTANCE = new WindowManager(); - private Map openWindows; + private final Map openWindows; public WindowManager() { this.openWindows = new HashMap<>();