diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 850ca7fcf..297796dc3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -98,6 +98,11 @@ public class GuiChemicalInfuser extends GuiMekanism fontRendererObj.drawString(MekanismUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + + if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) + { + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + } super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 96194deef..6265bdb6e 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -71,6 +71,11 @@ public class GuiChemicalOxidizer extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) + { + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + } super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 8478262e0..eb77220ae 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -1,6 +1,10 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -11,14 +15,14 @@ import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism { @@ -31,7 +35,15 @@ public class GuiPRC extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); - guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiUpgradeManagement(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity, tileEntity.ENERGY_PER_TICK)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity.guiLocation)); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override public FluidTank getTank() diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 67dd40d38..4cb22ab62 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -1,9 +1,12 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -43,7 +46,15 @@ public class GuiRotaryCondensentrator extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 55)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 4).with(SlotOverlay.POWER)); - + + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.ENERGY_USAGE); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override public FluidTank getTank() diff --git a/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png b/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png index 6f06e3076..49cbe9aa7 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png and b/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png differ diff --git a/src/main/resources/assets/mekanism/lang/zh_CN.lang b/src/main/resources/assets/mekanism/lang/zh_CN.lang index d2817a92e..7ca230ef4 100644 --- a/src/main/resources/assets/mekanism/lang/zh_CN.lang +++ b/src/main/resources/assets/mekanism/lang/zh_CN.lang @@ -122,7 +122,7 @@ tile.GlowPlasticBlock.name=塑料荧光方块 tile.ReinforcedPlasticBlock.name=强化塑料方块 tile.RoadPlasticBlock.name=塑料路 -tile.PlasticFence.name=塑料障碍 +tile.PlasticFence.name=塑料栅栏 //Infuse types infuse.carbon=碳 @@ -174,14 +174,14 @@ item.leadDust.name=铅粉 item.sulfurDust.name=硫磺粉 //Clumps -item.ironClump.name=铁疙瘩 -item.goldClump.name=金疙瘩 -item.osmiumClump.name=锇疙瘩 -item.copperClump.name=铜疙瘩 -item.tinClump.name=锡疙瘩 -item.silverClump.name=银疙瘩 -item.obsidianClump.name=黑曜石疙瘩 -item.leadClump.name=铅疙瘩 +item.ironClump.name=铁碎块 +item.goldClump.name=金碎块 +item.osmiumClump.name=锇碎块 +item.copperClump.name=铜碎块 +item.tinClump.name=锡碎块 +item.silverClump.name=银碎块 +item.obsidianClump.name=黑曜石碎块 +item.leadClump.name=铅碎块 //Shards item.ironShard.name=铁碎片 @@ -256,7 +256,7 @@ gas.cleanObsidian=纯净黑曜石浆液 gas.cleanLead=纯净铅浆液 //BC Fuel Gases -gas.fuel=气化燃料 +gas.fuel=气化燃油 gas.oil=气化石油 //Fluids @@ -286,7 +286,7 @@ update.consider=考虑升级到最新版 update.newFeatures=新特性 update.visit=访问 update.toDownload=下载 -update.devBuild=正在使用developer build版本 +update.devBuild=正在使用开发者构建版本 update.outdated=正在使用过期版本的一两个模块 //Key description text @@ -345,6 +345,7 @@ gui.finished=已完成 gui.chemicalInfuser.short=化学灌注器 gui.chemicalDissolutionChamber.short=化学溶解室 + gui.dictionary.noKey=无关键字. gui.configuration=配置 @@ -376,6 +377,7 @@ gui.oredictFilter.sameKey=关键字相同 gui.modIDFilter=Mod ID过滤器 gui.modIDFilter.noID=无ID gui.modIDFilter.sameID=相同ID + gui.itemFilter=物品过滤器 gui.itemFilter.noItem=无物品 gui.itemFilter.details=物品堆叠详情 @@ -438,10 +440,10 @@ gui.digitalMiner.inverse=反选模式 recipe.mekanismShaped=有序 //Item and block tooltip text -tooltip.configurator.modify=改装 +tooltip.configurator.configurate=配置 tooltip.configurator.empty=空 +tooltip.configurator.rotate=旋转 tooltip.configurator.wrench=扳手 -tooltip.configurator.link=链接 tooltip.configurator.pumpReset=重置电力泵计数 tooltip.configurator.toggleDiverter=分流模式更改为 tooltip.configurator.toggleColor=颜色切换为 @@ -509,6 +511,7 @@ tooltip.filterCard.logisticalSorter=物流分类器 tooltip.filterCard.digitalMiner=数字型采矿机 tooltip.balloon=气球 + tooltip.jetpack.regular=标准 tooltip.jetpack.hover=悬浮 tooltip.jetpack.disabled=禁用 @@ -728,4 +731,4 @@ item.SteelSword.name=钢剑 //Config Gui mekanism.configgui.ctgy.tools.general.tooltip=通用机械工具的通用设置 mekanism.configgui.ctgy.tools.armor.tooltip=保护值与通用机械工具的护甲平衡性设置的设置 -mekanism.configgui.ctgy.tools.tools.tooltip=效率值与通用机械工具的工具平衡性设置的设置 \ No newline at end of file +mekanism.configgui.ctgy.tools.tools.tooltip=效率值与通用机械工具的工具平衡性设置的设置