build for mythicmobs 4.8.0

BerndiVader · Sep 17, 2019 · 9402edc · 9402edc
1 parent 28cb897
commit 9402edc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,12 +37,12 @@ dependencies {
     compileOnly  ("com.sk89q:worldedit:6.1")
     compileOnly  ("com.sk89q:worldguard:6.2.1")
     compileOnly  ("fr.neatmonster:nocheatplus:+")
-    compileOnly  ("io.lumine.xikage:mythicmobs:+")
     compileOnly  ("me.blackvein:quests:+")
     compileOnly  ("me.libraryaddict:disguise:+")
     compileOnly  ("net.citizensnpcs:citizens:+")
     compileOnly  ("think:rpgitems:+")
     compileOnly  group: "me.clip", name: "placeholderapi" ,version: "+"
+	compile files('MythicMobs-4.8.0-20190912.065405-45.jar')
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-#Tue Sep 17 19:46:08 CEST 2019
+#Tue Sep 17 20:51:48 CEST 2019
 appName=MythicMobsExtension
-artbuild=3807
+artbuild=3813
 artver=1.440-SNAPSHOT
diff --git a/src/main/java/com/gmail/berndivader/mythicmobsext/conditions/AbstractCustomCondition.java b/src/main/java/com/gmail/berndivader/mythicmobsext/conditions/AbstractCustomCondition.java
@@ -3,6 +3,7 @@
 import io.lumine.xikage.mythicmobs.io.MythicLineConfig;
 import io.lumine.xikage.mythicmobs.skills.SkillCondition;
 import io.lumine.xikage.mythicmobs.skills.conditions.ConditionAction;
+import io.lumine.xikage.mythicmobs.skills.placeholders.parsers.PlaceholderString;
 
 public 
 class
@@ -29,7 +30,7 @@ public AbstractCustomCondition(String line, MythicLineConfig mlc) {
 		}
 		try {
 			this.ACTION = ConditionAction.valueOf(action.toUpperCase());
-			this.actionVar=actionVar;
+			this.actionVar=new PlaceholderString(actionVar);
 		} catch (Exception ex) {
 			this.ACTION = ConditionAction.TRUE;
 		}

diff --git a/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_12_R1/Core.java b/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_12_R1/Core.java
@@ -459,7 +459,7 @@ public void aiTargetSelector(LivingEntity entity,String uGoal,LivingEntity targe
 	        default:
 	        	List<String>gList=new ArrayList<String>();
 	        	gList.add(uGoal);
-	        	Utils.mythicmobs.getVolatileCodeHandler().aiTargetSelectorHandler(entity, gList);
+	        	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addTargetGoals(entity, gList);
 	        }
 
 		} catch (Exception e1) {
@@ -744,7 +744,7 @@ public void aiPathfinderGoal(LivingEntity entity, String uGoal, LivingEntity tar
            	} else {
                	List<String>gList=new ArrayList<String>();
                	gList.add(uGoal);
-               	Utils.mythicmobs.getVolatileCodeHandler().aiGoalSelectorHandler(entity,gList);
+               	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addPathfinderGoals(entity,gList);
            	}
         } else {
             if(i>-1) {

diff --git a/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_13_R2/Core.java b/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_13_R2/Core.java
@@ -433,7 +433,7 @@ public void aiTargetSelector(LivingEntity entity,String uGoal,LivingEntity targe
 	        default:
 	        	List<String>gList=new ArrayList<String>();
 	        	gList.add(uGoal);
-	        	Utils.mythicmobs.getVolatileCodeHandler().aiTargetSelectorHandler(entity, gList);
+	        	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addTargetGoals(entity, gList);
 	        }
 
 		} catch (Exception e1) {
@@ -709,7 +709,7 @@ public void aiPathfinderGoal(LivingEntity entity, String uGoal, LivingEntity tar
            	} else {
                	List<String>gList=new ArrayList<String>();
                	gList.add(uGoal);
-               	Utils.mythicmobs.getVolatileCodeHandler().aiGoalSelectorHandler(entity,gList);
+               	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addPathfinderGoals(entity,gList);
            	}
         } else {
             if(i>-1) {

diff --git a/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_14_R1/Core.java b/src/main/java/com/gmail/berndivader/mythicmobsext/volatilecode/v1_14_R1/Core.java
@@ -431,7 +431,7 @@ public void aiTargetSelector(LivingEntity entity,String uGoal,LivingEntity targe
 	        default:
 	        	List<String>gList=new ArrayList<String>();
 	        	gList.add(uGoal);
-	        	Utils.mythicmobs.getVolatileCodeHandler().aiTargetSelectorHandler(entity, gList);
+	        	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addTargetGoals(entity, gList);
 	        }
 
 		} catch (Exception e1) {
@@ -707,7 +707,7 @@ public void aiPathfinderGoal(LivingEntity entity, String uGoal, LivingEntity tar
            	} else {
                	List<String>gList=new ArrayList<String>();
                	gList.add(uGoal);
-               	Utils.mythicmobs.getVolatileCodeHandler().aiGoalSelectorHandler(entity,gList);
+               	Utils.mythicmobs.getVolatileCodeHandler().getAIHandler().addPathfinderGoals(entity,gList);
            	}
         } else {
             if(i>-1) {