Disabled LibraryLoader on bukkit, shaded HikariCP.

Former-commit-id: e5f03a6
awumii · May 29, 2020 · 26c5e20 · 26c5e20
1 parent 0c9a35b
commit 26c5e20
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.ishift</groupId>
     <artifactId>EpicGuard</artifactId>
-    <version>4.2.2</version>
+    <version>4.2.3</version>
 
     <dependencies>
         <dependency>
@@ -73,7 +73,6 @@
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>3.4.5</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/me/ishift/epicguard/bungee/EpicGuardBungee.java b/src/main/java/me/ishift/epicguard/bungee/EpicGuardBungee.java
@@ -28,6 +28,7 @@
 import me.ishift.epicguard.common.task.MonitorTask;
 import me.ishift.epicguard.common.types.Platform;
 import me.ishift.epicguard.common.util.FileUtil;
+import me.ishift.epicguard.common.util.LibraryLoader;
 import me.ishift.epicguard.common.util.Log4jFilter;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
@@ -47,6 +48,7 @@ public class EpicGuardBungee extends Plugin {
     @Override
     public void onEnable() {
         epicGuardBungee = this;
+        LibraryLoader.init();
         FileUtil.saveResource(this.getDataFolder(), "config.yml");
         BungeeSettings.load();
 

diff --git a/src/main/java/me/ishift/epicguard/common/AttackManager.java b/src/main/java/me/ishift/epicguard/common/AttackManager.java
@@ -55,7 +55,6 @@ public AttackManager() {
         this.proxyServices = new HashSet<>();
         this.logger = new GuardLogger("EpicGuard", "plugins/EpicGuard", this);
         this.logger.info("Loading libraries...");
-        LibraryLoader.init();
         this.logger.info("Loading configuration...");
         Configuration.load();
         Messages.load();

diff --git a/src/main/java/me/ishift/epicguard/common/util/LibraryLoader.java b/src/main/java/me/ishift/epicguard/common/util/LibraryLoader.java
@@ -25,10 +25,10 @@
 public class LibraryLoader {
     /**
      * Loads the required libraries for the EpicGuard.
+     * Only for proxies (Velocity and Bungee).
      */
     public static void init() {
         tryDownload("com.mysql.jdbc.Driver", "https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar", "mysql-connector-java-8.0.19");
-        tryDownload("com.zaxxer.hikari.HikariDataSource", "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2.jar", "HikariCP-3.4.2");
     }
 
     /**

diff --git a/src/main/java/me/ishift/epicguard/velocity/EpicGuardVelocity.java b/src/main/java/me/ishift/epicguard/velocity/EpicGuardVelocity.java
@@ -27,6 +27,7 @@
 import me.ishift.epicguard.common.task.AttackToggleTask;
 import me.ishift.epicguard.common.task.CounterTask;
 import me.ishift.epicguard.common.util.FileUtil;
+import me.ishift.epicguard.common.util.LibraryLoader;
 import me.ishift.epicguard.velocity.command.GuardCommand;
 import me.ishift.epicguard.velocity.listener.PreLoginListener;
 
@@ -46,6 +47,7 @@ public EpicGuardVelocity(ProxyServer server) {
 
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
+        LibraryLoader.init();
         FileUtil.saveResource(new File("plugins/EpicGuard"), "config.yml");
         this.manager = new AttackManager();