Separate common compound action parameters from base action parameters

Author: NathanWolf

src/main/java/com/elmakers/mine/bukkit/meta/MagicMeta.java

@@ -12,9 +12,12 @@
 
 import org.bukkit.entity.Player;
 import org.reflections.Reflections;
+
+import com.elmakers.mine.bukkit.action.BaseSpellAction;
 import com.elmakers.mine.bukkit.action.CastContext;
 import com.elmakers.mine.bukkit.action.CompoundAction;
 import com.elmakers.mine.bukkit.api.action.SpellAction;
+import com.elmakers.mine.bukkit.api.spell.SpellResult;
 import com.elmakers.mine.bukkit.effect.EffectPlayer;
 import com.elmakers.mine.bukkit.effect.builtin.EffectSingle;
 import com.elmakers.mine.bukkit.entity.EntityData;
@@ -147,13 +150,26 @@ private void generateActionMeta() {
         CastContext context = new CastContext(spell);
 
         // First get base action parameters
-        SpellAction baseAction = new CompoundAction() {};
+
+        BaseSpellAction baseAction = new BaseSpellAction() {
+            @Override
+            public SpellResult perform(com.elmakers.mine.bukkit.api.action.CastContext context) {
+                return SpellResult.NO_ACTION;
+            }
+        };
         InterrogatingConfiguration baseConfiguration = new InterrogatingConfiguration(data.getParameterStore());
         baseAction.initialize(spell, baseConfiguration);
         baseAction.prepare(context, baseConfiguration);
         ParameterList baseParameters = baseConfiguration.getParameters();
         data.addActionParameters(baseParameters);
 
+        SpellAction compoundAction = new CompoundAction() {};
+        InterrogatingConfiguration compoundConfiguration = new InterrogatingConfiguration(data.getParameterStore());
+        compoundAction.initialize(spell, compoundConfiguration);
+        compoundAction.prepare(context, compoundConfiguration);
+        ParameterList compoundParameters = compoundConfiguration.getParameters();
+        data.addCompoundActionParameters(compoundParameters);
+
         for (Class<? extends SpellAction> actionClass : allClasses) {
             if (!actionClass.getPackage().getName().equals(BUILTIN_SPELL_PACKAGE)
                 || actionClass.getAnnotation(Deprecated.class) != null
@@ -170,6 +186,7 @@ private void generateActionMeta() {
 
                 ParameterList spellParameters = actionConfiguration.getParameters();
                 spellParameters.removeDefaults(baseParameters);
+                spellParameters.removeDefaults(compoundParameters);
                 SpellActionDescription spellAction = new SpellActionDescription(actionClass, spellParameters);
                 if (CompoundAction.class.isAssignableFrom(actionClass)) {
                     spellAction.setCategory(getCategory("compound").getKey());

src/main/java/com/elmakers/mine/bukkit/meta/MetaData.java

@@ -1,18 +1,14 @@
 package com.elmakers.mine.bukkit.meta;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MetaData {
     private ParameterList mobParameters = new ParameterList();
+    private ParameterList compoundActionParameters = new ParameterList();
     private ParameterList actionParameters = new ParameterList();
     private ParameterList spellParameters = new ParameterList();
     private ParameterList spellProperties = new ParameterList();
@@ -51,6 +47,15 @@ public void setActionParameters(ParameterList actionParameters) {
         this.actionParameters = actionParameters;
     }
 
+    @JsonProperty("compound_action_parameters")
+    public ParameterList getCompoundActionParameters() {
+        return compoundActionParameters;
+    }
+
+    public void setCompoundActionParameters(ParameterList compoundActionParameters) {
+        this.compoundActionParameters = compoundActionParameters;
+    }
+
     @JsonProperty("spell_properties")
     public ParameterList getSpellProperties() {
         return spellProperties;
@@ -166,6 +171,10 @@ public void addActionParameters(ParameterList parameters) {
         actionParameters.merge(parameters, parameterStore);
     }
 
+    public void addCompoundActionParameters(ParameterList parameters) {
+        compoundActionParameters.merge(parameters, parameterStore);
+    }
+
     public void addSpellParameters(ParameterList parameters) {
         spellParameters.merge(parameters, parameterStore);
     }

src/web/common/meta.json

@@ -1,11 +1,8 @@
 {
   "action_parameters" : {
-    "action_class" : null,
-    "actions_map" : null,
     "ignore_result" : "false",
     "requires_entity_target" : "false",
-    "requires_target" : "false",
-    "stop_on_success" : "false"
+    "requires_target" : "false"
   },
   "actions" : {
     "absorb" : {
@@ -3259,6 +3256,13 @@
       "name" : "Wand"
     }
   },
+  "compound_action_parameters" : {
+    "actions" : null,
+    "ignore_result" : "false",
+    "requires_entity_target" : "false",
+    "requires_target" : "false",
+    "stop_on_success" : "false"
+  },
   "effect_parameters" : {
     "color" : null,
     "color2" : null,