Compare commits
10 Commits
90df1fa5fb
...
17.0
Author | SHA1 | Date | |
---|---|---|---|
|
36137777ee | ||
b5bd600bdb | |||
7f8a0c35cb | |||
5f2c2cacbe | |||
6ea2335bc2 | |||
7b574ffa02 | |||
2f7f8e3bee | |||
987af06fb4 | |||
311ae66d18 | |||
8ae50fcbbf |
8
pom.xml
8
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>16.7_dev-24</version>
|
<version>17.0_beta-2025-1</version>
|
||||||
<!--version>VERSION_snapshot-0</version-->
|
<!--version>VERSION_snapshot-0</version-->
|
||||||
<!--version>VERSION_beta-0</version-->
|
<!--version>VERSION_beta-0</version-->
|
||||||
<!--version>VERSION_dev-0</version-->
|
<!--version>VERSION_dev-0</version-->
|
||||||
@@ -181,7 +181,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.clip</groupId>
|
<groupId>me.clip</groupId>
|
||||||
<artifactId>placeholderapi</artifactId>
|
<artifactId>placeholderapi</artifactId>
|
||||||
<version>2.11.3</version>
|
<version>2.11.6</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@@ -189,7 +189,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.bencodez</groupId>
|
<groupId>com.bencodez</groupId>
|
||||||
<artifactId>votingplugin</artifactId>
|
<artifactId>votingplugin</artifactId>
|
||||||
<version>6.12.1</version>
|
<version>6.18.3</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-text-minimessage</artifactId>
|
<artifactId>adventure-text-minimessage</artifactId>
|
||||||
<version>4.18.0-SNAPSHOT</version>
|
<version>4.19.0</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
package net.t2code.t2codelib.SPIGOT.api.commands;
|
package net.t2code.t2codelib.SPIGOT.api.commands;
|
||||||
|
|
||||||
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
import net.t2code.t2codelib.SPIGOT.system.T2C_ProxyCommandSenderReceiver;
|
import net.t2code.t2codelib.SPIGOT.system.T2C_ProxyCommandSenderReceiver;
|
||||||
import net.t2code.t2codelib.SPIGOT.system.T2C_Main;
|
import net.t2code.t2codelib.SPIGOT.system.T2C_Main;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -24,7 +25,7 @@ public class T2C_Cmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void player(Player player, String cmdInput) {
|
public static void player(Player player, String cmdInput) {
|
||||||
Map.Entry<String,Integer> map = delay(cmdInput);
|
Map.Entry<String,Integer> map = delay(PlaceholderAPI.setPlaceholders(player, cmdInput));
|
||||||
int delay = map.getValue();
|
int delay = map.getValue();
|
||||||
String cmd = map.getKey();
|
String cmd = map.getKey();
|
||||||
Bukkit.getScheduler().runTaskLater(T2C_Main.getPlugin(), new Runnable() {
|
Bukkit.getScheduler().runTaskLater(T2C_Main.getPlugin(), new Runnable() {
|
||||||
|
@@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class T2C_Replace {
|
public class T2C_Replace {
|
||||||
|
|
||||||
|
@@ -57,6 +57,7 @@ public class T2C_McVersion {
|
|||||||
nms1_20_R4 = nms.contains("1_20_R4");
|
nms1_20_R4 = nms.contains("1_20_R4");
|
||||||
nms1_21_R1 = nms.contains("1_21_R1");
|
nms1_21_R1 = nms.contains("1_21_R1");
|
||||||
nms1_21_R2 = nms.contains("1_21_R2");
|
nms1_21_R2 = nms.contains("1_21_R2");
|
||||||
|
nms1_22_R1 = nms.contains("1_22_R1");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String mcVersion;
|
private static String mcVersion;
|
||||||
@@ -104,6 +105,7 @@ public class T2C_McVersion {
|
|||||||
private static boolean nms1_20_R4;
|
private static boolean nms1_20_R4;
|
||||||
private static boolean nms1_21_R1;
|
private static boolean nms1_21_R1;
|
||||||
private static boolean nms1_21_R2;
|
private static boolean nms1_21_R2;
|
||||||
|
private static boolean nms1_22_R1;
|
||||||
|
|
||||||
public static String getMcVersion() {
|
public static String getMcVersion() {
|
||||||
return mcVersion;
|
return mcVersion;
|
||||||
@@ -276,6 +278,12 @@ public class T2C_McVersion {
|
|||||||
public static boolean isNms1_21_R1() {
|
public static boolean isNms1_21_R1() {
|
||||||
return nms1_21_R1;
|
return nms1_21_R1;
|
||||||
}
|
}
|
||||||
|
public static boolean isNms1_21_R2() {
|
||||||
|
return nms1_21_R2;
|
||||||
|
}
|
||||||
|
public static boolean isNms1_22_R1() {
|
||||||
|
return nms1_22_R1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static boolean minMc1_8() {
|
public static boolean minMc1_8() {
|
||||||
@@ -330,4 +338,8 @@ public class T2C_McVersion {
|
|||||||
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
|
||||||
&& !isMc1_18() && !isMc1_19();
|
&& !isMc1_18() && !isMc1_19();
|
||||||
}
|
}
|
||||||
|
public static boolean minMc1_21() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
|
||||||
|
&& !isMc1_18() && !isMc1_19() && !isMc1_20();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -63,7 +63,7 @@ public class T2C_NmsVersions {
|
|||||||
t2CnmsEnum = T2C_NmsEnum.v1_20_R3;
|
t2CnmsEnum = T2C_NmsEnum.v1_20_R3;
|
||||||
} else if (mc.contains("(MC: 1.20.6)")) {
|
} else if (mc.contains("(MC: 1.20.6)")) {
|
||||||
t2CnmsEnum = T2C_NmsEnum.v1_20_R4;
|
t2CnmsEnum = T2C_NmsEnum.v1_20_R4;
|
||||||
} else if (mc.contains("(MC: 1.21)")) {
|
} else if (mc.contains("(MC: 1.21)")|| mc.contains("(MC: 1.21.1)")) {
|
||||||
t2CnmsEnum = T2C_NmsEnum.v1_21_R1;
|
t2CnmsEnum = T2C_NmsEnum.v1_21_R1;
|
||||||
} else t2CnmsEnum = T2C_NmsEnum.not_support;
|
} else t2CnmsEnum = T2C_NmsEnum.not_support;
|
||||||
|
|
||||||
|
@@ -21,6 +21,7 @@ public class T2C_ConfigWriter {
|
|||||||
private static FileConfiguration config;
|
private static FileConfiguration config;
|
||||||
|
|
||||||
public static void createConfig(String prefix, File configFile, T2C_ConfigItem[] values, boolean isReload, String... header) {
|
public static void createConfig(String prefix, File configFile, T2C_ConfigItem[] values, boolean isReload, String... header) {
|
||||||
|
long long_ = System.currentTimeMillis();
|
||||||
boolean exist = configFile.exists();
|
boolean exist = configFile.exists();
|
||||||
if (!exist) {
|
if (!exist) {
|
||||||
configFile.getParentFile().mkdir();
|
configFile.getParentFile().mkdir();
|
||||||
@@ -61,20 +62,21 @@ public class T2C_ConfigWriter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Copy default values if they are missing
|
// Copy default values if they are missing
|
||||||
config.options().copyDefaults(true);
|
config.options().copyDefaults(true);
|
||||||
|
|
||||||
T2C_YmlWriter.saveConfigWithComments(configFile, config, comments, false, header);
|
T2C_YmlWriter.saveConfigWithComments(configFile, config, comments, false, header);
|
||||||
readConfig(prefix, configFile, config, values, isReload);
|
readConfig(prefix, configFile, config, values, isReload, long_);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void readConfig(String prefix, File configFile, FileConfiguration config, T2C_ConfigItem[] values, boolean isReload) {
|
private static void readConfig(String prefix, File configFile, FileConfiguration config, T2C_ConfigItem[] values, boolean isReload, long long_) {
|
||||||
for (T2C_ConfigItem value : values) {
|
for (T2C_ConfigItem value : values) {
|
||||||
value.setValue(config.get(value.getPath()));
|
value.setValue(config.get(value.getPath()));
|
||||||
}
|
}
|
||||||
T2C_Send.sendStartTextCenter(prefix, "§2" + configFile.getName() + " were successfully created / updated.", isReload);
|
T2C_Send.sendStartTextCenter(prefix, "§2Load successfully: §7" + configFile.getPath() + "/" + config.getName().replace("/","")+" §7- §e"+ (System.currentTimeMillis() - long_) + "ms", isReload);
|
||||||
|
// T2C_Send.sendStartTextCenter(prefix, "§2Has been successfully created / updated §7- §e" + (System.currentTimeMillis() - long_) + "ms", isReload);
|
||||||
|
//T2C_Send.sendStartTextCenter(prefix, "", isReload);
|
||||||
//T2C_Send.sendStartTextCenter(Util.getPrefix(), "§2opWhitelist.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms",isReload);
|
//T2C_Send.sendStartTextCenter(Util.getPrefix(), "§2opWhitelist.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms",isReload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -12,7 +12,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class T2C_YmlWriter {
|
public class T2C_YmlWriter {
|
||||||
protected static void saveConfigWithComments(File file, FileConfiguration config, Map<String, List<String>> comments, boolean oneListToString,String... headers) {
|
public static void saveConfigWithComments(File file, FileConfiguration config, Map<String, List<String>> comments, boolean oneListToString,String... headers) {
|
||||||
try {
|
try {
|
||||||
StringBuilder configContent = new StringBuilder();
|
StringBuilder configContent = new StringBuilder();
|
||||||
for (String h : headers) {
|
for (String h : headers) {
|
||||||
|
@@ -18,7 +18,7 @@ public class ConvertT2ClibConfig {
|
|||||||
yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||||
|
|
||||||
|
|
||||||
if (yamlConfiguration.contains("plugin.updateCheck.onJoin")) return;
|
if (yamlConfiguration.contains("proxy.serverUUID")) return;
|
||||||
|
|
||||||
set("Plugin.UpdateCheck.OnJoin", T2C_LibConfig.VALUES.updateCheckOnJoin);
|
set("Plugin.UpdateCheck.OnJoin", T2C_LibConfig.VALUES.updateCheckOnJoin);
|
||||||
set("Plugin.UpdateCheck.TimeInterval", T2C_LibConfig.VALUES.updateCheckTimeInterval);
|
set("Plugin.UpdateCheck.TimeInterval", T2C_LibConfig.VALUES.updateCheckTimeInterval);
|
||||||
@@ -29,8 +29,8 @@ public class ConvertT2ClibConfig {
|
|||||||
set("Plugin.Not recommended to disable.developerTool", T2C_LibConfig.VALUES.developerTool);
|
set("Plugin.Not recommended to disable.developerTool", T2C_LibConfig.VALUES.developerTool);
|
||||||
set("BungeeCord.Enable", T2C_LibConfig.VALUES.proxy);
|
set("BungeeCord.Enable", T2C_LibConfig.VALUES.proxy);
|
||||||
set("Player.Inventories.CloseByServerStop", T2C_LibConfig.VALUES.inventoriesCloseByServerStop);
|
set("Player.Inventories.CloseByServerStop", T2C_LibConfig.VALUES.inventoriesCloseByServerStop);
|
||||||
set("Command.PermToggle.PermissionSetCommand", T2C_LibConfig.VALUES.updateCheckOnJoin);
|
set("Command.PermToggle.PermissionSetCommand", T2C_LibConfig.VALUES.commandPermToggleCommand);
|
||||||
|
config.delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void set(String path, T2C_ConfigItem item) {
|
private static void set(String path, T2C_ConfigItem item) {
|
||||||
|
@@ -133,6 +133,7 @@ public class T2C_LibConfig {
|
|||||||
|
|
||||||
public static void set(boolean isReload) {
|
public static void set(boolean isReload) {
|
||||||
long long_ = System.currentTimeMillis();
|
long long_ = System.currentTimeMillis();
|
||||||
|
ConvertT2ClibConfig.convert();
|
||||||
T2C_ConfigWriter.createConfig(T2C_Util.getPrefix(), new File(T2C_Main.getPath(), "config.yml"), VALUES.values(), isReload, T2C_Util.getConfigLogo());
|
T2C_ConfigWriter.createConfig(T2C_Util.getPrefix(), new File(T2C_Main.getPath(), "config.yml"), VALUES.values(), isReload, T2C_Util.getConfigLogo());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user