From 2605bdacebfd599e85fb3717eff875ee0fc5cca1 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 18 Oct 2015 17:57:20 -0700 Subject: [PATCH] Show actual fluid color on machine's exterior tanks --- .../forestry/apiculture/gui/GuiAlveary.java | 18 +-- .../apiculture/gui/GuiBeeHousing.java | 18 +-- .../java/forestry/core/fluids/Fluids.java | 24 ++++ .../java/forestry/core/gui/GuiAnalyzer.java | 18 +-- .../forestry/core/render/EnumTankLevel.java | 18 ++- .../forestry/core/render/RenderMachine.java | 131 +++++++----------- .../forestry/core/render/TankRenderInfo.java | 68 +++++++++ .../forestry/core/tiles/IRenderableTile.java | 7 +- .../forestry/core/tiles/TileEscritoire.java | 10 +- .../java/forestry/core/tiles/TilePowered.java | 12 +- .../forestry/energy/gui/GuiEngineTin.java | 35 +---- .../forestry/energy/tiles/TileGenerator.java | 10 +- .../forestry/factory/tiles/TileBottler.java | 6 +- .../forestry/factory/tiles/TileCarpenter.java | 6 +- .../forestry/factory/tiles/TileFermenter.java | 10 +- .../forestry/factory/tiles/TileMoistener.java | 11 +- .../forestry/factory/tiles/TileSqueezer.java | 8 +- .../forestry/factory/tiles/TileStill.java | 10 +- .../blocks/bottler_tank_resource_high.png | Bin 195 -> 0 bytes .../blocks/bottler_tank_resource_low.png | Bin 195 -> 0 bytes .../blocks/bottler_tank_resource_maximum.png | Bin 191 -> 0 bytes .../blocks/bottler_tank_resource_medium.png | Bin 195 -> 0 bytes .../blocks/carpenter_tank_resource_high.png | Bin 360 -> 0 bytes .../blocks/carpenter_tank_resource_low.png | Bin 360 -> 0 bytes .../carpenter_tank_resource_maximum.png | Bin 352 -> 0 bytes .../blocks/carpenter_tank_resource_medium.png | Bin 360 -> 0 bytes .../blocks/fermenter_tank_product_high.png | Bin 360 -> 0 bytes .../blocks/fermenter_tank_product_low.png | Bin 360 -> 0 bytes .../blocks/fermenter_tank_product_maximum.png | Bin 352 -> 0 bytes .../blocks/fermenter_tank_product_medium.png | Bin 360 -> 0 bytes .../blocks/fermenter_tank_resource_high.png | Bin 360 -> 0 bytes .../blocks/fermenter_tank_resource_low.png | Bin 360 -> 0 bytes .../fermenter_tank_resource_maximum.png | Bin 352 -> 0 bytes .../blocks/fermenter_tank_resource_medium.png | Bin 360 -> 0 bytes .../blocks/generator_tank_resource_high.png | Bin 630 -> 0 bytes .../blocks/generator_tank_resource_low.png | Bin 561 -> 0 bytes .../generator_tank_resource_maximum.png | Bin 552 -> 0 bytes .../blocks/generator_tank_resource_medium.png | Bin 561 -> 0 bytes .../textures/blocks/machine_tank_high.png | Bin 0 -> 125 bytes .../textures/blocks/machine_tank_low.png | Bin 0 -> 122 bytes .../textures/blocks/machine_tank_maximum.png | Bin 0 -> 125 bytes .../textures/blocks/machine_tank_medium.png | Bin 0 -> 124 bytes .../blocks/moistener_tank_resource_high.png | Bin 362 -> 0 bytes .../blocks/moistener_tank_resource_low.png | Bin 362 -> 0 bytes .../moistener_tank_resource_maximum.png | Bin 352 -> 0 bytes .../blocks/moistener_tank_resource_medium.png | Bin 363 -> 0 bytes .../blocks/squeezer_tank_product_high.png | Bin 358 -> 0 bytes .../blocks/squeezer_tank_product_low.png | Bin 360 -> 0 bytes .../blocks/squeezer_tank_product_maximum.png | Bin 347 -> 0 bytes .../blocks/squeezer_tank_product_medium.png | Bin 360 -> 0 bytes .../blocks/still_tank_product_high.png | Bin 358 -> 0 bytes .../blocks/still_tank_product_low.png | Bin 360 -> 0 bytes .../blocks/still_tank_product_maximum.png | Bin 347 -> 0 bytes .../blocks/still_tank_product_medium.png | Bin 360 -> 0 bytes .../blocks/still_tank_resource_high.png | Bin 362 -> 0 bytes .../blocks/still_tank_resource_low.png | Bin 362 -> 0 bytes .../blocks/still_tank_resource_maximum.png | Bin 349 -> 0 bytes .../blocks/still_tank_resource_medium.png | Bin 362 -> 0 bytes 58 files changed, 202 insertions(+), 218 deletions(-) create mode 100644 src/main/java/forestry/core/render/TankRenderInfo.java delete mode 100755 src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_medium.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/machine_tank_high.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/machine_tank_low.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/machine_tank_maximum.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/machine_tank_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_product_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_product_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_product_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_product_medium.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_resource_high.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_resource_low.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/still_tank_resource_medium.png diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index e5f42f6d4..a6e701c35 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -36,24 +36,8 @@ public class GuiAlveary extends GuiForestryTitled tagToFluid = new HashMap<>(); + + static { + for (Fluids fluids : Fluids.values()) { + tagToFluid.put(fluids.getTag(), fluids); + } + } + private final String tag; private final int density, viscosity; private final Color color; @@ -405,6 +415,20 @@ public enum Fluids { return a.isFluidEqual(b); } + public static Color getFluidColor(FluidStack fluidStack) { + if (fluidStack != null) { + Fluid fluid = fluidStack.getFluid(); + if (fluid != null) { + Fluids fluids = tagToFluid.get(fluid.getName()); + if (fluids != null) { + return fluids.getColor(); + } + } + } + + return Fluids.WATER.getColor(); + } + /** FluidBlock and Container registration */ /** * Add the filled containers for this fluid. diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index 371fd4353..675c22b46 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -32,24 +32,8 @@ public class GuiAnalyzer extends GuiForestryTitled texturesTankLevels = new EnumMap<>(EnumTankLevel.class); private RenderMachine() { + ModelBase model = new RenderModelBase(); basefront = new ModelRenderer(model, 0, 0); basefront.addBox(-8F, -8F, -8F, 16, 4, 16); @@ -66,51 +66,36 @@ public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRe productTank.rotationPointX = 8; productTank.rotationPointY = 8; productTank.rotationPointZ = 8; - } public RenderMachine(String baseTexture) { this(); - textures = new ResourceLocation[]{ - new ForestryResource(baseTexture + "base.png"), - - new ForestryResource(baseTexture + "tank_resource_empty.png"), - new ForestryResource(baseTexture + "tank_resource_low.png"), - new ForestryResource(baseTexture + "tank_resource_medium.png"), - new ForestryResource(baseTexture + "tank_resource_high.png"), - new ForestryResource(baseTexture + "tank_resource_maximum.png"), - - new ForestryResource(baseTexture + "tank_product_empty.png"), - new ForestryResource(baseTexture + "tank_product_low.png"), - new ForestryResource(baseTexture + "tank_product_medium.png"), - new ForestryResource(baseTexture + "tank_product_high.png"), - new ForestryResource(baseTexture + "tank_product_maximum.png"), - }; + textureBase = new ForestryResource(baseTexture + "base.png"); + textureProductTank = new ForestryResource(baseTexture + "tank_product_empty.png"); + textureResourceTank = new ForestryResource(baseTexture + "tank_resource_empty.png"); + for (EnumTankLevel tankLevel : EnumTankLevel.values()) { + if (tankLevel == EnumTankLevel.EMPTY) { + continue; + } + String tankLevelString = tankLevel.toString().toLowerCase(Locale.ENGLISH); + texturesTankLevels.put(tankLevel, new ForestryResource("textures/blocks/machine_tank_" + tankLevelString + ".png")); + } } @Override public void inventoryRender(double x, double y, double z) { - render(EnumTankLevel.EMPTY, EnumTankLevel.EMPTY, ForgeDirection.UP, x, y, z); + render(TankRenderInfo.EMPTY, TankRenderInfo.EMPTY, ForgeDirection.EAST, x, y, z); } @Override public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { IRenderableTile generator = (IRenderableTile) tileentity; - render(generator.getPrimaryLevel(), generator.getSecondaryLevel(), generator.getOrientation(), d, d1, d2); - + render(generator.getResourceTankInfo(), generator.getProductTankInfo(), generator.getOrientation(), d, d1, d2); } - private void render(EnumTankLevel waterLevel, EnumTankLevel melangeLevel, ForgeDirection orientation, double x, double y, double z) { - render(waterLevel.ordinal(), melangeLevel.ordinal(), orientation, x, y, z); - } - - private void render(int waterLevelInt, int melangeLevelInt, ForgeDirection orientation, double x, double y, double z) { - - EnumTankLevel waterLevel = EnumTankLevel.values()[waterLevelInt]; - EnumTankLevel melangeLevel = EnumTankLevel.values()[melangeLevelInt]; - + private void render(TankRenderInfo resourceTankInfo, TankRenderInfo productTankInfo, ForgeDirection orientation, double x, double y, double z) { GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); @@ -161,56 +146,36 @@ public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRe float factor = (float) (1.0 / 16.0); - Proxies.render.bindTexture(textures[Textures.BASE.ordinal()]); + Proxies.render.bindTexture(textureBase); basefront.render(factor); - - Proxies.render.bindTexture(textures[Textures.BASE.ordinal()]); baseback.render(factor); - ResourceLocation texture; - - switch (waterLevel) { - case LOW: - texture = textures[Textures.TANK_R_LOW.ordinal()]; - break; - case MEDIUM: - texture = textures[Textures.TANK_R_MEDIUM.ordinal()]; - break; - case HIGH: - texture = textures[Textures.TANK_R_HIGH.ordinal()]; - break; - case MAXIMUM: - texture = textures[Textures.TANK_R_MAXIMUM.ordinal()]; - break; - case EMPTY: - default: - texture = textures[Textures.TANK_R_EMPTY.ordinal()]; - break; - } - Proxies.render.bindTexture(texture); - resourceTank.render(factor); - - switch (melangeLevel) { - case LOW: - texture = textures[Textures.TANK_P_LOW.ordinal()]; - break; - case MEDIUM: - texture = textures[Textures.TANK_P_MEDIUM.ordinal()]; - break; - case HIGH: - texture = textures[Textures.TANK_P_HIGH.ordinal()]; - break; - case MAXIMUM: - texture = textures[Textures.TANK_P_MAXIMUM.ordinal()]; - break; - case EMPTY: - default: - texture = textures[Textures.TANK_P_EMPTY.ordinal()]; - break; - } - Proxies.render.bindTexture(texture); - productTank.render(factor); + renderTank(resourceTank, textureResourceTank, resourceTankInfo, factor); + renderTank(productTank, textureProductTank, productTankInfo, factor); GL11.glPopMatrix(); } + + private void renderTank(ModelRenderer tankModel, ResourceLocation textureBase, TankRenderInfo renderInfo, float factor) { + Proxies.render.bindTexture(textureBase); + tankModel.render(factor); + + ResourceLocation textureResourceTankLevel = texturesTankLevels.get(renderInfo.getLevel()); + if (textureResourceTankLevel == null) { + return; + } + + Color primaryTankColor = renderInfo.getFluidColor(); + float[] colors = new float[3]; + primaryTankColor.getRGBColorComponents(colors); + GL11.glColor4f(colors[0], colors[1], colors[2], 1.0f); + + Proxies.render.bindTexture(textureResourceTankLevel); + tankModel.render(factor); + + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + private static class RenderModelBase extends ModelBase { + } } diff --git a/src/main/java/forestry/core/render/TankRenderInfo.java b/src/main/java/forestry/core/render/TankRenderInfo.java new file mode 100644 index 000000000..4e60f7c48 --- /dev/null +++ b/src/main/java/forestry/core/render/TankRenderInfo.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render; + +import javax.annotation.Nonnull; +import java.awt.Color; + +import net.minecraftforge.fluids.IFluidTank; + +import forestry.core.fluids.Fluids; + +public class TankRenderInfo { + public static final TankRenderInfo EMPTY = new EmptyTankRenderInfo(); + + @Nonnull + private Color fluidColor; + @Nonnull + private EnumTankLevel level; + + public TankRenderInfo(@Nonnull IFluidTank fluidTank, int resourceScaled) { + this(Fluids.getFluidColor(fluidTank.getFluid()), EnumTankLevel.rateTankLevel(resourceScaled)); + } + + public TankRenderInfo(@Nonnull Color fluidColor, @Nonnull EnumTankLevel level) { + this.fluidColor = fluidColor; + this.level = level; + } + + @Nonnull + public Color getFluidColor() { + return fluidColor; + } + + @Nonnull + public EnumTankLevel getLevel() { + return level; + } + + public void setFluidColor(@Nonnull Color fluidColor) { + this.fluidColor = fluidColor; + } + + public void setLevel(@Nonnull EnumTankLevel level) { + this.level = level; + } + + private static class EmptyTankRenderInfo extends TankRenderInfo { + public EmptyTankRenderInfo() { + super(Fluids.WATER.getColor(), EnumTankLevel.EMPTY); + } + + @Override + public void setFluidColor(@Nonnull Color fluidColor) { + } + + @Override + public void setLevel(@Nonnull EnumTankLevel level) { + } + } +} diff --git a/src/main/java/forestry/core/tiles/IRenderableTile.java b/src/main/java/forestry/core/tiles/IRenderableTile.java index 44ff1f37f..93eb7b7e5 100644 --- a/src/main/java/forestry/core/tiles/IRenderableTile.java +++ b/src/main/java/forestry/core/tiles/IRenderableTile.java @@ -12,14 +12,13 @@ package forestry.core.tiles; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.render.EnumTankLevel; +import forestry.core.render.TankRenderInfo; public interface IRenderableTile { ForgeDirection getOrientation(); - EnumTankLevel getPrimaryLevel(); - - EnumTankLevel getSecondaryLevel(); + TankRenderInfo getResourceTankInfo(); + TankRenderInfo getProductTankInfo(); } diff --git a/src/main/java/forestry/core/tiles/TileEscritoire.java b/src/main/java/forestry/core/tiles/TileEscritoire.java index bcf90e449..0e815b295 100644 --- a/src/main/java/forestry/core/tiles/TileEscritoire.java +++ b/src/main/java/forestry/core/tiles/TileEscritoire.java @@ -28,7 +28,7 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.GuiId; import forestry.core.network.PacketTileStream; import forestry.core.proxy.Proxies; -import forestry.core.render.EnumTankLevel; +import forestry.core.render.TankRenderInfo; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.SlotUtil; @@ -126,13 +126,13 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender } @Override - public EnumTankLevel getPrimaryLevel() { - return EnumTankLevel.EMPTY; + public TankRenderInfo getResourceTankInfo() { + return TankRenderInfo.EMPTY; } @Override - public EnumTankLevel getSecondaryLevel() { - return EnumTankLevel.EMPTY; + public TankRenderInfo getProductTankInfo() { + return TankRenderInfo.EMPTY; } @Override diff --git a/src/main/java/forestry/core/tiles/TilePowered.java b/src/main/java/forestry/core/tiles/TilePowered.java index af9dba077..b4c572c3b 100644 --- a/src/main/java/forestry/core/tiles/TilePowered.java +++ b/src/main/java/forestry/core/tiles/TilePowered.java @@ -23,7 +23,7 @@ import forestry.core.circuits.ISpeedUpgradable; import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.render.EnumTankLevel; +import forestry.core.render.TankRenderInfo; import forestry.energy.EnergyManager; import buildcraft.api.tiles.IHasWork; @@ -176,15 +176,15 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I workCounter = 0; } - // / ADDITIONAL LIQUID HANDLING + /* IRenderableTile */ @Override - public EnumTankLevel getPrimaryLevel() { - return EnumTankLevel.EMPTY; + public TankRenderInfo getResourceTankInfo() { + return TankRenderInfo.EMPTY; } @Override - public EnumTankLevel getSecondaryLevel() { - return EnumTankLevel.EMPTY; + public TankRenderInfo getProductTankInfo() { + return TankRenderInfo.EMPTY; } /* IPowerHandler */ diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index 964485bd6..b7fe6c805 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -31,45 +31,14 @@ public class GuiEngineTin extends GuiEngineHYaZfQlbGqA+A7LS6A1-Uf3p3)F(|U zugCa)I{TLMlk6+XT8^wbaOLdT zvw@OMlU6E-aP%muv@sp(Gdafaf-B*jIUlbXli>x?8M_?jrauwNQJFMpl8{XTmz(H; opr(nFHX3#a`dIABWO8F<*swhGzopr0H||1-2eap diff --git a/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png deleted file mode 100755 index b7c6dff92195b558de2f9be0f60c23f559c453d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQlbGqA+A7LS6A1-Uf3p3)F(|U zugCa)I{TLMlk6+XT8^wbaOLd9 zi-D3(lU6E-aP%muv@sp(Gdafaf-B*jIUlbXli>x?8M_?jrauwNQBhKwBxIAomdKI;Vst0EbCBcmMzZ diff --git a/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png deleted file mode 100755 index 3c7875fd5c1ce7deb9a898900bac27c9636fe37e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQbGYfA+A8$z+TuUP}C<)DzC@* zemeW9gwT4RC}T;GUoeBivm0qZPPC_sV@O3@G6R#U%7F%64Nj&;ftDky9FB@`v?!>| zoqn2 diff --git a/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png deleted file mode 100755 index 7bf23d5471af6811c5ef677a44bb73173d682aad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQlbGqA+A7LS6A1-Uf3p3)F(|U zugCa)I{TLMlk6+XT8^wbaOLdT zi-D3(lU6E-aP%muv@sp(Gdafaf-B*jIUlbXli>x?8M_?jrauwNQBj&SNysLF%T4q^ oP}9Uo8x1=IeJplmGPyA_$aw_rTtC4f4rmX9r>mdKI;Vst0EkmL-T(jq diff --git a/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png deleted file mode 100755 index 76544d5dd850846242d6c2161a075979f55e0f2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)@a|e!)6A)1V{YLWEQBcw@wytw+`C7D=I7}Fqa z$0!>8;%W30xme;nIqzZ@xp;D#D0UX0s;Vws>?{xfkVpIc0)2dce{c{julXYv^;NTL zc48yi1W?*aEZD8KY&{Y{x|u<5knSWe%CdY-07g~;Fp_K!AYFLY<_3UO+N=vE0Xp}- z1#o1`0pKllps@pB_B8GRj0vE^urADf7*>bVPf7VDDRYwjVY&q{sKcZHyks39Nh3Rt zg9`I?bO_VKFTYyiB^;Nd!;voV`zNvCq7ip>8@o75{__be^^lC|ZbMT50000@bB7#(6J$jJ^c%@rM?p!u*ut)%SZavmv}=3yT_*wil;qoj!k7jr z9iwRUi>J|3B+p6q<8+6>AjU}`@S1f%Nzh~) z2jSmmvCN>4v%z!K0LEMWevNp+t|e>`Oha=d5-LjW&O_p0000kfag1i_WWl~Io>)*A(;#ifSM)W- z)7MkvCWQi0pxjL@0m&lft^#zqs4w8h_xA?})yq~sO4VLNfsyJ5g<>(&KV00X^m8F&@xVBoEE zz-eH>?Qz;OFcpA~W?fjuXjX^QPf7Tagqq}doNpO0`Z#L_4pj%1#7UgTLC57fJH+|n ymtPJ15|V=-_$U|T{gc{A)v3F-&)u9Q|M>(g%6W7&)(PqW0000!Y~v?^ACIiUjSmD-4n^oQBbl{Ti7!l!rVqOD~{3goY2}|NnR`%j9HM_ zc#5v>aCCJPIT_AaFxL1?VrRif0H09+=JVOi_>2M$0kD`hz5xHX?+FK1(2VXV%NF@2 z->{Sw0U)I2xS&^3ld%K@a|e!)6A)1V{YLWEQBcw@wytw+`C7D=I7}Fqa z$0!>8;%W30xme;nIqzZ@xp;D#D0UX0s;Vws>?{xfkVpIc0)2dce{c{julXYv^;NTL zc48yi1W?*aEZD8KY&{Y{x|u<5knSWe%CdY-07g~;Fp_K!AYFLY<_3UO+N=vE0Xp}- z1#o1`0pKllps@pB_B8GRj0vE^urADf7*>bVPf7VDDRYwjVY&q{sKcZHyks39Nh3Rt zg9`I?bO_VKFTYyiB^;Nd!;voV`zNvCq7ip>8@o75{__be^^lC|ZbMT50000 diff --git a/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png deleted file mode 100755 index b0596814aaf9d1e319217a45956588089610c1a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)@bB7#(6J$jJ^c%@rM?p!u*ut)%SZavmv}=3yT_*wil;qoj!k7jr z9iwRUi>J|3B+p6q<8+6>AjU}`@S1f%Nzh~) z2jSmmvCN>4v%z!K0LEMWevNp+t|e>`Oha=d5-LjW&O_p0000VU*JV diff --git a/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png deleted file mode 100755 index de2a7791de3b0461b93ac8ef46509e569687472e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP)kfag1i_WWl~Io>)*A(;#ifSM)W- z)7MkvCWQi0pxjL@0m&lft^#zqs4w8h_xA?})yq~sO4VLNfsyJ5g<>(&KV00X^m8F&@xVBoEE zz-eH>?Qz;OFcpA~W?fjuXjX^QPf7Tagqq}doNpO0`Z#L_4pj%1#7UgTLC57fJH+|n ymtPJ15|V=-_$U|T{gc{A)v3F-&)u9Q|M>(g%6W7&)(PqW0000!Y~v?^ACIiUjSmD-4n^oQBbl{Ti7!l!rVqOD~{3goY2}|NnR`%j9HM_ zc#5v>aCCJPIT_AaFxL1?VrRif0H09+=JVOi_>2M$0kD`hz5xHX?+FK1(2VXV%NF@2 z->{Sw0U)I2xS&^3ld%K@a|e!)6A)1V{YLWEQBcw@wytw+`C7D=I7}Fqa z$0!>8;%W30xme;nIqzZ@xp;D#D0UX0s;Vws>?{xfkVpIc0)2dce{c{julXYv^;NTL zc48yi1W?*aEZD8KY&{Y{x|u<5knSWe%CdY-07g~;Fp_K!AYFLY<_3UO+N=vE0Xp}- z1#o1`0pKllps@pB_B8GRj0vE^urADf7*>bVPf7VDDRYwjVY&q{sKcZHyks39Nh3Rt zg9`I?bO_VKFTYyiB^;Nd!;voV`zNvCq7ip>8@o75{__be^^lC|ZbMT50000@bB7#(6J$jJ^c%@rM?p!u*ut)%SZavmv}=3yT_*wil;qoj!k7jr z9iwRUi>J|3B+p6q<8+6>AjU}`@S1f%Nzh~) z2jSmmvCN>4v%z!K0LEMWevNp+t|e>`Oha=d5-LjW&O_p0000kfag1i_WWl~Io>)*A(;#ifSM)W- z)7MkvCWQi0pxjL@0m&lft^#zqs4w8h_xA?})yq~sO4VLNfsyJ5g<>(&KV00X^m8F&@xVBoEE zz-eH>?Qz;OFcpA~W?fjuXjX^QPf7Tagqq}doNpO0`Z#L_4pj%1#7UgTLC57fJH+|n ymtPJ15|V=-_$U|T{gc{A)v3F-&)u9Q|M>(g%6W7&)(PqW0000!Y~v?^ACIiUjSmD-4n^oQBbl{Ti7!l!rVqOD~{3goY2}|NnR`%j9HM_ zc#5v>aCCJPIT_AaFxL1?VrRif0H09+=JVOi_>2M$0kD`hz5xHX?+FK1(2VXV%NF@2 z->{Sw0U)I2xS&^3ld%KJP)~ryLv{si~>0t*x%Eu4rgzX=!Oat{-b_Ya=5g!^6XHaB#-P#y+nhb8~Zc zc6L9oAwjYuLbD`9vm`{dCP%m@B_$fv%Rh)l(x?`^6LhFsa)ZW1G+OEh9DS1CBiT zqkz4*NN0SK`^dmX!08Sq0Kn~qrQaBE_ck@&29V9=U;_Xa%=!b$4%#{Zbj?`OgY23P zrvMmZV8$_C8)+WJ$=_ZsTZblp_&eZ;%#1C1l2!L&3x+5GcjWW3Tm%(V0>&8dixe1MC_n*s$U%9GFthT~D=;0B0;2lREwRI1aeZ7zF?YE>8q7 z3e+FC2Ef)@25_mz!C+7cU<^oZVsj-xg080Og4{MNxC;t@DCPbf_y_)hA52BOLk;`r Q_W%F@07*qoM6N<$g1Da>umAu6 diff --git a/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_low.png deleted file mode 100755 index 83662f282c7e3bb357fcc281ee3f80530574ef2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmV-10?z%3P)=v-9mu0Sz1odVt)0t;ea3sI#lr(tR@n5T*1z#@N++ zdn;PM9Pqqn_u|0CW4Xbx{sgZAzBwoWqQC5S*8~1Jm(~x6diWY%0pO9yUZ5UmEdg+9 zByB!$&c5Rf$fI5VZlc@=8i85CJ z+*dT<$$-!XAQE{6>WpGQF9tvp0EitLaF~HRTnuCgk5~XufDKro0YQO}SD+kN6c`j3 zX5j2+0QSK*fHfCj4GORU=RfZN_Sl{g$2y|{r!yM>3Jja}j6aF;VFvEf>GvD3Xa(Ly zq755xlhO@Oz~C-!w*Uwbsq-^%O6i9I2lvInk{K011O6633U2{r>AgmaH*-O zt*x!DuC8ckXmfLOprD{@YipvSqIPz6q@<)cjxF>600CS{L_t(|UhUM!a)dApfMH4Q zrflyez32U(FS0ErIjz}4Zu@h<4Di9&18~T7SZaw{8FgGZR1*L(rarv)Z62>qk?Y0- zR)dC5aNxIT>>wRSyb5>#mjFcj4$JESdp4=r4v}{@hgSf&C6Wo`JxXH$EKP_T1~}B! z8OU?aw|RdTxs_)pzdawE7BQc^3|Ot>giM)t1-`|obpk+_%}^Cs5t(wegI5&bO8`{| zoF}s7b_Y>_E`pdz-F%nNNPW)D)2~TrUP&co2Or3%qr-mCz@*k)*-BQ z0eVQEWgSq?Q)>rc6T+JSQ}_lqW*Hek0bUXi1yJBd0A!3IM4P&AnkFz1BXV|bay5X% qQWr{?+u@c0t*x%Eu5fU0XlQ72b91YY2Jrv@0b)r+K~#8N?bNq&*nBVXR~B^wdk~QcVE>%Du!GyK-Ki zN$TeV9$Rc5jWuzf&$dN_hTtmTwY3=l@OSOa^?-kHx#a;sF1`d;0I+A)KTxiq%>iI+ z%hGg!DIKQ*5Rp6<;~PoqD315O+&fTS3uO@E5H&nu(Sf80>_Vk0Q69w5w>MU1r|qCAgjZwKI3m@x0!%bTD*S&vsS>H z$h<-Yb}8*}1O}5|%Q_HjCeIxeWok`dWjDSWf9g7-!g_v}UU Sn4N(d7(8A5T-G@yGywo{OeInP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/machine_tank_low.png b/src/main/resources/assets/forestry/textures/blocks/machine_tank_low.png new file mode 100644 index 0000000000000000000000000000000000000000..5179cc899b6c7a6cce8729f8c7ee7423ed5dbff9 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq}T#{LR|lYL1@j_9H0neNswPK zgTu2MX+VyWr;B4qMcm$F3mF+0IG7Id^Bv3R%iAL05o5)3R$cvu+b%xmcbuIvlKa(w Psu?_8{an^LB{Ts5C&eV< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/machine_tank_maximum.png b/src/main/resources/assets/forestry/textures/blocks/machine_tank_maximum.png new file mode 100644 index 0000000000000000000000000000000000000000..fbb5ab2d95251b0a7d58ad82cee1b7ed0d5ae43b GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq}T#{LR|lYL1@j_9H0neNswPK zgTu2MX+Vyur;B4qMcm$Fii`{l94s4+rzrA1`z;{b>A0XSOGadCrSQ$Z3f^z?cs)<# Syi@~fVDNPHb6Mw<&;$Uj({9FDAND{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png deleted file mode 100755 index fd458cce2610f4692ab5aa3c6add21e3ebec09bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmV-w0hRuVP)xN?QgLihTd9a!0)Xp@pkBxI%pcmeJp}*(B@pO2s2YK=;UN2G1eB1yYv==@ z(qCHyE@W8{_zWFjsN5BM81@JZ0U&JW8m8KI&SCy3$#0T8CRv}y7X&(S9t8r&r~^vE zK-O^(c6#y-c6|HgsX6|H#X(iLgbnodgJqNzY?qfllU3$_u1P(RRZ*Z$LI3~&07*qo IM6N<$f+RtPCIA2c diff --git a/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png deleted file mode 100755 index 546af0eae3044b8bca4230e5ef2d9d0a22fa1aa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQi=gSA+A7LS6A0mjKf@Ar*0NCvD6+Y#`$L zm-ioYu!d)PbwF5hlkF~{5UJnXZzru;$)4Jyd+2i3?66;_etD`iFVbnvsqHu|%@@wT zFhw%gLHez6XD_2JV~rbQ#koyBzk8U(7!78q-D9x7{+XRU>|#@0K$y+c+?$)`gfc2D zd30leS&-m%7KZD>j(huF&s?7Q>z^nC%M^zN&lgCs9BSM9<~oOlV)gY4><(-9n{&)L zu}PtTPc~u2T~TX^G7cU_g`DS7%Z`uP~}6D)bi$ zltoptTkpGDnbl{XSQuccm&jcEH^nkl^|sj5^G_5%+wWI@&|%sp-u4(61Pq?8elF{r G5}E)C&w`l% diff --git a/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png deleted file mode 100755 index 72c7044e8f0d57dc9e62b20230a1e623388830d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP);N2ss!CJQ)c+ZU03b3QiykQ6dafBMsMsC`14N00DGTPE!Ct=GbNc008hwL_t(| zUhR@GOT{o0h5H)>QRjBZTT794d?sKr`WJMmt7b??(;)Y*?L(7)Yi@%MF)l*4cPNKD zd>lSXsu=Wu9#dDPct8V?x(L8!45lsufdKH-zPtdRKi@wbM8_Nc$VGF}9^0d+MVA4} zI7ticU>w_y43M}o($f-8@*(Cm0~k0(fR*3|0`i4tW3LHt%GhneWOZ32W6}+%F}9xRQk&LNwkBa zEP-r!h|3!eR|lbF8f`!u?K6pu0WAT1MgdqZ=X32d3RncdV48RX{QRE>99T&+x~D8# z6q{nhQdS0lkcwl2%B3Q12>`A~f_g327e1TqcAo)2KnVmo4yr~VY&gp94FM%&=Nh^I zsPr{Q;EPNP0^gwn^p(4!fxbbY4*+3X*D%($bq<$XN&Y9vW0LiGct@ZW=RqKFiaMYq z^yE1X!j3ENV26)8PtEZsOb)8TC2XME14}6@*g7kHCQq5y`~tSmj75UC2i*Vw002ov JPDHLkV1iQLgopqD diff --git a/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png deleted file mode 100755 index 1a90ea0e059bf13c2cae4cf8b76f7d259144eff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#`ZP)d;Xeym`Ftmm@yo))+l0EF28HLWBMF0Q*0d!JMQvg8b*k%9#0P{&i zK~#8N?UJ#o!Y~wu`wYH;IOy$cA)@TQg}9nVPUco^);_5{4Lan;MR4;F zeh%d0=OZNQ$FyKt<1z|Oe{&;?2`1hkN9Xiy%Io9hCB z6X_QO&b|XwIRa`A)gFP$1B5MyhNiIP;Bfgb$sdwDBv~Bm9|THqtOWvpK?jtCihRaF z*kd;Xeym`Ftmm@yo))+l0EF28HLWBMF0Q*0d!JMQvg8b*k%9#0QE^k zK~#8N?UJ!>gD@0D`3C*~bx7J7Br_u-SgEbrb34$vK{9KNqvsiD@Y*je533zqXNi<8 zSLo_V990hRg6 z5%?tQfxyXkfT2P_wJ@{@3?3kCw=GPy?KX$`za;;a#!l&l=C#(*-!oy#n&u=WHtYC+%bRFF!_xu1`A%Mh8g2}9d&RU48Y2;;Y)n@gN&1=vh#zk=RQZ5gAxEx9o z7t?|1jPE2C_eKKvjsh@oF}|aKMF2YNF1`S_*Ykw~%V|p2l%<1gkuBJidKEVpes?(p00Au!P#koLK)A4zYJ`9mQuPZe019)RA#ft@K;RrYKwTi9 zwoq>or~^RQs$XbJTlEf?cS-(~J&SWo(}2zLTHip9dghe$0WzVj%zk002ovPDHLkV1i6ajb#7; diff --git a/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png deleted file mode 100755 index 650635cc7367d0d03b598f58d18f62248ebcb3ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)d;Xeym`Ftmm@yo))+l0EF28HLWBMF0Q*0d!JMQvg8b*k%9#0QE^k zK~#8N?UJ!>!yptz{SEnps6*S#u|#IemA$&4!ki4roFL)VHq~Rc)57X6tskfzC|N3H z>l3)@TQg}9nVPUco^);_5{4Lan;MR4;F zeh%d0=OZNQ$FyKt<1z|Oe{&;?2`1hkN9Xiy%Io9hCB z6X_QO&b|XwIRa`A)gFP$1B5MyhNiIP;Bfgb$sdwDBv~Bm9|THqtOWvpK?jtCihRaF z*kgD@0D`3C*~bx7J7Br_u-SgEbrb34$vK{9KNqvsiD@Y*je533zqXNi<8 zSLo_V990hRg6 z5%?tQfxyXkfT2P_wJ@{@3?3kCw=GPy?KX$`za;;a#!l&l=C#(*-!oy#n&u=WHtYC+%bRFF!_xu1`A%Mh8g2}9d&RU48Y2;;Y)n@gN&1=vh#zk=RQZ5gAxEx9o z7t?|1jPE2C_eKKvjsh@oF}|aKMF2YNF1`S_*Ykw~%V|p2l%<1gkuBJidKEVpes?(p00Au!P#koLK)A4zYJ`9mQuPZe019)RA#ft@K;RrYKwTi9 zwoq>or~^RQs$XbJTlEf?cS-(~J&SWo(}2zLTHip9dghe$0WzVj%zk002ovPDHLkV1k--jLZN4 diff --git a/src/main/resources/assets/forestry/textures/blocks/still_tank_product_medium.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_medium.png deleted file mode 100755 index 24737c5eeb4e3b89268ba429c0703e4e033abd37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)!yptz{SEnps6*S#u|#IemA$&4!ki4roFL)VHq~Rc)57X6tskfzC|N3H z>l3xN?QgLih8>xs}0)Xp@pkBxI%%7U3IR*d$B@pO2s2YK=VK4g^1eB1yYv==@ z(q9_{&SY5-xP%TcRPKr$3_Apd01&ow4O4A9=P>`2G$ui0cw#`eQ$wTIUt}}X&v9ohP?EnA(07*qo IM6N<$g7Y?wZU6uP diff --git a/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_low.png deleted file mode 100755 index c3f5b95df6d4612ef77105ac8deef16e13ebf152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmV-w0hRuVP)AApigX07*qo IM6N<$f+53+l>h($ diff --git a/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png deleted file mode 100755 index 05bd5613364e20a7d470afa9c5fc4fc567c5843a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)_zApd(00DGTPE!Ct=GbNc008YtL_t(| zUhR^x3c@fHMf(jRsIwH}TBx+6pP(U_th(r`6yj(~lz|h6`jsg||=&-x^0^DEE7Y;0^Dcw+(4zgvoWK)(0fRLKw zf}TlD`Xd0iX$k68++6v>{&?N%l!d|K|0$NDbFQ@=0%x#9inYaUiOXvV~ zfq>dUy+fc50AZ_sp)GCIJ6zu-`BRd|B+FAXL7)<+Mj&vAI-n%fudMKyyk-993X39*ar}I!i~s-t07*qo IM6N<$g3!c}SO5S3