From 3f07e68952b60bc284b0301c6885ebcab447cc22 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 15:42:12 +0200 Subject: [PATCH] Fix #1071 Butterflies spread out of control --- lang | 2 +- .../PluginLepidopterology.java | 2 ++ .../entities/AIButterflyGoHome.java | 32 +++++++++++++++++++ .../entities/AIButterflyWander.java | 1 - .../entities/EntityButterfly.java | 1 + 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/main/java/forestry/lepidopterology/entities/AIButterflyGoHome.java diff --git a/lang b/lang index a31d99f6f..6a30635d3 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit a31d99f6f669e6eb1891c547674d19a1e4204368 +Subproject commit 6a30635d3f2e548825953fbdfdcd646e953c620b diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index f174fe253..69d791966 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -79,6 +79,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { private static final String CONFIG_CATEGORY = "lepidopterology"; public static int spawnConstraint = 100; public static int entityConstraint = 1000; + public static int maxDistance = 1600; private static boolean allowPollination = true; public static final Map spawnRaritys = Maps.newHashMap(); private static boolean spawnButterflysFromLeaves = true; @@ -172,6 +173,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { spawnConstraint = config.getIntLocalized("butterfly.entities", "spawn.limit", spawnConstraint, 0, 500); entityConstraint = config.getIntLocalized("butterfly.entities", "maximum", entityConstraint, 0, 5000); + maxDistance = config.getIntLocalized("butterfly.entities", "maxDistance", maxDistance, 0, 1600); allowPollination = config.getBooleanLocalized("butterfly.entities", "pollination", allowPollination); spawnButterflysFromLeaves = config.getBooleanLocalized("butterfly.entities", "spawn.leaves", spawnButterflysFromLeaves); diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyGoHome.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyGoHome.java new file mode 100644 index 000000000..7a12e99b6 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyGoHome.java @@ -0,0 +1,32 @@ +package forestry.lepidopterology.entities; + +import forestry.lepidopterology.PluginLepidopterology; +import net.minecraft.util.math.Vec3d; + +public class AIButterflyGoHome extends AIButterflyMovement { + + public AIButterflyGoHome(EntityButterfly entity) { + super(entity); + setMutexBits(1); + } + + @Override + public boolean shouldExecute() { + if (PluginLepidopterology.maxDistance > entity.getDistanceSqToCenter(entity.getHomePosition())) { + return false; + } + + flightTarget = new Vec3d(entity.getHomePosition()); + if (flightTarget == null) { + if (entity.getState().doesMovement) { + entity.setState(EnumButterflyState.HOVER); + } + return false; + } + + entity.setDestination(flightTarget); + entity.setState(EnumButterflyState.FLYING); + return true; + } + +} diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java index d99eda4ad..fabe80229 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java @@ -19,7 +19,6 @@ public class AIButterflyWander extends AIButterflyMovement { @Override public boolean shouldExecute() { - if (entity.getDestination() != null) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 52dbf19d6..e6f0a9550 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -119,6 +119,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly tasks.addTask(11, new AIButterflyRest(this)); tasks.addTask(12, new AIButterflyRise(this)); tasks.addTask(12, new AIButterflyWander(this)); + tasks.addTask(13, new AIButterflyGoHome(this)); } @Override