diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 685c3c9fb..6274beac9 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -36,7 +36,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { // Breeding private int breedingTime; private final int totalBreedingTime = Defaults.APIARY_BREEDING_TIME; - private int throttle; + private int queenWorkCycleThrottle; private IEffectData effectData[] = new IEffectData[2]; private IBee queen; private IIndividual pollen; @@ -51,7 +51,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void readFromNBT(NBTTagCompound nbttagcompound) { breedingTime = nbttagcompound.getInteger("BreedingTime"); - throttle = nbttagcompound.getInteger("Throttle"); + queenWorkCycleThrottle = nbttagcompound.getInteger("Throttle"); NBTTagList nbttaglist = nbttagcompound.getTagList("Offspring", 10); for (int i = 0; i < nbttaglist.tagCount(); i++) { @@ -63,7 +63,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("BreedingTime", breedingTime); - nbttagcompound.setInteger("Throttle", throttle); + nbttagcompound.setInteger("Throttle", queenWorkCycleThrottle); Stack spawnCopy = new Stack(); spawnCopy.addAll(spawn); @@ -107,116 +107,151 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void update() { - resetQueen(null); + this.queen = null; - // Still something to spawn, try it - while (!spawn.isEmpty()) { - ItemStack next = spawn.peek(); - if (housing.addProduct(next, true)) { - spawn.pop(); - housing.setErrorState(EnumErrorCode.OK.ordinal()); - } else - housing.setErrorState(EnumErrorCode.NOSPACE.ordinal()); + if (!didSpawnPendingProducts()) { + return; + } + + if (tryBreedingPrincess() || !hasHealthyQueen()) { + return; + } + + if (!queenCanWork()) { return; } - // No queen? And no princess? - if (housing.getQueen() == null) { - housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); - return; - } + queenWorkTick(); - // Princess available? Try to breed! - if (ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) { - if (ForestryItem.beeDroneGE.isItemEqual(housing.getDrone())) - housing.setErrorState(EnumErrorCode.OK.ordinal()); - else - housing.setErrorState(EnumErrorCode.NODRONE.ordinal()); - tickBreed(); - return; - } - - // Can't continue if an item of the wrong type is in the queen slot. - if (!ForestryItem.beeQueenGE.isItemEqual(housing.getQueen())) { - housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); - return; - } - - IBee queen = PluginApiculture.beeInterface.getMember(housing.getQueen()); - // Kill dying queens - if (!queen.isAlive()) { - killQueen(queen); - housing.setErrorState(EnumErrorCode.OK.ordinal()); - return; - } - - resetQueen(queen); - - // Not while raining, at night or without light - EnumErrorCode state = EnumErrorCode.values()[queen.isWorking(housing)]; - if (state != EnumErrorCode.OK) { - housing.setErrorState(state.ordinal()); - return; - } else if (housing.getErrorOrdinal() != EnumErrorCode.NOFLOWER.ordinal()) - housing.setErrorState(EnumErrorCode.OK.ordinal()); + return; + } + private void queenWorkTick() { // Effects only fire when queen can work. effectData = queen.doEffect(effectData, housing); - // We have a queen, work! - throttle++; - - if (throttle >= PluginApiculture.beeCycleTicks) - throttle = 0; - else - return; - - // Need a flower - if (!queen.hasFlower(housing)) { - housing.setErrorState(EnumErrorCode.NOFLOWER.ordinal()); - return; - } else - housing.setErrorState(EnumErrorCode.OK.ordinal()); + // Work cycles are throttled, rather than occurring every game tick. + queenWorkCycleThrottle++; + if (queenWorkCycleThrottle >= PluginApiculture.ticksPerBeeWorkCycle) { + queenWorkCycleThrottle = 0; + + // Need a flower + if (queen.hasFlower(housing)) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + doQueenWorkCycle(); + } else { + housing.setErrorState(EnumErrorCode.NOFLOWER.ordinal()); + } + } + } + + private void doQueenWorkCycle() { + doProduction(); + queen.plantFlowerRandom(housing); + doPollination(); + // Age the queen + queen.age(housing.getWorld(), housing.getLifespanModifier(queen.getGenome(), queen.getMate(), 0f)); + updateQueenItemNBT(); + } + private void doProduction() { // Produce and add stacks ItemStack[] products = queen.produceStacks(housing); housing.wearOutEquipment(1); for (ItemStack stack : products) { housing.addProduct(stack, false); } + } - // Plant a flower - queen.plantFlowerRandom(housing); + private void doPollination() { // Get pollen if none available yet if (pollen == null) { pollen = queen.retrievePollen(housing); attemptedPollinations = 0; if (pollen != null) { - if (housing.onPollenRetrieved(queen, pollen, false)) + if (housing.onPollenRetrieved(queen, pollen, false)) { pollen = null; + } } } if (pollen != null) { attemptedPollinations++; - if (queen.pollinateRandom(housing, pollen) - || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) { + if (queen.pollinateRandom(housing, pollen) || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) { pollen = null; } } + } - // Age the queen - queen.age(housing.getWorld(), housing.getLifespanModifier(queen.getGenome(), queen.getMate(), 0f)); - + private void updateQueenItemNBT() { // Write the changed queen back into the item stack. NBTTagCompound nbttagcompound = new NBTTagCompound(); queen.writeToNBT(nbttagcompound); housing.getQueen().setTagCompound(nbttagcompound); - - return; } - private void resetQueen(IBee bee) { - this.queen = bee; + private boolean didSpawnPendingProducts() { + boolean didSpawnItem = true; + while (!spawn.isEmpty()) { + ItemStack next = spawn.peek(); + if (housing.addProduct(next, true)) { + spawn.pop(); + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } else { + housing.setErrorState(EnumErrorCode.NOSPACE.ordinal()); + didSpawnItem = false; + } + } + return didSpawnItem; + } + + private boolean hasHealthyQueen() { + boolean hasQueen = true; + + if (housing.getQueen() == null || !ForestryItem.beeQueenGE.isItemEqual(housing.getQueen())) { + housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); + hasQueen = false; + } else { + IBee queen = PluginApiculture.beeInterface.getMember(housing.getQueen()); + // Kill dying queens + if (!queen.isAlive()) { + killQueen(queen); + housing.setErrorState(EnumErrorCode.OK.ordinal()); + hasQueen = false; + } else { + this.queen = queen; + } + } + return hasQueen; + } + + private boolean tryBreedingPrincess() { + boolean isBreedingPrincess = false; + + // Princess available? Try to breed! + if (ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) { + if (ForestryItem.beeDroneGE.isItemEqual(housing.getDrone())) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } else { + housing.setErrorState(EnumErrorCode.NODRONE.ordinal()); + } + tickBreed(); + isBreedingPrincess = true; + } + + return isBreedingPrincess; + } + + private boolean queenCanWork() { + boolean canWork = true; + // Not while raining, at night or without light + EnumErrorCode state = EnumErrorCode.values()[queen.isWorking(housing)]; + if (state != EnumErrorCode.OK) { + housing.setErrorState(state.ordinal()); + canWork = false; + } else if (housing.getErrorOrdinal() != EnumErrorCode.NOFLOWER.ordinal()) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } + return canWork; } // / BREEDING diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 101cafe47..6b555b59d 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -167,7 +167,7 @@ public class PluginApiculture extends ForestryPlugin { private static final String CONFIG_CATEGORY = "apiculture"; private Configuration apicultureConfig; public static String beekeepingMode = "NORMAL"; - public static int beeCycleTicks = 550; + public static int ticksPerBeeWorkCycle = 550; public static boolean apiarySideSensitive = false; public static boolean fancyRenderedBees = false; public static Trigger triggerNoFrames;