From 5d4b84727d1a78e30ccf53013534151a4326857e Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Tue, 17 Mar 2015 23:03:48 -0700 Subject: [PATCH] Work on Thaumic Apiary. Creating Packet Handler for sending network events (ie queen item stack changes) Tweaking textures on thaumic apiary again Adding MORE crap to gitignore build.gradle missing a runDir argument, apparently. --- .gitignore | 5 +- build.gradle | 1 + .../magicbees/client/gui/ContainerMB.java | 4 +- .../client/gui/ContainerThaumicApiary.java | 16 +- .../client/gui/GuiThaumicApiary.java | 58 +++++++ .../magicbees/main/utils/PacketHandler.java | 19 +++ .../main/utils/net/PacketInventoryUpdate.java | 5 + .../tileentity/TileEntityThaumicApiary.java | 156 +++++++++++------- .../textures/blocks/thaumicapiary.2.png | Bin 1221 -> 1221 bytes .../textures/blocks/thaumicapiary.4.png | Bin 1221 -> 1221 bytes .../assets/magicbees/textures/gui/apiary.png | Bin 4717 -> 5195 bytes 11 files changed, 196 insertions(+), 68 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/PacketHandler.java create mode 100644 src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java diff --git a/.gitignore b/.gitignore index adab173..de81a7a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,7 @@ libs/ config/ crash-reports/ logs/ -mods/ \ No newline at end of file +mods/ +saves/ +usernamecache.json +options.txt \ No newline at end of file diff --git a/build.gradle b/build.gradle index f1f9623..ee5a5ff 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ archivesBaseName = "magicbees" minecraft { version = project.version_mc + "-" + project.version_forge assetDir = "eclipse/assets" + runDir = "." replace '@VERSION@', project.version_mod replace '@MCVERSION@', project.version_mc diff --git a/src/main/java/magicbees/client/gui/ContainerMB.java b/src/main/java/magicbees/client/gui/ContainerMB.java index e3f7e5e..e608cf7 100644 --- a/src/main/java/magicbees/client/gui/ContainerMB.java +++ b/src/main/java/magicbees/client/gui/ContainerMB.java @@ -13,12 +13,12 @@ public class ContainerMB extends Container public void addPlayerInventory(InventoryPlayer inventoryPlayer, int xStart, int yStart) { for (int x = 0; x < PLAYER_INVENTORY_COLUMNS; x++){ - addSlotToContainer(new Slot(inventoryPlayer, x, 8 + 18 * x, yStart + 4 + PLAYER_INVENTORY_ROWS * 18)); + addSlotToContainer(new Slot(inventoryPlayer, x, xStart + 8 + 18 * x, yStart + 4 + PLAYER_INVENTORY_ROWS * 18)); } for (int y = 0; y < PLAYER_INVENTORY_ROWS; y++){ for (int x = 0; x < PLAYER_INVENTORY_COLUMNS; x++){ - addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, yStart + y * 18)); + addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, xStart + 8 + 18 * x, yStart + y * 18)); } } } diff --git a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java index 81783cd..9e33171 100644 --- a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; public class ContainerThaumicApiary extends ContainerMB { - private TileEntityThaumicApiary thaumicApiary; + public TileEntityThaumicApiary apiary; public int maxSlot = 0; // Constants @@ -24,12 +24,12 @@ public class ContainerThaumicApiary extends ContainerMB { private static final int SLOT_INVENTORY_COUNT = 7; public ContainerThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary){ - this.thaumicApiary = thaumicApiary; + this.apiary = thaumicApiary; // Queen/Princess slot - addSlotToContainer(new SlotCustomItems(this.thaumicApiary, 0, 29, 39, ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); + addSlotToContainer(new SlotCustomItems(this.apiary, 0, 29, 39, ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); // Drone slot - addSlotToContainer(new SlotCustomItems(this.thaumicApiary, 1, 29, 65, ItemInterface.getItemStack("Forestry", "beeDroneGE", 64))); + addSlotToContainer(new SlotCustomItems(this.apiary, 1, 29, 65, ItemInterface.getItemStack("Forestry", "beeDroneGE", 64))); int currentSlot = 1; @@ -56,7 +56,7 @@ public class ContainerThaumicApiary extends ContainerMB { j++; } - addPlayerInventory(inventoryPlayer, 0, 108); + addPlayerInventory(inventoryPlayer, 6, 109); maxSlot = currentSlot; @@ -105,13 +105,13 @@ public class ContainerThaumicApiary extends ContainerMB { @Override public boolean canInteractWith(EntityPlayer entityPlayer) { - return thaumicApiary.isUseableByPlayer(entityPlayer); + return apiary.isUseableByPlayer(entityPlayer); } @Override public void updateProgressBar(int i, int j) { - thaumicApiary.getGUINetworkData(i, j); + apiary.getGUINetworkData(i, j); } @Override @@ -119,7 +119,7 @@ public class ContainerThaumicApiary extends ContainerMB { super.detectAndSendChanges(); for (Object crafter : crafters) { - thaumicApiary.sendGUINetworkData(this, (ICrafting) crafter); + apiary.sendGUINetworkData(this, (ICrafting) crafter); } } } diff --git a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java index 01a647b..f62973d 100644 --- a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -17,6 +18,40 @@ public class GuiThaumicApiary extends GuiContainer private static final int WIDTH = 176; private static final int HEIGHT = 190; + + private static final int LIFEBAR_WIDTH = 2; + private static final int LIFEBAR_HEIGHT = 46; + + private static final int LIFEBAR_DEST_X = 21; + private static final int LIFEBAR_DEST_Y = 37; + + private static final int LIFEBAR_SRC_Y = 0; + private static final int LIFEBAR_SRC_STAGE1_X = 193; + private static final int LIFEBAR_SRC_STAGE2_X = 189; + private static final int LIFEBAR_SRC_STAGE3_X = 185; + private static final int LIFEBAR_SRC_STAGE4_X = 181; + private static final int LIFEBAR_SRC_STAGE5_X = 177; + + private static final int WORKBOOST_WIDTH = 16; + private static final int WORKBOOST_HEIGHT = 12; + private static final int WORKBOOST_DEST_X = 37; + private static final int WORKBOOST_DEST_Y = 18; + private static final int WORKBOOST_SRC_X = 176; + private static final int WORKBOOST_SRC_Y = 46; + + private static final int DEATHBOOST_WIDTH = 11; + private static final int DEATHBOOST_HEIGHT = 13; + private static final int DEATHBOOST_DEST_X = 25; + private static final int DEATHBOOST_DEST_Y = 17; + private static final int DEATHBOOST_SRC_X = 176; + private static final int DEATHBOOST_SRC_Y = 58; + + private static final int MUTATIONBOOST_WIDTH = 9; + private static final int MUTATIONBOOST_HEIGHT = 13; + private static final int MUTATIONBOOST_DEST_X = 15; + private static final int MUTATIONBOOST_DEST_Y = 17; + private static final int MUTATIONBOOST_SRC_X = 176; + private static final int MUTATIONBOOST_SRC_Y = 71; public GuiThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary) { super(new ContainerThaumicApiary(inventoryPlayer, thaumicApiary)); @@ -25,12 +60,35 @@ public class GuiThaumicApiary extends GuiContainer this.ySize = HEIGHT; } + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + fontRendererObj.drawString("Inventory", 9, 99, 0); + } + @Override protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { GL11.glColor4f(1, 1, 1, 1); this.mc.getTextureManager().bindTexture(BACKGROUND_LOCATION); this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + TileEntityThaumicApiary apiary = ((ContainerThaumicApiary)this.inventorySlots).apiary; + int value = LIFEBAR_HEIGHT - (apiary.getHealthScaled(100) * LIFEBAR_HEIGHT) / 100; + this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + LIFEBAR_DEST_Y, + LIFEBAR_SRC_STAGE1_X, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, value); + if (apiary.isWorkBoosted()) { + this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, + WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); + } + if (apiary.isDeathRateBoosted()) { + this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y, + DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT); + } + if (apiary.isMutationBoosted()) { + this.drawTexturedModalRect(this.guiLeft + MUTATIONBOOST_DEST_X, this.guiTop + MUTATIONBOOST_DEST_Y, + MUTATIONBOOST_SRC_X, MUTATIONBOOST_SRC_Y, MUTATIONBOOST_WIDTH, MUTATIONBOOST_HEIGHT); + } } } diff --git a/src/main/java/magicbees/main/utils/PacketHandler.java b/src/main/java/magicbees/main/utils/PacketHandler.java new file mode 100644 index 0000000..5855da3 --- /dev/null +++ b/src/main/java/magicbees/main/utils/PacketHandler.java @@ -0,0 +1,19 @@ +package magicbees.main.utils; + +import cpw.mods.fml.common.network.FMLEventChannel; +import cpw.mods.fml.common.network.NetworkRegistry; + +public class PacketHandler { + + public enum PacketTypes { + INVENTORY_UPDATE, + } + + private FMLEventChannel channel; + + public PacketHandler() { + channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(VersionInfo.ModName); + channel.register(this); + } + +} diff --git a/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java new file mode 100644 index 0000000..4670eff --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java @@ -0,0 +1,5 @@ +package magicbees.main.utils.net; + +public class PacketInventoryUpdate { + +} diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index cebb2d5..02808dc 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -1,18 +1,5 @@ package magicbees.tileentity; -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.*; -import forestry.api.core.ErrorStateRegistry; -import forestry.api.core.IErrorState; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.IIndividual; -import forestry.core.config.ForestryItem; -import forestry.core.inventory.InvTools; -import forestry.core.proxy.Proxies; -import forestry.core.inventory.InventoryAdapter; -import forestry.core.utils.Utils; -import forestry.plugins.PluginApiculture; import magicbees.main.CommonProxy; import magicbees.main.utils.LogHelper; import magicbees.reference.Names; @@ -28,6 +15,26 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.Constants; +import com.mojang.authlib.GameProfile; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.IHiveFrame; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IIndividual; +import forestry.core.config.ForestryItem; +import forestry.core.inventory.InvTools; +import forestry.core.inventory.InventoryAdapter; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Utils; +import forestry.plugins.PluginApiculture; + public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing { public static final String tileEntityName = CommonProxy.DOMAIN + ".thaumicApiary"; @@ -95,15 +102,15 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento public void wearOutEquipment(int amount) { int wear = Math.round(amount * PluginApiculture.beeInterface.getBeekeepingMode(worldObj).getWearModifier()); - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) + for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++) { + if (getStackInSlot(i) == null) { continue; - if (!(getStackInSlot(i).getItem() instanceof IHiveFrame)) + } + if (!(getStackInSlot(i).getItem() instanceof IHiveFrame)) { continue; + } - setInventorySlotContents( - i, - ((IHiveFrame) getStackInSlot(i).getItem()).frameUsed(this, getStackInSlot(i), + setInventorySlotContents(i, ((IHiveFrame) getStackInSlot(i).getItem()).frameUsed(this, getStackInSlot(i), PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)), wear)); } } @@ -149,6 +156,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getMutationModifier(genome, mate, mod); } + if (this.isMutationBoosted()) { + mod = mod * 2f; + } return mod; } @@ -161,6 +171,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getLifespanModifier(genome, mate, mod); } + if (this.isDeathRateBoosted()) { + mod = mod / 2f; + } return mod; } @@ -173,6 +186,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getProductionModifier(genome, mod); } + if (this.isWorkBoosted()) { + mod = mod * 2f; + } return mod; } @@ -407,33 +423,41 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } - /* Health display */ - private int getHealthDisplay(){ - if (getStackInSlot(SLOT_QUEEN) == null) + private int getHealthDisplay() { + if (getStackInSlot(SLOT_QUEEN) == null) { return 0; + } - if (ForestryItem.beeQueenGE.isItemEqual(inventory.getStackInSlot(SLOT_QUEEN))) + if (ForestryItem.beeQueenGE.isItemEqual(inventory.getStackInSlot(SLOT_QUEEN))) { return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getHealth(); - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return displayHealth; - else + } + else { return 0; + } } - private int getMaxHealthDisplay(){ - if (getStackInSlot(SLOT_QUEEN) == null) + private int getMaxHealthDisplay() { + if (getStackInSlot(SLOT_QUEEN) == null) { return 0; - if (ForestryItem.beeQueenGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + if (ForestryItem.beeQueenGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getMaxHealth(); - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return displayHealthMax; - else + } + else { return 0; + } } - private int getHealthScaled(int i){ - if (getMaxHealthDisplay() == 0) + public int getHealthScaled(int i) { + if (getMaxHealthDisplay() == 0) { return 0; + } return (getHealthDisplay() * i) / getMaxHealthDisplay(); } @@ -448,15 +472,15 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento /* Saving and loading */ @Override - public void writeToNBT(NBTTagCompound compound){ + public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); NBTTagList items = new NBTTagList(); - for (int i = 0; i < getSizeInventory(); i++){ + for (int i = 0; i < getSizeInventory(); i++) { ItemStack itemStack = getStackInSlot(i); - if (itemStack != null){ + if (itemStack != null) { NBTTagCompound item = new NBTTagCompound(); item.setByte("Slot", (byte)i); itemStack.writeToNBT(item); @@ -465,23 +489,24 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } compound.setInteger("BiomeId", biome.biomeID); - if (logic != null) + if (logic != null) { logic.writeToNBT(compound); + } compound.setTag("Items", items); } @Override - public void readFromNBT(NBTTagCompound compound){ + public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); NBTTagList items = compound.getTagList("Items", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < items.tagCount(); i++){ + for (int i = 0; i < items.tagCount(); i++) { NBTTagCompound item = (NBTTagCompound)items.getCompoundTagAt(i); int slot = item.getByte("Slot"); - if (slot >= 0 && slot < getSizeInventory()){ + if (slot >= 0 && slot < getSizeInventory()) { setInventorySlotContents(slot, ItemStack.loadItemStackFromNBT(item)); } } @@ -491,32 +516,34 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento logic.readFromNBT(compound); } - public float getExactTemperature(){ + public float getExactTemperature() { return biome.temperature; } - public float getExactHumidity(){ + public float getExactHumidity() { return biome.rainfall; } @Override - public void updateEntity(){ - if (init == false){ + public void updateEntity() { + if (init == false) { init = true; updateBiome(); } - if (!Proxies.common.isSimulating(worldObj)) + if (!Proxies.common.isSimulating(worldObj)) { updateClientSide(); - else + } + else { updateServerSide(); + } } - public void updateBiome(){ - if (worldObj != null){ - if (biome == null){ + public void updateBiome() { + if (worldObj != null) { + if (biome == null) { BiomeGenBase biome = Utils.getBiomeAt(worldObj, xCoord, yCoord); - if (biome != null){ + if (biome != null) { this.biome = biome; setErrorState(ErrorStateRegistry.getErrorState("OK")); } @@ -524,7 +551,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } } - public void updateClientSide(){ + public void updateClientSide() { if (PluginApiculture.beeInterface.isMated(getStackInSlot(SLOT_QUEEN))) { if (getErrorState() == ErrorStateRegistry.getErrorState("OK") && worldObj.getTotalWorldTime() % 2 % 2 == 0) { IBee displayQueen = PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)); @@ -533,21 +560,23 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } } - public void updateServerSide(){ + public void updateServerSide() { logic.update(); IBee queen = logic.getQueen(); - if (queen == null) + if (queen == null) { return; + } - // Swarm effects - if (worldObj.getTotalWorldTime() % 200 * 10 == 0) + if (worldObj.getTotalWorldTime() % 200 * 10 == 0) { onQueenChange(getStackInSlot(SLOT_QUEEN)); + } } - public void getGUINetworkData(int i, int j){ - if (logic == null) + public void getGUINetworkData(int i, int j) { + if (logic == null) { return; + } switch(i) { case 0: @@ -559,10 +588,23 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - if (logic == null) + if (logic == null) { return; + } iCrafting.sendProgressBarUpdate(container, 0, logic.getBreedingTime()); iCrafting.sendProgressBarUpdate(container, 1, logic.getTotalBreedingTime()); } + + public boolean isWorkBoosted() { + return false; + } + + public boolean isDeathRateBoosted() { + return false; + } + + public boolean isMutationBoosted() { + return false; + } } diff --git a/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.2.png b/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.2.png index 1d38df9c7381a6ab0a56d0ae18e5debafc857910..bc573f9e6acd874dbe912cecd53d0d9b92cbf0e6 100644 GIT binary patch delta 594 zcmWlVOIH$M06@P{sSt$`hHr-VsDt1D1tSQ9W+MzRgMd9y6Em^Uw1;ULnmV8;YS}}i zlY3^}d6q0qc2AyQkSviH3-&Ey~g>g5h-OAxE<%kdE zJZ+q(J;YEEZ%4GdQ}o+Ke`lPfsh?QNTAMuoQ!vJh2%i zN&?&x@vRiLE#T!i+#bNo3A~)b%L1_**X<;Ta!S9KfWOE(A5zWM5xO(}M?C;QJ}-^CvYZQ~J4yjr{v3lewAAo6)x*m(9wWpFW?Pn7Sit&ZH-SH-G{}(ZhIq6#$X3 zePC);g&<9p#p;d<0g9D8Ser!=1YLMlT#--!Wb0eNgUP>sZ^V4p(T1j`MwA7wi|^*Y z4)JzdxbKE}z|?R3DwdR%@N$AKjwp1C)C`{DhO z^n;<)tw+FkQlsANl}49$w_gmL)Y^gO_$bof?Y3RL))h=1ACXp2r&el}j~B)=Gt*Y9 Yk-YTtuSloP8ip>G0Wp%|Pea+#KbC8m$N&HU delta 632 zcmWmA*;W#90D$rTD5juH;HJA573P-&^cZ97Tt7C7uh+#?*+bd{yG0}oUg3Klro7@R+XQZHyISwMrDmjb)l|Z zEw!j?teRSjMrza6*>qB?roKZfv+45R@ghc*|EVbH(+d0b`9HGe)`|hW(65Jw+u$K1 zJYo{rTN^2Z++}QH%*`IF+GEx9bzIOEypX(jr5h=PAS@l}!J^$n*dY$vkuZgX?P$b~ zuhF7)7m{!yaR(Z+6EO;nQ&@t+V>A+_(KwAIXgtB78%{Lo#8Wh$auG=eO)^-j7mqv0 z4LccS#R;}D#v(};O|e+gji*^+(}iby@eEC77&60RSr*^Yx`|B>w#A{_ERplz+g@VV zhvj@kjw5m`x$BYa_{bbrwdce4`-!h*MJ7lxEm#Zy0Qk%7=qdo^mH&f&{7U^TEEOBm zMVBkcOC=)&1;F=VRt$@O^u$nuSDQM9lkKO z9X`G@F%`^t=>nJ=DrGl)8onxv9ylRT))XU0`i`(m#CFH#vHZyU`yE-U83AA0Fo) z?F>c^?yv0S_x3@LqK)cl)zmkuue4hXhHeE&rPFiCxzLb57`S&cx_rCyxA)ty;`7PH NGT?S`^cQM6`wt52spbFx diff --git a/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.4.png b/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.4.png index 02c43424a3360280268f62a7b2dc88d226ecb146..3fdcfa37a9485306230ad8fc1c5d15c0220263a1 100644 GIT binary patch delta 591 zcmWlVOIH$M06@P{sSt%xhi``WD1+bt1tSQ9rX$Y*0j)?AGqDiup^*5H*+jJ3vDI^nY>e75l+d!0q7dInJ{wubQn*Hz%KO%ARH z(fSFZoZSh+oiJ7mV5I;o2Vpscm%_?&1a6NKMUE)(SeaLrqOii_yCGPMz-o}FhKU*v z_oDb-65Ho-AqMxya3PKhNnGHG!pB8gbsJ4RPzpNF8@&ciBp%@t(ZtsV4&-O2dOF|_21dMn z<6k~^f_+N8JXhIx|7v%2Ar5wCTqpqx6ziiwpNq{N9A`fbJ_aR z#=3Z%pDlg>;_5+R_QCXvbn0UmpOFx{v`{dD7>hb;L z9V5`5H>fv<)#<{)-m9_mh7oj~orXpS9Oj$1`hAJBQ_=*QI^|0F)BH?&F=sMq$!ot_ UA|v4YAOF=d5Dg`R7yeA`AAk0jS^xk5 delta 616 zcmWmA*;W#90D$rT2&SVlg0tZYDhRS9A|OlRFwBetD3+q;l1qe^nV1W!FoJ8DC6X<+ zS>1Qj3v}ZPbWWGOLl@n2P8ZoZzwZUU3-|&)o`f}xxJFs4QPvd}Rc&TK8?lrCf88&Se(3qRDQ0|v>UsqjbH-dQzdl7vjiXcsbK zLB_07s9N@kMTdjr*U}OzR9pSK7ytmkEByEx0F^cWgTDXF{w*$xEJ8_jmHbMn97FN?MnywS z8IXQDSJsg%&vL##-{*4_RDF0~tMX7@&oyhS|KmF;c-%xRP3*)@?@i4_b^}Zi%uG&- zD;FOuP0S65D?`C4&|yUY1lx@r4j4dUn+wdPB@k5cdhN{<2?XF|3~bIL5QIciLNbQ{ zAl}*s23Z*lm&;5}L{w2xj@ZDn?dQwknYZ(?jkA;JSndTlTRV!64GrH91z+aE;rt0O z88yb17L~QlX3$!+Jw0H3b~-eAy?=WAM)1~PBytD5x_NwBc)B+nKYFx!P&haQz3MKy xw^QHTuDjZ8H=EsRkQIc5%tCY|6bV1PomjamxcyGptJ%9;27GLg`9ja;{{iGsqJ;ne diff --git a/src/main/resources/assets/magicbees/textures/gui/apiary.png b/src/main/resources/assets/magicbees/textures/gui/apiary.png index 02208738d84e2afeab79e9d0f909c4e85f157201..c787c47c95b86b4b86d18c70cdb34f09476ca01b 100644 GIT binary patch delta 4680 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