From 37bedcf9195006b27243b531cd9d15de8781a198 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Tue, 18 Feb 2025 13:20:28 -0500
Subject: [PATCH] Behaviours return a java Object

---
 src/engine/mbEnums.java              | 106 +++++++++++++--------------
 src/engine/wpakpowers/Behaviour.java |  51 ++++++++-----
 2 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java
index 1c58ccd7..f4e66330 100644
--- a/src/engine/mbEnums.java
+++ b/src/engine/mbEnums.java
@@ -1338,126 +1338,126 @@ public class mbEnums {
     public enum ModBehaviorType {
         Behavior {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.Behaviour();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.Behaviour();
             }
         },
         Flag {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.Flag();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.Flag();
             }
         },
         MapIntToInts {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.MapIntToInts();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.MapIntToInts();
             }
         },
         Standard {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.Standard();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.Standard();
             }
         },
         FPSubTypeAttr {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.FPSubTypeAttr();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.FPSubTypeAttr();
             }
         },
         SubTypeSourceType {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypeSourceType();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypeSourceType();
             }
         },
         SubTypePowerType {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypePowerType();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypePowerType();
             }
         },
         SubTypeSkill {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypeSkill();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypeSkill();
             }
         },
         FPSubTypeDmg {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.FPSubTypeDmg();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.FPSubTypeDmg();
             }
         },
         DD {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.DD();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.DD();
             }
         },
         String {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.StringBehaviour();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.StringBehaviour();
             }
         },
         SubTypeMod {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypeMod();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypeMod();
             }
         },
         SubTypePower {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypePower();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypePower();
             }
         },
         SubTypeDmg {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.SubTypeDmg();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.SubTypeDmg();
             }
         },
         FPSubTypeSkill {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.FPSubTypeSkill();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.FPSubTypeSkill();
             }
         },
         FPSubTypeMonster {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.FPSubTypeMonster();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.FPSubTypeMonster();
             }
         },
         ProcInfo {
             @Override
-            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-                Behaviour.ProcInfo();
+            public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+                return Behaviour.ProcInfo();
             }
         };
 
-        public abstract void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                   ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank);
+        public abstract Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                     ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank);
     }
 
     public enum MovementState {
diff --git a/src/engine/wpakpowers/Behaviour.java b/src/engine/wpakpowers/Behaviour.java
index f50e3ad9..5ab509e9 100644
--- a/src/engine/wpakpowers/Behaviour.java
+++ b/src/engine/wpakpowers/Behaviour.java
@@ -10,71 +10,88 @@ package engine.wpakpowers;
 
 public class Behaviour {
 
-    public static void Behaviour() {
+    public static Object Behaviour() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void Flag() {
+    public static Object Flag() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void MapIntToInts() {
+    public static Object MapIntToInts() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void Standard() {
+    public static Object Standard() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void FPSubTypeAttr() {
+    public static Object FPSubTypeAttr() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypeSourceType() {
+    public static Object SubTypeSourceType() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypePowerType() {
+    public static Object SubTypePowerType() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypeSkill() {
+    public static Object SubTypeSkill() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void FPSubTypeDmg() {
+    public static Object FPSubTypeDmg() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void DD() {
+    public static Object DD() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void StringBehaviour() {
+    public static Object StringBehaviour() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypeMod() {
+    public static Object SubTypeMod() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypePower() {
+    public static Object SubTypePower() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void SubTypeDmg() {
+    public static Object SubTypeDmg() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void FPSubTypeSkill() {
+    public static Object FPSubTypeSkill() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void FPSubTypeMonster() {
+    public static Object FPSubTypeMonster() {
         System.out.println("Behavior method called");
+        return null;
     }
 
-    public static void ProcInfo() {
+    public static Object ProcInfo() {
         System.out.println("Behavior method called");
+        return null;
     }
 }