Update libraries + cleanup

Author: PetteriM1

.gitignore

@@ -2,4 +2,5 @@
 .idea/
 DbLib.iml
 src/test/
-target/
+target/
+dependency-reduced-pom.xml

README.md

@@ -1,11 +1,9 @@
 # DbLib
-DbLib a library for Nukkit and Voxelwind, that include ORMLite, Sql2o and jdbc-connectors (MySQL and SQLite).
+DbLib a library for Nukkit that include ORMLite, Sql2o and jdbc-connectors (MySQL and SQLite).
 
-[**Release (outdated, use dev builds)**](http://nukkit.ru/resources/dblib.14/)
+[**Download**](https://cloudburstmc.org/resources/dblib.12/)
 
-[**Latest Dev Build**  ![CircleCI](https://circleci.com/gh/fromgate/DbLib.svg?style=shield)](https://circleci.com/gh/fromgate/DbLib)
-
-Example project: [DbExample](https://github.com/fromgate/DbExample)
+[Example Project](https://github.com/fromgate/DbExample)
 
 
 ## Features
@@ -76,7 +74,7 @@ Here is example of creating new table:
 ```
   public boolean connectToDbLib(){
     if (this.getServer().getPluginManager().getPlugin("DbLib") == null){
-      this.getLogger().info(TextFormat.RED+"DbLib plugin not found");
+      this.getLogger().info("DbLib plugin not found");
       return false;
     }
     connectionSource = DbLib.getConnectionSource();

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.nukkit.dblib</groupId>
     <artifactId>DbLib</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -17,23 +17,10 @@
     <repositories>
         <repository>
             <id>nukkitx-repo</id>
-            <url>http://repo.nukkitx.com/snapshot</url>
+            <url>https://repo.opencollab.dev/snapshot</url>
         </repository>
     </repositories>
 
-    <distributionManagement>
-        <repository>
-            <id>releases</id>
-            <name>nukkitx-releases</name>
-            <url>https://repo.nukkitx.com/release</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots</id>
-            <name>nukkitx-snapshots</name>
-            <url>https://repo.nukkitx.com/snapshot</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <dependencies>
         <dependency>
             <groupId>cn.nukkit</groupId>
@@ -44,13 +31,13 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.13</version>
+            <version>8.0.33</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.25.2</version>
+            <version>3.49.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -73,11 +60,7 @@
         </dependency>
     </dependencies>
 
-
     <build>
-        <finalName>${project.name}</finalName>
-        <defaultGoal>clean package</defaultGoal>
-
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -89,7 +72,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

src/main/java/ru/nukkit/dblib/DbLib.java

@@ -3,13 +3,10 @@
 import com.j256.ormlite.db.DatabaseType;
 import com.j256.ormlite.db.DatabaseTypeUtils;
 import com.j256.ormlite.db.SqliteDatabaseType;
-import com.j256.ormlite.jdbc.DataSourceConnectionSource;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
 import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
-import com.j256.ormlite.jdbc.JdbcSingleConnectionSource;
 import com.j256.ormlite.logger.LocalLog;
 import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.support.DatabaseConnection;
 import org.sql2o.Sql2o;
 import ru.nukkit.dblib.connectionsource.LockedJdbcSingleConnectionSource;
 import ru.nukkit.dblib.core.M;

src/main/java/ru/nukkit/dblib/core/M.java

@@ -18,10 +18,8 @@ public enum M {
 
     private static boolean debugMode = false;
     private static String language = "default";
-    private static boolean saveLanguage = false;
-    private static char c1 = 'a';
-    private static char c2 = '2';
-    private static String pluginName;
+    private static final char c1 = 'a';
+    private static final char c2 = '2';
 
 
     public static String colorize(String text) {
@@ -39,7 +37,7 @@ public static String colorize(String text) {
     public static void BC(Object... s) {
         if (!debugMode) return;
         if (s.length == 0) return;
-        StringBuilder sb = new StringBuilder("&3[").append(pluginName).append("]&f ");
+        StringBuilder sb = new StringBuilder("&3[DbLib]&f ");
         for (Object str : s)
             sb.append(str.toString()).append(" ");
 
@@ -172,10 +170,10 @@ public String getText(Object... keys) {
         int count = 1;
         int c = 0;
         DecimalFormat fmt = new DecimalFormat("####0.##");
-        for (int i = 0; i < keys.length; i++) {
-            String s = messenger.toString(keys[i], fullFloat);//keys[i].toString();
-            if (c < 2 && keys[i] instanceof Character) {
-                colors[c] = (Character) keys[i];
+        for (Object key : keys) {
+            String s = messenger.toString(key, fullFloat);//keys[i].toString();
+            if (c < 2 && key instanceof Character) {
+                colors[c] = (Character) key;
                 c++;
                 continue;
             } else if (s.startsWith("prefix:")) {
@@ -190,12 +188,12 @@ public String getText(Object... keys) {
             } else if (s.equals("FULLFLOAT")) {
                 fullFloat = true;
                 continue;
-            } else if (keys[i] instanceof Double || keys[i] instanceof Float) {
-                if (!fullFloat) s = fmt.format((Double) keys[i]);
+            } else if (key instanceof Double || key instanceof Float) {
+                if (!fullFloat) s = fmt.format((Double) key);
             }
 
-            String from = (new StringBuilder("%").append(count).append("%")).toString();
-            String to = skipDefaultColors ? s : (new StringBuilder("&").append(colors[1]).append(s).append("&").append(colors[0])).toString();
+            String from = "%" + count + "%";
+            String to = skipDefaultColors ? s : "&" + colors[1] + s + "&" + colors[0];
             str = str.replace(from, to);
             count++;
         }
@@ -213,8 +211,8 @@ private void initMessage(String message) {
     }
 
     private String message;
-    private Character color1;
-    private Character color2;
+    private final Character color1;
+    private final Character color2;
 
     M(String msg) {
         message = msg;
@@ -245,9 +243,8 @@ public static void init(String pluginName, Messenger mess, String lang, boolean
         messenger = mess;
         language = lang.equalsIgnoreCase("default") ? "eng" : lang;
         debugMode = debug;
-        saveLanguage = save;
         initMessages();
-        if (saveLanguage) saveMessages();
+        if (save) saveMessages();
         LNG_CONFIG.debug(M.values().length, language, true, debugMode);
     }
 
@@ -268,16 +265,17 @@ public static boolean isDebug() {
     private static void initMessages() {
         Map<String, String> lng = messenger.load(language);
         for (M key : M.values()) {
-            if (lng.containsKey(key.name().toLowerCase())) {
-                key.initMessage(lng.get(key.name().toLowerCase()));
+            String keyLow = key.name().toLowerCase(Locale.ROOT);
+            if (lng.containsKey(keyLow)) {
+                key.initMessage(lng.get(keyLow));
             }
         }
     }
 
     private static void saveMessages() {
-        Map<String, String> messages = new LinkedHashMap<String, String>();
+        Map<String, String> messages = new LinkedHashMap<>();
         for (M msg : M.values()) {
-            messages.put(msg.name().toLowerCase(), msg.message);
+            messages.put(msg.name().toLowerCase(Locale.ROOT), msg.message);
         }
         messenger.save(language, messages);
     }
@@ -325,7 +323,7 @@ public static void printPage(Object sender, List<String> lines, M title, int pag
 
     public static void printPage(Object sender, List<String> lines, M title, M footer, int pageNum, int linesPerPage) {
         if (lines == null || lines.isEmpty()) return;
-        List<String> page = new ArrayList<String>();
+        List<String> page = new ArrayList<>();
         if (title != null) page.add(title.message);
 
         int pageCount = lines.size() / linesPerPage + 1;

src/main/java/ru/nukkit/dblib/nukkit/DbLibPlugin.java

@@ -1,7 +1,6 @@
 package ru.nukkit.dblib.nukkit;
 
 import cn.nukkit.plugin.PluginBase;
-import cn.nukkit.utils.TextFormat;
 import ru.nukkit.dblib.DbLib;
 import ru.nukkit.dblib.core.M;
 
@@ -14,19 +13,15 @@ public static DbLibPlugin getPlugin() {
         return plugin;
     }
 
-    private ConfigNukkit cfg;
-
-    private boolean debugLog;
-
     @Override
     public void onLoad() {
         plugin = this;
         this.saveDefaultConfig();
-        this.cfg = new ConfigNukkit(this);
-        this.cfg.load();
+        ConfigNukkit cfg = new ConfigNukkit(this);
+        cfg.load();
         M.init("DbLib", new MessengerNukkit(this), cfg.language, cfg.debugMode, cfg.saveLanguage);
         DbLib.init(cfg, this.getDataFolder());
-        getLogger().info(TextFormat.colorize("&eDbLib " + this.getDescription().getVersion() + " created by fromgate for nukkit.ru"));
+        getLogger().info("DbLib " + this.getDescription().getVersion() + " created by fromgate");
     }
 
 

src/main/java/ru/nukkit/dblib/nukkit/MessengerNukkit.java

@@ -12,10 +12,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static ru.nukkit.dblib.core.M.LNG_SAVE_FAIL;
 import static ru.nukkit.dblib.core.M.debugException;
@@ -92,7 +89,7 @@ public boolean print(Object obj, String text) {
 
     @Override
     public boolean broadcast(String permission, String text) {
-        List<Player> playerList = new ArrayList<Player>();
+        List<Player> playerList = new ArrayList<>();
         for (Player player : Server.getInstance().getOnlinePlayers().values()) {
             if (permission == null || permission.isEmpty() || player.hasPermission(permission)) {
                 player.sendMessage(text);
@@ -116,11 +113,10 @@ public String toString(Object obj, boolean fullFloat) {
         return s;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public Map<String, String> load(String language) {
         File f = new File(plugin.getDataFolder() + File.separator + language + ".lng");
-        Config lng = null;
+        Config lng;
         if (!f.exists()) {
             lng = new Config(f, Config.YAML);
             InputStream is = plugin.getClass().getResourceAsStream("/lang/" + language + ".lng");
@@ -131,7 +127,7 @@ public Map<String, String> load(String language) {
             }
         } else lng = new Config(f, Config.YAML);
 
-        Map<String, String> msg = new HashMap<String, String>();
+        Map<String, String> msg = new HashMap<>();
         for (String key : lng.getKeys(true)) {
             if (lng.isSection(key)) continue;
             msg.put(key, lng.getString(key));
@@ -144,7 +140,7 @@ public void save(String language, Map<String, String> messages) {
         File f = new File(plugin.getDataFolder() + File.separator + language + ".lng");
         Config lng = new Config(f, Config.YAML);
         for (String key : messages.keySet())
-            lng.set(key.toLowerCase(), messages.get(key));
+            lng.set(key.toLowerCase(Locale.ROOT), messages.get(key));
         try {
             lng.save();
         } catch (Exception e) {

src/main/resources/config.yml

@@ -1,5 +1,5 @@
 # DbLib plugin for Nukkit
-# https://nukkitx.com/resources/dblib.12/
+# https://cloudburstmc.org/resources/dblib.12/
 #
 general:
   language: default

src/main/resources/lang/eng.lng

@@ -1,6 +1,6 @@
-lng_load_fail: Failed to load languages from file. Default message used
-lng_save_fail: Failed to save translation file
-lng_print_fail: Could not display message (%1%). The receiver is null.
-lng_config: '[MESSAGES] Posts:%1% Language:%2% Debug Mode:%3%'
-err_fail_to_connect: 'Could not connect to:%1% (name:%2%)'
-url_log: 'Establishing a connection with%1% (user:%2%)'
+lng_load_fail: 'Failed to load languages from file. Default message used'
+lng_save_fail: 'Failed to save language file'
+lng_print_fail: 'Failed to print message %1%. Sender object is null.'
+lng_config: '[MESSAGES] Messages: %1% Language: %2% Debug mode: %3%'
+err_fail_to_connect: 'Failed to connect to: %1% (user: %2%)'
+url_log: 'Connecting to: %1% (user: %2%)'

src/main/resources/plugin.yml

@@ -3,4 +3,4 @@ main: ru.nukkit.dblib.nukkit.DbLibPlugin
 version: ${project.version}
 author: fromgate, nukkit.ru
 api: ["1.0.8"]
-description: SQLite/MySQL library for your plugins (Nukkit)
+description: SQLite/MySQL library for your plugins