diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index f3233c51f..f5d5d81dd 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -7,7 +7,6 @@ import java.util.Set; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiGauge; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; @@ -75,23 +74,6 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper if(tileEntity instanceof ISideConfiguration) { - for(GuiElement element : guiElements) - { - if(element instanceof GuiGauge) - { - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - if(element.getBounds(guiWidth, guiHeight).contains(xAxis, yAxis)) - { - if(((GuiGauge)element).color != null) - { - drawCreativeTabHoveringText(((GuiGauge)element).color.getName(), xAxis, yAxis); - } - } - } - } - Slot hovering = null; for(int i = 0; i < inventorySlots.inventorySlots.size(); i++) diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 6a2bf8941..1cb500743 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -55,28 +55,28 @@ public class GuiPRC extends GuiMekanism String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity, tileEntity.BASE_ENERGY_PER_TICK + extra)); return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy() - tileEntity.getEnergy())); } - }, this, tileEntity.guiLocation)); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override public FluidTank getTank() { return tileEntity.inputFluidTank; } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 5, 10)); + }, GuiGauge.Type.STANDARD_YELLOW, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 5, 10)); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @Override public GasTank getTank() { return tileEntity.inputGasTank; } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 28, 10)); + }, GuiGauge.Type.STANDARD_RED, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 28, 10)); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @Override public GasTank getTank() { return tileEntity.outputGasTank; } - }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 40)); + }, GuiGauge.Type.SMALL_BLUE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 40)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 53, 34)); diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 44d2b38c9..2374341cd 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -178,7 +178,7 @@ public class GuiSideConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - drawCreativeTabHoveringText(data.color != null ? data.color.getName() : MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getName() + ")", xAxis, yAxis); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 0d9a9134f..9ba152c18 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -1,6 +1,7 @@ package mekanism.client.gui.element; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; @@ -24,6 +25,12 @@ public class GuiEnergyGauge extends GuiGauge { return new Rectangle4i(guiWidth - 26, guiHeight + 6, 26, 26); } + + @Override + public TransmissionType getTransmission() + { + return TransmissionType.ENERGY; + } @Override public int getScaledLevel() diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index b9bd8d562..f3b185f6a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -1,10 +1,11 @@ package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.IGuiWrapper; import mekanism.common.Mekanism; -import mekanism.common.base.IDropperHandler; +import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; @@ -36,6 +37,12 @@ public class GuiFluidGauge extends GuiGauge return gauge; } + @Override + public TransmissionType getTransmission() + { + return TransmissionType.FLUID; + } + @Override public void mouseClicked(int xAxis, int yAxis, int button) { @@ -47,9 +54,9 @@ public class GuiFluidGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof IDropperHandler) + if(tile instanceof ITankManager) { - int index = Arrays.asList(((IDropperHandler)tile).getTanks()).indexOf(infoHandler.getTank()); + int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); if(index != -1) { diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 841eff9c2..27b33ecad 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -5,10 +5,11 @@ import java.util.Arrays; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.IGuiWrapper; import mekanism.common.Mekanism; -import mekanism.common.base.IDropperHandler; +import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.MekanismUtils; @@ -36,6 +37,12 @@ public class GuiGasGauge extends GuiGauge return gauge; } + @Override + public TransmissionType getTransmission() + { + return TransmissionType.GAS; + } + @Override public void mouseClicked(int xAxis, int yAxis, int button) { @@ -47,9 +54,9 @@ public class GuiGasGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof IDropperHandler) + if(tile instanceof ITankManager) { - int index = Arrays.asList(((IDropperHandler)tile).getTanks()).indexOf(infoHandler.getTank()); + int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); if(index != -1) { diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index ac0e4f694..7d43268ae 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -1,10 +1,17 @@ package mekanism.client.gui.element; import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; +import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; +import mekanism.common.SideData; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; @@ -113,7 +120,34 @@ public abstract class GuiGauge extends GuiElement { if(xAxis >= xLocation + 1 && xAxis <= xLocation + width - 1 && yAxis >= yLocation + 1 && yAxis <= yLocation + height - 1) { - guiObj.displayTooltip(getTooltipText(), xAxis, yAxis); + ItemStack stack = mc.thePlayer.inventory.getItemStack(); + + if(stack != null && stack.getItem() instanceof ItemConfigurator && color != null) + { + if(guiObj instanceof GuiMekanism && ((GuiMekanism)guiObj).getTileEntity() != null) + { + TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); + + if(tile instanceof ISideConfiguration && getTransmission() != null) + { + SideData data = null; + + for(SideData iterData : ((ISideConfiguration)tile).getConfig().getOutputs(getTransmission())) + { + if(iterData.color == color) + { + data = iterData; + break; + } + } + + guiObj.displayTooltip(color + data.localize() + " (" + color.getName() + ")", xAxis, yAxis); + } + } + } + else { + guiObj.displayTooltip(getTooltipText(), xAxis, yAxis); + } } } @@ -128,6 +162,8 @@ public abstract class GuiGauge extends GuiElement { } + + public abstract TransmissionType getTransmission(); public void setDummyType(T type) { diff --git a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index 0210d8aa9..8143e7bee 100644 --- a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -1,9 +1,10 @@ package mekanism.client.gui.element; +import static java.lang.Math.min; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import static java.lang.Math.min; public class GuiNumberGauge extends GuiGauge { @@ -15,6 +16,12 @@ public class GuiNumberGauge extends GuiGauge infoHandler = handler; } + + @Override + public TransmissionType getTransmission() + { + return null; + } @Override public int getScaledLevel() diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 9a297169e..cb22c77ef 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -73,7 +73,7 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer push(); - MekanismRenderer.color(color, 0.4F); + MekanismRenderer.color(color, 0.6F); bindTexture(MekanismRenderer.getBlocksTexture()); GL11.glTranslatef((float)x, (float)y, (float)z); diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index e144229be..983ec7b08 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -1,7 +1,14 @@ package mekanism.common; +import java.util.ArrayList; +import java.util.List; + import mekanism.api.EnumColor; +import mekanism.api.gas.GasTank; +import mekanism.common.base.ITankManager; import mekanism.common.util.MekanismUtils; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; public class SideData { @@ -36,19 +43,50 @@ public class SideData return MekanismUtils.localize("sideData." + name); } - public boolean hasSlot(int slot) + public boolean hasSlot(int... slots) { for(int i : availableSlots) { - if(i == slot) + for(int slot : slots) { - return true; + if(i == slot) + { + return true; + } } } return false; } + public FluidTankInfo[] getFluidTankInfo(ITankManager manager) + { + Object[] tanks = manager.getTanks(); + List infos = new ArrayList(); + + for(int slot : availableSlots) + { + if(slot <= tanks.length-1 && tanks[slot] instanceof IFluidTank) + { + infos.add(((IFluidTank)tanks[slot]).getInfo()); + } + } + + return infos.toArray(new FluidTankInfo[] {}); + } + + public GasTank getGasTank(ITankManager manager) + { + Object[] tanks = manager.getTanks(); + + if(tanks.length < 1 || !(tanks[0] instanceof GasTank)) + { + return null; + } + + return (GasTank)tanks[0]; + } + public static enum EnergyState { INPUT, diff --git a/src/main/java/mekanism/common/base/IDropperHandler.java b/src/main/java/mekanism/common/base/ITankManager.java similarity index 99% rename from src/main/java/mekanism/common/base/IDropperHandler.java rename to src/main/java/mekanism/common/base/ITankManager.java index 3b585491f..3b377e1c2 100644 --- a/src/main/java/mekanism/common/base/IDropperHandler.java +++ b/src/main/java/mekanism/common/base/ITankManager.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -public interface IDropperHandler +public interface ITankManager { public Object[] getTanks(); diff --git a/src/main/java/mekanism/common/network/PacketDropperUse.java b/src/main/java/mekanism/common/network/PacketDropperUse.java index 415dab2d1..48f9d0872 100644 --- a/src/main/java/mekanism/common/network/PacketDropperUse.java +++ b/src/main/java/mekanism/common/network/PacketDropperUse.java @@ -3,8 +3,8 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.base.IDropperHandler; -import mekanism.common.base.IDropperHandler.DropperHandler; +import mekanism.common.base.ITankManager; +import mekanism.common.base.ITankManager.DropperHandler; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -18,10 +18,10 @@ public class PacketDropperUse implements IMessageHandler implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, IDropperHandler +public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { public FluidTank inputFluidTank = new FluidTank(10000); public GasTank inputGasTank = new GasTank(10000); @@ -59,14 +58,24 @@ public class TileEntityPRC extends TileEntityBasicMachine