diff --git a/src/main/java/forestry/core/render/TextureManagerForestry.java b/src/main/java/forestry/core/render/TextureManagerForestry.java index 3525e5a86..1acc1174e 100644 --- a/src/main/java/forestry/core/render/TextureManagerForestry.java +++ b/src/main/java/forestry/core/render/TextureManagerForestry.java @@ -58,7 +58,7 @@ public class TextureManagerForestry implements ITextureManager { "analyzer/item", "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave", "analyzer/pure_flyer", "analyzer/pure_nocturnal", "analyzer/queen", "errors/errored", "errors/unknown", - "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", + "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "slots/cocoon", "mail/carrier.player", "mail/carrier.trader"}; for (String identifier : defaultIconNames) { ResourceLocation resourceLocation = getForestryGuiLocation(identifier); diff --git a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseNursery.java b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseNursery.java index 08c869932..a4e6eb094 100644 --- a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseNursery.java +++ b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseNursery.java @@ -15,7 +15,7 @@ import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.gui.slots.SlotWorking; import forestry.core.network.packets.PacketGuiUpdate; -import forestry.greenhouse.inventory.InventoryGreenhouseNursery; +import forestry.greenhouse.inventory.InventoryNursery; import forestry.greenhouse.tiles.TileGreenhouseNursery; import net.minecraft.entity.player.InventoryPlayer; @@ -27,17 +27,17 @@ public class ContainerGreenhouseNursery extends ContainerTile { +public class InventoryNursery extends InventoryAdapterTile { public static final short SLOT_WORK = 0; public static final short SLOT_OUTPUT_1 = 1; @@ -26,7 +26,7 @@ public class InventoryGreenhouseNursery extends InventoryAdapterTile 4) { - errorLogic.setCondition(true, EnumErrorCode.NO_POWER); - } - } - } - if (workCounter >= ticksPerWorkCycle) { if (workCycle()) { workCounter = 0; @@ -147,58 +132,74 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse } protected boolean canWork(){ - IErrorLogic errorLogic = getErrorLogic(); - Integer inputSlotIndex = getInputSlotIndex(); - boolean hasCocoon = inputSlotIndex != null || !getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK).isEmpty(); + moveCocoonToWorkSlot(); + ItemStack butterflyItem = getButterflyItem(); + boolean hasCocoon = !butterflyItem.isEmpty(); - errorLogic.setCondition(!hasCocoon, EnumErrorCode.NO_RESOURCE_INVENTORY); - if(butterfly == null && hasCocoon){ - ItemStack stack = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); - butterfly = ButterflyManager.butterflyRoot.getMember(stack); - if(butterfly == null){ - setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); - errorLogic.setCondition(true, EnumErrorCode.NO_RESOURCE_INVENTORY); + errorHandler.setCondition(!hasCocoon, EnumErrorCode.NO_RESOURCE_INVENTORY); + if(butterfly == null){ + butterfly = ButterflyManager.butterflyRoot.getMember(butterflyItem); + if(!butterflyItem.isEmpty() && butterfly == null){ + setInventorySlotContents(InventoryNursery.SLOT_WORK, ItemStack.EMPTY); + errorHandler.setCondition(true, EnumErrorCode.NO_RESOURCE_INVENTORY); return false; } } - if(canSpawnButterfly()){ - Set queenErrors = butterfly.getCanSpawn(this, null); - for (IErrorState errorState : queenErrors) { - errorLogic.setCondition(true, errorState); + + int ticksPerWorkCycle = getTicksPerWorkCycle(); + + if (workCounter < ticksPerWorkCycle) { + EnergyManager energyManager = getMultiblockLogic().getController().getEnergyManager(); + if(energyManager == null){ + return false; } - }else{ - Set queenErrors = butterfly.getCanGrow(this, null); - for (IErrorState errorState : queenErrors) { - errorLogic.setCondition(true, errorState); + + int energyPerWorkCycle = getEnergyPerWorkCycle(); + + boolean consumedEnergy = EnergyHelper.consumeEnergyToDoWork(energyManager, ticksPerWorkCycle, energyPerWorkCycle); + if (consumedEnergy) { + errorHandler.setCondition(false, EnumErrorCode.NO_POWER); + workCounter++; + noPowerTime = 0; + if(workCounter >= ticksPerWorkCycle){ + butterflyCanSpawnCache.clear(); + } + } else { + noPowerTime++; + if (noPowerTime > 4) { + errorHandler.setCondition(true, EnumErrorCode.NO_POWER); + } } } - return !errorLogic.hasErrors(); + + if(butterfly == null){ + return hasCocoon; + } + Set butterflyErrors = butterflyCanSpawnCache.butterflyCanSpawn(butterfly, this); + for (IErrorState errorState : butterflyErrors) { + errorHandler.setCondition(true, errorState); + } + return !errorHandler.hasErrors(); } protected boolean workCycle(){ - moveCocoonToWorkSlot(); if(butterfly != null){ if(canSpawnButterfly()){ IGreenhouseControllerInternal controller = getMultiblockLogic().getController(); if(controller.spawnButterfly(this)){ - setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, ItemStack.EMPTY); + setInventorySlotContents(InventoryNursery.SLOT_WORK, ItemStack.EMPTY); setTicksPerWorkCycle(1); setEnergyPerWorkCycle(0); butterfly = null; - cocoon = null; + butterflyCanSpawnCache.clear(); } return false; } else { - ItemStack stack = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); + ItemStack stack = getButterflyItem(); int age = getAge(); - IButterflyGenome genome = butterfly.getGenome(); - float matureTime = genome.getLifespan() / (genome.getFertility() * 2); - matureTime*=MATURE_TIME_MULTIPLIER; - int caterpillarMatureTime = Math.round(matureTime); - if(workCounter > 4){ - age++; - ItemButterflyGE.setAge(stack, age); - } + int caterpillarMatureTime = getCaterpillarMatureTime(); + age++; + ItemButterflyGE.setAge(stack, age); setTicksPerWorkCycle(caterpillarMatureTime); setEnergyPerWorkCycle(ENERGY_PER_WORK_CYCLE); } @@ -206,13 +207,20 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse return true; } - private boolean canSpawnButterfly(){ + public boolean canSpawnButterfly(){ int age = getAge(); return age > 2 && butterfly != null; } + private int getCaterpillarMatureTime(){ + IButterflyGenome genome = butterfly.getGenome(); + float matureTime = genome.getLifespan() / (genome.getFertility() * 2); + matureTime*=MATURE_TIME_MULTIPLIER; + return Math.round(matureTime); + } + private void moveCocoonToWorkSlot() { - if (!getStackInSlot(InventoryAnalyzer.SLOT_ANALYZE).isEmpty()) { + if (!getStackInSlot(InventoryNursery.SLOT_WORK).isEmpty()) { return; } @@ -229,25 +237,33 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse ItemStack stack = inputStack.copy(); stack.setCount(1); inputStack.shrink(1); - setInventorySlotContents(InventoryGreenhouseNursery.SLOT_WORK, stack); + setInventorySlotContents(InventoryNursery.SLOT_WORK, stack); if(inputStack.isEmpty()){ inventory.setInventorySlotContents(slotIndex, ItemStack.EMPTY); } + butterfly = ButterflyManager.butterflyRoot.getMember(stack); + int caterpillarMatureTime = getCaterpillarMatureTime(); + setTicksPerWorkCycle(caterpillarMatureTime); + setEnergyPerWorkCycle(ENERGY_PER_WORK_CYCLE); } @Nullable private Integer getInputSlotIndex() { - for (int slotIndex = 0; slotIndex < InventoryGreenhouseNursery.SLOT_INPUT_COUNT; slotIndex++) { - ItemStack inputStack = inventory.getStackInSlot(InventoryGreenhouseNursery.SLOT_INPUT_1 + slotIndex); + for (int slotIndex = 0; slotIndex < InventoryNursery.SLOT_INPUT_COUNT; slotIndex++) { + ItemStack inputStack = inventory.getStackInSlot(InventoryNursery.SLOT_INPUT_1 + slotIndex); if (!inputStack.isEmpty()) { - return InventoryGreenhouseNursery.SLOT_INPUT_1 + slotIndex; + return InventoryNursery.SLOT_INPUT_1 + slotIndex; } } return null; } + private ItemStack getButterflyItem(){ + return getStackInSlot(InventoryNursery.SLOT_WORK); + } + public int getAge(){ - ItemStack cocoon = getStackInSlot(InventoryGreenhouseNursery.SLOT_WORK); + ItemStack cocoon = getButterflyItem(); if(cocoon.isEmpty() || !cocoon.hasTagCompound()){ return -1; } @@ -298,7 +314,7 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse @Override public void addCocoonLoot(IButterflyCocoon cocoon, NonNullList cocoonDrops) { for (ItemStack drop : cocoonDrops) { - InventoryUtil.tryAddStack(this, drop, InventoryGreenhouseNursery.SLOT_OUTPUT_1, InventoryGreenhouseNursery.SLOT_OUTPUT_COUNT, true); + InventoryUtil.tryAddStack(this, drop, InventoryNursery.SLOT_OUTPUT_1, InventoryNursery.SLOT_OUTPUT_COUNT, true); } } @@ -330,6 +346,7 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse return butterfly; } + @Nullable @Override public IIndividual getNanny() { return null; @@ -359,4 +376,41 @@ public class TileGreenhouseNursery extends TileGreenhouse implements IGreenhouse return EnumHumidity.getFromValue(ClimateUtil.getHumidity(world, pos)); } + @Override + public float getExactHumidity() { + return ClimateUtil.getHumidity(world, pos); + } + + @Override + public float getExactTemperature() { + return ClimateUtil.getTemperature(world, pos); + } + + private static class ButterflyCanSpawnCache { + private static final int ticksPerCheckButterflyCanSpawn = 10; + + private Set butterflyCanSpawnCached = Collections.emptySet(); + private int butterflzCanSpawnCooldown = 0; + + public Set butterflyCanSpawn(IButterfly butterfly, TileGreenhouseNursery nursery) { + if (butterflzCanSpawnCooldown <= 0) { + if(nursery.canSpawnButterfly()){ + butterflyCanSpawnCached = butterfly.getCanSpawn(nursery, null); + }else{ + butterflyCanSpawnCached = butterfly.getCanGrow(nursery, null); + } + butterflzCanSpawnCooldown = ticksPerCheckButterflyCanSpawn; + } else { + butterflzCanSpawnCooldown--; + } + + return butterflyCanSpawnCached; + } + + public void clear() { + butterflyCanSpawnCached.clear(); + butterflzCanSpawnCooldown = 0; + } + } + } diff --git a/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png b/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png index 972e1c6e3..46aa8de53 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png and b/src/main/resources/assets/forestry/textures/blocks/bee_combs.0.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png b/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png index 463be91fc..167c90fca 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png and b/src/main/resources/assets/forestry/textures/blocks/bee_combs.1.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/beeswax.png b/src/main/resources/assets/forestry/textures/blocks/beeswax.png index 6dcfd24b9..22e47f325 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/beeswax.png and b/src/main/resources/assets/forestry/textures/blocks/beeswax.png differ diff --git a/src/main/resources/assets/forestry/textures/gui/slots/cocoon.png b/src/main/resources/assets/forestry/textures/gui/slots/cocoon.png index e04488fe7..3122df8e8 100644 Binary files a/src/main/resources/assets/forestry/textures/gui/slots/cocoon.png and b/src/main/resources/assets/forestry/textures/gui/slots/cocoon.png differ