Added ability to use dependency injection in actions

Added AbstractClickAction
Added ending all subprocess when the main process was set to end

Author: timsixth

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>pl.timsixth</groupId>
         <artifactId>T-GuiApi</artifactId>
-        <version>2.8.3</version>
+        <version>2.9.0</version>
     </parent>
 
     <artifactId>core</artifactId>

core/src/main/java/pl/timsixth/guilibrary/core/manager/YAMLMenuManager.java

@@ -18,6 +18,10 @@
 import pl.timsixth.guilibrary.core.util.ItemBuilder;
 import pl.timsixth.guilibrary.core.util.ItemUtil;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -129,8 +133,29 @@ private void setAction(ConfigurationSection slotSection, MenuItem menuItem) {
 
             ClickAction clickAction;
             try {
-                clickAction = action.getClass().newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                List<Field> fields = getAllFinalFields(action);
+
+                if (fields.isEmpty()) {
+                    clickAction = action.getClass().newInstance();
+                } else {
+                    Class<?>[] types = fields.stream()
+                            .map(Field::getType)
+                            .toArray(Class<?>[]::new);
+
+                    Object[] values = fields.stream().map(field -> {
+                                try {
+                                    return field.get(action);
+                                } catch (IllegalAccessException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            })
+                            .toArray(Object[]::new);
+
+                    clickAction = action.getClass().getConstructor(types).newInstance(values);
+                }
+
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
+                     NoSuchMethodException e) {
                 throw new RuntimeException(e);
             }
 
@@ -140,6 +165,32 @@ private void setAction(ConfigurationSection slotSection, MenuItem menuItem) {
         }
     }
 
+    private List<Field> getAllFinalFields(Action action) throws IllegalAccessException {
+        List<Field> fields = new ArrayList<>();
+
+        Field[] declaredFields = action.getClass().getDeclaredFields();
+        Constructor<?>[] constructors = action.getClass().getConstructors();
+
+        for (Field field : declaredFields) {
+            field.setAccessible(true);
+
+            if (Modifier.isFinal(field.getModifiers())) {
+
+                for (Constructor<?> constructor : constructors) {
+                    Class<?>[] parameterTypes = constructor.getParameterTypes();
+
+                    for (Class<?> parameterType : parameterTypes) {
+                        if (field.getType().equals(parameterType)) {
+                            fields.add(field);
+                        }
+                    }
+                }
+            }
+        }
+
+        return fields;
+    }
+
     /**
      * Sets price of {@link MenuItem}
      *

core/src/main/java/pl/timsixth/guilibrary/core/model/action/AbstractClickAction.java

@@ -0,0 +1,9 @@
+package pl.timsixth.guilibrary.core.model.action;
+
+import pl.timsixth.guilibrary.core.model.action.click.ClickAction;
+
+public abstract class AbstractClickAction extends AbstractAction implements ClickAction {
+    public AbstractClickAction(String name) {
+        super(name);
+    }
+}

example-plugin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>pl.timsixth</groupId>
         <artifactId>T-GuiApi</artifactId>
-        <version>2.8.3</version>
+        <version>2.9.0</version>
     </parent>
 
     <artifactId>example-plugin</artifactId>
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>pl.timsixth</groupId>
             <artifactId>core</artifactId>
-            <version>2.8.3</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>pl.timsixth</groupId>
             <artifactId>processes</artifactId>
-            <version>2.8.3</version>
+            <version>2.9.0</version>
         </dependency>
     </dependencies>
     <build>

example-plugin/src/main/java/pl/timsixth/guilibrary/example/GuiApiPlugin.java

@@ -12,6 +12,7 @@
 import pl.timsixth.guilibrary.core.model.pagination.PaginatedMenu;
 import pl.timsixth.guilibrary.example.action.ChooseUserGroupAction;
 import pl.timsixth.guilibrary.example.action.OpenPaginatedMenuAction;
+import pl.timsixth.guilibrary.example.action.DependencyInjectionAction;
 import pl.timsixth.guilibrary.example.command.TestGuiCommand;
 import pl.timsixth.guilibrary.example.command.UserCommand;
 import pl.timsixth.guilibrary.example.config.ConfigFile;
@@ -53,7 +54,7 @@ public void onEnable() {
         guiApi.setMenuManager(menuManager);
 
         guiApi.registerDefaultActions();
-        guiApi.getActionRegistration().register(new ChooseUserGroupAction(), new OpenPaginatedMenuAction());
+        guiApi.getActionRegistration().register(new ChooseUserGroupAction(), new OpenPaginatedMenuAction(), new DependencyInjectionAction("test123"));
 
         guiApi.registerMenuListener();
 

example-plugin/src/main/java/pl/timsixth/guilibrary/example/action/DependencyInjectionAction.java

@@ -0,0 +1,21 @@
+package pl.timsixth.guilibrary.example.action;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import pl.timsixth.guilibrary.core.model.MenuItem;
+import pl.timsixth.guilibrary.core.model.action.AbstractClickAction;
+
+public class DependencyInjectionAction extends AbstractClickAction {
+
+    private final String text;
+
+    public DependencyInjectionAction(String text) {
+        super("DEPENDENCY_INJECTION");
+        this.text = text;
+    }
+
+    @Override
+    public void handleClickEvent(InventoryClickEvent event, MenuItem menuItem) {
+        Bukkit.getLogger().info(text);
+    }
+}

example-plugin/src/main/resources/guis.yml

@@ -48,6 +48,15 @@ guis:
           type: 'NONE'
           args:
             - ''
+      3:
+        material: APPLE
+        displayname: '&cTest dependency injection action'
+        lore:
+          - 'Price {PRICE}'
+        click_action:
+          type: 'DEPENDENCY_INJECTION'
+          args:
+            - ''
   test2:
     displayname: '&a&ltest2'
     size: 54

example-plugin/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: T-GuiApi
 main: pl.timsixth.guilibrary.example.GuiApiPlugin
-version: '2.8.3'
+version: '2.9.0'
 author: timsixth
 api-version: 1.13
 commands:

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>pl.timsixth</groupId>
     <artifactId>T-GuiApi</artifactId>
-    <version>2.8.3</version>
+    <version>2.9.0</version>
     <packaging>pom</packaging>
     <modules>
         <module>core</module>

processes/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>pl.timsixth</groupId>
         <artifactId>T-GuiApi</artifactId>
-        <version>2.8.3</version>
+        <version>2.9.0</version>
     </parent>
 
     <artifactId>processes</artifactId>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>pl.timsixth</groupId>
             <artifactId>core</artifactId>
-            <version>2.8.3</version>
+            <version>2.9.0</version>
         </dependency>
     </dependencies>
     <properties>

processes/src/main/java/pl/timsixth/guilibrary/processes/manager/ProcessRunner.java

@@ -103,13 +103,16 @@ private static List<SubGuiProcess> configureSubProcesses(List<SubGuiProcess> sub
     }
 
     /**
-     * Ends process for player
+     * Ends process for player, ends all subprocesses
      *
      * @param player         player to end process
      * @param mainGuiProcess process to end
      */
     public static void endProcess(Player player, MainGuiProcess mainGuiProcess) {
         mainGuiProcess.setEnded(true);
+
+        mainGuiProcess.getGuiProcesses().forEach(subGuiProcess -> subGuiProcess.setEnded(true));
+
         processes.remove(player.getUniqueId());
     }