Arguments added to signature

src/engine/mbEnums.java

@@ -14,11 +14,12 @@ import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
-import engine.objects.AbstractCharacter;
-import engine.objects.ItemTemplate;
-import engine.objects.Shrine;
-import engine.objects.Zone;
+import engine.objects.*;
 import engine.powers.EffectsBase;
+import engine.wpak.data.Effect;
+import engine.wpak.data.ModifierEntry;
+import engine.wpak.data.Power;
+import engine.wpak.data.PowerAction;
 import engine.wpakpowers.Behaviour;
 import org.pmw.tinylog.Logger;
 
@@ -677,7 +678,7 @@ public class mbEnums {
         RUNE,
         OFFERING,
         RESOURCE,
-        REALMCHARTER;
+        REALMCHARTER
     }
 
     // Enum to derive effects for active spires from blueprintUUID
@@ -842,10 +843,10 @@ public class mbEnums {
         DRAIN;
 
         public static DamageType getDamageType(String modName) {
-            if(modName.toLowerCase().equals("blind"))
+            if (modName.equalsIgnoreCase("blind"))
                 modName = "BLINDNESS";
 
-            if(modName.toLowerCase().equals("powerblock"))
+            if (modName.equalsIgnoreCase("powerblock"))
                 modName = "POWERINHIBITOR";
 
             DamageType damageType;
@@ -1030,7 +1031,7 @@ public class mbEnums {
                     return SourceType.None;
                 }
                 return returnMod;
-            }catch(Exception e){
+            } catch (Exception e) {
                 Logger.error(" MISSING SOURCE TYPE: " + modName);
                 return SourceType.None;
             }
@@ -1337,108 +1338,126 @@ public class mbEnums {
     public enum ModBehaviorType {
         Behavior {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.Behaviour();
             }
         },
         Flag {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.Flag();
             }
         },
         MapIntToInts {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.MapIntToInts();
             }
         },
         Standard {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.Standard();
             }
         },
         FPSubTypeAttr {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.FPSubTypeAttr();
             }
         },
         SubTypeSourceType {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypeSourceType();
             }
         },
         SubTypePowerType {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypePowerType();
             }
         },
         SubTypeSkill {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypeSkill();
             }
         },
         FPSubTypeDmg {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.FPSubTypeDmg();
             }
         },
         DD {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.DD();
             }
         },
         String {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.StringBehaviour();
             }
         },
         SubTypeMod {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypeMod();
             }
         },
         SubTypePower {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypePower();
             }
         },
         SubTypeDmg {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.SubTypeDmg();
             }
         },
         FPSubTypeSkill {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.FPSubTypeSkill();
             }
         },
         FPSubTypeMonster {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.FPSubTypeMonster();
             }
         },
         ProcInfo {
             @Override
-            public void execute() {
+            public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
                 Behaviour.ProcInfo();
             }
         };
 
-        public abstract void execute();
+        public abstract void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
+                                   PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank);
     }
 
     public enum MovementState {
@@ -1575,7 +1594,7 @@ public class mbEnums {
         COMBATRUN,
         FLYWALK,
         FLYRUN,
-        SWIM;
+        SWIM
     }
 
     public enum SexType {
@@ -2728,14 +2747,11 @@ public class mbEnums {
         }
 
         public boolean canJoin(AbstractCharacter character) {
-            if (this.requiredRaces.contains(character.absRace) == false)
-                return false;
-            if (this.requiredClasses.contains(character.absBaseClass) == false && this.requiredClasses.contains(character.absPromotionClass) == false)
+            if (!this.requiredRaces.contains(character.absRace))
                 return false;
-            if (this.sexRequired.contains(character.absGender) == false)
+            if (!this.requiredClasses.contains(character.absBaseClass) && !this.requiredClasses.contains(character.absPromotionClass))
                 return false;
-
-            return true;
+            return this.sexRequired.contains(character.absGender);
         }
     }
 
@@ -3013,14 +3029,14 @@ public class mbEnums {
         NoQuit,
         Magic,
         NoDrop,
-        Rare;
+        Rare
     }
 
     public enum ItemUseFlags {
         USE_SELF,
         USE_TARGET,
         EMPTY_DESTROY,
-        EMPTY_NEWITEM;
+        EMPTY_NEWITEM
     }
 
     public enum AttributeType {
@@ -3142,25 +3158,25 @@ public class mbEnums {
         CONFIRM_PRODUCE,
         CONFIRM_SETPRICE,
         CONFIRM_DEPOSIT,
-        CONFIRM_TAKE;
+        CONFIRM_TAKE
     }
 
     public enum ItemModType {
         PREFIX,
-        SUFFIX;
+        SUFFIX
     }
 
     public enum PowerType {
         None,
         SPELL,
-        SKILL;
+        SKILL
     }
 
     public enum CostType {
         NONE,
         HEALTH,
         MANA,
-        STAMINA;
+        STAMINA
     }
 
     public enum AreaType {
@@ -3169,7 +3185,7 @@ public class mbEnums {
         POINTBLANK,
         LINE,
         CONE,
-        WALL;
+        WALL
     }
 
     public enum ExcludeType {
@@ -3180,14 +3196,14 @@ public class mbEnums {
         NATION,
         PLAYERS,
         ALLBUTGROUP,
-        ALLBUTPETS;
+        ALLBUTPETS
     }
 
     public enum CastingModeType {
         NONE,
         COMBAT,
         NONCOMBAT,
-        BOTH;
+        BOTH
     }
 
     public enum TargetSelectType {
@@ -3196,7 +3212,7 @@ public class mbEnums {
         GROUP,
         GUILD,
         NEARBYMOBS,
-        NAME;
+        NAME
     }
 
     public enum CategoryToPowerType {