Remove upgradeUtil, use commons-text for reading strings from config

Signed-off-by: William <will27528@gmail.com>

Author: WiIIiam278

bukkit/build.gradle

@@ -9,14 +9,16 @@ dependencies {
     }
 
     compileOnly 'redis.clients:jedis:' + rootProject.properties.get('jedis_version')
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
     compileOnly 'dev.dejvokep:boosted-yaml:1.2'
+    compileOnly 'commons-io:commons-io:2.11.0'
+    compileOnly 'org.apache.commons:commons-text:1.9'
     compileOnly 'us.dynmap:dynmap-api:3.1'
     compileOnly 'com.github.BlueMap-Minecraft:BlueMapAPI:1.7.0'
     compileOnly 'xyz.jpenilla:squaremap-api:1.1.3'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
     compileOnly 'com.github.WiIIiam278:HuskHomes2:2.10'
     compileOnly 'net.luckperms:api:5.4'
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }
 

bukkit/src/main/java/net/william278/husktowns/HuskTowns.java

@@ -28,7 +28,6 @@
 import net.william278.husktowns.cache.TownDataCache;
 import net.william278.husktowns.util.PlayerList;
 import net.william278.husktowns.util.UpdateChecker;
-import net.william278.husktowns.util.UpgradeUtil;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
@@ -271,9 +270,6 @@ public void onEnable() {
         // Initialise database
         initializeDatabase();
 
-        // Check for system upgrades needed
-        UpgradeUtil.checkNeededUpgrades();
-
         // Set up the map integration
         if (getSettings().doMapIntegration) {
             switch (getSettings().mapIntegrationPlugin.toLowerCase()) {

bukkit/src/main/java/net/william278/husktowns/MessageManager.java

@@ -3,8 +3,8 @@
 import de.themoep.minedown.MineDown;
 import dev.dejvokep.boostedyaml.YamlDocument;
 import net.md_5.bungee.api.ChatMessageType;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

bukkit/src/main/java/net/william278/husktowns/cache/ClaimCache.java

@@ -1,10 +1,9 @@
 package net.william278.husktowns.cache;
 
 import net.william278.husktowns.HuskTowns;
-import net.william278.husktowns.data.DataManager;
 import net.william278.husktowns.chunk.ChunkLocation;
 import net.william278.husktowns.chunk.ClaimedChunk;
-import net.william278.husktowns.util.UpgradeUtil;
+import net.william278.husktowns.data.DataManager;
 
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -34,9 +33,6 @@ public ClaimCache() {
      * Reload the claim cache
      */
     public void reload() {
-        if (UpgradeUtil.getIsUpgrading()) {
-            return;
-        }
         if (getStatus() == CacheStatus.UPDATING) {
             return;
         }

bukkit/src/main/java/net/william278/husktowns/cache/PlayerCache.java

@@ -4,7 +4,6 @@
 import net.william278.husktowns.data.DataManager;
 import net.william278.husktowns.town.Town;
 import net.william278.husktowns.town.TownRole;
-import net.william278.husktowns.util.UpgradeUtil;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -34,9 +33,6 @@ public PlayerCache() {
     }
 
     public void reload() {
-        if (UpgradeUtil.getIsUpgrading()) {
-            return;
-        }
         if (getStatus() == CacheStatus.UPDATING) {
             return;
         }

bukkit/src/main/java/net/william278/husktowns/cache/TownBonusesCache.java

@@ -2,7 +2,6 @@
 
 import net.william278.husktowns.data.DataManager;
 import net.william278.husktowns.town.TownBonus;
-import net.william278.husktowns.util.UpgradeUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,9 +16,6 @@ public TownBonusesCache() {
     }
 
     public void reload() {
-        if (UpgradeUtil.getIsUpgrading()) {
-            return;
-        }
         if (getStatus() == CacheStatus.UPDATING) {
             return;
         }

bukkit/src/main/java/net/william278/husktowns/cache/TownDataCache.java

@@ -4,7 +4,6 @@
 import net.william278.husktowns.data.DataManager;
 import net.william278.husktowns.chunk.ClaimedChunk;
 import net.william278.husktowns.flags.Flag;
-import net.william278.husktowns.util.UpgradeUtil;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,9 +31,6 @@ public TownDataCache() {
     }
 
     public void reload() {
-        if (UpgradeUtil.getIsUpgrading()) {
-            return;
-        }
         if (getStatus() == CacheStatus.UPDATING) {
             return;
         }

bukkit/src/main/java/net/william278/husktowns/util/UpgradeUtil.java

@@ -1,15 +1,10 @@
-plugins {
-    id 'java'
-}
-
 dependencies {
     implementation 'dev.dejvokep:boosted-yaml:1.2'
+    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'org.apache.commons:commons-text:1.9'
 }
 
-java {
-    withJavadocJar()
-}
-
-test {
-    useJUnitPlatform()
+shadowJar {
+    relocate 'dev.dejvokep', 'net.william278.husktowns.libraries'
+    relocate 'org.apache', 'net.william278.husktowns.libraries'
 }