From 0853d6d98563b72be8f90be4113284525b0382b1 Mon Sep 17 00:00:00 2001 From: Almighty-Satan <43804777+Almighty-Satan@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:31:18 +0200 Subject: [PATCH] Replace some legacy CFW functions --- src/de/cuuky/varo/Main.java | 14 +++++---- .../varo/command/VaroCommandListener.java | 9 +++--- .../command/essentials/MessageCommand.java | 5 ++-- .../varo/command/essentials/ReplyCommand.java | 3 +- .../varo/command/varo/ConfigCommand.java | 3 +- .../cuuky/varo/command/varo/ResetCommand.java | 2 +- .../varo/configuration/ConfigHandler.java | 5 ++-- .../placeholder/MessagePlaceholderLoader.java | 18 ++++++------ src/de/cuuky/varo/data/DataManager.java | 2 +- src/de/cuuky/varo/data/Dependencies.java | 29 +++++++++++++------ .../cuuky/varo/entity/player/VaroPlayer.java | 2 +- .../entity/player/stats/VaroInventory.java | 15 ++++++---- .../stats/stat/inventory/VaroSaveable.java | 2 +- src/de/cuuky/varo/game/world/VaroWorld.java | 2 +- .../game/world/generators/LobbyGenerator.java | 2 +- .../varo/gui/admin/backup/BackupListGUI.java | 27 ++++++----------- .../gui/admin/config/ConfigSectionGUI.java | 15 +++++----- .../gui/admin/varoevents/VaroEventGUI.java | 7 +++-- .../varo/listener/FancyEffectListener.java | 2 +- .../varo/recovery/recoveries/VaroBackup.java | 12 ++++++-- .../recovery/recoveries/VaroBugreport.java | 6 ++-- src/de/cuuky/varo/report/Report.java | 2 +- src/de/cuuky/varo/utils/MagmaUtils.java | 4 +-- 23 files changed, 104 insertions(+), 84 deletions(-) diff --git a/src/de/cuuky/varo/Main.java b/src/de/cuuky/varo/Main.java index 35a4da7cc..67c5c83fa 100644 --- a/src/de/cuuky/varo/Main.java +++ b/src/de/cuuky/varo/Main.java @@ -5,6 +5,7 @@ import java.security.DigestInputStream; import java.security.MessageDigest; import java.util.UUID; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -12,11 +13,7 @@ import com.google.common.io.BaseEncoding; import de.cuuky.cfw.CuukyFrameWork; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.cfw.utils.UUIDUtils; -import de.varoplugin.cfw.version.ServerSoftware; -import de.varoplugin.cfw.version.ServerVersion; -import de.varoplugin.cfw.version.VersionUtils; import de.cuuky.varo.bot.BotLauncher; import de.cuuky.varo.bstats.MetricsLoader; import de.cuuky.varo.configuration.ConfigFailureDetector; @@ -24,11 +21,15 @@ import de.cuuky.varo.configuration.configurations.language.VaroLanguageManager; import de.cuuky.varo.data.BukkitRegisterer; import de.cuuky.varo.data.DataManager; +import de.cuuky.varo.data.Dependencies; import de.cuuky.varo.game.VaroGame; import de.cuuky.varo.gui.VaroInventoryManager; import de.cuuky.varo.recovery.recoveries.VaroBugreport; import de.cuuky.varo.spigot.updater.VaroUpdater; import de.cuuky.varo.threads.SmartLagDetector; +import de.varoplugin.cfw.version.ServerSoftware; +import de.varoplugin.cfw.version.ServerVersion; +import de.varoplugin.cfw.version.VersionUtils; public class Main extends JavaPlugin { @@ -99,6 +100,8 @@ public void onEnable() { } System.out.println(CONSOLE_PREFIX); + Dependencies.loadRequired(this); + dataManager = new DataManager(this); dataManager.preLoad(); @@ -275,8 +278,7 @@ public static String getPluginName() { } public static String getContributors() { - return JavaUtils.getArgsToString( - JavaUtils.removeString(JavaUtils.arrayToCollection(instance.getDescription().getAuthors()), 0), ", "); + return instance.getDescription().getAuthors().stream().skip(1).collect(Collectors.joining(", ")); } public static String getPrefix() { diff --git a/src/de/cuuky/varo/command/VaroCommandListener.java b/src/de/cuuky/varo/command/VaroCommandListener.java index 7b6c632ab..b5096865b 100644 --- a/src/de/cuuky/varo/command/VaroCommandListener.java +++ b/src/de/cuuky/varo/command/VaroCommandListener.java @@ -1,14 +1,15 @@ package de.cuuky.varo.command; -import de.cuuky.varo.command.custom.CustomCommand; +import java.util.Arrays; + import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; +import de.cuuky.varo.command.custom.CustomCommand; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.entity.player.VaroPlayer; @@ -35,7 +36,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String if (command instanceof CustomCommand && ((CustomCommand) command).isUnused()) { if (sender.hasPermission("varo.useCustoms")) { sender.sendMessage(player == null ? Main.getConsolePrefix() : Main.getPrefix() + ChatColor.GRAY + "Dieser Command ist " + Main.getColorCode() + "deaktiviert" + ChatColor.GRAY + ", aber du kannst ihn\n" + Main.getPrefix() + "benutzen:"); - command.onCommand(sender, player, cmd, label, JavaUtils.removeString(args, 0)); + command.onCommand(sender, player, cmd, label, Arrays.copyOfRange(args, 1, args.length)); } else sender.sendMessage(Main.getPrefix() + "§7Kommando '" + Main.getColorCode() + args[0] + "§7' nicht gefunden!"); return false; @@ -46,7 +47,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String return false; } - command.onCommand(sender, player, cmd, label, JavaUtils.removeString(args, 0)); + command.onCommand(sender, player, cmd, label, Arrays.copyOfRange(args, 1, args.length)); return true; } } \ No newline at end of file diff --git a/src/de/cuuky/varo/command/essentials/MessageCommand.java b/src/de/cuuky/varo/command/essentials/MessageCommand.java index fadcdab39..aa22a8587 100644 --- a/src/de/cuuky/varo/command/essentials/MessageCommand.java +++ b/src/de/cuuky/varo/command/essentials/MessageCommand.java @@ -1,6 +1,8 @@ package de.cuuky.varo.command.essentials; +import java.util.Arrays; import java.util.HashMap; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -8,7 +10,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; public class MessageCommand implements CommandExecutor { @@ -40,7 +41,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String return false; } - String message = JavaUtils.getArgsToString(JavaUtils.removeString(args, 0), " "); + String message = Arrays.stream(args).skip(1).collect(Collectors.joining(" ")); to.sendMessage(Main.getColorCode() + sender.getName() + " §8-> §7Dir§8: §f" + message); sender.sendMessage("§7Du §8-> " + Main.getColorCode() + to.getName() + "§8: §f" + message); if (MessageCommand.lastChat.containsKey(to.getName())) diff --git a/src/de/cuuky/varo/command/essentials/ReplyCommand.java b/src/de/cuuky/varo/command/essentials/ReplyCommand.java index cfcb661f5..973d1d6ee 100644 --- a/src/de/cuuky/varo/command/essentials/ReplyCommand.java +++ b/src/de/cuuky/varo/command/essentials/ReplyCommand.java @@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; public class ReplyCommand implements CommandExecutor { @@ -33,7 +32,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String return false; } - String message = JavaUtils.getArgsToString(args, " "); + String message = String.join(" ", args); to.sendMessage(Main.getColorCode() + sender.getName() + " §8-> §7Dir§8: §f" + message); sender.sendMessage("§7Du §8-> " + Main.getColorCode() + to.getName() + "§8: §f" + message); if (MessageCommand.lastChat.containsKey(to.getName())) diff --git a/src/de/cuuky/varo/command/varo/ConfigCommand.java b/src/de/cuuky/varo/command/varo/ConfigCommand.java index da0fc8046..cec2f59e8 100644 --- a/src/de/cuuky/varo/command/varo/ConfigCommand.java +++ b/src/de/cuuky/varo/command/varo/ConfigCommand.java @@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.command.VaroCommand; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; @@ -99,7 +98,7 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l sender.sendMessage(Main.getPrefix() + ConfigMessages.VARO_COMMANDS_CONFIG_SEARCH_LIST_TITLE.getValue(vp)); for (ConfigSetting setting : foundSettings) - sender.sendMessage(Main.getPrefix() + ConfigMessages.VARO_COMMANDS_CONFIG_SEARCH_LIST_FORMAT.getValue(vp).replace("%entry%", setting.getFullPath().toString()).replace("%description%", JavaUtils.getArgsToString(setting.getDescription(), " "))); + sender.sendMessage(Main.getPrefix() + ConfigMessages.VARO_COMMANDS_CONFIG_SEARCH_LIST_FORMAT.getValue(vp).replace("%entry%", setting.getFullPath().toString()).replace("%description%", String.join(" ", setting.getDescription()))); } else sender.sendMessage(Main.getPrefix() + ConfigMessages.VARO_COMMANDS_ERROR_USAGE.getValue(vp).replace("%command%", "config")); } diff --git a/src/de/cuuky/varo/command/varo/ResetCommand.java b/src/de/cuuky/varo/command/varo/ResetCommand.java index 92983c086..8e363866a 100644 --- a/src/de/cuuky/varo/command/varo/ResetCommand.java +++ b/src/de/cuuky/varo/command/varo/ResetCommand.java @@ -10,12 +10,12 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.command.VaroCommand; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.entity.player.VaroPlayer; import de.varoplugin.cfw.inventory.inbuilt.ConfirmInventory; +import de.varoplugin.cfw.utils.JavaUtils; import de.varoplugin.cfw.version.VersionUtils; public class ResetCommand extends VaroCommand { diff --git a/src/de/cuuky/varo/configuration/ConfigHandler.java b/src/de/cuuky/varo/configuration/ConfigHandler.java index 136fade17..15b8c5644 100644 --- a/src/de/cuuky/varo/configuration/ConfigHandler.java +++ b/src/de/cuuky/varo/configuration/ConfigHandler.java @@ -9,13 +9,12 @@ import com.google.common.io.Files; -import de.varoplugin.cfw.configuration.YamlConfigurationUtil; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.SectionConfiguration; import de.cuuky.varo.configuration.configurations.SectionEntry; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.configuration.configurations.config.ConfigSettingSection; +import de.varoplugin.cfw.configuration.YamlConfigurationUtil; public class ConfigHandler { @@ -192,7 +191,7 @@ private String getConfigHeader(SectionConfiguration section) { if (entry.getDescription() == null) break; - String description = JavaUtils.getArgsToString(entry.getDescription(), "\n "); + String description = String.join("\n ", entry.getDescription()); desc = desc + "\r\n" + " " + entry.getPath() + ":\n " + description + "\n Default-Value: " + entry.getDefaultValueToWrite() + "\r\n"; } diff --git a/src/de/cuuky/varo/configuration/placeholder/MessagePlaceholderLoader.java b/src/de/cuuky/varo/configuration/placeholder/MessagePlaceholderLoader.java index 01bc461c4..1227ff2e1 100644 --- a/src/de/cuuky/varo/configuration/placeholder/MessagePlaceholderLoader.java +++ b/src/de/cuuky/varo/configuration/placeholder/MessagePlaceholderLoader.java @@ -1,21 +1,21 @@ package de.cuuky.varo.configuration.placeholder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.stream.Collectors; + +import org.bukkit.ChatColor; + import de.cuuky.cfw.configuration.placeholder.placeholder.util.DateInfo; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.cfw.utils.PermissionUtils; -import de.varoplugin.cfw.version.ServerVersion; -import de.varoplugin.cfw.version.VersionUtils; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.configuration.placeholder.varo.VaroGeneralMessagePlaceholder; import de.cuuky.varo.configuration.placeholder.varo.VaroPlayerMessagePlaceholder; import de.cuuky.varo.entity.player.VaroPlayer; import de.cuuky.varo.entity.player.disconnect.VaroPlayerDisconnect; -import org.bukkit.ChatColor; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.stream.Collectors; +import de.varoplugin.cfw.version.ServerVersion; +import de.varoplugin.cfw.version.VersionUtils; public class MessagePlaceholderLoader { @@ -65,7 +65,7 @@ private void loadMessagePlaceHolder() { for (ConfigSetting setting : ConfigSetting.values()) if (!setting.isSensitive()) - new VaroGeneralMessagePlaceholder(setting.getPath(), 10, JavaUtils.getArgsToString(setting.getDescription(), " "), () -> String.valueOf(setting.getValue()).replace("&", "§")); + new VaroGeneralMessagePlaceholder(setting.getPath(), 10, String.join(" ", setting.getDescription()), () -> String.valueOf(setting.getValue()).replace("&", "§")); } private void loadPlayerPlaceholder() { diff --git a/src/de/cuuky/varo/data/DataManager.java b/src/de/cuuky/varo/data/DataManager.java index 3a0462134..f3de0a3a7 100644 --- a/src/de/cuuky/varo/data/DataManager.java +++ b/src/de/cuuky/varo/data/DataManager.java @@ -72,7 +72,7 @@ public DataManager(Main ownerInstance) { public void preLoad() { this.configHandler = new ConfigHandler(); - Dependencies.loadNeeded(this.ownerInstance); + Dependencies.loadOptional(this.ownerInstance); this.scoreboardConfig = new ScoreboardConfig(); this.tablistConfig = new TablistConfig(); this.actionbarConfig = new ActionbarConfig(); diff --git a/src/de/cuuky/varo/data/Dependencies.java b/src/de/cuuky/varo/data/Dependencies.java index 9e3f45dd0..8903f1eeb 100644 --- a/src/de/cuuky/varo/data/Dependencies.java +++ b/src/de/cuuky/varo/data/Dependencies.java @@ -41,23 +41,34 @@ public class Dependencies { private static final URL DEPENDENCY_FILE = Dependencies.class.getClassLoader().getResource("dependencies.txt"); + private static final Collection REQUIRED_DEPENDENCIES = new ArrayList<>(); private static final Collection OPTIONAL_DEPENDENCIES = new ArrayList<>(); static { - OPTIONAL_DEPENDENCIES.add(new VaroDependency("XSeries", MAVEN_CENTERAL, JarDependency::new, () -> !doesClassExist("com.cryptomorin.xseries.XMaterial"))); - OPTIONAL_DEPENDENCIES.add(new VaroDependency("gson", MAVEN_CENTERAL, JarDependency::new, () -> !doesClassExist("com.google.gson.JsonElement"))); + REQUIRED_DEPENDENCIES.add(new VaroDependency("XSeries", MAVEN_CENTERAL, JarDependency::new, () -> !doesClassExist("com.cryptomorin.xseries.XMaterial"))); + REQUIRED_DEPENDENCIES.add(new VaroDependency("gson", MAVEN_CENTERAL, JarDependency::new, () -> !doesClassExist("com.google.gson.JsonElement"))); + OPTIONAL_DEPENDENCIES.add(new VaroDependency("JDA", MAVEN_CENTERAL, JarDependency::new, () -> ConfigSetting.DISCORDBOT_ENABLED.getValueAsBoolean() && !doesClassExist("net.dv8tion.jda.api.JDA"))); OPTIONAL_DEPENDENCIES.add(new VaroDependency("slf4j-simple", MAVEN_CENTERAL, JarDependency::new, () -> ConfigSetting.DISCORDBOT_ENABLED.getValueAsBoolean() && !doesClassExist("org.slf4j.impl.SimpleLogger"))); OPTIONAL_DEPENDENCIES.add(new VaroDependency("java-telegram-bot-api", MAVEN_CENTERAL, JarDependency::new, () -> ConfigSetting.TELEGRAM_ENABLED.getValueAsBoolean() && !doesClassExist("com.pengrad.telegrambot.TelegramBot"))); } - - public static void loadNeeded(Plugin plugin) { + + public static void loadRequired(Plugin plugin) { + for (VaroDependency lib : REQUIRED_DEPENDENCIES) + load(plugin, lib); + } + + public static void loadOptional(Plugin plugin) { for (VaroDependency lib : OPTIONAL_DEPENDENCIES) - try { - lib.load(plugin); - } catch (Throwable e) { - plugin.getLogger().log(Level.SEVERE, "Unable to load dependency", e); - } + load(plugin, lib); + } + + private static void load(Plugin plugin, VaroDependency dependency) { + try { + dependency.load(plugin); + } catch (Throwable e) { + plugin.getLogger().log(Level.SEVERE, "Unable to load dependency", e); + } } public static class VaroDependency { diff --git a/src/de/cuuky/varo/entity/player/VaroPlayer.java b/src/de/cuuky/varo/entity/player/VaroPlayer.java index 9ff3307ca..55603f5a2 100644 --- a/src/de/cuuky/varo/entity/player/VaroPlayer.java +++ b/src/de/cuuky/varo/entity/player/VaroPlayer.java @@ -21,7 +21,6 @@ import de.cuuky.cfw.player.CustomPlayer; import de.cuuky.cfw.player.clientadapter.BoardUpdateHandler; import de.cuuky.cfw.utils.BukkitUtils; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.alert.Alert; import de.cuuky.varo.alert.AlertType; @@ -50,6 +49,7 @@ import de.varoplugin.cfw.player.hud.AnimatedScoreboard; import de.varoplugin.cfw.player.hud.AnimatedTablist; import de.varoplugin.cfw.player.hud.ScoreboardInstance; +import de.varoplugin.cfw.utils.JavaUtils; import de.varoplugin.cfw.version.ServerVersion; import de.varoplugin.cfw.version.VersionUtils; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/de/cuuky/varo/entity/player/stats/VaroInventory.java b/src/de/cuuky/varo/entity/player/stats/VaroInventory.java index cb1aa165b..4690d6ce9 100644 --- a/src/de/cuuky/varo/entity/player/stats/VaroInventory.java +++ b/src/de/cuuky/varo/entity/player/stats/VaroInventory.java @@ -1,14 +1,14 @@ package de.cuuky.varo.entity.player.stats; -import de.cuuky.cfw.utils.JavaUtils; -import de.cuuky.varo.serialize.identifier.VaroSerializeField; -import de.cuuky.varo.serialize.identifier.VaroSerializeable; +import java.util.HashMap; + import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import java.util.HashMap; +import de.cuuky.varo.serialize.identifier.VaroSerializeField; +import de.cuuky.varo.serialize.identifier.VaroSerializeable; public class VaroInventory implements VaroSerializeable { @@ -24,7 +24,12 @@ public VaroInventory() {} // Serialization public VaroInventory(int size) { inventoryList = new HashMap<>(); - this.size = 54 < size ? 54 : (size < 9 ? 9 : JavaUtils.getNextToNine(size)); + if (size >= 54) + this.size = 54; + else if (size < 9) + this.size = 9; + else + this.size = Math.min(54, (size % 9 == 0 ? 0 : (9 - (size % 9))) + size); createInventory(); } diff --git a/src/de/cuuky/varo/entity/player/stats/stat/inventory/VaroSaveable.java b/src/de/cuuky/varo/entity/player/stats/stat/inventory/VaroSaveable.java index fe0051408..d33369671 100644 --- a/src/de/cuuky/varo/entity/player/stats/stat/inventory/VaroSaveable.java +++ b/src/de/cuuky/varo/entity/player/stats/stat/inventory/VaroSaveable.java @@ -1,6 +1,6 @@ package de.cuuky.varo.entity.player.stats.stat.inventory; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.cfw.version.types.Materials; import de.cuuky.varo.Main; import de.cuuky.varo.entity.player.VaroPlayer; diff --git a/src/de/cuuky/varo/game/world/VaroWorld.java b/src/de/cuuky/varo/game/world/VaroWorld.java index 9dac6bb97..639ac7915 100644 --- a/src/de/cuuky/varo/game/world/VaroWorld.java +++ b/src/de/cuuky/varo/game/world/VaroWorld.java @@ -1,6 +1,6 @@ package de.cuuky.varo.game.world; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.varoplugin.cfw.version.ServerVersion; import de.varoplugin.cfw.version.VersionUtils; import de.cuuky.varo.Main; diff --git a/src/de/cuuky/varo/game/world/generators/LobbyGenerator.java b/src/de/cuuky/varo/game/world/generators/LobbyGenerator.java index 2fa1d6c90..892ae76da 100644 --- a/src/de/cuuky/varo/game/world/generators/LobbyGenerator.java +++ b/src/de/cuuky/varo/game/world/generators/LobbyGenerator.java @@ -6,7 +6,7 @@ import org.bukkit.Location; import de.cuuky.cfw.utils.BlockUtils; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.cfw.version.types.Materials; import de.cuuky.varo.Main; import de.cuuky.varo.game.world.schematic.SchematicLoader; diff --git a/src/de/cuuky/varo/gui/admin/backup/BackupListGUI.java b/src/de/cuuky/varo/gui/admin/backup/BackupListGUI.java index 2f083ee67..f932c5d86 100644 --- a/src/de/cuuky/varo/gui/admin/backup/BackupListGUI.java +++ b/src/de/cuuky/varo/gui/admin/backup/BackupListGUI.java @@ -1,19 +1,17 @@ package de.cuuky.varo.gui.admin.backup; -import de.varoplugin.cfw.inventory.ItemClick; -import de.cuuky.cfw.utils.item.BuildItem; -import de.cuuky.varo.Main; -import de.cuuky.varo.gui.VaroListInventory; -import de.cuuky.varo.recovery.recoveries.VaroBackup; +import java.util.ArrayList; +import java.util.List; + import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import de.cuuky.cfw.utils.item.BuildItem; +import de.cuuky.varo.Main; +import de.cuuky.varo.gui.VaroListInventory; +import de.cuuky.varo.recovery.recoveries.VaroBackup; +import de.varoplugin.cfw.inventory.ItemClick; public class BackupListGUI extends VaroListInventory { @@ -21,13 +19,6 @@ public BackupListGUI(Player player) { super(Main.getInventoryManager(), player, VaroBackup.getBackups()); } - private String getCurrentDate() { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); - Date date = new Date(); - - return dateFormat.format(date); - } - @Override protected ItemStack getItemStack(VaroBackup backup) { List lore = new ArrayList<>(); @@ -50,7 +41,7 @@ public void refreshContent() { super.refreshContent(); addItem(this.getSize() - 1, new BuildItem().displayName("§aCreate Backup") .itemstack(new ItemStack(Material.EMERALD)).build(), (event) -> { - if (VaroBackup.getBackup(getCurrentDate()) != null) { + if (VaroBackup.getBackup(VaroBackup.newFileName()) != null) { getPlayer().sendMessage(Main.getPrefix() + "Warte kurz, bevor du ein neues Backup erstellen kannst."); return; } diff --git a/src/de/cuuky/varo/gui/admin/config/ConfigSectionGUI.java b/src/de/cuuky/varo/gui/admin/config/ConfigSectionGUI.java index 28ab45213..b661f456a 100644 --- a/src/de/cuuky/varo/gui/admin/config/ConfigSectionGUI.java +++ b/src/de/cuuky/varo/gui/admin/config/ConfigSectionGUI.java @@ -1,15 +1,15 @@ package de.cuuky.varo.gui.admin.config; -import de.varoplugin.cfw.inventory.ItemClick; -import de.cuuky.cfw.utils.JavaUtils; +import java.util.Arrays; + +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + import de.cuuky.cfw.utils.item.BuildItem; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.config.ConfigSettingSection; import de.cuuky.varo.gui.VaroListInventory; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.util.Arrays; +import de.varoplugin.cfw.inventory.ItemClick; public class ConfigSectionGUI extends VaroListInventory { @@ -21,8 +21,7 @@ public ConfigSectionGUI(Player opener) { protected ItemStack getItemStack(ConfigSettingSection section) { return new BuildItem().displayName("§7" + section.getName()) .material(section.getMaterial()).deleteDamageAnnotation() - .lore((JavaUtils.getArgsToString(JavaUtils.addIntoEvery(section.getDescription().split("\n"), Main.getColorCode(), true), - "\n")).split("\n")).build(); + .lore(String.join("\n" + Main.getColorCode(), (Main.getColorCode() + section.getDescription()).split("\n"))).build(); } @Override diff --git a/src/de/cuuky/varo/gui/admin/varoevents/VaroEventGUI.java b/src/de/cuuky/varo/gui/admin/varoevents/VaroEventGUI.java index f34d372b4..aa54fde61 100644 --- a/src/de/cuuky/varo/gui/admin/varoevents/VaroEventGUI.java +++ b/src/de/cuuky/varo/gui/admin/varoevents/VaroEventGUI.java @@ -1,12 +1,15 @@ package de.cuuky.varo.gui.admin.varoevents; import de.varoplugin.cfw.inventory.ItemClick; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.cfw.utils.item.BuildItem; import de.cuuky.varo.Main; import de.cuuky.varo.event.VaroEvent; import de.cuuky.varo.game.state.GameState; import de.cuuky.varo.gui.VaroListInventory; + +import java.util.Arrays; + import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -31,7 +34,7 @@ protected ItemStack getItemStack(VaroEvent event) { return new BuildItem().displayName(event.getEventType().getName()) .itemstack(new ItemStack(event.getIcon())) .lore(JavaUtils.combineArrays(new String[]{"§7Enabled: " + (event.isEnabled() ? "§a" : "§c") + event.isEnabled(), ""}, - JavaUtils.addIntoEvery(event.getDescription().split("\n"), "§7", true))).build(); + Arrays.stream(event.getDescription().split("\n")).map(s -> "§7" + s).toArray(String[]::new))).build(); } @Override diff --git a/src/de/cuuky/varo/listener/FancyEffectListener.java b/src/de/cuuky/varo/listener/FancyEffectListener.java index 826aefbd9..b38711499 100644 --- a/src/de/cuuky/varo/listener/FancyEffectListener.java +++ b/src/de/cuuky/varo/listener/FancyEffectListener.java @@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.scheduler.BukkitRunnable; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; diff --git a/src/de/cuuky/varo/recovery/recoveries/VaroBackup.java b/src/de/cuuky/varo/recovery/recoveries/VaroBackup.java index 5a908440f..b552607e3 100644 --- a/src/de/cuuky/varo/recovery/recoveries/VaroBackup.java +++ b/src/de/cuuky/varo/recovery/recoveries/VaroBackup.java @@ -2,13 +2,17 @@ import java.io.File; import java.nio.file.Paths; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import de.cuuky.cfw.recovery.FileZipper; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; public class VaroBackup extends FileZipper { + + private static final DateFormat DATE_FROMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); private static ArrayList backups; @@ -23,7 +27,7 @@ private VaroBackup(File file) { } public VaroBackup() { - super(new File("plugins/Varo/backups/" + JavaUtils.getCurrentDateAsFileable() + ".zip")); + super(new File("plugins/Varo/backups/" + newFileName())); Main.getDataManager().save(); @@ -50,6 +54,10 @@ public void delete() { zipFile.delete(); backups.remove(this); } + + public static String newFileName() { + return DATE_FROMAT.format(new Date()) + ".zip"; + } private static void loadBackups() { File file = new File("plugins/Varo/backups/"); diff --git a/src/de/cuuky/varo/recovery/recoveries/VaroBugreport.java b/src/de/cuuky/varo/recovery/recoveries/VaroBugreport.java index 706385f9d..fd95748f4 100644 --- a/src/de/cuuky/varo/recovery/recoveries/VaroBugreport.java +++ b/src/de/cuuky/varo/recovery/recoveries/VaroBugreport.java @@ -2,6 +2,7 @@ import java.io.File; import java.nio.file.Paths; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -12,12 +13,13 @@ import org.bukkit.plugin.PluginDescriptionFile; import de.cuuky.cfw.recovery.FileZipper; -import de.cuuky.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.threads.LagCounter; public class VaroBugreport extends FileZipper { + + private static final DateFormat DATE_FROMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); private static List exeptions; @@ -31,7 +33,7 @@ public class VaroBugreport extends FileZipper { private boolean failed; public VaroBugreport() { - super(new File("plugins/Varo/bugreports/bugreport-" + JavaUtils.getCurrentDateAsFileable() + ".zip")); + super(new File("plugins/Varo/bugreports/bugreport-" + DATE_FROMAT.format(new Date()) + ".zip")); boolean fileInit = Main.getDataManager() != null && Main.getDataManager().getConfigHandler() != null; if (fileInit) { diff --git a/src/de/cuuky/varo/report/Report.java b/src/de/cuuky/varo/report/Report.java index 79fb7219e..789ffbf41 100644 --- a/src/de/cuuky/varo/report/Report.java +++ b/src/de/cuuky/varo/report/Report.java @@ -2,7 +2,7 @@ import java.util.ArrayList; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.varo.entity.player.VaroPlayer; import de.cuuky.varo.serialize.identifier.VaroSerializeField; import de.cuuky.varo.serialize.identifier.VaroSerializeable; diff --git a/src/de/cuuky/varo/utils/MagmaUtils.java b/src/de/cuuky/varo/utils/MagmaUtils.java index e79aac23c..7dcb599f3 100644 --- a/src/de/cuuky/varo/utils/MagmaUtils.java +++ b/src/de/cuuky/varo/utils/MagmaUtils.java @@ -9,7 +9,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import de.cuuky.cfw.utils.JavaUtils; +import de.varoplugin.cfw.utils.JavaUtils; import de.cuuky.varo.Main; import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.entity.player.VaroPlayer; @@ -40,7 +40,7 @@ public static void checkForIllegalMods(Player player) { usedMods.add(mod); } if (kickPlayer) { - String illegalMods = JavaUtils.getArgsToString(usedMods, ConfigMessages.MODS_BLOCKED_MODLIST_SPLIT.getValue() + Main.getColorCode()); + String illegalMods = String.join(ConfigMessages.MODS_BLOCKED_MODLIST_SPLIT.getValue() + Main.getColorCode(), usedMods); if (!player.hasPermission("varo.alwaysjoin")) { player.kickPlayer(Main.getPrefix() + ConfigMessages.MODS_BLOCKED_MODS_KICK.getValue(VaroPlayer.getPlayer(player)).replace("%mods%", illegalMods)); }