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 GuiEngine