From bab3479cdebbd08ac61824a8c71a6928246a7b4f Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 7 Apr 2017 17:45:45 +0200 Subject: [PATCH] Add Cache to greenhouse nursery and clean up --- .../core/render/TextureManagerForestry.java | 2 +- .../gui/ContainerGreenhouseNursery.java | 10 +- .../greenhouse/gui/GuiGreenhouseNursery.java | 4 +- ...ouseNursery.java => InventoryNursery.java} | 4 +- .../multiblock/GreenhouseController.java | 1 - .../tiles/TileGreenhouseNursery.java | 192 +++++++++++------- .../forestry/textures/blocks/bee_combs.0.png | Bin 287 -> 232 bytes .../forestry/textures/blocks/bee_combs.1.png | Bin 274 -> 208 bytes .../forestry/textures/blocks/beeswax.png | Bin 444 -> 420 bytes .../forestry/textures/gui/slots/cocoon.png | Bin 219 -> 186 bytes 10 files changed, 133 insertions(+), 80 deletions(-) rename src/main/java/forestry/greenhouse/inventory/{InventoryGreenhouseNursery.java => InventoryNursery.java} (91%) 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 972e1c6e3b94c67a4511b2da8ca4eb91d5f5f9bd..46aa8de53f5ddcef7cc56be0d081e3866a06d5a5 100644 GIT binary patch delta 184 zcmV;p07w6y0_XvdBo78+OGiWi{{a60|De66laW3ce+P6)O+^Rc1P2c*0duf+JOBUy zbxA})R5;76(@P4#APfZ1(JOk+IZ?dJbd}OdTEBsSJX|;-!puZc06CqKdq=GZ99H_2rn!9eG~K{qo%isW+^tJs8bB mvpF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0FOyT zK~y+TmC}I?gD?;SK=$7y6J?kbn>Q+tO{t}b_YtHZ*yfyTjC`@SJ-DK4Iq${+prC6N zG0Dy$ZTM*@h&!VE$%uNmZ+>G8idGTx%KmxC`Rz0IcljSoW2OqdcAu0d>002ov JPDHLkV1n>{Xc_DBMpl#vEK{Zfm-~V#py>~eW+2xkM^8`A$yPXc`L2&>8 O002ov22Mn-LSTX!-$vE| delta 246 zcmcb>IEiV3NGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YL$r9IylHmNblJdl&REC1Y%)Ao4ywnl}6FmbxLt_)>=qjM1CQlc~5DWj_Q-NYk zh8#yPysN*=W%xGY_Z;J&P29=fR>^FiB!A6dvPZts%Ppo7;*;~vmg>vSld`QnR>!~h z{F3O~)A&}zcq(-+@n;V?x$6bz+YZT>a#udD2vw-*#VY uCVMDl-rQEw;HmQW@6!i6rvBMvcuym%ZUW~4nTJ5Z&RKi3cygH;`@(p0ASmuDnD>bLKA?>%wPZm z(5*{ENwOPYo#JxysxK`vG_SwLjcUl^UhBNW7_V{TG%zGfsygvsf5muxU^g)B1muTb z_ja@gsFb?+0MA2_q1)(QmWcS|{rM;oIE`m7%STWFX!`?n z>nPaM`$*}02BI^kCVzpPo5ty`sY)q~)9FL^pR96jhcE=RNz`aL@dBXi38Z3hX^+@C(@5~;!ikQH;SLHBbKaXvr7suSS#f)_W?xyO=a+d$NK z45!|ckp)K)WY V&k=v4U^oB(002ovPDHLkV1gdcvYh|` delta 397 zcmV;80doGN1H1!}BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%m=8FWQhbW?9; zba!ELWdLwtX>N2bZe?^JG%heMF*7s+TY3Nh0W3*GK~y+Tb&^qT!Y~j-x&J{b75FYv zNoWxyBK;@9abj;m57Jo=Y}`tfo{$~Svv*gl=6ge?`6AQh{{02gwvKX+;WKfXq?)Ax zD#%n3I7v%ee;oae4B-QRgm~(^%|pNiOg{vFG$F*A;2jlE22@Muf<>7IZM#+h&siEW z(*Ml!rKyxMx{TpG_(gfSyp$BOw;7aW;6Y?}kO-mYR*5!W=dRqj-1}In$X5!a% z+Jmml$%Q`-NKH!>#$`&(BpcX!>YFphhqeZNNm=3pIt$%_F_ajy#K r1H(db%5{6YZ2;ztH40e37If<$gEf4P0#q4T00000NkvXXu0mjfLNukS 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 e04488fe7a90d61b861ffb5617e2f5db32c39340..3122df8e8a4ce0062aefce43f63ed4abd5c21574 100644 GIT binary patch delta 158 zcmcc3xQlUuNEu8E|JyUGHgq;RIY={0NJ>hA@TJR_{~x~b<-1c<)UEoI zSt`sIOdlGjOgMJvfV4sOH66E_nkgp6KA)MyH5nMVR7G~DKDtv0G?T&8)z4*}Q$iB} DlyEnM delta 191 zcmdnRc$;y8NGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YL$r9IylHmNblJdl&REC1Y%)Ao4ywnl}6FmbxLt_)>=qjKhZ%-G;5DWje6CJr2 z6gXI_*Z%+CsG8w&X5rE7Lozbg_FCN8%j(5Ch08*x_)L!e6z+&;Teu$Wn81DR@uPDh p8ubS!-PPAv5aO`1;ghVqaQx?e-wjvo+zm9B!PC{xWt~$(6977RM56!z