diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 36122f8..1896984 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 1729e73..6462421 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -31,5 +31,19 @@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 07a2f26..305a306 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 16.7_dev-22 + 16.7_dev-24 diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java index 15bb47a..a249aed 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java @@ -64,7 +64,7 @@ public class T2C_ConfigWriter { // Copy default values if they are missing config.options().copyDefaults(true); - T2C_YmlWriter.saveConfigWithComments(configFile, config, comments, header); + T2C_YmlWriter.saveConfigWithComments(configFile, config, comments, false,header); readConfig(prefix, configFile, config, values, isReload); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java index 0fd1369..ef1765b 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java @@ -61,7 +61,7 @@ public class T2C_LanguageWriter { comments.put(item.getPath(), commandList); } } - T2C_YmlWriter.saveConfigWithComments(langFile, config, comments, header); + T2C_YmlWriter.saveConfigWithComments(langFile, config, comments, true, header); } } readConfig(prefix, path, values, loadConfig, isReload); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java index 4dbcdcd..c878a05 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java @@ -12,14 +12,14 @@ import java.util.List; import java.util.Map; public class T2C_YmlWriter { - protected static void saveConfigWithComments(File file, FileConfiguration config, Map> comments, String... headers) { + protected static void saveConfigWithComments(File file, FileConfiguration config, Map> comments, boolean oneListToString,String... headers) { try { StringBuilder configContent = new StringBuilder(); for (String h : headers) { configContent.append(h).append("\n"); } configContent.append("\n"); - addSection(config, comments, configContent, "", 0); + addSection(config, comments, configContent, "", 0,oneListToString); // Write the content to the file Files.write(file.toPath(), configContent.toString().getBytes()); @@ -28,7 +28,7 @@ public class T2C_YmlWriter { } } - protected static void addSection(ConfigurationSection section, Map> comments, StringBuilder builder, String prefix, int indentLevel) { + protected static void addSection(ConfigurationSection section, Map> comments, StringBuilder builder, String prefix, int indentLevel, boolean oneListToString) { String indent = " ".repeat(indentLevel); for (String key : section.getKeys(false)) { @@ -49,12 +49,19 @@ public class T2C_YmlWriter { if (value instanceof ConfigurationSection) { // Correctly add the section builder.append(indent).append(key).append(":\n"); - addSection((ConfigurationSection) value, comments, builder, fullKey, indentLevel + 1); + addSection((ConfigurationSection) value, comments, builder, fullKey, indentLevel + 1, oneListToString); } else { // Add value with proper indentation // builder.append(indent).append(key).append(": ").append(value).append("\n"); if (value instanceof List) { List list = (List) value; + + if (oneListToString && list.size() == 1) { + for (Object s : list) { + builder.append(indent).append(key).append(": \"").append(s).append("\"\n"); + } + continue; + } if (list.isEmpty()) { builder.append(indent).append(key).append(": []").append("\n"); continue; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java index ee6e472..4f2d9d2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java @@ -13,9 +13,11 @@ public class ConvertT2ClibConfig { public static void convert() { File config = new File(T2C_Main.getPath(), "config.yml"); - yamlConfiguration = YamlConfiguration.loadConfiguration(config); if (!config.exists()) return; + yamlConfiguration = YamlConfiguration.loadConfiguration(config); + + if (yamlConfiguration.contains("plugin.updateCheck.onJoin")) return; set("Plugin.UpdateCheck.OnJoin", T2C_LibConfig.VALUES.updateCheckOnJoin); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java index 6c79a65..210cf9c 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java @@ -59,9 +59,9 @@ public class T2C_LibConfig { space_proxy("proxy", null, true, new HashMap<>() {{ put(T2C_LanguageEnum.german, List.of()); - put(T2C_LanguageEnum.english, List.of()); + put(T2C_LanguageEnum.english, List.of("For this option, the option proxy.enable in the config.yml of the T2CodeLib must be set to true and the T2CodeLib must also be present on the proxy in order to function as a bridge.")); }}), - proxy("For this option, the option proxy.enable in the config.yml of the T2CodeLib must be set to true and the T2CodeLib must also be present on the proxy in order to function as a bridge.", T2C_Main.getIsBungee(), true, + proxy("proxy.enable", T2C_Main.getIsBungee(), true, new HashMap<>() {{ put(T2C_LanguageEnum.german, List.of("Diese Option muss aktiviert werden, wenn du die T2CodeLib auf einem BungeeCord, Waterfall oder Velocity Proxy als Bridge verwenden möchtest." , "Bitte beachte, dass die einzelnen APIs der Plugins, die eine Bridge auf einem Proxy verwenden, in der config.yml der T2CodeLib auf dem Proxy aktiviert werden müssen!")); @@ -148,7 +148,7 @@ public class T2C_LibConfig { public static void set(boolean isReload) { long long_ = System.currentTimeMillis(); - ConvertT2ClibConfig.convert(); + // ConvertT2ClibConfig.convert(); todo T2C_ConfigWriter.createConfig(T2C_Util.getPrefix(), new File(T2C_Main.getPath(), "config.yml"), VALUES.values(), isReload, T2C_Util.getConfigLogo()); } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java index 2293ff2..dc501cd 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java @@ -17,6 +17,7 @@ public class T2CV_Send { public static void console(Logger logger, String msg) { if (msg == null || msg.contains("[empty]")) return; logger.info(msg); + } public static void player(Player player, String msg) { diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java b/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java index 896da19..6aed686 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java @@ -11,7 +11,6 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import lombok.Getter; -import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.util.T2C_GenerateFrame; import net.t2code.t2codelib.util.T2C_PlatformDetector; import net.t2code.t2codelib.util.T2C_Util; @@ -73,6 +72,7 @@ public class T2CV_Main { logger.info(T2C_GenerateFrame.setCenterAligned("", "Spigot: " + T2C_Util.getSpigot())); logger.info(T2C_GenerateFrame.setCenterAligned("", "Discord: " + T2C_Util.getDiscord())); + try { T2CV_LibConfig.set(dataDirectory, logger); } catch (IOException ex) {