Abstract onEnable/onDisable, moved consumers, added mfgui

Author: dkim19375

.idea/jarRepositories.xml

@@ -1,20 +1,28 @@
 plugins {
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
     id 'java'
 }
 
+shadowJar {
+    relocate 'me.mattstudios.mfgui', 'me.dkim19375.dkim19375core.mfgui'
+}
+
 group 'me.dkim19375'
-version '1.4.0'
+version '2.0.0'
 
 repositories {
     mavenCentral()
     maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' }
     maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
     maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     maven { url = 'https://maven.enginehub.org/repo/' }
+    maven { url = 'https://jitpack.io' }
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.10.9'
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.4'
+    compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
+    implementation 'me.mattstudios.utils:matt-framework-gui:2.0.2'
 }

build.gradle

@@ -6,4 +6,10 @@ public abstract class CoreJavaPlugin extends JavaPlugin {
     public void printToConsole(String msg) {
         getServer().getConsoleSender().sendMessage("[" + getDescription().getName() + "] " + msg);
     }
+
+    @Override
+    public abstract void onEnable();
+
+    @Override
+    public abstract void onDisable();
 }

src/main/java/me/dkim19375/dkim19375core/CoreJavaPlugin.java

@@ -0,0 +1,63 @@
+package me.dkim19375.dkim19375core.external;
+
+import me.dkim19375.dkim19375core.CoreJavaPlugin;
+import net.milkbowl.vault.chat.Chat;
+import net.milkbowl.vault.economy.Economy;
+import net.milkbowl.vault.permission.Permission;
+import org.bukkit.plugin.RegisteredServiceProvider;
+
+public abstract class VaultJavaPlugin extends CoreJavaPlugin {
+    protected static Economy econ = null;
+    protected static Permission perms = null;
+    protected static Chat chat = null;
+
+    @Override
+    public void onEnable() {
+        if (!setupEconomy() ) {
+            printToConsole("Disabled due to no Vault dependency found!");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        setupPermissions();
+        setupChat();
+    }
+
+    @Override
+    public abstract void onDisable();
+
+    protected boolean setupEconomy() {
+        if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            return false;
+        }
+        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
+        if (rsp == null) {
+            return false;
+        }
+        econ = rsp.getProvider();
+        return econ != null;
+    }
+
+    protected boolean setupChat() {
+        RegisteredServiceProvider<Chat> rsp = getServer().getServicesManager().getRegistration(Chat.class);
+        chat = rsp.getProvider();
+        return chat != null;
+    }
+
+    protected boolean setupPermissions() {
+        RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
+        perms = rsp.getProvider();
+        return perms != null;
+    }
+
+    public static Economy getEconomy() {
+        return econ;
+    }
+
+    public static Permission getPermissions() {
+        return perms;
+    }
+
+    public static Chat getChat() {
+        return chat;
+    }
+}

src/main/java/me/dkim19375/dkim19375core/Licensing.java

@@ -1,4 +1,4 @@
-package me.dkim19375.dkim19375core;
+package me.dkim19375.dkim19375core.function;
 
 import java.util.Map;
 

src/main/java/me/dkim19375/dkim19375core/external/VaultJavaPlugin.java

@@ -1,4 +1,4 @@
-package me.dkim19375.dkim19375core.consumers;
+package me.dkim19375.dkim19375core.function;
 
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -17,8 +17,6 @@
  *
  * @see Consumer
  * @see java.util.function.BiConsumer
- * @see TriConsumer
- * @see QuadConsumer
  */
 @FunctionalInterface
 public interface HexaConsumer<T, U, V, W, X> {

src/main/java/me/dkim19375/dkim19375core/Entry.java renamed to src/main/java/me/dkim19375/dkim19375core/function/Entry.java

@@ -1,4 +1,4 @@
-package me.dkim19375.dkim19375core.consumers;
+package me.dkim19375.dkim19375core.function;
 
 import java.util.Objects;
 import java.util.function.Consumer;

src/main/java/me/dkim19375/dkim19375core/consumers/HexaConsumer.java renamed to src/main/java/me/dkim19375/dkim19375core/function/HexaConsumer.java

@@ -1,4 +1,4 @@
-package me.dkim19375.dkim19375core;
+package me.dkim19375.dkim19375core.function;
 
 import org.bukkit.Location;
 

src/main/java/me/dkim19375/dkim19375core/consumers/QuadConsumer.java renamed to src/main/java/me/dkim19375/dkim19375core/function/QuadConsumer.java

@@ -1,4 +1,4 @@
-package me.dkim19375.dkim19375core.consumers;
+package me.dkim19375.dkim19375core.function;
 
 import java.util.Objects;
 import java.util.function.Consumer;