From fb9ec04ef09462996ab07c4d9f935f290f642b1c Mon Sep 17 00:00:00 2001 From: jmongeon Date: Fri, 12 Sep 2014 02:31:34 -0400 Subject: [PATCH 1/5] Add missing energy info tab Rotary Condensentrator Gui. --- .../client/gui/GuiRotaryCondensentrator.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index e2765b5e7..d0426b0dd 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() From b558b5b6d7f0418bdfee04a6c68ec7a413f0287a Mon Sep 17 00:00:00 2001 From: jmongeon Date: Fri, 12 Sep 2014 02:37:21 -0400 Subject: [PATCH 2/5] Fix energy gauge in Rotary Condensentrator GUI always appearing empty. --- .../mekanism/gui/GuiRotaryCondensentrator.png | Bin 3310 -> 3312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png b/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png index 6f06e30763cae5c8ccd237c255ce79c20e3b4377..49cbe9aa71e36c0245eecb70ad13008666228eb5 100644 GIT binary patch delta 3182 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 From 6b456fba9a203ad9467e53f43cb9c3bc67ef6554 Mon Sep 17 00:00:00 2001 From: jmongeon Date: Fri, 12 Sep 2014 04:38:11 -0400 Subject: [PATCH 3/5] Add missing energy gauge tooltip to Chemical Infuser and Chemical Oxidizer. --- src/main/java/mekanism/client/gui/GuiChemicalInfuser.java | 5 +++++ src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index c10009dee..0febf50f4 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -99,6 +99,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 15c75fd28..f16ab7bb8 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); } From b1105fb0b0fe106ff321922befd35e427ab124ac Mon Sep 17 00:00:00 2001 From: jmongeon Date: Fri, 12 Sep 2014 04:50:49 -0400 Subject: [PATCH 4/5] Add energy info widget to Pressurized Reaction Chamber. --- src/main/java/mekanism/client/gui/GuiPRC.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 9f1bdb145..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; @@ -32,6 +36,14 @@ 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 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() From 4755a1cbcd6f3b89323b0d9df354a57eb3bb6f47 Mon Sep 17 00:00:00 2001 From: Mrkwtkr <1069894992@qq.com> Date: Sun, 14 Sep 2014 00:04:02 +0800 Subject: [PATCH 5/5] Update zh_CN.lang Updated loacalization :) --- .../resources/assets/mekanism/lang/zh_CN.lang | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) 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=效率值与通用机械工具的工具平衡性设置的设置