Allow to use all ReA placeholders in PAPI expansion

Author: imDaniX

reactions/src/main/java/fun/reactions/module/ModulesRegistry.java

@@ -9,7 +9,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -98,9 +97,9 @@ private <T extends Named> void register(String what, Collection<T> values, Consu
             try {
                 register.accept(type);
                 names.add(type.getName().toUpperCase(Locale.ROOT));
-            } catch (IllegalStateException e) {
+            } catch (Exception ex) {
                 if (failed == null) failed = new ArrayList<>();
-                failed.add(e.getMessage());
+                failed.add(ex.getMessage());
             }
         }
         if (!names.isEmpty()) {
@@ -131,7 +130,7 @@ public void loadFolderModules() {
                         toRegister.add(clazz);
                     }
                 }
-            } catch (IOException | ClassNotFoundException ex) {
+            } catch (Exception ex) {
                 platform.logger().error("Something went wrong during module parsing", ex);
             }
         }

reactions/src/main/java/fun/reactions/module/papi/PapiModule.java

@@ -22,7 +22,7 @@ public class PapiModule implements Module { // TODO To own jar
 
     @Override
     public void preRegister(@NotNull ReActions.Platform platform) {
-        new RaPapiExpansion().register();
+        new RaPapiExpansion(platform).register();
         this.papiPlugin = (PlaceholderAPIPlugin) Objects.requireNonNull(
                 platform.getServer().getPluginManager().getPlugin("PlaceholderAPI")
         );

reactions/src/main/java/fun/reactions/module/papi/external/RaPapiExpansion.java

@@ -1,13 +1,23 @@
 package fun.reactions.module.papi.external;
 
-import fun.reactions.PersistentVariablesManager;
 import fun.reactions.ReActions;
+import fun.reactions.model.environment.Environment;
+import fun.reactions.model.environment.Variables;
+import fun.reactions.placeholders.PlaceholdersManager;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.util.StringUtil;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class RaPapiExpansion extends PlaceholderExpansion {
+    private final ReActions.Platform platform;
+    private final PlaceholdersManager raPlaceholders;
+
+    public RaPapiExpansion(@NotNull ReActions.Platform platform) {
+        this.platform = platform;
+        this.raPlaceholders = platform.getPlaceholders();
+    }
+
     @Override
     public boolean persist() {
         return true;
@@ -25,29 +35,22 @@ public boolean canRegister() {
 
     @Override
     public @NotNull String getAuthor() {
-        return "fromgate";
+        return "imDaniX";
     }
 
     @Override
     public @NotNull String getVersion() {
-        return "0.0.3";
+        return "1.0";
     }
 
     @Override
     public String onRequest(OfflinePlayer player, @NotNull String param) {
-        PersistentVariablesManager variables = ReActions.getPersistentVariables();
-
-        if (StringUtil.startsWithIgnoreCase(param, "varp:")) {
-            return player == null || player.getName() == null
-                    ? null
-                    : variables.getVariable(player.getName(), param.substring(5));
-        } else if (StringUtil.startsWithIgnoreCase(param, "var:")) {
-            String[] split = param.substring(4).split("\\.", 2);
-            return split.length > 1
-                    ? variables.getVariable(split[0], split[1])
-                    : variables.getVariable(null, split[0]);
-        }
-
-        return null;
+        return raPlaceholders.resolvePlaceholder(new Environment(
+                platform,
+                "",
+                new Variables(),
+                player instanceof Player onlinePlayer ? onlinePlayer : null,
+                true // We don't know if we're in async, so let's consider we are
+        ), param);
     }
 }

reactions/src/main/java/fun/reactions/placeholders/Placeholder.java

@@ -2,7 +2,6 @@
 
 import fun.reactions.model.environment.Environment;
 import fun.reactions.util.naming.Named;
-import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -14,7 +13,7 @@ public interface Placeholder extends Named {
      * @param params Text of placeholder(e.g. %var:test% - test)
      * @return Processed placeholder
      */
-    @Nullable String resolve(@NotNull Environment env, @Pattern("[a-z\\d_-]+") @NotNull String key, @NotNull String params);
+    @Nullable String resolve(@NotNull Environment env, @NotNull String key, @NotNull String params);
 
     interface Dynamic extends Placeholder {
         @Override

reactions/src/main/java/fun/reactions/placeholders/PlaceholdersManager.java

@@ -22,13 +22,14 @@ public static void setCountLimit(int countLimit) {
 
     public final void registerPlaceholder(@NotNull Placeholder ph) {
         if (!resolver.add(ph)) {
-            throw new IllegalArgumentException("Cannot register '" + ph.getName() + "' placeholder - it doesn't implement any specific Placeholder interfaces");
+            throw new IllegalStateException("Cannot register " + ph.getClass() + " placeholder - " +
+                    "the name '" + ph.getName() + "' is already registered");
         }
     }
 
     public abstract @NotNull String parse(@NotNull Environment env, @NotNull String text);
 
-    protected final @Nullable String resolvePlaceholder(@NotNull Environment env, @NotNull String phText) {
+    public final @Nullable String resolvePlaceholder(@NotNull Environment env, @NotNull String phText) {
         return resolver.resolve(env, phText);
     }
 }