Finalized extension system

PlayPro · Oct 3, 2024 · 385c11a · 385c11a
1 parent 88b19ef
commit 385c11a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -198,4 +198,5 @@ hs_err_pid*
 docs/dev/
 
 # Extensions
-/src/main/java/net/coreprotect/extensions/*.java
+/src/main/java/net/coreprotect/extensions/*.java
+!/src/main/java/net/coreprotect/extensions/Extensions.java
diff --git a/src/main/java/net/coreprotect/command/CommandHandler.java b/src/main/java/net/coreprotect/command/CommandHandler.java
@@ -1279,14 +1279,7 @@ else if (corecommand.equals("migrate-db")) {
                         Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DONATION_KEY_REQUIRED));
                     }
                     else {
-                        try {
-                            Class.forName("net.coreprotect.extensions.DatabaseMigration");
-                            Extensions.runDatabaseMigration(user, argumentArray);
-                        }
-                        catch (Exception e) {
-                            // plugin not compiled with extension
-                            Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + corecommand));
-                        }
+                        Extensions.runDatabaseMigration(corecommand, user, argumentArray);
                     }
                 }
                 else {

diff --git a/src/main/java/net/coreprotect/extensions/Extensions.java b/src/main/java/net/coreprotect/extensions/Extensions.java
@@ -1,11 +1,25 @@
 package net.coreprotect.extensions;
 
+import java.lang.reflect.Method;
+
 import org.bukkit.command.CommandSender;
 
+import net.coreprotect.language.Phrase;
+import net.coreprotect.utility.Chat;
+import net.coreprotect.utility.Color;
+
 public class Extensions {
 
-    public static void runDatabaseMigration(CommandSender user, String[] argumentArray) {
-        DatabaseMigration.runCommand(user, argumentArray);
+    public static void runDatabaseMigration(String command, CommandSender user, String[] argumentArray) {
+        try {
+            Class<?> patchClass = Class.forName("net.coreprotect.extensions.DatabaseMigration");
+            Method patchMethod = patchClass.getDeclaredMethod("runCommand", CommandSender.class, String[].class);
+            patchMethod.invoke(null, user, argumentArray);
+        }
+        catch (Exception e) {
+            // plugin not compiled with extension
+            Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + command));
+        }
     }
 
 }