diff --git a/pom.xml b/pom.xml
index a3157b2..4620571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,54 +12,25 @@
${project.artifactId}
+ 1.8
UTF-8
- clean package
- ${project.artifactId}-${project.version}
org.apache.maven.plugins
maven-compiler-plugin
3.8.1
- 1.8
- 1.8
+ ${java.version}
+ ${java.version}
org.apache.maven.plugins
maven-shade-plugin
- 3.2.1
-
-
-
- com.cryptomorin.xseries
- com.planetgallium.kitpvp
-
-
-
-
- *:*
-
- com/cryptomorin/xseries/messages/ActionBar*
- com/cryptomorin/xseries/messages/Titles*
- com/cryptomorin/xseries/particles/*
- com/cryptomorin/xseries/NMSExtras*
- com/cryptomorin/xseries/NoteBlockMusic*
- com/cryptomorin/xseries/ReflectionUtils*
- com/cryptomorin/xseries/XBlock*
- com/cryptomorin/xseries/SkullUtils*
- com/cryptomorin/xseries/XBiome*
- com/cryptomorin/xseries/XEnchantment*
- com/cryptomorin/xseries/XEntity*
- com/cryptomorin/xseries/XItemStack*
- com/cryptomorin/xseries/XPotion*
-
-
-
-
+ 3.3.0
package
@@ -68,8 +39,6 @@
false
- false
- /Users/nico/Developer/Spigot/Latest/plugins/${project.artifactId}.jar
@@ -82,18 +51,27 @@
-
+
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+
+ placeholderapi
+ https://repo.extendedclip.com/content/repositories/placeholderapi/
+
+
org.spigotmc
spigot-api
- 1.19.2-R0.1-SNAPSHOT
+ 1.20.1-R0.1-SNAPSHOT
provided
me.clip
placeholderapi
- 2.10.3
+ 2.10.9
provided
@@ -114,16 +92,11 @@
3.0.2
provided
+
+ org.jetbrains
+ annotations
+ 24.0.0
+ compile
+
-
-
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-
-
- placeholderapi
- http://repo.extendedclip.com/content/repositories/placeholderapi/
-
-
diff --git a/src/main/java/me/cervinakuy/joineventspro/command/MainCommand.java b/src/main/java/me/cervinakuy/joineventspro/command/MainCommand.java
index d20e728..95eb2ab 100644
--- a/src/main/java/me/cervinakuy/joineventspro/command/MainCommand.java
+++ b/src/main/java/me/cervinakuy/joineventspro/command/MainCommand.java
@@ -158,7 +158,7 @@ private void executeMaintenanceCommand(CommandSender sender) {
}
private void executeSetMaxPlayersCommand(CommandSender sender, String[] args) {
- if (!Toolkit.isNumeric(args[1])) {
+ if (isNumeric(args[1])) {
sender.sendMessage(messages.fetchString("Messages.Error.Number"));
return;
}
@@ -216,5 +216,16 @@ private boolean hasPermission(CommandSender sender, String permission) {
return false;
}
+ public static boolean isNumeric(String strNum) {
+ if (strNum == null) {
+ return false;
+ }
+ try {
+ double d = Double.parseDouble(strNum);
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/main/java/me/cervinakuy/joineventspro/util/Resource.java b/src/main/java/me/cervinakuy/joineventspro/util/Resource.java
index 3c184f3..e348655 100644
--- a/src/main/java/me/cervinakuy/joineventspro/util/Resource.java
+++ b/src/main/java/me/cervinakuy/joineventspro/util/Resource.java
@@ -4,13 +4,17 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import me.cervinakuy.joineventspro.Game;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
+import static net.md_5.bungee.api.ChatColor.COLOR_CHAR;
+
public class Resource extends YamlConfiguration {
private final String name;
@@ -95,13 +99,8 @@ public void save() {
public String fetchString(String path) {
String string = super.getString(path);
- if (string != null) {
- string = ChatColor.translateAlternateColorCodes('&',
- string.replace("%prefix%", Game.getPrefix() == null ? "" : Game.getPrefix()));
- } else {
- string = "String not found";
- Toolkit.printToConsole(String.format("&7[&b&lJOINEVENTSPRO7] &cString with path %s was not found.", path));
- }
+ string = translateHexColorCodes(string);
+ //string.replace("%prefix%", Game.getPrefix() == null ? "" : Game.getPrefix());
return string;
}
@@ -113,7 +112,7 @@ public List getStringList(String path) {
if (originalList != null) {
List colorizedList = new ArrayList<>();
for (String line : originalList) {
- colorizedList.add(ChatColor.translateAlternateColorCodes('&', line));
+ colorizedList.add(translateHexColorCodes(line));
}
return colorizedList;
}
@@ -121,6 +120,20 @@ public List getStringList(String path) {
return originalList;
}
+ public String translateHexColorCodes(String message)
+ {
+ Pattern pattern = Pattern.compile("<#[a-fA-F0-9]{6}>");
+ Matcher matcher = pattern.matcher(message);
+
+ while (matcher.find()) {
+ String color = message.substring(matcher.start(), matcher.end());
+ message = message.replace(color, ChatColor.of(color) + "");
+ matcher = pattern.matcher(message);
+ }
+ System.out.println(matcher);
+ System.out.println(message);
+ return ChatColor.translateAlternateColorCodes('&', message);
+ }
public String getName() { return name; }