From aec238dde52e1e2d6add9d2bdc651b5ddf5af996 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 11 Jun 2015 19:59:19 -0400 Subject: [PATCH] Version bump, improved Rotary Condensentrator crafting recipe, made Solar Evaporation Controller use new gauge standards --- build.properties | 2 +- .../gui/GuiSolarEvaporationController.java | 82 +++++-------------- src/main/java/mekanism/common/Mekanism.java | 6 +- .../generators/common/MekanismGenerators.java | 4 +- .../mekanism/tools/common/MekanismTools.java | 4 +- 5 files changed, 28 insertions(+), 70 deletions(-) diff --git a/build.properties b/build.properties index 407d54a9c..54aa6fbf7 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=8.1.4 +mod_version=8.1.5 diff --git a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java index 0d64293bb..952b4a41a 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java @@ -2,6 +2,9 @@ package mekanism.client.gui; import mekanism.api.gas.GasStack; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerSolarEvaporationController; import mekanism.common.tile.TileEntitySolarEvaporationController; @@ -10,6 +13,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -25,6 +29,21 @@ public class GuiSolarEvaporationController extends GuiMekanism { super(tentity, new ContainerSolarEvaporationController(inventory, tentity)); tileEntity = tentity; + + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { + @Override + public FluidTank getTank() + { + return tileEntity.inputTank; + } + }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png"), 6, 13)); + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { + @Override + public FluidTank getTank() + { + return tileEntity.outputTank; + } + }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png"), 152, 13)); } @Override @@ -108,68 +127,7 @@ public class GuiSolarEvaporationController extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int displayInt; - - if(tileEntity.getScaledInputLevel(58) > 0) - { - displayGauge(7, 14, tileEntity.getScaledInputLevel(58), tileEntity.inputTank.getFluid(), null); - } - - if(tileEntity.getScaledOutputLevel(58) > 0) - { - displayGauge(153, 14, tileEntity.getScaledOutputLevel(58), tileEntity.outputTank.getFluid(), null); - } - - displayInt = tileEntity.getScaledTempLevel(78); + int displayInt = tileEntity.getScaledTempLevel(78); drawTexturedModalRect(guiWidth + 49, guiHeight + 64, 176, 59, displayInt, 8); } - - public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid, GasStack gas) - { - if(fluid == null && gas == null) - { - return; - } - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - int start = 0; - - while(true) - { - int renderRemaining; - - if(scale > 16) - { - renderRemaining = 16; - scale -= 16; - } - else { - renderRemaining = scale; - scale = 0; - } - - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - - if(fluid != null) - { - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); - } - else if(gas != null) - { - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, gas.getGas().getIcon(), 16, 16 - (16 - renderRemaining)); - } - - start+=16; - - if(renderRemaining == 0 || scale == 0) - { - break; - } - } - - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png")); - drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 0, 16, 59); - } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 6eaaaa9d7..12f4514a1 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -139,7 +139,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.4", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.5", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -168,7 +168,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(8, 1, 4); + public static Version versionNumber = new Version(8, 1, 5); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); @@ -382,7 +382,7 @@ public class Mekanism })); MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { "GCG", "tET", "GIG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), - Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 6b996af6c..8f3640c40 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -39,7 +39,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.4", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.5", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { /** Mekanism Generators Packet Pipeline */ @@ -52,7 +52,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(8, 1, 4); + public static Version versionNumber = new Version(8, 1, 5); @EventHandler public void preInit(FMLPreInitializationEvent event) diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index cc0023db1..da406e852 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -30,7 +30,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import io.netty.buffer.ByteBuf; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.4", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.5", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -40,7 +40,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(8, 1, 4); + public static Version versionNumber = new Version(8, 1, 5); //Enums: Tools public static ToolMaterial toolOBSIDIAN;