Replace some legacy CFW functions

CuukyOfficial · Sep 6, 2024 · 0853d6d · 0853d6d
1 parent e353012
commit 0853d6d
Show file tree

Hide file tree

Showing 23 changed files with 104 additions and 84 deletions.
diff --git a/src/de/cuuky/varo/Main.java b/src/de/cuuky/varo/Main.java
@@ -5,30 +5,31 @@
 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;
 
 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;
 import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
 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
@@ -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;
     }
 }
diff --git a/src/de/cuuky/varo/command/essentials/MessageCommand.java b/src/de/cuuky/varo/command/essentials/MessageCommand.java
@@ -1,14 +1,15 @@
 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;
 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;
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -41,23 +41,34 @@ public class Dependencies {
 
     private static final URL DEPENDENCY_FILE = Dependencies.class.getClassLoader().getResource("dependencies.txt");
 
+    private static final Collection<VaroDependency> REQUIRED_DEPENDENCIES = new ArrayList<>();
     private static final Collection<VaroDependency> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;