From 3c8b3a7bfcdd02e5f712961664deb0af5268b7d2 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 13 Jun 2015 12:52:22 +0200 Subject: [PATCH] -Changed Coffee Machine -Changed Machines not to lose Progress when Power is low --- .../inventory/ContainerCoffeeMachine.java | 12 ++-- .../actuallyadditions/items/ItemCoffee.java | 3 +- .../tile/TileEntityCanolaPress.java | 21 +++--- .../tile/TileEntityCoffeeMachine.java | 51 ++++++------- .../tile/TileEntityFurnaceDouble.java | 19 +++-- .../tile/TileEntityGrinder.java | 20 +++--- .../tile/TileEntityXPSolidifier.java | 67 ------------------ .../textures/blocks/blockCoffeeStage1.png | Bin 291 -> 220 bytes .../textures/blocks/blockCoffeeStage2.png | Bin 325 -> 294 bytes .../textures/blocks/blockCoffeeStage3.png | Bin 312 -> 354 bytes .../textures/blocks/blockCoffeeStage4.png | Bin 366 -> 396 bytes .../textures/blocks/blockCoffeeStage5.png | Bin 383 -> 474 bytes .../textures/blocks/blockCoffeeStage6.png | Bin 399 -> 562 bytes .../textures/blocks/blockFlaxStage1.png | Bin 308 -> 252 bytes .../textures/blocks/blockFlaxStage2.png | Bin 354 -> 274 bytes .../textures/blocks/blockFlaxStage3.png | Bin 377 -> 337 bytes .../textures/blocks/blockFlaxStage4.png | Bin 407 -> 388 bytes .../textures/blocks/blockFlaxStage5.png | Bin 433 -> 418 bytes .../textures/blocks/blockFlaxStage6.png | Bin 454 -> 436 bytes .../textures/items/itemCoffeeBeans.png | Bin 273 -> 490 bytes 20 files changed, 58 insertions(+), 135 deletions(-) delete mode 100644 src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java index 3fb6596b1..23ba136db 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.inventory.slot.SlotOutput; import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.ItemCoffee; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; @@ -33,13 +34,7 @@ public class ContainerCoffeeMachine extends Container{ for (int i = 0; i < 4; i++){ for (int j = 0; j < 2; j++){ - this.addSlotToContainer(new Slot(machine, j+i*2+3, 125+j*18, 6+i*18){ - @Override - public int getSlotStackLimit(){ - return 1; - } - - }); + this.addSlotToContainer(new Slot(machine, j+i*2+3, 125+j*18, 6+i*18)); } } @@ -111,6 +106,9 @@ public class ContainerCoffeeMachine extends Container{ if(currentStack.getItem() == InitItems.itemMisc && currentStack.getItemDamage() == TheMiscItems.CUP.ordinal()){ this.mergeItemStack(newStack, TileEntityCoffeeMachine.SLOT_INPUT, TileEntityCoffeeMachine.SLOT_INPUT+1, false); } + if(ItemCoffee.getIngredientFromStack(newStack) != null){ + this.mergeItemStack(newStack, 3, 10, false); + } } if(slot <= hotbarEnd && slot >= hotbarStart){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index 13a59170a..222ac2470 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -62,10 +62,11 @@ public class ItemCoffee extends ItemFood implements INameableItem{ } public ItemCoffee(){ - super(2, 2.0F, false); + super(8, 5.0F, false); this.setMaxDamage(ConfigIntValues.COFFEE_DRINK_AMOUNT.getValue()-1); this.setAlwaysEdible(); this.setMaxStackSize(1); + this.setNoRepair(); } public static Ingredient getIngredientFromStack(ItemStack stack){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java index 195384333..31fbf5d2c 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java @@ -35,16 +35,19 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE @SuppressWarnings("unchecked") public void updateEntity(){ if(!worldObj.isRemote){ - if(this.isCanola(0) && this.storage.getEnergyStored() >= energyUsedPerTick && this.mbProducedPerCanola <= this.tank.getCapacity()-this.tank.getFluidAmount()){ - this.currentProcessTime++; - if(this.currentProcessTime >= this.maxTimeProcessing){ - this.currentProcessTime = 0; + if(this.isCanola(0) && this.mbProducedPerCanola <= this.tank.getCapacity()-this.tank.getFluidAmount()){ + if(this.storage.getEnergyStored() >= energyUsedPerTick){ + this.currentProcessTime++; + this.storage.extractEnergy(energyUsedPerTick, false); + if(this.currentProcessTime >= this.maxTimeProcessing){ + this.currentProcessTime = 0; - this.slots[0].stackSize--; - if(this.slots[0].stackSize == 0) this.slots[0] = null; + this.slots[0].stackSize--; + if(this.slots[0].stackSize == 0) this.slots[0] = null; - this.tank.fill(new FluidStack(InitBlocks.fluidCanolaOil, mbProducedPerCanola), true); - this.markDirty(); + this.tank.fill(new FluidStack(InitBlocks.fluidCanolaOil, mbProducedPerCanola), true); + this.markDirty(); + } } } else this.currentProcessTime = 0; @@ -58,8 +61,6 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE } } - if(this.currentProcessTime > 0) this.storage.extractEnergy(energyUsedPerTick, false); - if(this.tank.getFluidAmount() > 0){ WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.DOWN, this.tank); } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java index a0a445880..64de879ad 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java @@ -41,7 +41,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements if(!worldObj.isRemote){ this.storeCoffee(); - if(this.brewTime > 0){ + if(this.brewTime > 0 || this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ this.brew(); } } @@ -59,41 +59,34 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements public void brew(){ if(!worldObj.isRemote){ - if(this.slots[SLOT_INPUT] != null && this.slots[SLOT_INPUT].getItem() == InitItems.itemMisc && this.slots[SLOT_INPUT].getItemDamage() == TheMiscItems.CUP.ordinal() && this.slots[SLOT_OUTPUT] == null && this.storage.getEnergyStored() >= energyUsePerTick && this.coffeeCacheAmount >= this.coffeeCacheUsePerItem){ - this.brewTime++; - if(this.brewTime >= this.maxBrewTime){ - this.brewTime = 0; - ItemStack output = new ItemStack(InitItems.itemCoffee); - while(getFirstAvailIngredient() > 0){ - int ingr = this.getFirstAvailIngredient(); - ItemCoffee.Ingredient ingredient = ItemCoffee.getIngredientFromStack(this.slots[ingr]); - if(ingredient != null){ - ingredient.effect(output); + if(this.slots[SLOT_INPUT] != null && this.slots[SLOT_INPUT].getItem() == InitItems.itemMisc && this.slots[SLOT_INPUT].getItemDamage() == TheMiscItems.CUP.ordinal() && this.slots[SLOT_OUTPUT] == null && this.coffeeCacheAmount >= this.coffeeCacheUsePerItem){ + if(this.storage.getEnergyStored() >= energyUsePerTick){ + this.brewTime++; + this.storage.extractEnergy(energyUsePerTick, false); + if(this.brewTime >= this.maxBrewTime){ + this.brewTime = 0; + ItemStack output = new ItemStack(InitItems.itemCoffee); + for(int i = 3; i < this.slots.length; i++){ + if(this.slots[i] != null && ItemCoffee.getIngredientFromStack((this.slots[i])) != null){ + ItemCoffee.Ingredient ingredient = ItemCoffee.getIngredientFromStack(this.slots[i]); + if(ingredient != null){ + ingredient.effect(output); + } + this.slots[i].stackSize--; + if(this.slots[i].stackSize <= 0) this.slots[i] = this.slots[i].getItem().getContainerItem(this.slots[i]); + } } - this.slots[ingr].stackSize--; - if(this.slots[ingr].stackSize <= 0) this.slots[ingr] = this.slots[ingr].getItem().getContainerItem(this.slots[ingr]); + this.slots[SLOT_OUTPUT] = output.copy(); + this.slots[SLOT_INPUT].stackSize--; + if(this.slots[SLOT_INPUT].stackSize <= 0) this.slots[SLOT_INPUT] = null; + this.coffeeCacheAmount -= this.coffeeCacheUsePerItem; } - this.slots[SLOT_OUTPUT] = output.copy(); - this.slots[SLOT_INPUT].stackSize--; - if(this.slots[SLOT_INPUT].stackSize <= 0) this.slots[SLOT_INPUT] = null; - this.coffeeCacheAmount -= this.coffeeCacheUsePerItem; } } else this.brewTime = 0; - - if(this.brewTime > 0) this.storage.extractEnergy(energyUsePerTick, false); } } - public int getFirstAvailIngredient(){ - for(int i = 3; i < this.slots.length; i++){ - if(this.slots[i] != null && this.slots[i].stackSize == 1 && ItemCoffee.getIngredientFromStack((this.slots[i])) != null){ - return i; - } - } - return 0; - } - @SideOnly(Side.CLIENT) public int getCoffeeScaled(int i){ return this.coffeeCacheAmount * i / this.coffeeCacheMaxAmount; @@ -127,7 +120,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements @Override public boolean isItemValidForSlot(int i, ItemStack stack){ - return (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal()); + return (i >= 3 && ItemCoffee.getIngredientFromStack(stack) != null) || (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal()); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java index 1c30689b2..5cc3552f9 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java @@ -38,31 +38,30 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements boolean canSmeltOnFirst = this.canSmeltOn(SLOT_INPUT_1, SLOT_OUTPUT_1); boolean canSmeltOnSecond = this.canSmeltOn(SLOT_INPUT_2, SLOT_OUTPUT_2); - if(this.storage.getEnergyStored() >= energyUsePerTick){ - if(canSmeltOnFirst){ + + if(canSmeltOnFirst){ + if(this.storage.getEnergyStored() >= energyUsePerTick){ this.firstSmeltTime++; if(this.firstSmeltTime >= maxBurnTime){ this.finishBurning(SLOT_INPUT_1, SLOT_OUTPUT_1); this.firstSmeltTime = 0; } } - else this.firstSmeltTime = 0; + } + else this.firstSmeltTime = 0; - if(canSmeltOnSecond){ + if(canSmeltOnSecond){ + if(this.storage.getEnergyStored() >= energyUsePerTick){ this.secondSmeltTime++; if(this.secondSmeltTime >= maxBurnTime){ this.finishBurning(SLOT_INPUT_2, SLOT_OUTPUT_2); this.secondSmeltTime = 0; } } - else this.secondSmeltTime = 0; - } - else{ - this.firstSmeltTime = 0; - this.secondSmeltTime = 0; } + else this.secondSmeltTime = 0; - if(this.firstSmeltTime > 0 || this.secondSmeltTime > 0) this.storage.extractEnergy(energyUsePerTick, false); + if(this.storage.getEnergyStored() >= energyUsePerTick && this.firstSmeltTime > 0 || this.secondSmeltTime > 0) this.storage.extractEnergy(energyUsePerTick, false); } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java index 19d4fcf0c..f6ec5bc46 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java @@ -82,33 +82,31 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg boolean canCrushOnSecond = false; if(this.isDouble) canCrushOnSecond = this.canCrushOn(SLOT_INPUT_2, SLOT_OUTPUT_2_1, SLOT_OUTPUT_2_2); - if(this.storage.getEnergyStored() >= energyUsePerTick){ - if(canCrushOnFirst){ + if(canCrushOnFirst){ + if(this.storage.getEnergyStored() >= energyUsePerTick){ this.firstCrushTime++; if(this.firstCrushTime >= maxCrushTime){ this.finishCrushing(SLOT_INPUT_1, SLOT_OUTPUT_1_1, SLOT_OUTPUT_1_2); this.firstCrushTime = 0; } } - else this.firstCrushTime = 0; + } + else this.firstCrushTime = 0; - if(this.isDouble){ - if(canCrushOnSecond){ + if(this.isDouble){ + if(canCrushOnSecond){ + if(this.storage.getEnergyStored() >= energyUsePerTick){ this.secondCrushTime++; if(this.secondCrushTime >= maxCrushTime){ this.finishCrushing(SLOT_INPUT_2, SLOT_OUTPUT_2_1, SLOT_OUTPUT_2_2); this.secondCrushTime = 0; } } - else this.secondCrushTime = 0; } - } - else{ - this.firstCrushTime = 0; - this.secondCrushTime = 0; + else this.secondCrushTime = 0; } - if(this.firstCrushTime > 0 || this.secondCrushTime > 0) this.storage.extractEnergy(energyUsePerTick, false); + if(this.storage.getEnergyStored() >= energyUsePerTick && this.firstCrushTime > 0 || this.secondCrushTime > 0) this.storage.extractEnergy(energyUsePerTick, false); } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java deleted file mode 100644 index 6cceea975..000000000 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java +++ /dev/null @@ -1,67 +0,0 @@ -package ellpeck.actuallyadditions.tile; - -import ellpeck.actuallyadditions.items.InitItems; -import ellpeck.actuallyadditions.items.ItemSpecialDrop; -import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; -import ellpeck.actuallyadditions.network.gui.IButtonReactor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -public class TileEntityXPSolidifier extends TileEntityInventoryBase implements IButtonReactor{ - - public TileEntityXPSolidifier(){ - super(12, "xpSolidifier"); - } - - public int getFirstSlot(int itemsNeeded){ - for(int i = 0; i < this.slots.length; i++){ - if(this.slots[i] == null || this.slots[i].stackSize <= this.slots[i].getMaxStackSize()-itemsNeeded){ - return i; - } - } - return -1; - } - - @Override - public boolean canUpdate(){ - return false; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return false; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, int side){ - return this.isItemValidForSlot(slot, stack); - } - - @Override - public boolean canExtractItem(int slot, ItemStack stack, int side){ - return true; - } - - @Override - public void onButtonPressed(int buttonID, EntityPlayer player){ - if(!player.worldObj.isRemote){ - if(buttonID == 0 && player.experienceTotal >= ItemSpecialDrop.SOLID_XP_AMOUNT){ - int slot = this.getFirstSlot(1); - if(slot >= 0){ - if(this.slots[slot] != null){ - this.slots[slot].stackSize++; - } - else this.slots[slot] = new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()); - player.addExperience(ItemSpecialDrop.SOLID_XP_AMOUNT); - } - } - else if(buttonID == 1 && player.experienceTotal >= 64*ItemSpecialDrop.SOLID_XP_AMOUNT){ - int slot = this.getFirstSlot(64); - if(slot >= 0){ - this.slots[slot] = new ItemStack(InitItems.itemSpecialDrop, 64, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()); - player.addExperience(64*ItemSpecialDrop.SOLID_XP_AMOUNT); - } - } - } - } -} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage1.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage1.png index 6e893add6db867ce1abcf702b817683c1a0a717e..52a8b8b8296f30744f665dc45c3aa7d3940d4560 100644 GIT binary patch delta 192 zcmZ3?bcb<*NFdgV zpN)r)U;3@*wrrq~Y-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$4itCr zba4!^IGvmz!MZp>M1ZBrG3o!-L$3cH2On;-yxwBZ^S|EcPwJ87Eu8aJ{#U!X^~Imz mN!i^nb@o)pFXD0X1`G`GC%OGInY27Wws^YwxvX)2bwWdkI*DbUr;kNGUBN7f0EE`rH)#BJBn9`BHo$W@M zfb?{b3hBAGrwGPHtl$+pzD#Vlf(Qfeulf6rik~{XY+55D!;6kz4o9@VMFO41;OXk; Kvd$@iu?YaqLS8rk diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage2.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage2.png index 8a5e090ddb7ccd7b37e110f0e8ece31374bbad34..90274425f8c24b3c99179ef793949e32ee5245bf 100644 GIT binary patch delta 267 zcmX@gw2WzjNFdgV zpN)r)UsXqA^#P!eY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$4ixY5 zba4!^IQ@2lE!QCj377lt)OSZ@Tu@rR;gia|`U8h=-tc%Qn0-+Bhxi8W7kQtaGTn68 zB~tlTx-BswEsbl&lpFFzv42~St10Q;IY0m28>P?-9YMOvW?HWmPO_S*?h)(|aPp4a zbLK_U>!+EUqCSMxIm_Qr)ZF@LUq!=RL;3HF4X0&pyD{#Vd+*ltmkh0ol-{vqJ8T8H O*VEO{g=L*nLK6U0^<+!{ delta 298 zcmV+_0oDGd0>uK5B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FWS01FWTe`H^g00007 zbV*G`2j2w`6bmQf?)-270009VKdcbs zHR}$1*gXEsd?ra!lMvPjVT};hh+!_`B!uIuk0Hw`PnnJ0g+KLU^3IbecC# zqQh-1CnBGP&`te)727?`iO6Rm9G<&qKF{0O?jhu}80K;c5Ab%se?4CzT>gc>j_9pT wM|3qGu{1^keL0B=I^00e?B zfW=|>08m`1DDAb2Xh0oFgYL-LnPg@bs89i5zYe3BPxgx=a1~SoxNII;E!UCVWs7Pt zL&^!t1k8{ySa_t<8alEW34~4tl>;mxND`>W`movrc5Xlj4k$vZa-@uK+}+AoIP9-X zJ{hDEu!KNjlR)}w;mNo|{b~E#eK_}6sRSQHJcA4iPjBV3(>9<|BYxnx7APw`=k;Ct Zg*VCTJuL24+IIi|002ovPDHLkV1lOzdK3Tv delta 285 zcmaFFw1a7aNV~B-+ z@{j-j?Oi2SC;SjnW-Dp%mE}kl<(ZSgarGEOQay9%#Egd2xf0FE+j&l?{`WoY@~=6j z1+0c8(`eNr=G%NmJWrHzUO4~_c;J+~A?XUtaxBiS?-@E_+ d{}+>FSgn|Kc0;SeR-l6!JYD@<);T3K0RTinVmJT* diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage4.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage4.png index b456db29d879fe9b936ecb851f36bddb1a372c2c..60fb42c24eb987542a6bfe42975e509edf957fe6 100644 GIT binary patch delta 369 zcmV-%0gnFe0*nKYB!32COGiWiHUK&R7kv#A*Z=?k32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1`G}lI8QFe82|tP9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0PsmfK~y-)?UA8U!(b4Ezx)3*X<9OvreKiFFn^$Ms5)K&i>Tn47&K3V z1;+!B!Gr;tCi!!RPnZ-GhLyWJcYC++kH3d}M;@7 za-ExOjm4`ct{?D#x@IibWvQ zhSr9kc(RR07-|FwQX#KZxRn5e|S$jHFZiDR%aFn@4?P8wh zS`}&|J^A(Z`KNAzh|Gd3UfxZpkLLr0>~BjAKi)ofDJ{U&^+y4KnRs}t!m(R3iBOn{ ztj}T~P=uuBzKEP+OjLU^@4d)qU)yLpb(`3oB2iZj*w5`H7Euo-3eX*HyIKqcVE+P% zM9&8bu^s3-X-tWER633=(ZUr;^mah3y}gHwu^rS!3bCN;#hD87X diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage5.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoffeeStage5.png index e2cbbc9298ea82bae193b53d6c0fe0e7568151c4..794403d4d1b287a1544bfc498424c3e1ab3d56cb 100644 GIT binary patch delta 448 zcmV;x0YCo#0@?$RB!32COGiWiHUK&R7kv#A*Z=?k32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1`G}m216CpEC2ui9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0X|7YK~y-)?UK7rRZ$RzzgcVT%V7f@+e0AMJgfSK3Sa@~3 zdk+%sIwcxO6@L-ocC!!=q!nbT?B<%J%Cax41q6lpO~ueCKl@Dit=Ir=!%;1usys<- z{R-RJvza~4dknDA&}5{j#0}V5Ili4-%36Sk;6zA`(O$!g)r`&u@NnBILtU6W;@8tl zIp2?e7Tbk`MN2yhsTj>xU_iN;=l}ZyfDdo?>_;70&N-C)T=LoHtLo8T_U2u0uiy7J qr3q8XIyj0>H<<*?x*BwH0R95Mn}SwQcu@bfwtX#0Lw6w6;%467BSbundtvrI@5xn1+FJ{6d z%!06iM_%5(`N?F1h|Gd3Ufz9Zm*)e8>~G7s{rK?Q<*)#cu0ImoyG}5}506zij%zv* z64R0TT2u#3LQsESr0Q9#d|C)p9~8rDn@p#1ld98E(xV3Kb*sQ4#)XLlRJYdyoRwFB z3i}EKvU@&Ih+VBf)mcNNq7IS!lhFDsT#-OK1Gs9fw>l`MWcF$$Z4-6|NnLGm#xOALQ z%Y-PgXi$6>2&Iw_JSP_{Ll@}m#Jqm^RmL3%L@FG`9)B^0aNxPQJIkzbrv+ZMMjR(+ z7jZg+cTe_2HrtATmddRUbD)rUC22;KBhSZHpt~UOV#*rdKK>?RVC(6g*dRQ=IK+7Y z1GZ+dv6=tV{?tnZxN&<)e;k&C2=Wz~c!mFrE7#h(alNfo8dvoh#TM(Ui&O$?Nd%$N b06zgv&=Q?Xl|s%^00000NkvXXu0mjfe~IAx delta 372 zcmV-)0gL{!1djudB!2{FK}|sb0I`n?{9y$E000SaNLh0L01FWS01FWTe`H^g00007 zbV*G`2j2w`6E-^TPtKA6000d5s|*~<9^#ePJ@X2g<|mZsKa=bbRd!KWv<(Yx3|rZ7T~IyP@tzS*hHR9o4fo()~|GntIIt)Aw5hp(l(K<3jIQOTZ*Lh?I8xV{XE)7O># zJ{u3Ok%Gyal`DWkvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=}J5W5q z)5S5w;&gI?1nc623g*Wy7yqkOD*cy~kdQbNX?*nm>TCpPMc|M~rK{>%IJY;Bus^CeCiHMCCdZ0r=Qk6>gl*eRA? T%2y6_H3NgEtDnm{r-UW|1=CI2 delta 281 zcmeyvxP@tgNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x37`TN%nDNrx zx<5cc_7YEDSN8j?{35*EZ8_$mKp}||*NBqf{Irtt#G+J&g2c?c61}|C5(N`I13lB! zR-;s)nn|86jv*HQ$r7xK8KgPpWc-jnr6Si-f6hFm;LWr|j`*Z6_qX^wv7gX(N`R9o zEz3Y6^kZZ0_BF!H7Xu_Y7$O;%6-*_>8gf`YE6TDPR2|zCm?yBF&~w?&kfZFul)})% zJC%u9K>lXy3$X^)Ik%?>n(16=JLSNj$SvU@wV>{J7LfITVa12~e`4_({K5&Rj13qV Z{F8-(9Ck!i{06#@!PC{xWt~$(69C&uSdah! diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage2.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage2.png index cea1ba434497b4ebcd8245c27472d56233401b61..9a48e693b7abfa41a8d957cd5c4b2ea62e5859db 100644 GIT binary patch delta 246 zcmaFFG>K_~N{XE)7O># zJ{u3Op>o@a)fa(6vY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=}J5apL z)5S5w;`G}I8@ZYTcwGHIzj~zdY1%K|xwrU^=GO~;5q`D2Tp;lCqbnC1Sk2Fi>@aT^ zu&}h8R9?LKe$4i%xnEPXB|c5Ot}b;T#P5w*i^2*uhLGI-2|x5+@SL}s)pEMNen)w$ s?XQeD_dN!x9^Jd&b8m{_2><^_G-|D!XwYGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x37`TN%nDNrx zx<5cc_7YEDSN8j?{36`ykKX+$018QzxJHx&=ckpFCl;kL6eMQmmFVTAmMEC$8R(g& zwi=}Z)g172aSXBWPyX@$zrCx(Y6VR&u7@!ow2>QIqcHD5CXG)wL=G`{*p%#3Y);8U;J93yZ8+LK* zXWWs~#JJ$k|3A9>63l$~Bjk<&6<^eAU@V!Pz_6S9pD_c&DNoP&)7R|13-k?xr>mdK II;Vst0QOaM3;+NC diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage3.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage3.png index 892529aa2208a637ae2ea257c08f5da89fd929d2..0b4544dd166b18a01188f646a10ce740ba1d8f87 100644 GIT binary patch delta 310 zcmey#bdhO-N{XE)7O># zJ{u3Ofd&VoGe}4_GbEzKIX^cyHLnE7WngeFN=+yU%MoU=z+SQIBr2->hY)FZb(IX_+VMnvRK0q@;Ek_|MgpQIffaZC&q|T})3S%OCJ6UofqBs%H%LoTsaw%Q~lo FCIA>bcAWqK delta 350 zcmcb}^pk0VNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x37`TN%nDNrx zx<5cc_7YEDSN8j?{34v968z_jfI<=_t`Q}{`DrEPiAAXl1&Nt?C3<V|VA5AYri4WFs)G3`i68iV=-g+nt{fuasuZ2Xgw zs>A2sDw@|K#~}B&mU+8?0LL^I*;*Hi`rq7{LM2}WAI=fh;j}t`+~2gB!Tr_0o!g9k tKY5gXWZP-%t+k8s!^9^S=da$wu=w#Y5vIbf_driFc)I$ztaD0e0sw@VgM0u0 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage4.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage4.png index 56e5e111bc1282015c09ded8e4c13dcc60b5f8b7..a9aff1f149f8d7d6bf0d2967ceb26c360dc9db50 100644 GIT binary patch delta 361 zcmV-v0ha!k1B3&RB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1`G`@COi01zyJUM9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0O(0XK~y-)?U6A`15pr$zj^DjB%lNgkzlog5P!>%(oO;u=WbVrbumr delta 380 zcmV-?0fYX81D6AkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-yn4-^C+O>|fx0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@NWrZ?j0002>NklE*MHBBIn{^<^fBNGl(6xtu0pRiKZxo4{RAXv0c^E`97U z!MDE6}BEyQ~&?~9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0R~A#K~y-)-I2RWgFz65zuA9L3o#lI5p6<1L4WXqqD{J7zz}R~?b2GP zh2SGt*$9@tkqDyCVBv-2mn4v^I~F0)K>kgzbgJc?IcLu7!2hdKC944C(yIQ(EBQ4o z7Y8u_Gax?5>c>h9z{~zCg~Lo=5HB|QTxxK%yP?4Zx#Q)2!`9i{&-*;Bo0q9@0)Tp| z!S+d70jxw0V1MsoL5&k0uj(?=;OVv|-gO5V+e0;exOtahiOn!jMA$i<@3foV0=Tx$ zB&{q-#CmmBC#NHf?Y7)szm1=u=j>V@^_nOS8a&_CL<}GjyqXD--YM$z?*{r6`lT@p m#0q{y0vjZ!glHl-gKra!Pf(P}2KoR1002ovPDHLkU;%>BfuxuK delta 407 zcmV;I0cifB1F-{;B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-yn4-^3sPO{M10000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@NWrZ?j0003GNkllLU% zR3I@G4H892I08rDG+biXH|<-t?IIc`ne5Me^WJo8MC7jwUiQi0WuI&u()4AQCeY3- zdyCICqFwZpb!1t7IkUS(W?78Q{t?UkI25}o><2({XoLWSRA76Z>Sc0?WN{i9yVh-$ zW1fQ(<>Gwcrhjw-a7FXFn5sKOIFS#AI2C{+iYRaoC%~KtV2D!zK&$ga9WiclpJ_8d zxYG$M19hy`1h#>}0-gB10Kv5%+fDH6FZcrBLZ7C}d|ehoPT)}I!{V$03|rI!_H+X5 zoaz8~cy4s>Ca9g&(Lei6A+9q4l@T4MI-2)lK4bgu1Q0=Vw3Pq=002ovPDHLkV1leX BqoM!+ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage6.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFlaxStage6.png index 65f70d2592135a08bab0eff731cc3138e7fd8746..d899281660a53b1dda1d2b1acc9ea00521c6448a 100644 GIT binary patch delta 410 zcmV;L0cHNi1GEE>B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1`G`;BLvekhyVZp9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*P zO;BVmWd{HN0T@X{K~y-)t&+h?0#Ou(|8qyIg^QT6r)V+bM1Q?dE6KqKqD6(aaN8y# z2r_cf#;~C0h!W{7O5H@LGxN8&rh|4(rL(%6bN=t1|8Ri+jN4L!Kkw_KIw$LQl_wg- zHz)UW^EUmWLjc&^&$3p2U{dTC9o9}C&5-JGonFBv0Bjv(>F(O2W-o9?@R{KSV^LC& zGlBI*&jKz}!jB>;f!!*wG5{lh6h>#8GRPj@Rz=NJ<&=N~c`Knn%_p2Pm928DgI zbukq-cGj5ASWrV7&u8!RPoU=p!mk*NXcW%`yj8m*GG64u001C?Xu#zFZr)}*Amop` zF#?*GZ5gftUg9DbvY=7|MqGXe)`}pts_=TzHahtRk`o+gDZEoCr~m)}07*qoM6N<$ Eg7j;ue*gdg delta 428 zcmV;d0aO081I7c8B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-yn4-+;z?oZB=0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@NWrZ?j0003bNklZ5QcjK6hYzEkbkU#1cBVFLXdzUIIaK+ z@dOe9f~-Ul5{|G(;51yK^c(ogKnjjYn!fh`=AW77g&1RA)9EQ~_j75@=jZ6T90=?6 zqv)3y)^>a6!g${fKbvNl96M$JV6+QBaU@~@X9mMv%PvXoEgNC<*S@7)D^?X;G_F(C z@(9_WyQteme}B`8sf&P#I`SY~GJoLAfQpC+`lb@FIsz%M27r%>RHM zQLqO&&;AGYZTE5}fr>f0WbcM0_p>hB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1`G`q7gm(M!TfWL4P0`+WQI7 z6hwcZ$uZg*8=9ILTa1W?E_k8T4tYWIbPk^LwFOZ`Lu1eS!UONi3;#$zg^Q_#aAJ{} ziL!rqBK=yhvAQTarj1s;hW6Sf6B|eId9k}>b`FlDZw1?%YvQh0B^eo^-qtz0xJDUJ zxGxk@dS&7hBY)gi>#QuK5yE0Odn|nj)|cl*kL;mTQEArdJU3b_C1adlJ)n0@!l5Dj z-hLj{20_I`DBxvwD$3SgR3L8w0Uom#o=@H!nNCWD;j?zp@yNdE`^L*4;s=Y9;1sm)OU0000;TIJEM5ofPpn0gqpNd{`wfu>*u%gcf+{vig2SO0+f#!!8uG?BF^aA>5- v=TUi6kYSmELY^)pXwFwjw;(LZ+J|i~1O;jm7qvE;00000NkvXXu0mjfy=h&W