Fix raider fleeing speed reseach amplifier (#11407)

Fix chief sword group speed ability cooldown and difficulty selection
Little bit of constants cleanup

Author: someaddons

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/fleeingspeedaddition.json

@@ -1,9 +1,9 @@
 {
   "effect": true,
   "levels": [
+    0.0,
     1.0,
     2.0,
-    3.0,
-    5.0
+    3.0
   ]
 }

src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityMinecoloniesMonster.java

@@ -38,7 +38,7 @@
 import static com.minecolonies.api.entity.citizen.AbstractEntityCitizen.ENTITY_AI_TICKRATE;
 import static com.minecolonies.api.entity.mobs.RaiderMobUtils.MOB_ATTACK_DAMAGE;
 import static com.minecolonies.api.util.constant.NbtTagConstants.TAG_SPAWN_POS;
-import static com.minecolonies.api.util.constant.RaiderConstants.*;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.*;
 
 /**
  * Abstract for all villain entities.

src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityMinecoloniesRaider.java

@@ -36,7 +36,7 @@
 
 import static com.minecolonies.api.util.constant.ColonyManagerConstants.NO_COLONY_ID;
 import static com.minecolonies.api.util.constant.NbtTagConstants.*;
-import static com.minecolonies.api.util.constant.RaiderConstants.*;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.*;
 
 /**
  * Abstract for all raider entities.
@@ -86,7 +86,7 @@ public abstract class AbstractEntityMinecoloniesRaider extends AbstractEntityMin
     /**
      * Current count of ticks.
      */
-    private int currentCount = 0;
+    private int chiefSpeedCooldown = 0;
 
     /**
      * The world time when the barbarian spawns.
@@ -118,11 +118,6 @@ public abstract class AbstractEntityMinecoloniesRaider extends AbstractEntityMin
      */
     private int envDmgCooldown = 0;
 
-    /**
-     * Environmental damage immunity
-     */
-    private boolean envDamageImmunity = false;
-
     /**
      * Temporary Environmental damage immunity shortly after spawning.
      */
@@ -302,9 +297,8 @@ public void aiStep()
             return;
         }
 
-        if (currentTick % (random.nextInt(EVERY_X_TICKS) + 1) == 0)
+        if (++currentTick % (random.nextInt(EVERY_X_TICKS) + 1) == 0)
         {
-
             if (worldTimeAtSpawn == 0)
             {
                 worldTimeAtSpawn = level().getGameTime();
@@ -331,24 +325,23 @@ public void aiStep()
                 registerWithColony();
             }
 
-            if (currentCount <= 0)
+            if (--chiefSpeedCooldown <= 0)
             {
-                currentCount = COUNTDOWN_SECOND_MULTIPLIER * TIME_TO_COUNTDOWN;
+                chiefSpeedCooldown = TIME_TO_COUNTDOWN;
 
-                if (!this.getMainHandItem().isEmpty() && SPEED_EFFECT != null && this.getMainHandItem().getItem() instanceof IChiefSwordItem
-                      && MinecoloniesAPIProxy.getInstance().getConfig().getServer().raidDifficulty.get() >= BARBARIAN_HORDE_DIFFICULTY_FIVE)
+                if (!this.getMainHandItem().isEmpty() && this.getMainHandItem().getItem() instanceof IChiefSwordItem
+                    && difficulty > CHIEF_SWORD_SPEED_DIFFICULTY)
                 {
-                    RaiderMobUtils.getBarbariansCloseToEntity(this, SPEED_EFFECT_DISTANCE)
-                      .stream().filter(entity -> !entity.hasEffect(MobEffects.MOVEMENT_SPEED))
-                      .forEach(entity -> entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, SPEED_EFFECT_DURATION, SPEED_EFFECT_MULTIPLIER)));
+                    for (AbstractEntityMinecoloniesRaider entity : RaiderMobUtils.getBarbariansCloseToEntity(this, SPEED_EFFECT_DISTANCE))
+                    {
+                        if (!entity.hasEffect(MobEffects.MOVEMENT_SPEED))
+                        {
+                            entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, SPEED_EFFECT_DURATION, SPEED_EFFECT_MULTIPLIER));
+                        }
+                    }
                 }
             }
-            else
-            {
-                --currentCount;
-            }
         }
-        currentTick++;
 
         if (isRegistered)
         {
@@ -434,7 +427,7 @@ public boolean hurt(@NotNull final DamageSource damageSource, final float damage
     {
         if (!(damageSource.getEntity() instanceof LivingEntity) || damageSource.getEntity() instanceof FakePlayer)
         {
-            if (envDamageImmunity || tempEnvDamageImmunity)
+            if (tempEnvDamageImmunity)
             {
                 return false;
             }

src/main/java/com/minecolonies/api/entity/mobs/RaiderMobUtils.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Random;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.*;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.*;
 
 /**
  * Util class for raider mobs/spawning

src/main/java/com/minecolonies/api/entity/mobs/amazons/AbstractEntityAmazon.java

@@ -8,8 +8,8 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all amazon entities.

src/main/java/com/minecolonies/api/entity/mobs/amazons/AbstractEntityAmazonRaider.java

@@ -8,8 +8,8 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all amazon entities.

src/main/java/com/minecolonies/api/entity/mobs/barbarians/AbstractEntityBarbarian.java

@@ -6,8 +6,8 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all Barbarian entities.

src/main/java/com/minecolonies/api/entity/mobs/barbarians/AbstractEntityBarbarianRaider.java

@@ -6,8 +6,8 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all Barbarian entities.

src/main/java/com/minecolonies/api/entity/mobs/drownedpirate/AbstractDrownedEntityPirate.java

@@ -14,8 +14,8 @@
 import net.minecraft.world.level.LevelReader;
 import org.jetbrains.annotations.NotNull;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all drowned pirate entities.

src/main/java/com/minecolonies/api/entity/mobs/drownedpirate/AbstractDrownedEntityPirateRaider.java

@@ -14,8 +14,8 @@
 import net.minecraft.world.level.LevelReader;
 import org.jetbrains.annotations.NotNull;
 
-import static com.minecolonies.api.util.constant.RaiderConstants.ONE;
-import static com.minecolonies.api.util.constant.RaiderConstants.OUT_OF_ONE_HUNDRED;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.ONE;
+import static com.minecolonies.core.colony.events.raid.RaiderConstants.OUT_OF_ONE_HUNDRED;
 
 /**
  * Abstract for all drowned pirate entities.