fix PermissionHook not being enabled properly (rookie mistake)

Author: iGabyTM

.gitignore

@@ -1,5 +1,6 @@
 .gradle/
 .idea/
 build/
+testServer/
 
 *.iml

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'at.helpch.placeholderapi.expansion'
-version = '1.8.0'
+version = '1.8.1'
 
 repositories {
     mavenCentral()
@@ -31,4 +31,10 @@ dependencies {
 
 shadowJar {
     archiveName("Expansion-Vault-${project.version}.jar")
+}
+
+tasks.register("buildToServer", Copy) {
+    group = "custom"
+    from(shadowJar)
+    into("./testServer/plugins/PlaceholderAPI/expansions")
 }

src/main/java/at/helpch/placeholderapi/expansion/vault/EconomyHook.java

@@ -31,6 +31,7 @@ public EconomyHook(VaultExpansion expansion) {
         suffixes.put(1_000_000_000L, expansion.getString("formatting.billions", "B"));
         suffixes.put(1_000_000_000_000L, expansion.getString("formatting.trillions", "T"));
         suffixes.put(1_000_000_000_000_000L, expansion.getString("formatting.quadrillions", "Q"));
+        setup();
     }
 
     private double getBalance(@NotNull final OfflinePlayer player) {
@@ -81,8 +82,13 @@ private double getBalance(@NotNull final OfflinePlayer player) {
     }
 
     @Override
-    public boolean setup() {
-        return (economy = getService(Economy.class)) != null;
+    public void setup() {
+        economy = getService(Economy.class);
+    }
+
+    @Override
+    public boolean isReady() {
+        return economy != null;
     }
 
     @SuppressWarnings("UnstableApiUsage")

src/main/java/at/helpch/placeholderapi/expansion/vault/PermissionHook.java

@@ -19,6 +19,7 @@ public class PermissionHook extends VaultHook {
 
     public PermissionHook(VaultExpansion expansion) {
         super(expansion);
+        setup();
     }
 
     private @NotNull String[] getPlayerGroups(@NotNull final OfflinePlayer player) {
@@ -71,9 +72,13 @@ public PermissionHook(VaultExpansion expansion) {
     }
 
     @Override
-    public boolean setup() {
+    public void setup() {
         permission = getService(Permission.class);
         chat = getService(Chat.class);
+    }
+
+    @Override
+    public boolean isReady() {
         return permission != null && chat != null;
     }
 

src/main/java/at/helpch/placeholderapi/expansion/vault/VaultExpansion.java

@@ -27,7 +27,7 @@ public class VaultExpansion extends PlaceholderExpansion implements Cacheable, C
 
     @Override
     public @NotNull String getVersion() {
-        return "1.8.0";
+        return "1.8.1";
     }
 
     @Override
@@ -38,6 +38,7 @@ public class VaultExpansion extends PlaceholderExpansion implements Cacheable, C
     @Override
     public void clear() {
         economyHook = null;
+        permissionHook = null;
     }
 
     @Override
@@ -55,8 +56,7 @@ public Map<String, Object> getDefaults() {
     public boolean canRegister() {
         economyHook = new EconomyHook(this);
         permissionHook = new PermissionHook(this);
-
-        return economyHook.setup() || permissionHook.setup();
+        return economyHook.isReady() || permissionHook.isReady();
     }
 
     @Override
@@ -65,11 +65,11 @@ public boolean canRegister() {
             return "";
         }
 
-        if (economyHook != null && params.startsWith("eco_")) {
+        if (economyHook.isReady() && params.startsWith("eco_")) {
             return economyHook.onRequest(player, params.replace("eco_", ""));
         }
 
-        return (permissionHook != null) ? permissionHook.onRequest(player, params) : null;
+        return (permissionHook.isReady()) ? permissionHook.onRequest(player, params) : null;
     }
 
 }

src/main/java/at/helpch/placeholderapi/expansion/vault/VaultHook.java

@@ -24,7 +24,9 @@ protected final <T> T getService(final Class<T> cls) {
         return rsp.getProvider();
     }
 
-    public abstract boolean setup();
+    protected abstract void setup();
+
+    public abstract boolean isReady();
 
     public abstract @Nullable String onRequest(@Nullable OfflinePlayer offlinePlayer, @NotNull String params);