From f12ca929329ca8be47da9022325d994b94a9d52a Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 4 Feb 2022 09:30:10 +0100 Subject: [PATCH] threw out all the old fluid rendering code --- .../java/com/hbm/inventory/FluidTank.java | 25 ++-- .../com/hbm/inventory/fluid/FluidType.java | 32 +--- .../inventory/fluid/FluidTypeCombustible.java | 16 +- .../inventory/fluid/FluidTypeFlammable.java | 16 +- .../java/com/hbm/inventory/fluid/Fluids.java | 141 +++++++++--------- .../com/hbm/inventory/gui/GUIAMSBase.java | 12 +- .../com/hbm/inventory/gui/GUIAMSEmitter.java | 4 +- .../com/hbm/inventory/gui/GUIAMSLimiter.java | 4 +- .../java/com/hbm/inventory/gui/GUIBarrel.java | 2 +- .../java/com/hbm/inventory/gui/GUICore.java | 6 +- .../com/hbm/inventory/gui/GUICoreEmitter.java | 5 +- .../hbm/inventory/gui/GUICoreInjector.java | 6 +- .../hbm/inventory/gui/GUICoreReceiver.java | 3 +- .../hbm/inventory/gui/GUICrystallizer.java | 3 +- .../com/hbm/inventory/gui/GUIFWatzCore.java | 11 +- .../inventory/gui/GUIFusionMultiblock.java | 11 +- .../com/hbm/inventory/gui/GUIIGenerator.java | 7 +- .../java/com/hbm/inventory/gui/GUIITER.java | 8 +- .../com/hbm/inventory/gui/GUILiquefactor.java | 3 +- .../hbm/inventory/gui/GUIMachineBoiler.java | 7 +- .../gui/GUIMachineBoilerElectric.java | 7 +- .../inventory/gui/GUIMachineCMBFactory.java | 3 +- .../inventory/gui/GUIMachineChemplant.java | 15 +- .../com/hbm/inventory/gui/GUIMachineCoal.java | 3 +- .../gui/GUIMachineCompactLauncher.java | 7 +- .../inventory/gui/GUIMachineCyclotron.java | 6 +- .../hbm/inventory/gui/GUIMachineDiesel.java | 15 +- .../inventory/gui/GUIMachineFluidTank.java | 5 +- .../hbm/inventory/gui/GUIMachineGasFlare.java | 5 +- .../inventory/gui/GUIMachineGenerator.java | 7 +- .../hbm/inventory/gui/GUIMachineInserter.java | 11 +- .../inventory/gui/GUIMachineLargeTurbine.java | 25 +--- .../inventory/gui/GUIMachineLaunchTable.java | 7 +- .../hbm/inventory/gui/GUIMachineOilWell.java | 10 +- .../hbm/inventory/gui/GUIMachinePuF6Tank.java | 3 +- .../hbm/inventory/gui/GUIMachineRefinery.java | 21 +-- .../hbm/inventory/gui/GUIMachineSelenium.java | 3 +- .../hbm/inventory/gui/GUIMachineTurbine.java | 27 +--- .../hbm/inventory/gui/GUIMachineTurbofan.java | 5 +- .../hbm/inventory/gui/GUIMachineUF6Tank.java | 3 +- .../com/hbm/inventory/gui/GUIMiningLaser.java | 3 +- .../hbm/inventory/gui/GUIPlasmaHeater.java | 10 +- .../com/hbm/inventory/gui/GUIRadiolysis.java | 6 +- .../inventory/gui/GUIReactorMultiblock.java | 6 +- .../com/hbm/inventory/gui/GUISolidifier.java | 3 +- .../hbm/inventory/gui/GUISoyuzLauncher.java | 7 +- .../com/hbm/inventory/gui/GUITurretFritz.java | 3 +- .../com/hbm/inventory/gui/GUIWatzCore.java | 3 +- 48 files changed, 195 insertions(+), 356 deletions(-) diff --git a/src/main/java/com/hbm/inventory/FluidTank.java b/src/main/java/com/hbm/inventory/FluidTank.java index 719db9a5d..d5d3360b0 100644 --- a/src/main/java/com/hbm/inventory/FluidTank.java +++ b/src/main/java/com/hbm/inventory/FluidTank.java @@ -33,8 +33,6 @@ public class FluidTank { int fluid; int maxFluid; public int index; - public static int x = 16; - public static int y = 100; public FluidTank(FluidType type, int maxFluid, int index) { this.type = type; @@ -253,15 +251,19 @@ public class FluidTank { } } - //Used in the GUI rendering, renders correct fluid type in container with progress - @Deprecated //fuck you - public void renderTank(GuiContainer gui, int x, int y, int tx, int ty, int width, int height) { - renderTank(x, y - height, 1, width, height); - } - - /** Works flawlessly, now we just have to add alpha compatibility and boom, sexo. */ + /** + * Renders the fluid texture into a GUI, with the height based on the fill state + * @param x the tank's left side + * @param y the tank's bottom side (convention from the old system, changing it now would be a pain in the ass) + * @param z the GUI's zLevel + * @param width + * @param height + */ + //TODO: add a directional parameter to allow tanks to grow horizontally public void renderTank(int x, int y, double z, int width, int height) { + y -= height; + Minecraft.getMinecraft().getTextureManager().bindTexture(type.getTexture()); int i = (fluid * height) / maxFluid; @@ -312,11 +314,6 @@ public class FluidTank { gui.drawFluidInfo(list.toArray(new String[0]), mouseX, mouseY); } } - - @Deprecated - public ResourceLocation getSheet() { - return new ResourceLocation(RefStrings.MODID + ":textures/gui/fluids" + this.type.getSheetID() + ".png"); - } //Called by TE to save fillstate public void writeToNBT(NBTTagCompound nbt, String s) { diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index 2d089611d..b9a890c5e 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -19,12 +19,6 @@ public class FluidType { private int id; //Approximate HEX Color of the fluid, used for pipe rendering private int color; - //X position of the fluid on the sheet, the "row" - private int textureX; - //Y position of the fluid on the sheet, the "column" - private int textureY; - //ID of the texture sheet the fluid is on - private int sheetID; //Unlocalized string ID of the fluid private String unlocalized; @@ -38,25 +32,22 @@ public class FluidType { private ResourceLocation texture; - public FluidType(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]); + public FluidType(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name) { + this(compat, color, p, f, r, symbol, name, 0, new FluidTrait[0]); } - public FluidType(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, traits); + public FluidType(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { + this(compat, color, p, f, r, symbol, name, 0, traits); } - public FluidType(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]); + public FluidType(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { + this(compat, color, p, f, r, symbol, name, temperature, new FluidTrait[0]); } - public FluidType(String name, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String unlocalized, int temperature, FluidTrait... traits) { + public FluidType(String name, int color, int p, int f, int r, EnumSymbol symbol, String unlocalized, int temperature, FluidTrait... traits) { this.stringId = name; this.color = color; - this.textureX = x; - this.textureY = y; this.unlocalized = unlocalized; - this.sheetID = sheet; this.poison = p; this.flammability = f; this.reactivity = r; @@ -85,15 +76,6 @@ public class FluidType { public int getColor() { return this.color; } - public int textureX() { - return this.textureX; - } - public int textureY() { - return this.textureY; - } - public int getSheetID() { - return this.sheetID; - } public ResourceLocation getTexture() { return this.texture; } diff --git a/src/main/java/com/hbm/inventory/fluid/FluidTypeCombustible.java b/src/main/java/com/hbm/inventory/fluid/FluidTypeCombustible.java index 331f3d6b3..9f1a1faea 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidTypeCombustible.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidTypeCombustible.java @@ -14,20 +14,20 @@ public class FluidTypeCombustible extends FluidTypeFlammable { protected FuelGrade fuelGrade; protected double combustionEnergy; - public FluidTypeCombustible(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]); + public FluidTypeCombustible(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name) { + this(compat, color, p, f, r, symbol, name, 0, new FluidTrait[0]); } - public FluidTypeCombustible(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, traits); + public FluidTypeCombustible(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { + this(compat, color, p, f, r, symbol, name, 0, traits); } - public FluidTypeCombustible(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]); + public FluidTypeCombustible(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { + this(compat, color, p, f, r, symbol, name, temperature, new FluidTrait[0]); } - public FluidTypeCombustible(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { - super(compat, color, x, y, sheet, p, f, r, symbol, name, temperature, traits); + public FluidTypeCombustible(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { + super(compat, color, p, f, r, symbol, name, temperature, traits); } public FluidTypeCombustible setCombustionEnergy(FuelGrade grade, double energy) { diff --git a/src/main/java/com/hbm/inventory/fluid/FluidTypeFlammable.java b/src/main/java/com/hbm/inventory/fluid/FluidTypeFlammable.java index 4a0c52c7d..dd0a97f05 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidTypeFlammable.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidTypeFlammable.java @@ -13,20 +13,20 @@ public class FluidTypeFlammable extends FluidType { /** How much heat energy (usually translates into HE 1:1) 1000mB hold */ protected double energy; - public FluidTypeFlammable(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]); + public FluidTypeFlammable(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name) { + this(compat, color, p, f, r, symbol, name, 0, new FluidTrait[0]); } - public FluidTypeFlammable(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, 0, traits); + public FluidTypeFlammable(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { + this(compat, color, p, f, r, symbol, name, 0, traits); } - public FluidTypeFlammable(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { - this(compat, color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]); + public FluidTypeFlammable(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { + this(compat, color, p, f, r, symbol, name, temperature, new FluidTrait[0]); } - public FluidTypeFlammable(String compat, int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { - super(compat, color, x, y, sheet, p, f, r, symbol, name, temperature, traits); + public FluidTypeFlammable(String compat, int color, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { + super(compat, color, p, f, r, symbol, name, temperature, traits); } public FluidTypeFlammable setHeatEnergy(double energy) { diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 4c6ff4fa0..f27c8af1f 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -98,76 +98,77 @@ public class Fluids { * You may screw with metaOrder as much as you like, as long as you keep all fluids in the list exactly once. */ - NONE = new FluidType("NONE",0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"); - WATER = new FluidType("WATER",0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"); - STEAM = new FluidType("STEAM",0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100); - HOTSTEAM = new FluidType("HOTSTEAM",0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300); - SUPERHOTSTEAM = new FluidType("SUPERHOTSTEAM",0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450); - ULTRAHOTSTEAM = new FluidType("ULTRAHOTSTEAM",0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600); - COOLANT = new FluidType("COOLANT",0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"); - LAVA = new FluidType("LAVA",0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200); - DEUTERIUM = new FluidTypeCombustible("DEUTERIUM",0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"); - TRITIUM = new FluidTypeCombustible("TRITIUM",0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"); - OIL = new FluidTypeFlammable("OIL",0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"); - HOTOIL = new FluidTypeFlammable("HOTOIL",0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350); - HEAVYOIL = new FluidTypeFlammable("HEAVYOIL",0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"); - BITUMEN = new FluidType("BITUMEN",0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"); - SMEAR = new FluidTypeFlammable("SMEAR",0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"); - HEATINGOIL = new FluidTypeCombustible("HEATINGOIL",0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"); - RECLAIMED = new FluidTypeCombustible("RECLAIMED",0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"); - PETROIL = new FluidTypeCombustible("PETROIL",0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"); - LUBRICANT = new FluidType("LUBRICANT",0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"); - NAPHTHA = new FluidTypeFlammable("NAPHTHA",0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"); - DIESEL = new FluidTypeCombustible("DIESEL",0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"); - DIESEL_CRACK = new FluidTypeCombustible("DIESEL_CRACK",0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel_crack"); - LIGHTOIL = new FluidTypeCombustible("LIGHTOIL",0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"); - KEROSENE = new FluidTypeCombustible("KEROSENE",0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"); - GAS = new FluidTypeFlammable("GAS",0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"); - PETROLEUM = new FluidTypeFlammable("PETROLEUM",0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"); - LPG = new FluidTypeCombustible("LPG",0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"); - BIOGAS = new FluidTypeFlammable("BIOGAS",0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"); - BIOFUEL = new FluidTypeCombustible("BIOFUEL",0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"); - NITAN = new FluidTypeCombustible("NITAN",0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"); - UF6 = new FluidType("UF6",0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE); - PUF6 = new FluidType("PUF6",0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE); - SAS3 = new FluidType("SAS3",0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE); - SCHRABIDIC = new FluidType("SCHRABIDIC",0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2); - AMAT = new FluidType("AMAT",0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT); - ASCHRAB = new FluidType("ASCHRAB",0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT); - ACID = new FluidType("ACID",0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE); - WATZ = new FluidType("WATZ",0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2); - CRYOGEL = new FluidType("CRYOGEL",0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170); - HYDROGEN = new FluidTypeCombustible("HYDROGEN",0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"); - OXYGEN = new FluidType("OXYGEN",0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"); - XENON = new FluidType("XENON",0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"); - BALEFIRE = new FluidType("BALEFIRE",0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE); - MERCURY = new FluidType("MERCURY",0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"); - PAIN = new FluidType("PAIN",0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE); - WASTEFLUID = new FluidType("WASTEFLUID",0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.NO_CONTAINER); - WASTEGAS = new FluidType("WASTEGAS",0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.NO_CONTAINER); - GASOLINE = new FluidTypeCombustible("GASOLINE",0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"); - COALGAS = new FluidTypeCombustible("COALGAS",0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.coalgas"); - SPENTSTEAM = new FluidType("SPENTSTEAM",0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam", FluidTrait.NO_CONTAINER); - FRACKSOL = new FluidType("FRACKSOL",0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE); - PLASMA_DT = new FluidType("PLASMA_DT",0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - PLASMA_HD = new FluidType("PLASMA_HD",0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - PLASMA_HT = new FluidType("PLASMA_HT",0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - PLASMA_XM = new FluidType("PLASMA_XM",0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - PLASMA_BF = new FluidType("PLASMA_BF",0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - // v v v v v v v v - CARBONDIOXIDE = new FluidType("CARBONDIOXIDE",0x404040, 6, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); - PLASMA_DH3 = new FluidType("PLASMA_DH3",0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); - HELIUM3 = new FluidType("HELIUM3",0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"); - DEATH = new FluidType("DEATH",0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER); - ETHANOL = new FluidTypeCombustible("ETHANOL",0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"); - HEAVYWATER = new FluidType("HEAVYWATER",0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"); - CRACKOIL = new FluidTypeFlammable("CRACKOIL",0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.crackoil"); - COALOIL = new FluidTypeFlammable("COALOIL",0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.coaloil"); - HOTCRACKOIL = new FluidTypeFlammable("HOTCRACKOIL",0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotcrackoil", 350); - NAPHTHA_CRACK = new FluidTypeFlammable("NAPHTHA_CRACK",0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha_crack"); - LIGHTOIL_CRACK = new FluidTypeFlammable("LIGHTOIL_CRACK",0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil_crack"); - AROMATICS = new FluidTypeFlammable("AROMATICS",0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.aromatics"); - UNSATURATEDS = new FluidTypeFlammable("UNSATURATEDS",0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.unsaturateds"); + NONE = new FluidType("NONE",0x888888, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"); + WATER = new FluidType("WATER",0x3333FF, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"); + STEAM = new FluidType("STEAM",0xe5e5e5, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100); + HOTSTEAM = new FluidType("HOTSTEAM",0xE7D6D6, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300); + SUPERHOTSTEAM = new FluidType("SUPERHOTSTEAM",0xE7B7B7, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450); + ULTRAHOTSTEAM = new FluidType("ULTRAHOTSTEAM",0xE39393, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600); + COOLANT = new FluidType("COOLANT",0xd8fcff, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"); + LAVA = new FluidType("LAVA",0xFF3300, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200); + DEUTERIUM = new FluidTypeCombustible("DEUTERIUM",0x0000FF, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"); + TRITIUM = new FluidTypeCombustible("TRITIUM",0x000099, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"); + OIL = new FluidTypeFlammable("OIL",0x020202, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"); + HOTOIL = new FluidTypeFlammable("HOTOIL",0x300900, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350); + HEAVYOIL = new FluidTypeFlammable("HEAVYOIL",0x141312, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"); + BITUMEN = new FluidType("BITUMEN",0x1f2426, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"); + SMEAR = new FluidTypeFlammable("SMEAR",0x190f01, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"); + HEATINGOIL = new FluidTypeCombustible("HEATINGOIL",0x211806, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"); + RECLAIMED = new FluidTypeCombustible("RECLAIMED",0x332b22, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"); + PETROIL = new FluidTypeCombustible("PETROIL",0x44413d, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"); + LUBRICANT = new FluidType("LUBRICANT",0x606060, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"); + NAPHTHA = new FluidTypeFlammable("NAPHTHA",0x595744, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"); + DIESEL = new FluidTypeCombustible("DIESEL",0xf2eed5, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"); + LIGHTOIL = new FluidTypeCombustible("LIGHTOIL",0x8c7451, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"); + KEROSENE = new FluidTypeCombustible("KEROSENE",0xffa5d2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"); + GAS = new FluidTypeFlammable("GAS",0xfffeed, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"); + PETROLEUM = new FluidTypeFlammable("PETROLEUM",0x7cb7c9, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"); + LPG = new FluidTypeCombustible("LPG",0x4747EA, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"); + BIOGAS = new FluidTypeFlammable("BIOGAS",0xbfd37c, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"); + BIOFUEL = new FluidTypeCombustible("BIOFUEL",0xeef274, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"); + NITAN = new FluidTypeCombustible("NITAN",0x8018ad, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"); + UF6 = new FluidType("UF6",0xD1CEBE, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE); + PUF6 = new FluidType("PUF6",0x4C4C4C, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE); + SAS3 = new FluidType("SAS3",0x4ffffc, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE); + SCHRABIDIC = new FluidType("SCHRABIDIC",0x006B6B, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2); + AMAT = new FluidType("AMAT",0x010101, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT); + ASCHRAB = new FluidType("ASCHRAB",0xb50000, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT); + ACID = new FluidType("ACID",0xfff7aa, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE); + WATZ = new FluidType("WATZ",0x86653E, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2); + CRYOGEL = new FluidType("CRYOGEL",0x32ffff, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170); + HYDROGEN = new FluidTypeCombustible("HYDROGEN",0x4286f4, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"); + OXYGEN = new FluidType("OXYGEN",0x98bdf9, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"); + XENON = new FluidType("XENON",0xba45e8, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"); + BALEFIRE = new FluidType("BALEFIRE",0x28e02e, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE); + MERCURY = new FluidType("MERCURY",0x808080, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"); + PAIN = new FluidType("PAIN",0x938541, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE); + WASTEFLUID = new FluidType("WASTEFLUID",0x544400, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.NO_CONTAINER); + WASTEGAS = new FluidType("WASTEGAS",0xB8B8B8, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.NO_CONTAINER); + GASOLINE = new FluidTypeCombustible("GASOLINE",0x445772, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"); + COALGAS = new FluidTypeCombustible("COALGAS",0x445772, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.coalgas"); + SPENTSTEAM = new FluidType("SPENTSTEAM",0x445772, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam", FluidTrait.NO_CONTAINER); + FRACKSOL = new FluidType("FRACKSOL",0x798A6B, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE); + PLASMA_DT = new FluidType("PLASMA_DT",0xF7AFDE, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + PLASMA_HD = new FluidType("PLASMA_HD",0xF0ADF4, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + PLASMA_HT = new FluidType("PLASMA_HT",0xD1ABF2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + PLASMA_XM = new FluidType("PLASMA_XM",0xC6A5FF, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + PLASMA_BF = new FluidType("PLASMA_BF",0xA7F1A3, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + CARBONDIOXIDE = new FluidType("CARBONDIOXIDE",0x404040, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); + PLASMA_DH3 = new FluidType("PLASMA_DH3",0xFF83AA, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + HELIUM3 = new FluidType("HELIUM3",0xFCF0C4, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"); + DEATH = new FluidType("DEATH",0x717A88, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER); + ETHANOL = new FluidTypeCombustible("ETHANOL",0xe0ffff, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"); + HEAVYWATER = new FluidType("HEAVYWATER",0x00a0b0, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"); + CRACKOIL = new FluidTypeFlammable("CRACKOIL",0x020202, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.crackoil"); + COALOIL = new FluidTypeFlammable("COALOIL",0x020202, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.coaloil"); + HOTCRACKOIL = new FluidTypeFlammable("HOTCRACKOIL",0x300900, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotcrackoil", 350); + NAPHTHA_CRACK = new FluidTypeFlammable("NAPHTHA_CRACK",0x595744, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha_crack"); + LIGHTOIL_CRACK = new FluidTypeFlammable("LIGHTOIL_CRACK",0x8c7451, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil_crack"); + DIESEL_CRACK = new FluidTypeCombustible("DIESEL_CRACK",0xf2eed5, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel_crack"); + AROMATICS = new FluidTypeFlammable("AROMATICS",0xfffeed, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.aromatics"); + UNSATURATEDS = new FluidTypeFlammable("UNSATURATEDS",0xfffeed, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.unsaturateds"); + + // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE //AND DON'T FORGET THE META DOWN HERE diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java b/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java index 8bc843089..0e9ccc27e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java @@ -89,16 +89,12 @@ public class GUIAMSBase extends GuiInfoContainer { if(!base.hasResonators()) this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 6); - Minecraft.getMinecraft().getTextureManager().bindTexture(base.tanks[0].getSheet()); - base.tanks[0].renderTank(this, guiLeft + 26, guiTop + 70, base.tanks[0].getTankType().textureX() * FluidTank.x, base.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + base.tanks[0].renderTank(guiLeft + 26, guiTop + 70, this.zLevel, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(base.tanks[1].getSheet()); - base.tanks[1].renderTank(this, guiLeft + 134, guiTop + 70, base.tanks[1].getTankType().textureX() * FluidTank.x, base.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + base.tanks[1].renderTank(guiLeft + 134, guiTop + 70, this.zLevel, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(base.tanks[2].getSheet()); - base.tanks[2].renderTank(this, guiLeft + 26, guiTop + 124, base.tanks[2].getTankType().textureX() * FluidTank.x, base.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52); + base.tanks[2].renderTank(guiLeft + 26, guiTop + 124, this.zLevel, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(base.tanks[3].getSheet()); - base.tanks[3].renderTank(this, guiLeft + 134, guiTop + 124, base.tanks[3].getTankType().textureX() * FluidTank.x, base.tanks[3].getTankType().textureY() * FluidTank.y, 16, 52); + base.tanks[3].renderTank(guiLeft + 134, guiTop + 124, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java b/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java index 9b127d3da..522a3da4e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java @@ -61,8 +61,6 @@ public class GUIAMSEmitter extends GuiInfoContainer { if(m > 0) drawTexturedModalRect(guiLeft + 80, guiTop + 17, 176, 36 + 16 * m, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(emitter.tank.getSheet()); - - emitter.tank.renderTank(this, guiLeft + 26, guiTop + 69, emitter.tank.getTankType().textureX() * FluidTank.x, emitter.tank.getTankType().textureY() * FluidTank.y, 16, 52); + emitter.tank.renderTank(guiLeft + 26, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java b/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java index 69f8cffeb..c3717774b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java @@ -66,8 +66,6 @@ public class GUIAMSLimiter extends GuiInfoContainer { if(m > 0) drawTexturedModalRect(guiLeft + 80, guiTop + 17, 176, 36 + 16 * m, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(limiter.tank.getSheet()); - - limiter.tank.renderTank(this, guiLeft + 26, guiTop + 69, limiter.tank.getTankType().textureX() * FluidTank.x, limiter.tank.getTankType().textureY() * FluidTank.y, 16, 52); + limiter.tank.renderTank(guiLeft + 26, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java index 2fa84fffb..5342faf13 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java @@ -67,6 +67,6 @@ public class GUIBarrel extends GuiInfoContainer { tank.tank.renderTank(this, guiLeft + 71 + 16, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); tank.tank.renderTank(this, guiLeft + 71 + 32, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 2, 52);*/ - tank.tank.renderTank(guiLeft + 71, guiTop + 17, this.zLevel, 34, 52); + tank.tank.renderTank(guiLeft + 71, guiTop + 69, this.zLevel, 34, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUICore.java b/src/main/java/com/hbm/inventory/gui/GUICore.java index ca6f7679b..7e54f413a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICore.java +++ b/src/main/java/com/hbm/inventory/gui/GUICore.java @@ -58,9 +58,7 @@ public class GUICore extends GuiInfoContainer { int j = core.getHeatScaled(52); drawTexturedModalRect(guiLeft + 152, guiTop + 69 - j, 192, 52 - j, 16, j); - Minecraft.getMinecraft().getTextureManager().bindTexture(core.tanks[0].getSheet()); - core.tanks[0].renderTank(this, guiLeft + 26, guiTop + 69, core.tanks[0].getTankType().textureX() * FluidTank.x, core.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(core.tanks[1].getSheet()); - core.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, core.tanks[1].getTankType().textureX() * FluidTank.x, core.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + core.tanks[0].renderTank(guiLeft + 26, guiTop + 69, this.zLevel, 16, 52); + core.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java b/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java index b4aa1fa1a..f775e92c9 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java @@ -103,10 +103,9 @@ public class GUICoreEmitter extends GuiInfoContainer { int i = (int) emitter.getPowerScaled(52); drawTexturedModalRect(guiLeft + 26, guiTop + 69 - i, 176, 52 - i, 16, i); - this.field.drawTextBox(); + this.field.drawTextBox(); - Minecraft.getMinecraft().getTextureManager().bindTexture(emitter.tank.getSheet()); - emitter.tank.renderTank(this, guiLeft + 8, guiTop + 69, emitter.tank.getTankType().textureX() * FluidTank.x, emitter.tank.getTankType().textureY() * FluidTank.y, 16, 52); + emitter.tank.renderTank(guiLeft + 8, guiTop + 69, this.zLevel, 16, 52); } protected void keyTyped(char p_73869_1_, int p_73869_2_) { diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java b/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java index 850e10eb2..74896f066 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java @@ -47,9 +47,7 @@ public class GUICoreInjector extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(injector.tanks[0].getSheet()); - injector.tanks[0].renderTank(this, guiLeft + 44, guiTop + 69, injector.tanks[0].getTankType().textureX() * FluidTank.x, injector.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(injector.tanks[1].getSheet()); - injector.tanks[1].renderTank(this, guiLeft + 116, guiTop + 69, injector.tanks[1].getTankType().textureX() * FluidTank.x, injector.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + injector.tanks[0].renderTank(guiLeft + 44, guiTop + 69, this.zLevel, 16, 52); + injector.tanks[1].renderTank(guiLeft + 116, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java b/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java index eb9134820..e099104d9 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java @@ -52,7 +52,6 @@ public class GUICoreReceiver extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(receiver.tank.getSheet()); - receiver.tank.renderTank(this, guiLeft + 8, guiTop + 69, receiver.tank.getTankType().textureX() * FluidTank.x, receiver.tank.getTankType().textureY() * FluidTank.y, 16, 52); + receiver.tank.renderTank(guiLeft + 8, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java index 320e8b79e..ed298edab 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java @@ -61,7 +61,6 @@ public class GUICrystallizer extends GuiInfoContainer { this.drawInfoPanel(guiLeft + 87, guiTop + 21, 8, 8, 8); - Minecraft.getMinecraft().getTextureManager().bindTexture(acidomatic.tank.getSheet()); - acidomatic.tank.renderTank(this, guiLeft + 44, guiTop + 69, acidomatic.tank.getTankType().textureX() * FluidTank.x, acidomatic.tank.getTankType().textureY() * FluidTank.y, 16, 52); + acidomatic.tank.renderTank(guiLeft + 44, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java b/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java index ba109c68e..3aa6b4939 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java @@ -58,13 +58,8 @@ public class GUIFWatzCore extends GuiInfoContainer { int m = diFurnace.getSingularityType(); drawTexturedModalRect(guiLeft + 98, guiTop + 109, 240, 4 * m, 16, 4); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); - diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70); + diFurnace.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 70); + diFurnace.tanks[1].renderTank(guiLeft + 134, guiTop + 88, this.zLevel, 16, 70); + diFurnace.tanks[2].renderTank(guiLeft + 152, guiTop + 88, this.zLevel, 16, 70); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIFusionMultiblock.java b/src/main/java/com/hbm/inventory/gui/GUIFusionMultiblock.java index 89e0ae8db..bf1982cfc 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -55,13 +55,8 @@ public class GUIFusionMultiblock extends GuiInfoContainer { if(diFurnace.isRunning()) drawTexturedModalRect(guiLeft + 80, guiTop + 18, 240, 0, 16, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); - diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70); + diFurnace.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 70); + diFurnace.tanks[1].renderTank(guiLeft + 134, guiTop + 88, this.zLevel, 16, 70); + diFurnace.tanks[2].renderTank(guiLeft + 152, guiTop + 88, this.zLevel, 16, 70); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java index 13f3937c9..ab2a46985 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java +++ b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java @@ -83,10 +83,7 @@ public class GUIIGenerator extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 51, guiTop + 34, 180, 0, 4, 89); } - Minecraft.getMinecraft().getTextureManager().bindTexture(igen.tanks[1].getSheet()); - igen.tanks[1].renderTank(this, guiLeft + 114, guiTop + 103, igen.tanks[1].getTankType().textureX() * FluidTank.x, igen.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70); - - Minecraft.getMinecraft().getTextureManager().bindTexture(igen.tanks[2].getSheet()); - igen.tanks[2].renderTank(this, guiLeft + 150, guiTop + 103, igen.tanks[2].getTankType().textureX() * FluidTank.x, igen.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70); + igen.tanks[1].renderTank(guiLeft + 114, guiTop + 103, this.zLevel, 16, 70); + igen.tanks[2].renderTank(guiLeft + 150, guiTop + 103, this.zLevel, 16, 70); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIITER.java b/src/main/java/com/hbm/inventory/gui/GUIITER.java index 52ecf1c1b..4bf14fce3 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIITER.java +++ b/src/main/java/com/hbm/inventory/gui/GUIITER.java @@ -83,13 +83,9 @@ public class GUIITER extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 44, guiTop + 22, 176, 18, j, 7); for(int t = 0; t < 2; t++) { - Minecraft.getMinecraft().getTextureManager().bindTexture(iter.tanks[t].getSheet()); - iter.tanks[t].renderTank(this, guiLeft + 26 + 108 * t, guiTop + 106, iter.tanks[t].getTankType().textureX() * FluidTank.x, iter.tanks[t].getTankType().textureY() * FluidTank.y, 16, 52); + iter.tanks[t].renderTank(guiLeft + 26 + 108 * t, guiTop + 106, this.zLevel, 16, 52); } - Minecraft.getMinecraft().getTextureManager().bindTexture(iter.plasma.getSheet()); - iter.plasma.renderTank(this, guiLeft + 71, guiTop + 88, iter.plasma.getTankType().textureX() * FluidTank.x, iter.plasma.getTankType().textureY() * FluidTank.y, 16, 34); - iter.plasma.renderTank(this, guiLeft + 71 + 16, guiTop + 88, iter.plasma.getTankType().textureX() * FluidTank.x, iter.plasma.getTankType().textureY() * FluidTank.y, 16, 34); - iter.plasma.renderTank(this, guiLeft + 71 + 32, guiTop + 88, iter.plasma.getTankType().textureX() * FluidTank.x, iter.plasma.getTankType().textureY() * FluidTank.y, 2, 34); + iter.plasma.renderTank(guiLeft + 71, guiTop + 88, this.zLevel, 34, 34); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java index 8cd892ef0..0053d6866 100644 --- a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java +++ b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java @@ -57,7 +57,6 @@ public class GUILiquefactor extends GuiInfoContainer { if(i > 0) drawTexturedModalRect(guiLeft + 138, guiTop + 4, 176, 52, 9, 12); - Minecraft.getMinecraft().getTextureManager().bindTexture(liquefactor.tank.getSheet()); - liquefactor.tank.renderTank(this, guiLeft + 71, guiTop + 88, liquefactor.tank.getTankType().textureX() * FluidTank.x, liquefactor.tank.getTankType().textureY() * FluidTank.y, 16, 52); + liquefactor.tank.renderTank(guiLeft + 71, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java index 3a6ee8f68..63228567a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java @@ -98,10 +98,7 @@ public class GUIMachineBoiler extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } - Minecraft.getMinecraft().getTextureManager().bindTexture(dud.tanks[0].getSheet()); - dud.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, dud.tanks[0].getTankType().textureX() * FluidTank.x, dud.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(dud.tanks[1].getSheet()); - dud.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, dud.tanks[1].getTankType().textureX() * FluidTank.x, dud.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + dud.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + dud.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java index 1bfb8a670..82dd23d8c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java @@ -97,10 +97,7 @@ public class GUIMachineBoilerElectric extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } - Minecraft.getMinecraft().getTextureManager().bindTexture(dud.tanks[0].getSheet()); - dud.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, dud.tanks[0].getTankType().textureX() * FluidTank.x, dud.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(dud.tanks[1].getSheet()); - dud.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, dud.tanks[1].getTankType().textureX() * FluidTank.x, dud.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + dud.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + dud.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java index e87fe76ce..f50281ce6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -55,7 +55,6 @@ public class GUIMachineCMBFactory extends GuiInfoContainer { int j1 = diFurnace.getProgressScaled(24); drawTexturedModalRect(guiLeft + 101 + 9, guiTop + 34, 208, 0, j1 + 1, 16); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); - diFurnace.tank.renderTank(this, guiLeft + 26, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tank.renderTank(guiLeft + 26, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java b/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java index 4fac9a382..1fc14d3a6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -76,16 +76,9 @@ public class GUIMachineChemplant extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 6); } - Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[0].getSheet()); - chemplant.tanks[0].renderTank(this, guiLeft + 8, guiTop + 52, chemplant.tanks[0].getTankType().textureX() * FluidTank.x, chemplant.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); - - Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[1].getSheet()); - chemplant.tanks[1].renderTank(this, guiLeft + 26, guiTop + 52, chemplant.tanks[1].getTankType().textureX() * FluidTank.x, chemplant.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); - - Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[2].getSheet()); - chemplant.tanks[2].renderTank(this, guiLeft + 134, guiTop + 52, chemplant.tanks[2].getTankType().textureX() * FluidTank.x, chemplant.tanks[2].getTankType().textureY() * FluidTank.y, 16, 34); - - Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[3].getSheet()); - chemplant.tanks[3].renderTank(this, guiLeft + 152, guiTop + 52, chemplant.tanks[3].getTankType().textureX() * FluidTank.x, chemplant.tanks[3].getTankType().textureY() * FluidTank.y, 16, 34); + chemplant.tanks[0].renderTank(guiLeft + 8, guiTop + 52, this.zLevel, 16, 34); + chemplant.tanks[1].renderTank(guiLeft + 26, guiTop + 52, this.zLevel, 16, 34); + chemplant.tanks[2].renderTank(guiLeft + 134, guiTop + 52, this.zLevel, 16, 34); + chemplant.tanks[3].renderTank(guiLeft + 152, guiTop + 52, this.zLevel, 16, 34); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCoal.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCoal.java index a117ca721..0f63fb550 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCoal.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCoal.java @@ -92,7 +92,6 @@ public class GUIMachineCoal extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3); - Minecraft.getMinecraft().getTextureManager().bindTexture(dud.tank.getSheet()); - dud.tank.renderTank(this, guiLeft + 8, guiTop + 69, dud.tank.getTankType().textureX() * FluidTank.x, dud.tank.getTankType().textureY() * FluidTank.y, 16, 52); + dud.tank.renderTank(guiLeft + 8, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index 81ce3d7cf..00c096038 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -88,11 +88,8 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); - launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 70, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); - - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[1].getSheet()); - launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 70, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); + launcher.tanks[0].renderTank(guiLeft + 116, guiTop + 70, this.zLevel, 16, 34); + launcher.tanks[1].renderTank(guiLeft + 134, guiTop + 70, this.zLevel, 16, 34); /// DRAW MISSILE START GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java index 2ae46a3ec..12d7c0f1b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -77,9 +77,7 @@ public class GUIMachineCyclotron extends GuiInfoContainer { this.drawInfoPanel(guiLeft + 21, guiTop + 75, 8, 8, 8); - Minecraft.getMinecraft().getTextureManager().bindTexture(cyclotron.coolant.getSheet()); - cyclotron.coolant.renderTank(this, guiLeft + 53, guiTop + 124, cyclotron.coolant.getTankType().textureX() * FluidTank.x, cyclotron.coolant.getTankType().textureY() * FluidTank.y, 7, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(cyclotron.amat.getSheet()); - cyclotron.amat.renderTank(this, guiLeft + 134, guiTop + 124, cyclotron.amat.getTankType().textureX() * FluidTank.x, cyclotron.amat.getTankType().textureY() * FluidTank.y, 7, 34); + cyclotron.coolant.renderTank(guiLeft + 53, guiTop + 124, this.zLevel, 7, 52); + cyclotron.amat.renderTank(guiLeft + 134, guiTop + 124, this.zLevel, 7, 34); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index f26f7f787..6a9729a22 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -92,19 +92,6 @@ public class GUIMachineDiesel extends GuiInfoContainer { if(!diFurnace.hasAcceptableFuel()) this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); - diFurnace.tank.renderTank(this, guiLeft + 80, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); - - /*Minecraft.getMinecraft().getTextureManager().bindTexture(ResourceManager.missileNuclear_tex); - GL11.glPushMatrix(); - GL11.glTranslatef(guiLeft + 88, guiTop + 110, 50); - GL11.glRotatef(System.currentTimeMillis() / 10 % 360, 0, -1, 0); - GL11.glTranslatef(60, 0, 0); - GL11.glScalef(16, 16, 16); - GL11.glRotatef(90, 1, 0, 0); - GL11.glRotatef(-90, 0, 0, 1); - GL11.glScalef(-1, -1, -1); - ResourceManager.missileNuclear.renderAll(); - GL11.glPopMatrix();*/ + diFurnace.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java index 62b419c3f..03a4fff72 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -62,9 +62,6 @@ public class GUIMachineFluidTank extends GuiInfoContainer { int i = tank.mode; drawTexturedModalRect(guiLeft + 151, guiTop + 34, 176, i * 18, 18, 18); - Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); - tank.tank.renderTank(this, guiLeft + 71, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); - tank.tank.renderTank(this, guiLeft + 71 + 16, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); - tank.tank.renderTank(this, guiLeft + 71 + 32, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 2, 52); + tank.tank.renderTank(guiLeft + 71, guiTop + 69, this.zLevel, 34, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGasFlare.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGasFlare.java index 35e3f7613..64854f31c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -50,9 +50,6 @@ public class GUIMachineGasFlare extends GuiInfoContainer { int j = (int)flare.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - j, 176, 52 - j, 16, j); - Minecraft.getMinecraft().getTextureManager().bindTexture(flare.tank.getSheet()); - flare.tank.renderTank(this, guiLeft + 80, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); - flare.tank.renderTank(this, guiLeft + 80 + 16, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); - flare.tank.renderTank(this, guiLeft + 80 + 32, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 2, 52); + flare.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 34, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGenerator.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGenerator.java index d1414f5c6..ed98ce875 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineGenerator.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGenerator.java @@ -75,10 +75,7 @@ public class GUIMachineGenerator extends GuiInfoContainer { if(diFurnace.tanks[1].getFill() <= 0) this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 7); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 52); + diFurnace.tanks[1].renderTank(guiLeft + 26, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java b/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java index e6a153dc8..bc3a2e2aa 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java @@ -47,13 +47,8 @@ public class GUIMachineInserter extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 44, guiTop + 69, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 98, guiTop + 69, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet()); - diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 69, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tanks[0].renderTank(guiLeft + 44, guiTop + 69, this.zLevel, 16, 52); + diFurnace.tanks[1].renderTank(guiLeft + 98, guiTop + 69, this.zLevel, 16, 52); + diFurnace.tanks[2].renderTank(guiLeft + 152, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java index b601c95fb..ab0299c1a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java @@ -56,30 +56,19 @@ public class GUIMachineLargeTurbine extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(turbine.tanks[0].getTankType().name().equals(Fluids.STEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); - } - if(turbine.tanks[0].getTankType().name().equals(Fluids.HOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); - } - if(turbine.tanks[0].getTankType().name().equals(Fluids.SUPERHOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); - } - if(turbine.tanks[0].getTankType().name().equals(Fluids.ULTRAHOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); - } + if(turbine.tanks[0].getTankType() == Fluids.STEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); + if(turbine.tanks[0].getTankType() == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); + if(turbine.tanks[0].getTankType() == Fluids.SUPERHOTSTEAM)drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); + if(turbine.tanks[0].getTankType() == Fluids.ULTRAHOTSTEAM)drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); int i = (int)turbine.getPowerScaled(34); drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i); - if(turbine.tanks[1].getTankType().name().equals(Fluids.NONE.name())) { + if(turbine.tanks[1].getTankType() == Fluids.NONE) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } - Minecraft.getMinecraft().getTextureManager().bindTexture(turbine.tanks[0].getSheet()); - turbine.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, turbine.tanks[0].getTankType().textureX() * FluidTank.x, turbine.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(turbine.tanks[1].getSheet()); - turbine.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, turbine.tanks[1].getTankType().textureX() * FluidTank.x, turbine.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + turbine.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + turbine.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java index 23ec4f79e..9cdf56b0b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -134,11 +134,8 @@ public class GUIMachineLaunchTable extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); - launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 70, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); - - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[1].getSheet()); - launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 70, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); + launcher.tanks[0].renderTank(guiLeft + 116, guiTop + 70, this.zLevel, 16, 34); + launcher.tanks[1].renderTank(guiLeft + 134, guiTop + 70, this.zLevel, 16, 34); /// DRAW MISSILE START GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java b/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java index 3bd9568df..4448db22a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -65,15 +65,11 @@ public class GUIMachineOilWell extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 34, guiTop + 36, 192, 0, 18, 34); } - Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[0].getSheet()); - derrick.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[1].getSheet()); - derrick.tanks[1].renderTank(this, guiLeft + 107, guiTop + 69, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + derrick.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + derrick.tanks[1].renderTank(guiLeft + 107, guiTop + 69, this.zLevel, 16, 52); if(derrick.tanks.length > 2) { - Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[2].getSheet()); - derrick.tanks[2].renderTank(this, guiLeft + 40, guiTop + 69, derrick.tanks[2].getTankType().textureX() * FluidTank.x, derrick.tanks[2].getTankType().textureY() * FluidTank.y, 6, 32); + derrick.tanks[2].renderTank(guiLeft + 40, guiTop + 69, this.zLevel, 6, 32); } } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index 03322880e..0bfd234c9 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java @@ -46,7 +46,6 @@ public class GUIMachinePuF6Tank extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); - tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); + tank.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index f16e4b07d..df5036107 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -54,21 +54,10 @@ public class GUIMachineRefinery extends GuiInfoContainer { int j = (int)refinery.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 176, 52 - j, 16, j); - Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[0].getSheet()); - refinery.tanks[0].renderTank(this, guiLeft + 26, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - refinery.tanks[0].renderTank(this, guiLeft + 26 + 16, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - refinery.tanks[0].renderTank(this, guiLeft + 26 + 32, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[1].getSheet()); - refinery.tanks[1].renderTank(this, guiLeft + 80, guiTop + 70, refinery.tanks[1].getTankType().textureX() * FluidTank.x, refinery.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[2].getSheet()); - refinery.tanks[2].renderTank(this, guiLeft + 98, guiTop + 70, refinery.tanks[2].getTankType().textureX() * FluidTank.x, refinery.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[3].getSheet()); - refinery.tanks[3].renderTank(this, guiLeft + 116, guiTop + 70, refinery.tanks[3].getTankType().textureX() * FluidTank.x, refinery.tanks[3].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[4].getSheet()); - refinery.tanks[4].renderTank(this, guiLeft + 134, guiTop + 70, refinery.tanks[4].getTankType().textureX() * FluidTank.x, refinery.tanks[4].getTankType().textureY() * FluidTank.y, 16, 52); + refinery.tanks[0].renderTank(guiLeft + 26, guiTop + 70, this.zLevel, 34, 52); + refinery.tanks[1].renderTank(guiLeft + 80, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[2].renderTank(guiLeft + 98, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[3].renderTank(guiLeft + 116, guiTop + 70, this.zLevel, 16, 52); + refinery.tanks[4].renderTank(guiLeft + 134, guiTop + 70, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java index 497a88505..e2ff49ac0 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -116,7 +116,6 @@ public class GUIMachineSelenium extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); - diFurnace.tank.renderTank(this, guiLeft + 80 + 36, guiTop + 70, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tank.renderTank(guiLeft + 80 + 36, guiTop + 70, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java index f7aaf0a98..d5ee1d33e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java @@ -33,7 +33,7 @@ public class GUIMachineTurbine extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52); - if(diFurnace.tanks[1].getTankType().name().equals(Fluids.NONE.name())) { + if(diFurnace.tanks[1].getTankType() == Fluids.NONE) { String[] text2 = new String[] { "Error: Invalid fluid!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2); @@ -56,30 +56,19 @@ public class GUIMachineTurbine extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(diFurnace.tanks[0].getTankType().name().equals(Fluids.STEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); - } - if(diFurnace.tanks[0].getTankType().name().equals(Fluids.HOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); - } - if(diFurnace.tanks[0].getTankType().name().equals(Fluids.SUPERHOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); - } - if(diFurnace.tanks[0].getTankType().name().equals(Fluids.ULTRAHOTSTEAM.name())) { - drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); - } + if(diFurnace.tanks[0].getTankType() == Fluids.STEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); + if(diFurnace.tanks[0].getTankType() == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); + if(diFurnace.tanks[0].getTankType() == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); + if(diFurnace.tanks[0].getTankType() == Fluids.ULTRAHOTSTEAM) drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); int i = (int)diFurnace.getPowerScaled(34); drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i); - if(diFurnace.tanks[1].getTankType().name().equals(Fluids.NONE.name())) { + if(diFurnace.tanks[1].getTankType() == Fluids.NONE) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + diFurnace.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbofan.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbofan.java index c04655766..ce0d4b30a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbofan.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbofan.java @@ -63,9 +63,6 @@ public class GUIMachineTurbofan extends GuiInfoContainer { this.drawInfoPanel(guiLeft + 96, guiTop + 21, 8, 8, 8); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); - diFurnace.tank.renderTank(this, guiLeft + 53, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); - diFurnace.tank.renderTank(this, guiLeft + 53 + 16, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52); - diFurnace.tank.renderTank(this, guiLeft + 53 + 32, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 2, 52); + diFurnace.tank.renderTank(guiLeft + 53, guiTop + 69, this.zLevel, 34, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java index 20adc69c3..d6d587474 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java @@ -46,7 +46,6 @@ public class GUIMachineUF6Tank extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet()); - tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52); + tank.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java index 1e54cbb94..a8aab0b0a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java @@ -87,7 +87,6 @@ public class GUIMiningLaser extends GuiInfoContainer { this.drawInfoPanel(guiLeft + 87, guiTop + 31, 8, 8, 8); - Minecraft.getMinecraft().getTextureManager().bindTexture(laser.tank.getSheet()); - laser.tank.renderTank(this, guiLeft + 35, guiTop + 124, laser.tank.getTankType().textureX() * FluidTank.x, laser.tank.getTankType().textureY() * FluidTank.y, 7, 52); + laser.tank.renderTank(guiLeft + 35, guiTop + 124, this.zLevel, 7, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java b/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java index 9b97a7f6d..3397ec832 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java +++ b/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java @@ -55,12 +55,8 @@ public class GUIPlasmaHeater extends GuiInfoContainer { int i = (int)microwave.getPowerScaled(34); drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 176, 34 - i, 16, i); - Minecraft.getMinecraft().getTextureManager().bindTexture(microwave.tanks[0].getSheet()); - microwave.tanks[0].renderTank(this, guiLeft + 62, guiTop + 69, microwave.tanks[0].getTankType().textureX() * FluidTank.x, microwave.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(microwave.tanks[1].getSheet()); - microwave.tanks[1].renderTank(this, guiLeft + 134, guiTop + 69, microwave.tanks[1].getTankType().textureX() * FluidTank.x, microwave.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(microwave.plasma.getSheet()); - microwave.plasma.renderTank(this, guiLeft + 98, guiTop + 69, microwave.plasma.getTankType().textureX() * FluidTank.x, microwave.plasma.getTankType().textureY() * FluidTank.y, 16, 52); + microwave.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); + microwave.tanks[1].renderTank(guiLeft + 134, guiTop + 69, this.zLevel, 16, 52); + microwave.plasma.renderTank(guiLeft + 98, guiTop + 69, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java index c59102c07..c6c6f7b8e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java @@ -75,12 +75,10 @@ public class GUIRadiolysis extends GuiInfoContainer { int i = (int)(radiolysis.getPower() * 34 / radiolysis.getMaxPower()); drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 240, 34 - i, 16, i); - Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[0].getSheet()); - radiolysis.tanks[0].renderTank(this, guiLeft + 61, guiTop + 69, radiolysis.tanks[0].getTankType().textureX() * FluidTank.x, radiolysis.tanks[0].getTankType().textureY() * FluidTank.y, 8, 52); + radiolysis.tanks[0].renderTank(guiLeft + 61, guiTop + 69, this.zLevel, 8, 52); for(byte j = 0; j < 2; j++) { - Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[j + 1].getSheet()); - radiolysis.tanks[j + 1].renderTank(this, guiLeft + 87, guiTop + 33 + j * 36, radiolysis.tanks[j + 1].getTankType().textureX() * FluidTank.x, radiolysis.tanks[j + 1].getTankType().textureY() * FluidTank.y, 12, 16); + radiolysis.tanks[j + 1].renderTank(guiLeft + 87, guiTop + 33 + j * 36, this.zLevel, 12, 16); } this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 10); diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java index 20c15920d..b5f36f45a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -184,9 +184,7 @@ public class GUIReactorMultiblock extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 80, guiTop + 108, 0, offset, i, 4); } - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet()); - diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet()); - diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + diFurnace.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 52); + diFurnace.tanks[1].renderTank(guiLeft + 26, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUISolidifier.java b/src/main/java/com/hbm/inventory/gui/GUISolidifier.java index 665d74ddf..cd70af185 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISolidifier.java +++ b/src/main/java/com/hbm/inventory/gui/GUISolidifier.java @@ -57,7 +57,6 @@ public class GUISolidifier extends GuiInfoContainer { if(i > 0) drawTexturedModalRect(guiLeft + 138, guiTop + 4, 176, 52, 9, 12); - Minecraft.getMinecraft().getTextureManager().bindTexture(solidifier.tank.getSheet()); - solidifier.tank.renderTank(this, guiLeft + 35, guiTop + 88, solidifier.tank.getTankType().textureX() * FluidTank.x, solidifier.tank.getTankType().textureY() * FluidTank.y, 16, 52); + solidifier.tank.renderTank(guiLeft + 35, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java b/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java index 01e6acf83..31ee4f315 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java +++ b/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java @@ -132,10 +132,7 @@ public class GUISoyuzLauncher extends GuiInfoContainer { else drawTexturedModalRect(guiLeft + 49, guiTop + 59, 218, 0, 6, 8); - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); - launcher.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); - - Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[1].getSheet()); - launcher.tanks[1].renderTank(this, guiLeft + 26, guiTop + 88, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + launcher.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 52); + launcher.tanks[1].renderTank(guiLeft + 26, guiTop + 88, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java index 24b7abaf1..214431e27 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java @@ -30,8 +30,7 @@ public class GUITurretFritz extends GUITurretBase { FluidTank tank = ((TileEntityTurretFritz)this.turret).tank; - Minecraft.getMinecraft().getTextureManager().bindTexture(tank.getSheet()); - tank.renderTank(this, guiLeft + 134, guiTop + 116, tank.getTankType().textureX() * FluidTank.x, tank.getTankType().textureY() * FluidTank.y, 7, 52); + tank.renderTank(guiLeft + 134, guiTop + 116, this.zLevel, 7, 52); } protected ResourceLocation getTexture() { diff --git a/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java b/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java index 975034aa2..535427cda 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java +++ b/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java @@ -57,7 +57,6 @@ public class GUIWatzCore extends GuiInfoContainer { int l = (int)diFurnace.getPowerScaled(70); drawTexturedModalRect(guiLeft + 152, guiTop + 106 - 18 - l, 192, 70 - l, 16, l); - Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet()); - diFurnace.tank.renderTank(this, guiLeft + 134, guiTop + 106 - 18, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 70); + diFurnace.tank.renderTank(guiLeft + 134, guiTop + 106 - 18, this.zLevel, 16, 70); } }