[CHANGE] -fix #63 -fixed ocelots being attacked by creepers

Author: seymourimadeit

src/main/java/tallestegg/bigbrain/BigBrainConfig.java

@@ -104,12 +104,14 @@ public static class CommonConfig {
         public final ModConfigSpec.BooleanValue huskBurrowing;
         public final ModConfigSpec.BooleanValue babyNerf;
         public final ModConfigSpec.BooleanValue jumpAi;
+        public final ModConfigSpec.BooleanValue jumpOnlyIfTargeting;
         public final ModConfigSpec.BooleanValue armadilloShell;
         public final ModConfigSpec.DoubleValue pillagerSpyGlass;
         public final ModConfigSpec.IntValue minPigBabiesBred;
         public final ModConfigSpec.IntValue maxPigBabiesBred;
         public final ModConfigSpec.IntValue snowBallFreezingTime;
         public final ModConfigSpec.DoubleValue mobBlindnessVision;
+        public final ModConfigSpec.DoubleValue huskBurrowSpeed;
         public final ModConfigSpec.ConfigValue<List<? extends String>> MobBlackList;
         public final ModConfigSpec.ConfigValue<List<? extends String>> AnimalCoverWhiteList;
         public final ModConfigSpec.ConfigValue<List<? extends String>> NightCoverBlackList;
@@ -133,13 +135,15 @@ public CommonConfig(ModConfigSpec.Builder builder) {
             bowAiCloseRange = builder.define("Enable bow attacking mobs to shoot faster if the attacker is closer (deals less damage)", true);
             bowAiBlackList = builder.defineListAllowEmpty("Mobs that don't have the new bow ai", Lists.newArrayList(), () -> "", obj -> true);
             jumpAi = builder.define("Enable jumping ai", true);
+            jumpOnlyIfTargeting = builder.define("Jump only if a mob is actively targeting another mob", false);
             jumpWhiteList = builder.defineListAllowEmpty("List additional mobs that can also utilize jumping", Lists.newArrayList("guardvillagers:guard"), () -> "", obj -> true);
             jumpBlackList = builder.defineListAllowEmpty("Mobs that don't have the jumping ai", Lists.newArrayList("minecraft:villager"), () -> "", obj -> true);
             babyNerf = builder.define("Halve all health of baby mobs?", true);
-            babiesExemptFromNerf = builder.defineListAllowEmpty("Baby mobs exempt from above nerf if enabled", Lists.newArrayList("minecraft:villager", "minecraft:horse", "minecraft:donkey", "minecraft:bee", "minecraft:mule", "minecraft:cow", "minecraft:goat", "minecraft:mooshroom","minecraft:sheep","minecraft:pig","minecraft:chicken","minecraft:wolf","minecraft:cat","minecraft:ocelot","minecraft:axolotl","minecraft:llama","minecraft:rabbit","minecraft:turtle","minecraft:strider","minecraft:armadillo","minecraft:camel","minecraft:squid"), () -> "", obj -> true);
+            babiesExemptFromNerf = builder.defineListAllowEmpty("Baby mobs exempt from above nerf if enabled", Lists.newArrayList("minecraft:villager", "minecraft:horse", "minecraft:donkey", "minecraft:bee", "minecraft:mule", "minecraft:cow", "minecraft:goat", "minecraft:mooshroom", "minecraft:sheep", "minecraft:pig", "minecraft:chicken", "minecraft:wolf", "minecraft:cat", "minecraft:ocelot", "minecraft:axolotl", "minecraft:llama", "minecraft:rabbit", "minecraft:turtle", "minecraft:strider", "minecraft:armadillo", "minecraft:camel", "minecraft:squid"), () -> "", obj -> true);
             builder.pop();
             builder.push("husk");
             huskBurrowing = builder.define("Enable burrowing attack for husk?", true);
+            huskBurrowSpeed = builder.defineInRange("How fast the husk is able to burrow", 1.8D, -10000.0D, 10000.0D);
             builder.pop();
             builder.push("pillager");
             PillagerCover = builder.translation(BigBrain.MODID + ".config.pillagerCover").define("Have pillagers run while reloading?", true);
@@ -181,7 +185,7 @@ public CommonConfig(ModConfigSpec.Builder builder) {
     public static class ClientConfig {
         public final ModConfigSpec.BooleanValue bedrockBeeAnim;
         public final ModConfigSpec.BooleanValue drownedGlow;
-        
+
 
         public ClientConfig(ModConfigSpec.Builder builder) {
             builder.push("bedrock animations");

src/main/java/tallestegg/bigbrain/BigBrainEvents.java

@@ -307,8 +307,8 @@ public static void onTargetSet(LivingChangeTargetEvent event) {
             if (event.getOriginalAboutToBeSetTarget() != null)
                 piglin.getBrain().setMemory(MemoryModuleType.ANGRY_AT, event.getOriginalAboutToBeSetTarget().getUUID());
         }
-        if (event.getEntity() instanceof Creeper creeper && event.getOriginalAboutToBeSetTarget() instanceof Ocelot && event.getOriginalAboutToBeSetTarget() != null)
-            creeper.setTarget(null);
+        if (event.getEntity() instanceof Creeper && event.getOriginalAboutToBeSetTarget() != null && event.getOriginalAboutToBeSetTarget() instanceof Ocelot)
+            event.setNewAboutToBeSetTarget(null);
         if (event.getEntity() instanceof Pillager pillager) {
             if (pillager.getUseItem().getItem() instanceof SpyglassItem && pillager.isPatrolling() && event.getOriginalAboutToBeSetTarget() != null) {
                 pillager.setAggressive(true); // This needs to be done as pillagers patrolling stare at the player from

src/main/java/tallestegg/bigbrain/common/entity/ai/goals/HuskBurrowGoal.java

@@ -15,6 +15,7 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
+import tallestegg.bigbrain.BigBrainConfig;
 import tallestegg.bigbrain.common.capabilities.BigBrainCapabilities;
 
 import java.util.EnumSet;
@@ -95,7 +96,7 @@ public void tick() {
                 this.husk.setData(BigBrainCapabilities.BURROWING.get(), true);
                 this.phase = BurrowPhases.BURROW;
             } else if (this.phase == BurrowPhases.BURROW) {
-                this.husk.getNavigation().moveTo(target, 1.8D);
+                this.husk.getNavigation().moveTo(target, BigBrainConfig.COMMON.huskBurrowSpeed.get());
                 if (this.husk.isWithinMeleeAttackRange(target)) {
                     this.husk.getNavigation().stop();
                     this.husk.setPose(Pose.STANDING);

src/main/java/tallestegg/bigbrain/common/entity/ai/goals/ParkourGoal.java

@@ -11,6 +11,7 @@
 import net.minecraft.world.entity.ai.util.GoalUtils;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.phys.Vec3;
+import tallestegg.bigbrain.BigBrainConfig;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
@@ -45,11 +46,15 @@ public static <E extends Mob> boolean defaultAcceptableLandingSpot(E mob, BlockP
         return mob instanceof PathfinderMob && GoalUtils.isSolid((PathfinderMob) mob, blockpos);
     }
 
+    public boolean canJump() {
+        Path path = this.mob.getNavigation().getPath();
+        return this.mob.getNavigation().isInProgress() && path != null && !path.canReach() && (this.mob.level().getGameTime() - tryAgainTime > 100L);
+    }
+
     @Override
     public boolean canUse() {
         if (this.mob.getNavigation() != null && this.mob.onGround()) {
-            Path path = this.mob.getNavigation().getPath();
-            return this.mob.getNavigation().isInProgress() && path != null && !path.canReach() && (this.mob.level().getGameTime() - tryAgainTime > 100L);
+            return this.canJump() || (BigBrainConfig.COMMON.jumpOnlyIfTargeting.get() && mob.getTarget() != null && this.canJump());
         } else {
             return false;
         }

src/main/resources/assets/bigbrain/lang/en_us.json

@@ -46,5 +46,8 @@
   "bigbrain.configuration.armadillos": "Armadillos",
   "bigbrain.configuration.Enable bow attacking mobs to shoot faster if the attacker is closer (deals less damage)": "Enable bow attacking mobs to shoot faster if the attacker is closer (deals less damage)",
   "bigbrain.configuration.Halve all health of baby mobs?": "Halve all health of baby mobs",
-  "bigbrain.configuration.Baby mobs exempt from above nerf if enabled": "Baby mobs exempt from above nerf if enabled"
+  "bigbrain.configuration.Baby mobs exempt from above nerf if enabled": "Baby mobs exempt from above nerf if enabled",
+  "bigbrain.configuration.Jump only if a mob is actively targeting another mob": "Jump only if a mob is actively targeting another mob",
+  "bigbrain.configuration.How fast the husk is able to burrow": "How fast the husk is able to burrow",
+  "bigbrain.configuration.Each snowball will add up this amount of freezing time": "Each snowball will add up this amount of freezing tim"
 }