From 273ffb28ecad36675c191ae4cac8bb73af70fa99 Mon Sep 17 00:00:00 2001
From: aro <pantoine.rochas@gmail.com>
Date: Mon, 30 Jan 2023 18:39:47 +0100
Subject: [PATCH] feat(bungee): force sql

---
 nicko-core/dependency-reduced-pom.xml           | 11 +++++------
 nicko-core/pom.xml                              |  5 +++++
 .../main/java/net/artelnatif/nicko/Nicko.java   |  3 ++-
 .../artelnatif/nicko/bungee/NickoBungee.java    | 17 +++++------------
 .../nicko/storage/PlayerDataStore.java          |  2 +-
 nicko-core/src/main/resources/config.yml        |  4 ++--
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/nicko-core/dependency-reduced-pom.xml b/nicko-core/dependency-reduced-pom.xml
index 8f4cd54..e615464 100644
--- a/nicko-core/dependency-reduced-pom.xml
+++ b/nicko-core/dependency-reduced-pom.xml
@@ -37,6 +37,7 @@
                   <include>com.github.jsixface:*</include>
                   <include>com.fasterxml.jackson.dataformat</include>
                   <include>com.fasterxml.jackson.core</include>
+                  <include>org.mariadb.jdbc</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -60,6 +61,10 @@
                   <pattern>com.fasterxml.jackson.core</pattern>
                   <shadedPattern>net.artelnatif.libs.jackson.core</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.mariadb.jdbc</pattern>
+                  <shadedPattern>net.artelnatif.libs.mariadb</shadedPattern>
+                </relocation>
               </relocations>
               <minimizeJar>false</minimizeJar>
             </configuration>
@@ -161,12 +166,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.mariadb.jdbc</groupId>
-      <artifactId>mariadb-java-client</artifactId>
-      <version>3.1.0</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
   <properties>
     <maven.compiler.target>17</maven.compiler.target>
diff --git a/nicko-core/pom.xml b/nicko-core/pom.xml
index 74941cb..642bcdb 100644
--- a/nicko-core/pom.xml
+++ b/nicko-core/pom.xml
@@ -150,6 +150,7 @@
                                     <include>com.github.jsixface:*</include>
                                     <include>com.fasterxml.jackson.dataformat</include>
                                     <include>com.fasterxml.jackson.core</include>
+                                    <include>org.mariadb.jdbc</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
@@ -173,6 +174,10 @@
                                     <pattern>com.fasterxml.jackson.core</pattern>
                                     <shadedPattern>net.artelnatif.libs.jackson.core</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.mariadb.jdbc</pattern>
+                                    <shadedPattern>net.artelnatif.libs.mariadb</shadedPattern>
+                                </relocation>
                             </relocations>
                             <!-- Prevents breaking AnvilGUI's VersionWrapper. -->
                             <minimizeJar>false</minimizeJar>
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java b/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
index e51dcdc..8bf90f6 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/Nicko.java
@@ -12,11 +12,11 @@ import java.io.IOException;
 import java.util.logging.Logger;
 
 public class Nicko {
+    private boolean bungeecord = false;
     private ConfigurationManager configManager;
     private Logger logger;
     private File dataFolder;
     private MojangAPI mojangAPI;
-    private boolean bungeecord;
     private Configuration config;
 
     private PlayerDataStore dataStore;
@@ -24,6 +24,7 @@ public class Nicko {
     public void initBungeecord(Plugin bungee) {
         logger = bungee.getLogger();
         dataFolder = bungee.getDataFolder();
+        bungeecord = true;
         initNicko();
     }
 
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
index 8045bb1..bee4a05 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
@@ -2,7 +2,6 @@ package net.artelnatif.nicko.bungee;
 
 import net.artelnatif.nicko.Nicko;
 import net.artelnatif.nicko.bungee.event.UpdateMessageListener;
-import net.artelnatif.nicko.storage.sql.SQLStorageProvider;
 import net.md_5.bungee.api.plugin.Plugin;
 
 public class NickoBungee extends Plugin {
@@ -21,20 +20,14 @@ public class NickoBungee extends Plugin {
         nicko.initBungeecord(this);
 
         getLogger().info("Loading persistence...");
-        if (!(nicko.getDataStore().getStorage().getProvider() instanceof SQLStorageProvider)) {
-            getLogger().severe("Nicko does not support local storage in combination with Bungeecord.");
-            getLogger().severe("The plugin will not continue.");
-            nicko.getDataStore().getStorage().setError(true);
-            nicko.setBungeecord(false);
-            onDisable();
-            return;
-        }
-
         if (!nicko.getDataStore().getStorage().isError()) {
             if (!nicko.getDataStore().getStorage().getProvider().init()) {
-                getLogger().severe("Failed to open persistence!");
-                getLogger().severe("Player data transfer is disabled.");
+                getLogger().severe("Failed to load persistence!");
+                getLogger().severe("Nicko can't enable BungeeCord support without SQL storage.");
+                getLogger().severe("The plugin will not continue.");
+                nicko.getDataStore().getStorage().setError(true);
                 nicko.setBungeecord(false);
+                onDisable();
                 return;
             }
 
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java b/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
index 8a42fb2..edb6465 100644
--- a/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
+++ b/nicko-core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
@@ -20,7 +20,7 @@ public class PlayerDataStore {
 
     public PlayerDataStore(Nicko nicko) {
         this.nicko = nicko;
-        this.storage = nicko.getConfig().local() ? new JSONStorage(nicko) : new SQLStorage(nicko);
+        this.storage = nicko.getConfig().local() && !nicko.isBungeecord() ? new JSONStorage(nicko) : new SQLStorage(nicko);
     }
 
     public void storeName(Player player) {
diff --git a/nicko-core/src/main/resources/config.yml b/nicko-core/src/main/resources/config.yml
index 2c8ae41..fc6637f 100644
--- a/nicko-core/src/main/resources/config.yml
+++ b/nicko-core/src/main/resources/config.yml
@@ -18,10 +18,10 @@
 address: "localhost"
 # SQL database's username.
 # Accepted values: any string
-username: ""
+username: "username"
 # SQL database's password.
 # Accepted values: any string
-password: ""
+password: "password"
 
 #################
 # BUKKIT/SPIGOT #