From 06059ba059fb81c1a9bb5ca7289d992364c45c43 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 20 Mar 2015 18:58:31 +0100 Subject: [PATCH] Getting Ready for Version 0.0.2.0! --- build.gradle | 2 +- .../inventory/ContainerFeeder.java | 33 +++++++++++++ .../inventory/ContainerFurnaceDouble.java | 44 +++++++++++++++++- .../inventory/ContainerGiantChest.java | 33 +++++++++++++ .../inventory/ContainerGrinder.java | 42 +++++++++++++++++ .../inventory/ContainerInputter.java | 33 +++++++++++++ .../inventory/GuiInputter.java | 10 ++-- .../tile/TileEntityInputter.java | 14 ++++-- .../ellpeck/actuallyadditions/util/Util.java | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 1 + .../textures/items/itemAxeEmerald.png | Bin 255 -> 343 bytes .../textures/items/itemFoodCheese.png | Bin 276 -> 585 bytes .../textures/items/itemFoodChocolate.png | Bin 646 -> 716 bytes .../textures/items/itemFoodChocolateCake.png | Bin 295 -> 536 bytes .../textures/items/itemFoodPizza.png | Bin 645 -> 646 bytes .../textures/items/itemHoeEmerald.png | Bin 227 -> 317 bytes .../textures/items/itemPickaxeEmerald.png | Bin 271 -> 341 bytes .../textures/items/itemShovelEmerald.png | Bin 230 -> 348 bytes .../textures/items/itemSwordEmerald.png | Bin 277 -> 341 bytes src/main/resources/mcmod.info | 2 +- 20 files changed, 203 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 421f07bbd..91b386c2e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.0.1.4" +version = "1.7.10-0.0.2.0" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java index 2b8c8f933..e33ea433d 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java @@ -67,6 +67,39 @@ public class ContainerFeeder extends Container{ @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ + final int inventoryStart = 1; + final int inventoryEnd = inventoryStart+26; + final int hotbarStart = inventoryEnd+1; + final int hotbarEnd = hotbarStart+8; + + Slot theSlot = (Slot)this.inventorySlots.get(slot); + if(theSlot.getHasStack()){ + ItemStack currentStack = theSlot.getStack(); + ItemStack newStack = currentStack.copy(); + + if(slot <= hotbarEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, 0, 1, false); + } + + if(slot <= hotbarEnd && slot >= hotbarStart){ + this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false); + } + + else if(slot <= inventoryEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false); + } + + else if(slot < inventoryStart){ + this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false); + } + + if(newStack.stackSize == 0) theSlot.putStack(null); + else theSlot.onSlotChanged(); + if(newStack.stackSize == currentStack.stackSize) return null; + theSlot.onPickupFromSlot(player, newStack); + + return currentStack; + } return null; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java index 34060b20a..d923304b1 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java @@ -11,6 +11,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.tileentity.TileEntityFurnace; public class ContainerFurnaceDouble extends Container{ @@ -27,8 +29,8 @@ public class ContainerFurnaceDouble extends Container{ this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_COAL, 80, 21)); this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_1, 51, 21)); - this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21)); this.addSlotToContainer(new SlotOutput(this.tileFurnace, TileEntityFurnaceDouble.SLOT_OUTPUT_1, 51, 69)); + this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21)); this.addSlotToContainer(new SlotOutput(this.tileFurnace, TileEntityFurnaceDouble.SLOT_OUTPUT_2, 108, 69)); for (int i = 0; i < 3; i++){ @@ -84,6 +86,46 @@ public class ContainerFurnaceDouble extends Container{ @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ + final int inventoryStart = 5; + final int inventoryEnd = inventoryStart+26; + final int hotbarStart = inventoryEnd+1; + final int hotbarEnd = hotbarStart+8; + + Slot theSlot = (Slot)this.inventorySlots.get(slot); + if(theSlot.getHasStack()){ + ItemStack currentStack = theSlot.getStack(); + ItemStack newStack = currentStack.copy(); + + if(slot <= hotbarEnd && slot >= inventoryStart){ + if(FurnaceRecipes.smelting().getSmeltingResult(currentStack) != null){ + this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_INPUT_1, TileEntityFurnaceDouble.SLOT_INPUT_1+1, false); + this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_INPUT_2, TileEntityFurnaceDouble.SLOT_INPUT_2+2, false); + } + + if(TileEntityFurnace.getItemBurnTime(currentStack) > 0){ + this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_COAL, TileEntityFurnaceDouble.SLOT_COAL+1, false); + } + } + + if(slot <= hotbarEnd && slot >= hotbarStart){ + this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false); + } + + else if(slot <= inventoryEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false); + } + + else if(slot < inventoryStart){ + this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false); + } + + if(newStack.stackSize == 0) theSlot.putStack(null); + else theSlot.onSlotChanged(); + if(newStack.stackSize == currentStack.stackSize) return null; + theSlot.onPickupFromSlot(player, newStack); + + return currentStack; + } return null; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java index 6ddf263dd..27ee0269b 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java @@ -38,6 +38,39 @@ public class ContainerGiantChest extends Container{ @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ + final int inventoryStart = 117; + final int inventoryEnd = inventoryStart+26; + final int hotbarStart = inventoryEnd+1; + final int hotbarEnd = hotbarStart+8; + + Slot theSlot = (Slot)this.inventorySlots.get(slot); + if(theSlot.getHasStack()){ + ItemStack currentStack = theSlot.getStack(); + ItemStack newStack = currentStack.copy(); + + if(slot <= hotbarEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, 0, 117, false); + } + + if(slot <= hotbarEnd && slot >= hotbarStart){ + this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false); + } + + else if(slot <= inventoryEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false); + } + + else if(slot < inventoryStart){ + this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false); + } + + if(newStack.stackSize == 0) theSlot.putStack(null); + else theSlot.onSlotChanged(); + if(newStack.stackSize == currentStack.stackSize) return null; + theSlot.onPickupFromSlot(player, newStack); + + return currentStack; + } return null; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java index 9185bcc14..2718c0dc2 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java @@ -3,6 +3,7 @@ package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import ellpeck.actuallyadditions.recipe.GrinderRecipes; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityGrinder; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +12,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; public class ContainerGrinder extends Container{ @@ -90,6 +92,46 @@ public class ContainerGrinder extends Container{ @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ + final int inventoryStart = this.isDouble ? 7 : 4; + final int inventoryEnd = inventoryStart+26; + final int hotbarStart = inventoryEnd+1; + final int hotbarEnd = hotbarStart+8; + + Slot theSlot = (Slot)this.inventorySlots.get(slot); + if(theSlot.getHasStack()){ + ItemStack currentStack = theSlot.getStack(); + ItemStack newStack = currentStack.copy(); + + if(slot <= hotbarEnd && slot >= inventoryStart){ + if(GrinderRecipes.instance().getOutput(currentStack, false) != null){ + this.mergeItemStack(newStack, TileEntityGrinder.SLOT_INPUT_1, TileEntityGrinder.SLOT_INPUT_1+1, false); + if(this.isDouble) this.mergeItemStack(newStack, TileEntityGrinder.SLOT_INPUT_2, TileEntityGrinder.SLOT_INPUT_2+1, false); + } + + if(TileEntityFurnace.getItemBurnTime(currentStack) > 0){ + this.mergeItemStack(newStack, TileEntityGrinder.SLOT_COAL, TileEntityGrinder.SLOT_COAL+1, false); + } + } + + if(slot <= hotbarEnd && slot >= hotbarStart){ + this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false); + } + + else if(slot <= inventoryEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false); + } + + else if(slot < inventoryStart){ + this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false); + } + + if(newStack.stackSize == 0) theSlot.putStack(null); + else theSlot.onSlotChanged(); + if(newStack.stackSize == currentStack.stackSize) return null; + theSlot.onPickupFromSlot(player, newStack); + + return currentStack; + } return null; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java index cd969c79a..f71db1cc6 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java @@ -87,6 +87,39 @@ public class ContainerInputter extends Container{ @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ + final int inventoryStart = 1; + final int inventoryEnd = inventoryStart+26; + final int hotbarStart = inventoryEnd+1; + final int hotbarEnd = hotbarStart+8; + + Slot theSlot = (Slot)this.inventorySlots.get(slot); + if(theSlot.getHasStack()){ + ItemStack currentStack = theSlot.getStack(); + ItemStack newStack = currentStack.copy(); + + if(slot <= hotbarEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, 0, 1, false); + } + + if(slot <= hotbarEnd && slot >= hotbarStart){ + this.mergeItemStack(newStack, inventoryStart, inventoryEnd, false); + } + + else if(slot <= inventoryEnd && slot >= inventoryStart){ + this.mergeItemStack(newStack, hotbarStart, hotbarEnd, false); + } + + else if(slot < inventoryStart){ + this.mergeItemStack(newStack, inventoryStart, hotbarEnd, false); + } + + if(newStack.stackSize == 0) theSlot.putStack(null); + else theSlot.onSlotChanged(); + if(newStack.stackSize == currentStack.stackSize) return null; + theSlot.onPickupFromSlot(player, newStack); + + return currentStack; + } return null; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java index 8d99ee171..e82771d7d 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java @@ -92,11 +92,11 @@ public class GuiInputter extends GuiContainer{ this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.put"), guiLeft + 22 + 3, guiTop + 32, 4210752); this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.pull"), guiLeft + 107 + 3, guiTop + 32, 4210752); - this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft + 24 + 3, guiTop + 45 + 1, 4210752); - this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPut == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPut).toString(), guiLeft + 24, guiTop + 66 + 1, 4210752); + this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft + 24 + 1, guiTop + 45 + 3, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPut == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPut).toString(), guiLeft + 24 + 3, guiTop + 66 + 3, 4210752); - this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft + 109 + 3, guiTop + 45 + 1, 4210752); - this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPull == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPull).toString(), guiLeft + 109, guiTop + 66 + 1, 4210752); + this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft + 109 + 1, guiTop + 45 + 3, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPull == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPull).toString(), guiLeft + 109 + 3, guiTop + 66 + 3, 4210752); } @Override @@ -142,7 +142,7 @@ public class GuiInputter extends GuiContainer{ else if (!this.enabled) color = 10526880; else if (this.field_146123_n) color = 16777120; - this.drawCenteredString(renderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height-3) / 2, color); + this.drawCenteredString(renderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height-8) / 2, color); } } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java index 848ec16db..45f7e2e7f 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java @@ -64,8 +64,11 @@ public class TileEntityInputter extends TileEntityInventoryBase{ } } else{ - this.setInventorySlotContents(0, theStack.copy()); - theInventory.setInventorySlotContents(theSlotToPull, null); + ItemStack toBePut = theStack.copy(); + if(theInventory.getInventoryStackLimit() < toBePut.stackSize) toBePut.stackSize = theInventory.getInventoryStackLimit(); + this.setInventorySlotContents(0, toBePut); + if(theStack.stackSize == toBePut.stackSize) theInventory.setInventorySlotContents(theSlotToPull, null); + else theStack.stackSize -= toBePut.stackSize; } } } @@ -103,8 +106,11 @@ public class TileEntityInputter extends TileEntityInventoryBase{ } } else{ - theInventory.setInventorySlotContents(theSlotToPut, this.slots[0].copy()); - this.slots[0] = null; + ItemStack toBePut = this.slots[0].copy(); + if(theInventory.getInventoryStackLimit() < toBePut.stackSize) toBePut.stackSize = theInventory.getInventoryStackLimit(); + theInventory.setInventorySlotContents(theSlotToPut, toBePut); + if(this.slots[0].stackSize == toBePut.stackSize) this.slots[0] = null; + else this.slots[0].stackSize -= toBePut.stackSize; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/Util.java b/src/main/java/ellpeck/actuallyadditions/util/Util.java index 4f7dde362..8753a6768 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/Util.java +++ b/src/main/java/ellpeck/actuallyadditions/util/Util.java @@ -18,7 +18,7 @@ import org.lwjgl.input.Keyboard; @SuppressWarnings("unused") public class Util{ - public static final String VERSION = "1.7.10-0.0.1.4"; + public static final String VERSION = "1.7.10-0.0.2.0"; public static final String MOD_ID = "ActuallyAdditions"; public static final String NAME = "Actually Additions"; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 8230b2dfb..1bb628af6 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -100,6 +100,7 @@ tooltip.actuallyadditions.blockGrinder.desc.4=build the Double Crusher! tooltip.actuallyadditions.blockGrinderDouble.desc.1=Crushes Ores into Dusts! tooltip.actuallyadditions.blockGrinderDouble.desc.2=You get two Dusts per Ore and Extras! tooltip.actuallyadditions.blockGrinderDouble.desc.3=Can crush two Ores simultaneously! +tooltip.actuallyadditions.blockFurnaceDouble.desc=Smelts two things simultaneously! tooltip.actuallyadditions.blockInputter.desc.1=Its real name is %sObfuscated%s! tooltip.actuallyadditions.blockInputter.desc.2=Acts like a more advanced Hopper tooltip.actuallyadditions.blockInputter.desc.3=Configurable: diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png index fec125b914e95773d91d11d94b6f9380733dd75f..2851f389497dd8e07fd47d354378d3b37bf71897 100644 GIT binary patch delta 296 zcmV+@0oVTj0oMYMBo78+OGiWi{{a60|De66laVnPe+P6)O+^Ra0}~N6Cn=>Y__4dwt&Wpk`s6auR_5QD6J?Y z!I%vpY>Gfcr90OO5k2bdQ9FzOef5oTRYfAvfaweJQE(|urY4RUB+Wz bz`(FnKlN1F_RHQtmoRv``njxgN@xNAgk(^) diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png index 7559422df4e6cc634b1a44ab0830376852eb0821..68e490b8254c123d55335acfe43a4ce5f0259f34 100644 GIT binary patch delta 540 zcmV+%0^|LZ0?7oBBo78+OGiWi{{a60|De66laVnPe+P6)O+^Ra0}~M#CTBuY7ytkP z)=5M`R5;7kl1*WyyzeEB>Rd=bI7x3(Vj zO7|`ki!TzDE?`>*<717MdH_JBq#%kBO!E-6tpy^Y4;S)DBuPe&FAxfanVlTdQV+;w zGdy`*q|yA2ZJWsQB?|c@YwJ<(#&sFdx39J}e0KMLTe*chMHbb*D zz_O;OZ4F&N?Tcp?gxc2F-ua4Yj&Ph405&(5@jU3g9gxdr*xl<>E?x=t7WR{Pe2H>V z#&vD>Uj7UQp1*j*PQ8dAETbrk=(>w2hW{4Obr;hd5sNK=AW$hOc%DbKw$E;(M7h%B zf7Z?00W_N(0r2tD1hLaK80=fZ(`Ub!PIX+zCK8behoe}QL%%;_W8)6*KfGgQp85A^`c^7Wun%fB-)CNa<99(UHgMsx`~mEl$3!qMS`+{P002ovPDHLk0$_qBZ~edk delta 248 zcmX@fGKFb^NbO{QKnia! zZ&E_3K~ECHCdD5nipf084iZZk=c`HRX^OZ?FbFxAF~l13G{>-9VmbW4frT-}`2ugl v&6b6nvIlq=B^|b?l`t5!r1&!PNJubD6Od`j@(}n8bRL7JtDnm{r-UW|@w!i? diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png index 2ced8770db62a78c745123547563d6cd71d340a3..8f0419c6a58e1fdbafe4ce979a29fceaedd76274 100644 GIT binary patch delta 672 zcmV;R0$=@x1Sed(}dr)G~Y1ipq;-8R9JjcZw)H ziHD4WpiW&1Gt3SJdeQPVn&wtXxy_fqwVZ6~Y|C|Wl$i!Sx98>a@O_?#2maH9)!GKY zmC`cKe;>&rdH+V5?^zgeIPw1o0FbR7WmnN9?2a*dhsUve{=$trO$?fQk$*J5q_Lre z^?oN`-F{4`9->dxP+Oi)=aVLcp@OWvMrtZeq=egu4ws=#h+}GOob-$=ve*1s*v-j3Jn#dP5qLYELp{MK0d zhaD8|OQWLV1ezU3ne#X($vYcZnl(nH1VEa0lXL2;YNG)Q@UW=_`j{DDF;G7A^ zI%N9;nweb)E-fk|49Vr;Ovbbr_UjO(`Vc-$Z(0+YnOz_%A}kn_TpoOj3qt6%F@b-D ze^yc=|2453TJl$GDo2Rl0&78DpAWCg2S8!=HX+-drV*0M6O_1I!4f37JV-7Ni*g|n zHA)e^&MBUCjv%W%xtqH3JwkGMh>8eX5h}f!B>F}sMc>Gz7_d%ITYr;pC`nJ&AOPyC z5An%1LAQA_c#X{5asBO7kM)%h;f1yfHZ(KPVUNKIDLE(gN?pCLy9FMLy0ppLus5W!;yW9 z81CLVzyQ`_#Nn7T>m$Ax!1yTP0 zdQuDw>5c*nNxnu546hznf}NWiqsE5PX^p)g{5{#94!t!Bj(n0iMEOhQKrSHWZEz?6i1jc`0Ft< zfD9oBE@p48g|e^%m`gwy#5Pu!V3?5a!eFE#1POz)mzKd@;9@MxkmfDKAT7+vpd-%@ z4ybkQAq?AB1TpwpDKX4wv0|{%m1J-*kYcdbm1fwnvWNiym=hA$L%{NC00000NkvXX Hu0mjf=9T$p diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png index 151e7f61250e6db8c05e7f46836fb6c5d0ccf685..b02269b06a3962b87c8f0540e8a718cfaf08cbcd 100644 GIT binary patch delta 490 zcmV8+{>&WjO5B7J>J4fyv03j&=uiu}@UjYaE zyXKs*f799E@ig$fTde<7jsExofHxm{at&~JZ_kz?@}$w^Xfwym0Kv>qGXM_fiB~r= zLQ;;069C?R8i=bEce)!KZRV)12D}rT6CTVWX7IA*iAlMi;O?ERwV4CRz2kJcqzZ|L zlYknR7VzR`hIc}qIhsYryH>`x$?`fNBxS2ze{gnD@hp}Ikkn8$9!&yCjS!X3!zqLD zoRiZDvqc3!29Q)qNonK`!P6hl$-N^a<*6#ob7dJKqw~f3B6Tu=Fa58Sw{NlCZc@cW zOv<8E)C>b=ixO4CIl-wwEJ>HUay9AuXvD`}A1AWX2Mq8cL{$_cCM6?L6a{&nT^X#l zP`+aI21A_pYb0vV}-zz}#1uOzAd|Z#pbm|qW*S`Rf2gOQo-mcW#lKA4S zUuWr9y$Iw|h+g2!pNji#=Dx z1_s5#pm~vh$Wjo~va=n}wb^~_JFX*eY>i)bNVuBW3kw{%GO!L}uPx7BdPLXg4h)*P z3Au_YQ-mr+Aeg(GMd=u&=DBzJ4*vA8$#z~7e{$_sUm3KqQIW;olO@{wd{S;e6uE>t zjnXlmYjbdX3rj&vsZy(JP^v0=#<%nOdIHb&Xz#BeC8)?EiUn!QaNyJmkq(HBMRQV8 zc=LIcI^bz2VWWX^(_+{ ze~BdwnN&ciEVL>UMkzktZvvoWV3AGf+V5|?@%TMQFE>&SH07#6Yj``+fYLD?{f3q% zpLenaPKExjx3OM1ZrCr&$Y=lD8Bt@z%G8Estij( zjOy;>#QA4pgA;FGJY2)A zW2x0#`DA`oH~5hT%3kkDCl5DbbYlz)b$2ZkjD*~Iaw{aH4c zpJuWx%N2}eTTa`L{mfa|+10+aL2G#K4bQ>L{a!cs^S;8;l;2v5Ji+EF;@t+KH%&yE z_K>j`R~l+D(|Ns)N!K}|U1iKk<-EJ1A$nKEM_Y9|ICDK$vf;6;B{8~-SKj*qH5*gk~&{{_FrGn&ZC1X8D zdHduf-UIsFCUT-@uZ~Yo4GeXdm~LH3(zz_Pe*qD36aKRXzV|4JwyT(TYVe&{pBo?_ zVt3Z?YuvzxN0m%nEu`_Hg~ZrKrc#Z@+Dcv?Nz`IXDtXGjX!?q&a z;t@VOD~LK*ajCwBfOR#)_EUTr+Jbk#E;r!W`5m~bO9{UyVcusV-nD|~7J(lQCBMhj z%-qo6t}Ugdp^ngij<3CXWF~_PLi6!$+^;IZ*;dJf!@%62g1{{Sv9X4ql9sq#jq9{P z-?g3i`(=ue8nnnv2LG#U$iOi*v%`hVj#i`|bOYhmVv>VO5-v6GoAh*>*X6@m$%Z`Q zZ5xvP458GwE=(BdKdj;5ZY^!~<%`4rDjW3wWb7p+LHGmRIAKBcROyuf0000avHoCZJ@ z|7T!eV30{>Wl+dxWnf@n_;2z_kU?I8lVQfDM~rw4Ky&tgnPgT5@c?E9fd`BX2Ufj> zt6?H0bD&=D`NJsD&%?kj$;fa``xC=kwV!Y~W?~HRG!y+VFTu%hd*Kg;SI>Uq3{ae! zJJZ$wYshi`Cpj8nHXpd~mf^;uuZ$!m5JEQNbpc&$#_9sP+Kd4*{N%{jObGx0=`>mT T1&xom00000NkvXXu0mjfFP3*& delta 199 zcmdnX^q6siNja|>R-Q*EflIywU!=`XM?GytuGsBj+5dLz(zd)xkFnGH9xvX0oneK0@VVLBo78+OGiWi{{a60|De66laVnPe+P6)O+^Ra0}~N8B!Wvi7ytkO z;z>k7R5;6HU>In?h)Y7$h2=lG*y}xiFx0c)(kvOl%<%s|0|Uc928KUh{xdLfFfcGM zu>3dqB*-8y!O1XV(<4Tl20(2>ae;U+GlN73GlSd>HiiT1-V*i#I`A|T{r@!m6T|;s z3=A*UfBuDghlyCt@)Dd3zZzK>n7J7k#DkdNVZ=m?W(Pwdh65MgGTeCdmGSAKzYGkF z2!}HfWAps&PZ(}I`U=;@h@^{&SeudM{{8un-vC@T!vLEgBYtOhrmO$gkmLSOOd?~% sW-~Tt6BSj2Y{m;R{N%{jObGx0pqO8Zz|hJ23;+NC07*qoM6N<$g7jvA(*OVf delta 243 zcmV>^!-hoQv2O!PJ&W3r1CIn?NQz=n7nc7p_Uk==7#SEC7+6TrEE&nn@b}w4hVKs;85kH?{=eSy zhmnO?%~G+<4BsC7WBC2yKLe{U+#w81MA;m{%<%K&KZb7){xk4sGBR*VFcWXU>pg!M zrDyRmfBbyL$iSn@$iOMZ!ti{>Uw9Z0G{DnL^uL3l5Ci) zUH!j?9QS|pSRfdUo@S!|74qSN4aO2TelA;^KW|9&TsW!tEXvlH@SCrsla4-~N zn7{oA(awg)0y&ydlJfRbuNfH_82-~eHv#}G6RcZFcmO1n00000NkvXXu0mjf5ub%T delta 202 zcmcb^^o((WN0oneQ0@VVLBo78+OGiWi{{a60|De66laVnPe+P6)O+^Ra0}~NCBrg7S6aWAK z;z>k7R5;6HWFP~Gy0H9*v6;!ytlrATAYjhS@czhO1}1Ve|M|kez`_F&VmZha{aeC$@L#O-q8WhXe7yIT&{q52OnTT=6ITk{+E~FWLPr!DT87z zE5oO&e;F7U82%#%EKcBQCi=fKUH!j?9QS{iOL#Px|I25w;&llNOj2HglVSe$Ck!_p sePu+8&i_RFnVg)-h^&z)zoG#Ep#*%iV|R1^3;+NC07*qoM6N<$g0TgIlK=n! delta 249 zcmVPqrv|850)mFX z6oPDqX+{Pxc_