From 5cd2350c9bcf4b634b25938c56d31356d7afb212 Mon Sep 17 00:00:00 2001 From: ganymedes01 Date: Wed, 26 Aug 2015 01:17:42 +0100 Subject: [PATCH] Fix #806 Chests now render akin to the vanilla chests --- .gitignore | 3 +- .../java/forestry/core/gadgets/BlockBase.java | 20 +++++ .../core/gadgets/MachineDefinition.java | 24 ++++- .../core/gadgets/TileNaturalistChest.java | 73 ++++++++++++++++ .../gui/ContainerNaturalistInventory.java | 6 ++ .../core/render/RenderNaturalistChest.java | 82 ++++++++++++++++++ .../forestry/plugins/PluginApiculture.java | 9 +- .../forestry/plugins/PluginArboriculture.java | 7 +- .../plugins/PluginLepidopterology.java | 9 +- .../textures/blocks/apiaristchest.1.png | Bin 275 -> 0 bytes .../textures/blocks/apiaristchest.2.png | Bin 239 -> 0 bytes .../textures/blocks/apiaristchest.3.png | Bin 300 -> 0 bytes .../textures/blocks/apiaristchest.4.png | Bin 239 -> 0 bytes .../textures/blocks/apiaristchest.png | Bin 0 -> 733 bytes .../forestry/textures/blocks/arbchest.1.png | Bin 376 -> 0 bytes .../forestry/textures/blocks/arbchest.2.png | Bin 240 -> 0 bytes .../forestry/textures/blocks/arbchest.3.png | Bin 300 -> 0 bytes .../forestry/textures/blocks/arbchest.4.png | Bin 240 -> 0 bytes .../forestry/textures/blocks/arbchest.7.png | Bin 374 -> 0 bytes .../forestry/textures/blocks/arbchest.png | Bin 0 -> 840 bytes .../forestry/textures/blocks/lepichest.1.png | Bin 303 -> 0 bytes .../forestry/textures/blocks/lepichest.2.png | Bin 240 -> 0 bytes .../forestry/textures/blocks/lepichest.3.png | Bin 300 -> 0 bytes .../forestry/textures/blocks/lepichest.4.png | Bin 240 -> 0 bytes .../forestry/textures/blocks/lepichest.7.png | Bin 302 -> 0 bytes .../forestry/textures/blocks/lepichest.png | Bin 0 -> 765 bytes 26 files changed, 219 insertions(+), 14 deletions(-) create mode 100644 src/main/java/forestry/core/render/RenderNaturalistChest.java delete mode 100755 src/main/resources/assets/forestry/textures/blocks/apiaristchest.1.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/apiaristchest.2.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/apiaristchest.3.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/apiaristchest.4.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/apiaristchest.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/arbchest.1.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/arbchest.2.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/arbchest.3.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/arbchest.4.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/arbchest.7.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/arbchest.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/lepichest.1.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/lepichest.2.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/lepichest.3.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/lepichest.4.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/lepichest.7.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepichest.png diff --git a/.gitignore b/.gitignore index 32258774f..a0abcab4a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ !/build.gradle !/build.xml !/gradlew -!/gradlew.bat \ No newline at end of file +!/gradlew.bat +.DS_Store diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java index 8e5c47f6d..3fee9ff6f 100755 --- a/src/main/java/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/gadgets/BlockBase.java @@ -24,6 +24,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -101,6 +102,25 @@ public class BlockBase extends BlockForestry { return definitions.get(metadata); } + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + MachineDefinition definition = definitions.get(world.getBlockMetadata(x, y, z)); + if (definition == null) { + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + return definition.getBoundingBox(x, y, z); + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + MachineDefinition definition = definitions.get(world.getBlockMetadata(x, y, z)); + if (definition == null) { + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + return definition.getBoundingBox(x, y, z); + } + /* CREATIVE INVENTORY */ @SuppressWarnings("rawtypes") @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/gadgets/MachineDefinition.java b/src/main/java/forestry/core/gadgets/MachineDefinition.java index 26a0b18f9..2d7107608 100755 --- a/src/main/java/forestry/core/gadgets/MachineDefinition.java +++ b/src/main/java/forestry/core/gadgets/MachineDefinition.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,7 +36,6 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.core.interfaces.IBlockRenderer; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; -import forestry.core.render.TileRendererIndex; public class MachineDefinition { @@ -46,6 +46,8 @@ public class MachineDefinition { private final int meta; public final IBlockRenderer renderer; + + private float minX, minY, minZ, maxX, maxY, maxZ; /* CRAFTING */ public IRecipe[] recipes; @@ -67,6 +69,12 @@ public class MachineDefinition { faceMap[i] = 0; } + minX = 0; + minY = 0; + minZ = 0; + maxX = 1; + maxY = 1; + maxZ = 1; } public Block getBlock() { @@ -80,6 +88,16 @@ public class MachineDefinition { public void setBlock(Block block) { this.block = block; } + + public MachineDefinition setBoundingBox(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) { + this.minX = minX; + this.minY = minY; + this.minZ = minZ; + this.maxX = maxX; + this.maxY = maxY; + this.maxZ = maxZ; + return this; + } public void register() { registerTileEntity(); @@ -97,6 +115,10 @@ public class MachineDefinition { } } } + + public AxisAlignedBB getBoundingBox(int x, int y, int z) { + return AxisAlignedBB.getBoundingBox(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); + } /** * Registers the tile entity with MC. diff --git a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java index e284d6f0b..ff084eb72 100755 --- a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java +++ b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.gadgets; +import java.io.IOException; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,9 +21,15 @@ import forestry.core.GuiHandler; import forestry.core.config.Config; import forestry.core.gui.IPagedInventory; import forestry.core.inventory.TileInventoryAdapter; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; public abstract class TileNaturalistChest extends TileBase implements IPagedInventory { private final int guiID; + public float lidAngle; + public float prevLidAngle; + private int numPlayersUsing; + private static float lidAngleVariationPerTick = 0.1F; public TileNaturalistChest(ISpeciesRoot speciesRoot, int guiId) { setInternalInventory(new NaturalistInventoryAdapter(this, speciesRoot)); @@ -29,6 +37,44 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve this.guiID = guiId; } + @Override + protected void updateClientSide() { + update(); + } + + @Override + protected void updateServerSide() { + update(); + } + + private void update() { + prevLidAngle = lidAngle; + + if (numPlayersUsing > 0 && lidAngle == 0.0F) { + playLidSound("random.chestopen"); + } + + if (numPlayersUsing == 0 && lidAngle > 0.0F || numPlayersUsing > 0 && lidAngle < 1.0F) { + float oldAngle = lidAngle; + + if (numPlayersUsing > 0) { + lidAngle += lidAngleVariationPerTick; + } else { + lidAngle -= lidAngleVariationPerTick; + } + + lidAngle = Math.max(Math.min(lidAngle, 1), 0); + + if (lidAngle < 0.5F && oldAngle >= 0.5F) { + playLidSound("random.chestclosed"); + } + } + } + + private void playLidSound(String sound) { + worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, sound, 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F); + } + @Override public void openGui(EntityPlayer player) { player.openGui(ForestryAPI.instance, guiID, player.worldObj, xCoord, yCoord, zCoord); @@ -39,6 +85,18 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve player.openGui(ForestryAPI.instance, GuiHandler.encodeGuiData(guiID, page), player.worldObj, xCoord, yCoord, zCoord); } + @Override + public void writeData(DataOutputStreamForestry data) throws IOException { + super.writeData(data); + data.writeInt(numPlayersUsing); + } + + @Override + public void readData(DataInputStreamForestry data) throws IOException { + super.readData(data); + numPlayersUsing = data.readInt(); + } + private static class NaturalistInventoryAdapter extends TileInventoryAdapter { private final ISpeciesRoot speciesRoot; @@ -56,5 +114,20 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { return true; } + + @Override + public void openInventory() { + tile.numPlayersUsing++; + tile.setNeedsNetworkUpdate(); + } + + @Override + public void closeInventory() { + tile.numPlayersUsing--; + if (tile.numPlayersUsing < 0) { + tile.numPlayersUsing = 0; + } + tile.setNeedsNetworkUpdate(); + } } } diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 69b42038c..2c1134918 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -21,6 +21,7 @@ public class ContainerNaturalistInventory extends ContainerTile defaultPlantableFlowers = new HashMap(); @Override - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) protected void setupAPI() { super.setupAPI(); @@ -208,7 +209,7 @@ public class PluginApiculture extends ForestryPlugin { MinecraftForge.EVENT_BUS.register(this); - ForestryBlock.apiculture.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "apiculture"); + ForestryBlock.apiculture.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "apiculture"); ForestryBlock.apiculture.block().setCreativeTab(Tabs.tabApiculture); ForestryBlock.apiculture.block().setHarvestLevel("axe", 0); @@ -222,7 +223,7 @@ public class PluginApiculture extends ForestryPlugin { 'C', ForestryItem.impregnatedCasing)) .setFaces(0, 1, 2, 2, 4, 4, 0, 7)); - definitionChest = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChest", TileApiaristChest.class, + definitionChest = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChest", TileApiaristChest.class, new RenderNaturalistChest("apiaristchest"), ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_APIARISTCHEST_META), " # ", "XYX", @@ -230,7 +231,7 @@ public class PluginApiculture extends ForestryPlugin { '#', "blockGlass", 'X', "beeComb", 'Y', "chestWood")) - .setFaces(0, 1, 2, 3, 4, 4)); + .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F)); definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeehouse.class, ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_BEEHOUSE_META), diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 3f9d2bd6a..33e2a7426 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -92,6 +92,7 @@ import forestry.core.items.ItemForestryBlock; import forestry.core.items.ItemFruit.EnumFruit; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; +import forestry.core.render.RenderNaturalistChest; import forestry.core.utils.RecipeUtil; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.ShapelessRecipeCustom; @@ -183,11 +184,11 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.pods.registerBlock(new BlockFruitPod(), ItemForestryBlock.class, "pods"); // Machines - ForestryBlock.arboriculture.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "arboriculture"); + ForestryBlock.arboriculture.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "arboriculture"); ForestryBlock.arboriculture.block().setCreativeTab(Tabs.tabArboriculture); definitionChest = ((BlockBase) ForestryBlock.arboriculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ARBCHEST_META, - "forestry.ArbChest", TileArboristChest.class, + "forestry.ArbChest", TileArboristChest.class, new RenderNaturalistChest("arbchest"), ShapedRecipeCustom.createShapedRecipe(ForestryBlock.arboriculture.getItemStack(1, Defaults.DEFINITION_ARBCHEST_META), " # ", "XYX", @@ -195,7 +196,7 @@ public class PluginArboriculture extends ForestryPlugin { '#', "blockGlass", 'X', "treeSapling", 'Y', "chestWood")) - .setFaces(0, 1, 2, 3, 4, 4, 0, 7)); + .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F)); // Init rendering proxy.initializeRendering(); diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 83929b2f6..3fca030fe 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -15,8 +15,6 @@ import java.util.EnumSet; import java.util.Locale; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.oredict.RecipeSorter; @@ -46,6 +44,7 @@ import forestry.core.genetics.Branch; import forestry.core.genetics.alleles.Allele; import forestry.core.items.ItemForestryBlock; import forestry.core.proxy.Proxies; +import forestry.core.render.RenderNaturalistChest; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.Utils; import forestry.lepidopterology.ButterflySpawner; @@ -85,7 +84,7 @@ public class PluginLepidopterology extends ForestryPlugin { @Override public void preInit() { - ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "lepidopterology"); + ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "lepidopterology"); ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology); createAlleles(); @@ -125,7 +124,7 @@ public class PluginLepidopterology extends ForestryPlugin { registerTemplates(); BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block()); - MachineDefinition definitionChest = lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, + MachineDefinition definitionChest = lepidopterology.addDefinition(new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, new RenderNaturalistChest("lepichest"), ShapedRecipeCustom.createShapedRecipe( ForestryBlock.lepidopterology.getItemStack(1, Defaults.DEFINITION_LEPICHEST_META), " # ", @@ -134,7 +133,7 @@ public class PluginLepidopterology extends ForestryPlugin { '#', "blockGlass", 'X', ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), 'Y', "chestWood")) - .setFaces(0, 1, 2, 3, 4, 4, 0, 7))); + .setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F)); definitionChest.register(); ((ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees")).registerLeafTickHandler(new ButterflySpawner()); diff --git a/src/main/resources/assets/forestry/textures/blocks/apiaristchest.1.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.1.png deleted file mode 100755 index 9f19f52e1022070419a67c271b6cbc297f4cc82d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPtD>y zzfjn%neThJ4`@D@nb;M;c_?c2&ADg#I-^!4=t>@t;#wUl&@DKADZj2N7RJ-o zGCTtE4e8uxC!ZF~&ureZkda;M<*cRiAOD})9I{n0vxU#(8GrBDzao}L?>8ZXDzfr2;*)cAU2XKW)Z}zjWz7xM)s^MU^i^jT8625p>tbV| zC@UWO?OzYjz*J8c$B>G+R^M>0qXs;a!^6Huf46^Ctgvv&-xVpz22u_s3*^Iycd^U2$X+`Wj1GJFA)78&qol`;+02voi3;+NC diff --git a/src/main/resources/assets/forestry/textures/blocks/apiaristchest.3.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.3.png deleted file mode 100755 index b36e50a6f4ee5cc5a41be89a6d20b6d04fa73025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmV+{0n`48P)!&#F9NKB^@Xv9V;duHZUfWZ7r#NGeJ8qw1zjCaxg|dGIn-$MLjV^JTIlC zr7R^KHZLX3&CMSi7eqWTEGHhZgg23qk)nArhK7bJCLSRj7sA5ACnFv#Cm*R_kc9vM z0D(zFK~#8NT}}rI!$1s^?VBUJd-wmJtT}Sf!~+{4BmsS`JnCxoaAZiQtlNOr3fMxV z!(1wGhOY#kkGwKY07AGt-ro?y0U5rFv5P#+Tp!gSlhT!k8>f3RG&L9I=HjZ$n!-?q ytAzg?+oTixKIwC-F~aXPULqf{*2*HX==}kqQwCl(K*M+d00008ZXDzfr2;*)cAU2XKW)Z}zjWz7xM)s^MU^i^jT8625p>tbV| zC@UWO?OzYjz*J8c$B>G+R^M>0qXs;a!^6Huf46^Ctgvv&-xVpz22u_s3*^Iycd^U2$X+`Wj1GJFA)78&qol`;+02voi3;+NC diff --git a/src/main/resources/assets/forestry/textures/blocks/apiaristchest.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.png new file mode 100644 index 0000000000000000000000000000000000000000..9cfeadb3f170776d207d9cff6f8f5d5a0c663475 GIT binary patch literal 733 zcmV<30wVp1P)nEB^`!_hRw~* za8n|6S0zO}FCQEiL_9E=axfts7ezfW0000dBOZxnD#F6Tk&%%sCm*@SZr0X_&BQ#8VO-qZSN?Tspkh`EKKlTF@b;p;{M*JW8YZ~zl4Ayj8b&`iMN zk4Nm0{3;0IcyK9w6;4ueCSbGPV2{LATnEV5*KtrXXJMF}J11wwa{)g$*dtLD2S|vU z2A@PKNx~3@a0M4}Y+QlayaGD~$O`2*NI*s@r9kls3<>F00RoyafUFAKu0ZA$h_d1N z@Y%Ho&CtX>nz+BF0$HJiy1zz!We;wA3tUyz97g zjVLY|0l@YCH7_PMFC{;sJ86PEZizp$*4r~KCI0^YI4>nABpoUx9V;duAY>gjFeW!K zCuDs&MmZ=*J~T)_KT1F?OhPnHM>|$eLPac0R0I5ktK~#8NRgG5?!Y~j+ zz3XnLkfY z>@B`T*2LtTCKRnoKGH*937vkrAPn3#x7nJ<^pY1gL?F)h>FT)T+<_rb0iHn4m`wrv zhKS}^$~}WwH?)|rX7))KpJp>c{ut0@ctFa^AjB9M*5WV#<4>)stSyWwjJ4M6j7e{W W`U&R>ER?kX00005QZR diff --git a/src/main/resources/assets/forestry/textures/blocks/arbchest.2.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.2.png deleted file mode 100755 index 7c6bbfb6b8d1cdcefff9556bdca6dc90a8de1f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPtGtZ3ma43ls+_T&s+*lr zVx_s6ftsVWzN@XFhKj7VntW=Vm4C9XtBt;*thkxJs*b8`NQQyBvYd;JL3XRHmYSTo zq55u)PoY2q(>z@qLn`80eZ#qq8t{BR^RDLcKlioFoQiMVRi&FRGJIs4m=JwX;pgmJ zE9H)7YrZah`*CH{!h?Aiw{hC!pWA6~&1}qkBG7B@F_zOg2h-Q?zkVu4I^I~Q#qx3a kd5?w;>x+J6FIA%S8FjcTDlApk18rpRboFyt=akR{0Fix5!vFvP diff --git a/src/main/resources/assets/forestry/textures/blocks/arbchest.3.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.3.png deleted file mode 100755 index c9c1b36e72173a78f5258552dd5837759375dfb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8tGtZ3ma3drj8blRxrT~tcB^ejhJmZCp_`qNj;gGyjec2K+0vy;!*h(< z+S*)f3=+!Cb=2i_)aA9*^O zJJ(?cp3ggMH(j><|No@a^X$x@-#J`m5Ze>Gq*Afgr8(P6d{+FFYax|cdM;;|t~fny(WdrAE&pYH vFA<)ReCc=GV)o)I70PyoEe*<#G`_RHtLFG7@#{l9&@l|2u6{1-oD!M<#@1<= diff --git a/src/main/resources/assets/forestry/textures/blocks/arbchest.4.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.4.png deleted file mode 100755 index 7c6bbfb6b8d1cdcefff9556bdca6dc90a8de1f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPtGtZ3ma43ls+_T&s+*lr zVx_s6ftsVWzN@XFhKj7VntW=Vm4C9XtBt;*thkxJs*b8`NQQyBvYd;JL3XRHmYSTo zq55u)PoY2q(>z@qLn`80eZ#qq8t{BR^RDLcKlioFoQiMVRi&FRGJIs4m=JwX;pgmJ zE9H)7YrZah`*CH{!h?Aiw{hC!pWA6~&1}qkBG7B@F_zOg2h-Q?zkVu4I^I~Q#qx3a kd5?w;>x+J6FIA%S8FjcTDlApk18rpRboFyt=akR{0Fix5!vFvP diff --git a/src/main/resources/assets/forestry/textures/blocks/arbchest.7.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.7.png deleted file mode 100755 index 0a9d451d44e2a4908e956cf4177e9b9b5ca8d6ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}SAb85tGtZ3Zm))(B%}Qz>wo|L znH#EWsK}<&T4pxcY`%8;z}J7qda9=SY6>Z`X8Njmo%Uu1YFetY+G_G1b|xP7_FfLU zK29cn?p6V|ronDzin8KHx@s=A+ODQLt`?eZmKxz+mf>Dj;a(0=-Zs%5`q5s_F(FP# zk#1UQau)ik_QqNvF2!an09j<+hX8{@%Wo!gar5#_z=~3sx~{tajs=8$9v$+(ISx{bq~ZT9x*)$~a~A zGC3drD`zbV zTol3CZ2a7EPtYEv#>xz9Cti`4mGeIp7`7ZRNSJY$|26M+Gwtltd+PeHmD!sLa$c2Q SkdOp)GJ~h9pUXO@geCxntb$CPh6lN?a|_eLrzCJNIo=IN=!!jYh3p@^%Y9 zZY8iP&vX9Iz?9aiHC~}7;N;#3?vCPuOIdPMS>_^E*;Y#Q1dJzR+#RukSCY%JtYn!p z=4V;BZXB)^>kD`^#@!JV@^kfEVn+3|1W;j^WoVQJk0OS5Uwr@an!l94u>$)M7%4y$ z*n*GWetr7zj^{#XEIve|w4hahO>7$Y7CV`PQvvM}fOEc(Qob)a27tf0KYC5>0q501 zzWKo`&iAQ66m7z@uXx?J2dGz1U*L7Gx4?>`;OMF`W7-leAP|>vd>IQN;@dH})Dtj@ zqG&X_gGK?JOn_3pQd;?Fy`s}L;Gsgs-L7Cm%b7*Ecaf<;cd6*4rP`2D1aLgAU&8)r-sa#L!KkrNTbLdVlI&aVsÁPcX_*M3;0LGfv)>`|-fdW^T!0>G}LgGm++x=Sa?(OYTVP)@nn`nMKIE$n?OO zwREz_x=CKqskaA)_US=Fr``Wd37Jel5S*szX&MAUdMmw8C-47j(4aws2K@yN6imd0000~1UFDAhC{)ka5mL4ZIFC{ZBB}W9%SULp${{A*FCO0uBI4>nABpoUx z9eYYC_`Vw}CLbXk7b+$m9~>8zKLj!@CYFjPI8y(|0001%NklWq^){xF9v=S5_ZoU?pH$`6NU2b+kvTj2lz002ovPDHLkV1hMq Ba=ZWl diff --git a/src/main/resources/assets/forestry/textures/blocks/lepichest.2.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.2.png deleted file mode 100755 index a749b01278324f2073db9258ad37eedefeb440a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPtGtZ3ma43ls+_T&s+*lr zwU?%uftsVWzN@XFhKj7VntYS5R;rDntBt;*thkxJs*b8`roFPdvYd;JK}VpDmYSTo zp}LsUZ)Ko?X`U{QAr*10zTsR)4R}7Ec~|rJpZi*7PQ|zGs?yCD89uU2Oo%?H@N;&q zm2$_kHD8y${kXDe;laF%+c<6V&+W9gW;SL%5$HAd7|ZFLgXwGcUq2Ni9d9huV)?lI kyhlTa^+mt3mnu>Ej5^#E6_%>&fi^ODy85}Sb4q9e0Ng=Jf&c&j diff --git a/src/main/resources/assets/forestry/textures/blocks/lepichest.3.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.3.png deleted file mode 100755 index d1082185ae4ae943c38d2f098508bb322569c0b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8tGtZ3ma1I5rF@gGmbRL_ zv7V}#ftsVWzLu(Ns*Pfat6H^}riO}aN1#roy|SyVVOd$3o1Kx4s;sMx{?esO^PN>E zPMqjsW1yohSLvy#qb{$dCfC;1W~Q&It}Lf0D}LzEp|fYtR+LSV1lri>>Eakt5f|&n z&UM&<=kpHRO_y!||34`;xmiu_28SZ&n-x#1BUcJ?g-<(q+ibyB21Vo30;#O$5~etu zo^Hk#kv(^}jh*@PJC~~rVtZnjBr4XrG-rE-OZiQ?7E+m~=W=%Giqq2;ZE9cC@?Yln v65|=kmwv}BW-q={p}fzar9t?S%6Imky_~EpY`0DV9mC-1>gTe~DWM4f8+m2X diff --git a/src/main/resources/assets/forestry/textures/blocks/lepichest.4.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.4.png deleted file mode 100755 index a749b01278324f2073db9258ad37eedefeb440a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPtGtZ3ma43ls+_T&s+*lr zwU?%uftsVWzN@XFhKj7VntYS5R;rDntBt;*thkxJs*b8`roFPdvYd;JK}VpDmYSTo zp}LsUZ)Ko?X`U{QAr*10zTsR)4R}7Ec~|rJpZi*7PQ|zGs?yCD89uU2Oo%?H@N;&q zm2$_kHD8y${kXDe;laF%+c<6V&+W9gW;SL%5$HAd7|ZFLgXwGcUq2Ni9d9huV)?lI kyhlTa^+mt3mnu>Ej5^#E6_%>&fi^ODy85}Sb4q9e0Ng=Jf&c&j diff --git a/src/main/resources/assets/forestry/textures/blocks/lepichest.7.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.7.png deleted file mode 100755 index ec8aa3c97478713128e33009e10b7b328b8fff35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)f1S%#TtWiia0001$NklW~=8hC^;e~ynk4u+k;rtNK-U~I`kvV5rLKq_p zDXunxu#sQnQc5nx3;K8mk>xx9@7|kzf7I6ZKbKJmp0hkBApigX07*qoM6N<$f_jf_ AH~;_u diff --git a/src/main/resources/assets/forestry/textures/blocks/lepichest.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.png new file mode 100644 index 0000000000000000000000000000000000000000..c5dfc0988c62eaa7de6733c9e35d3aca2ed8d3f2 GIT binary patch literal 765 zcmVyXg(r(NGSNe8%91dJ|z`pJR!}^&4z}C zEF~Q{FC|Sb8Bj1AMLaJ60018x7eqWTMLjWTKO-k29w8kUUO69;k&(i}!Yn5rmWn5I zMkkd&1QrnjfJ`YeEhhCg#_|9F00DGTPE!Ct=GbNc00I3;L_t(|UhS2~j^r>5L`@~< z+&NDU8*}*oA6rVjwj`hpa6F4SxkMfw1eZ%PnjHk!i|a+usRRJV8f?_ur{J>iamRsG zv)PRQYhY3-sT-wWz~JWV4OT~4$k%Ir)=Xrw?Ip#4!E&+0>WGD_3ZKpMivOH37PW11 z(w&?n8#4H^#Oesb)fydgbjWi6nIvtCjZzR$#Mb5r=&;H$fqMi-G7ur>-!XwP5JF-2 z#B`zrEkVe&@?Y8jyaco(KwWbzOu*3qBK>~TC+Z#WT7QPafmi%6CV>d+Rb6qdYUCZ5 zBN&bP3M>pmj$P?yOgW+%#NsZ??lK`n_9p|M1`LjAnjVkuu~9%LYanGLrIHc0n$xK_ zcqfsu%!<#n+gQ?diEIMZxnh@wHlH^;OLotr-XIlC(=cdI0M98PecNugmh7HKfhXEX zqsSj(K9LME`P55_Oga*@1d(IFnEq_0RYV*p;3QB0FFyj4UIJ-F9cju*AcVs3rcvVM z3BXN29chtw2i^N4T=41yZ+Zvgzk)Z!-e#n|{^xwWy858YtkTf^!~KILyXR4F@aWE& z_)+cmzx71g|JWmWdp`Lity}Xm?KTb}Um|-4-mImQJJzl9oKAyxU}?-9lytiM&s37h v8pQE!QQQ`B92XypPjm|Yza~wZG-=XbNq<+XKb;i000000NkvXXu0mjfEu=?= literal 0 HcmV?d00001