mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 03:59:45 +00:00
Show actual fluid color on machine's exterior tanks
This commit is contained in:
1 parent
9899687786
commit
2605bdaceb
58 files changed
+202
-218
No files matched your search
@@ -36,24 +36,8 @@ public class GuiAlveary extends GuiForestryTitled<ContainerAlveary, TileAlvearyP
|
||||
}
|
||||
|
||||
private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
|
||||
int i = 176;
|
||||
int i = 176 + rated.getLevelScaled(16);
|
||||
int k = 0;
|
||||
switch (rated) {
|
||||
case EMPTY:
|
||||
break;
|
||||
case LOW:
|
||||
i += 4;
|
||||
break;
|
||||
case MEDIUM:
|
||||
i += 8;
|
||||
break;
|
||||
case HIGH:
|
||||
i += 12;
|
||||
break;
|
||||
case MAXIMUM:
|
||||
i += 16;
|
||||
break;
|
||||
}
|
||||
|
||||
this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
|
||||
}
|
||||
|
||||
@@ -41,24 +41,8 @@ public class GuiBeeHousing extends GuiForestryTitled<ContainerBeeHousing, TileAb
|
||||
}
|
||||
|
||||
private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
|
||||
int i = 176;
|
||||
int i = 176 + rated.getLevelScaled(16);
|
||||
int k = 0;
|
||||
switch (rated) {
|
||||
case EMPTY:
|
||||
break;
|
||||
case LOW:
|
||||
i += 4;
|
||||
break;
|
||||
case MEDIUM:
|
||||
i += 8;
|
||||
break;
|
||||
case HIGH:
|
||||
i += 12;
|
||||
break;
|
||||
case MAXIMUM:
|
||||
i += 16;
|
||||
break;
|
||||
}
|
||||
|
||||
this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
|
||||
}
|
||||
|
||||
@@ -13,8 +13,10 @@ package forestry.core.fluids;
|
||||
import java.awt.Color;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -321,6 +323,14 @@ public enum Fluids {
|
||||
|
||||
public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD};
|
||||
|
||||
private static final Map<String, Fluids> 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.
|
||||
|
||||
@@ -32,24 +32,8 @@ public class GuiAnalyzer extends GuiForestryTitled<ContainerAnalyzer, TileAnalyz
|
||||
}
|
||||
|
||||
private void drawAnalyzeMeter(int x, int y, int height, EnumTankLevel rated) {
|
||||
int i = 176;
|
||||
int i = 176 + rated.getLevelScaled(16);
|
||||
int k = 60;
|
||||
switch (rated) {
|
||||
case EMPTY:
|
||||
break;
|
||||
case LOW:
|
||||
i += 4;
|
||||
break;
|
||||
case MEDIUM:
|
||||
i += 8;
|
||||
break;
|
||||
case HIGH:
|
||||
i += 12;
|
||||
break;
|
||||
case MAXIMUM:
|
||||
i += 16;
|
||||
break;
|
||||
}
|
||||
|
||||
drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
|
||||
}
|
||||
|
||||
@@ -12,15 +12,21 @@ package forestry.core.render;
|
||||
|
||||
public enum EnumTankLevel {
|
||||
|
||||
EMPTY,
|
||||
EMPTY(0),
|
||||
LOW(25),
|
||||
MEDIUM(50),
|
||||
HIGH(75),
|
||||
MAXIMUM(100);
|
||||
|
||||
LOW,
|
||||
private final int level;
|
||||
|
||||
MEDIUM,
|
||||
EnumTankLevel(int level) {
|
||||
this.level = level;
|
||||
}
|
||||
|
||||
HIGH,
|
||||
|
||||
MAXIMUM;
|
||||
public int getLevelScaled(int scale) {
|
||||
return level * scale / 100;
|
||||
}
|
||||
|
||||
public static EnumTankLevel rateTankLevel(int scaled) {
|
||||
|
||||
|
||||
@@ -10,6 +10,10 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.render;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -25,23 +29,19 @@ import forestry.core.tiles.IRenderableTile;
|
||||
|
||||
public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRenderer {
|
||||
|
||||
private final ModelBase model = new ModelBase() {
|
||||
};
|
||||
|
||||
private final ModelRenderer basefront;
|
||||
private final ModelRenderer baseback;
|
||||
private final ModelRenderer resourceTank;
|
||||
private final ModelRenderer productTank;
|
||||
|
||||
private enum Textures {
|
||||
BASE,
|
||||
TANK_R_EMPTY, TANK_R_LOW, TANK_R_MEDIUM, TANK_R_HIGH, TANK_R_MAXIMUM,
|
||||
TANK_P_EMPTY, TANK_P_LOW, TANK_P_MEDIUM, TANK_P_HIGH, TANK_P_MAXIMUM
|
||||
}
|
||||
private ResourceLocation textureBase;
|
||||
private ResourceLocation textureResourceTank;
|
||||
private ResourceLocation textureProductTank;
|
||||
|
||||
private ResourceLocation[] textures;
|
||||
private final EnumMap<EnumTankLevel, ResourceLocation> 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 {
|
||||
}
|
||||
}
|
||||
@@ -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) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -31,45 +31,14 @@ public class GuiEngineTin extends GuiEngine<ContainerEngineTin, TileEngineElectr
|
||||
TileEngineElectric engine = inventory;
|
||||
int storageHeight = engine.getStorageScaled(46);
|
||||
int storageMaxHeight = engine.getStorageScaled(100);
|
||||
EnumTankLevel rated = rateLevel(storageMaxHeight);
|
||||
EnumTankLevel rated = EnumTankLevel.rateTankLevel(storageMaxHeight);
|
||||
|
||||
drawHealthMeter(guiLeft + 74, guiTop + 25, storageHeight, rated);
|
||||
}
|
||||
|
||||
private static EnumTankLevel rateLevel(int scaled) {
|
||||
|
||||
if (scaled < 5) {
|
||||
return EnumTankLevel.EMPTY;
|
||||
} else if (scaled < 30) {
|
||||
return EnumTankLevel.LOW;
|
||||
} else if (scaled < 60) {
|
||||
return EnumTankLevel.MEDIUM;
|
||||
} else if (scaled < 90) {
|
||||
return EnumTankLevel.HIGH;
|
||||
} else {
|
||||
return EnumTankLevel.MAXIMUM;
|
||||
}
|
||||
}
|
||||
|
||||
private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
|
||||
int i = 176;
|
||||
int i = 176 + rated.getLevelScaled(16);
|
||||
int k = 0;
|
||||
switch (rated) {
|
||||
case EMPTY:
|
||||
break;
|
||||
case LOW:
|
||||
i += 4;
|
||||
break;
|
||||
case MEDIUM:
|
||||
i += 8;
|
||||
break;
|
||||
case HIGH:
|
||||
i += 12;
|
||||
break;
|
||||
case MAXIMUM:
|
||||
i += 16;
|
||||
break;
|
||||
}
|
||||
|
||||
this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ import forestry.core.inventory.TileInventoryAdapter;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.IRenderableTile;
|
||||
import forestry.core.tiles.TileBase;
|
||||
@@ -188,13 +188,13 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getSecondaryLevel() {
|
||||
return EnumTankLevel.EMPTY;
|
||||
public TankRenderInfo getProductTankInfo() {
|
||||
return TankRenderInfo.EMPTY;
|
||||
}
|
||||
|
||||
/* SMP GUI */
|
||||
|
||||
@@ -47,7 +47,7 @@ import forestry.core.inventory.TileInventoryAdapter;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
import forestry.core.utils.InventoryUtil;
|
||||
@@ -294,8 +294,8 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
/* SMP GUI */
|
||||
|
||||
@@ -54,7 +54,7 @@ import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.IItemStackDisplay;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
@@ -355,8 +355,8 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
/* SMP GUI */
|
||||
|
||||
@@ -51,7 +51,7 @@ import forestry.core.inventory.TileInventoryAdapter;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
@@ -463,13 +463,13 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getSecondaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getProductScaled(100));
|
||||
public TankRenderInfo getProductTankInfo() {
|
||||
return new TankRenderInfo(productTank, getProductScaled(100));
|
||||
}
|
||||
|
||||
private ItemStack getFermentationStack() {
|
||||
|
||||
@@ -44,7 +44,7 @@ import forestry.core.inventory.TileInventoryAdapter;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.IRenderableTile;
|
||||
import forestry.core.tiles.TileBase;
|
||||
@@ -547,14 +547,15 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
}
|
||||
|
||||
/* IRenderableTile */
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getSecondaryLevel() {
|
||||
return EnumTankLevel.EMPTY;
|
||||
public TankRenderInfo getProductTankInfo() {
|
||||
return TankRenderInfo.EMPTY;
|
||||
}
|
||||
|
||||
/* ILiquidTankTile */
|
||||
|
||||
@@ -53,7 +53,7 @@ import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
import forestry.core.utils.InventoryUtil;
|
||||
@@ -223,13 +223,13 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
return hasResources && hasRecipe && canFill && canAdd;
|
||||
}
|
||||
|
||||
public int getResourceScaled(int i) {
|
||||
public int getProductScaled(int i) {
|
||||
return (productTank.getFluidAmount() * i) / Constants.PROCESSOR_TANK_CAPACITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getSecondaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getProductTankInfo() {
|
||||
return new TankRenderInfo(productTank, getProductScaled(100));
|
||||
}
|
||||
|
||||
/* ILIQUIDCONTAINER IMPLEMENTATION */
|
||||
|
||||
@@ -43,7 +43,7 @@ import forestry.core.inventory.TileInventoryAdapter;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
|
||||
@@ -284,13 +284,13 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getPrimaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getResourceScaled(100));
|
||||
public TankRenderInfo getResourceTankInfo() {
|
||||
return new TankRenderInfo(resourceTank, getResourceScaled(100));
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumTankLevel getSecondaryLevel() {
|
||||
return EnumTankLevel.rateTankLevel(getProductScaled(100));
|
||||
public TankRenderInfo getProductTankInfo() {
|
||||
return new TankRenderInfo(productTank, getProductScaled(100));
|
||||
}
|
||||
|
||||
/* SMP GUI */
|
||||
|
||||
Reference in new issue
Block a user