Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history 
添加TechReborn的脚本。
调整IC2的存电器电量显示为整数，增加铁炉、电炉加工时间的显示，增加作物架的信息显示。
添加相应的语言翻译
  • Loading branch information
@Amamiya-Nagisa
Amamiya-Nagisa committed Sep 8, 2016
1 parent efbe527 commit 97e8003
Show file tree
Hide file tree
Showing 4 changed files with 225 additions and 7 deletions.
45 changes: 38 additions & 7 deletions src/main/resources/assets/omniocular/config/IC2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</tileentity>
<tileentity id="BatBox">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"40000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"40000"+GRAY+" EU"
</line>
<line displayname="Output">
return "32"+GRAY+" EU/t"
Expand All @@ -52,7 +52,7 @@
</tileentity>
<tileentity id="CESU">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"300000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"300000"+GRAY+" EU"
</line>
<line displayname="Output">
return "128"+GRAY+" EU/t"
Expand All @@ -75,7 +75,7 @@
</tileentity>
<tileentity id="MFE">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"4000000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"4000000"+GRAY+" EU"
</line>
<line displayname="Output">
return "512"+GRAY+" EU/t"
Expand All @@ -98,7 +98,7 @@
</tileentity>
<tileentity id="MFSU">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"40000000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"40000000"+GRAY+" EU"
</line>
<line displayname="Output">
return "2048"+GRAY+" EU/t"
Expand Down Expand Up @@ -129,23 +129,23 @@
</tileentity>
<tileentity id="Chargepad CESU">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"300000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"300000"+GRAY+" EU"
</line>
<line displayname="Output">
return "128"+GRAY+" EU/t"
</line>
</tileentity>
<tileentity id="Chargepad MFE">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"4000000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"4000000"+GRAY+" EU"
</line>
<line displayname="Output">
return "512"+GRAY+" EU/t"
</line>
</tileentity>
<tileentity id="Chargepad MFSU">
<line displayname="Stored">
return nbt['energy']+GRAY+" / "+WHITE+"40000000"+GRAY+" EU"
return Math.floor(nbt['energy'])+GRAY+" / "+WHITE+"40000000"+GRAY+" EU"
</line>
<line displayname="Output">
return "2048"+GRAY+" EU/t"
Expand Down Expand Up @@ -519,4 +519,35 @@
return RED+name(nbt['InvSlots']['discharge']['Contents'][0])+" was out of power"}
</line>
</tileentity>
<tileentity id="Iron Furnace">
<line displayname="hud.msg.progress">
return nbt['progress'] / 20+GRAY+"/"+GRAY+"8 s"
</line>
<line displayname="hud.msg.common.BurnTime">
return nbt['fuel'] / 20+GRAY+"/"+nbt['maxFuel']/20+GRAY+" s"
</line>
</tileentity>
<tileentity id="Electric Furnace">
<line displayname="hud.msg.progress">
return nbt['progress'] / 20+GRAY+"/"+GRAY+"5 s"
</line>
<line displayname="hud.msg.energy">
return nbt['energy']+GRAY+" EU"
</line>
</tileentity>
<tileentity id="TECrop">
<line displayname="作物:">
return name(nbt['cropName'])
</line>
<line displayname="所属mod:">
return nbt['cropOwner']
</line>
<line displayname="长速G/种子G/抵抗R:">
if(nbt['cropName']!=undefined){return nbt['statGrowth']+"/"+nbt['statGain']+"/"+nbt['statResistance']}
</line>
<line displayname="营养/农药/含水量:">
if(nbt['exStorage']!=0||nbt['nutrientStorage']!=0||nbt['waterStorage']!=0)
{return nbt['nutrientStorage']+"/"+nbt['exStorage']+"/"+nbt['waterStorage']}
</line>
</tileentity>
</oo>
181 changes: 181 additions & 0 deletions src/main/resources/assets/omniocular/config/TechReborn.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<!--Author: Amamiya-Nagisa-->
<!--Date: 2016/09/08-->
<!--Version:1.7.10-0.7.18.1111-->
<oo>
<tileentity id="TileRollingMachineTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.progress">
if(nbt['tickTime']!=undefined)
if(nbt['tickTime']!=-1){
return nbt['tickTime']/20+"/"+"12.5"+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileBlastFurnaceTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
<tileentity id="TileThermalGeneratorTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hudmsg.IC2.LavaAmount">
if(nbt['TileThermalGenerator']['Amount']!=undefined){
return Math.floor(nbt['TileThermalGenerator']['Amount'])+GREEN+" mB"}
</line>
</tileentity>
<tileentity id="TileDieselGeneratorTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.fuel">
if(nbt['TileDieselGenerator']['Amount']!=undefined){
return Math.floor(nbt['TileDieselGenerator']['Amount'])+GREEN+"mB"+RED+" "+nbt['TileDieselGenerator']['FluidName']}
</line>
</tileentity>
<tileentity id="TileGassTurbineTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.fuel">
if(nbt['TileGasTurbine']['Amount']!=undefined){
return Math.floor(nbt['TileGasTurbine']['Amount'])+GREEN+"mB"+RED+" "+nbt['TileGasTurbine']['FluidName']}
</line>
</tileentity>
<tileentity id="TileAssemblyMachineTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileVacuumFreezerTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileGrinderTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+"/5"+GREEN+" s"}
</line>
<line displayname="hud.msg.common.LiquidAmount">
if(nbt['TileGrinder']['Amount']!=undefined){
return Math.floor(nbt['TileGrinder']['Amount'])+GREEN+"mB"+RED+" "+nbt['TileGrinder']['FluidName']}
</line>
</tileentity>
<tileentity id="TileIndustrialSawmillTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+"/10"+GREEN+" s"}
</line>
<line displayname="hud.msg.common.LiquidAmount">
if(nbt['TileSawmill']['Amount']!=undefined){
return Math.floor(nbt['TileSawmill']['Amount'])+GREEN+"mB"+RED+" "+nbt['TileSawmill']['FluidName']}
</line>
</tileentity>
<tileentity id="TileCentrifugeTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileAlloySmalterTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return Math.floor(nbt['Crater']['currentTickTime']/20)+"/10"+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileChemicalReactorTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.currentTickTime">
if(nbt['Crater']['currentTickTime']!=0){
return nbt['Crater']['currentTickTime']/20+GREEN+" s"}
</line>
</tileentity>
<tileentity id="TileQuantumChestTR">
<line displayname="hud.msg.factorization.Count">
if(nbt['storedQuantity']!=undefined){
return nbt['storedQuantity']+GREEN+" 个"}
</line>
</tileentity>
<tileentity id="TileDigitalChestTR">
<line displayname="hud.msg.factorization.Count">
if(nbt['storedQuantity']!=undefined){
return nbt['storedQuantity']+GREEN+" 个"}
</line>
</tileentity>
<tileentity id="TileChargeBench">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
<tileentity id="TileMatterFabricatorTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
<tileentity id="TileChunkLoaderTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
<tileentity id="TileHeatGeneratorTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
<tileentity id="TileAesuTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
<line displayname="hud.msg.TR.energyOutput">
return nbt['output']+GREEN+" EU"
</line>
</tileentity>
<tileentity id="TileLesuTR">
<line displayname="hud.msg.energy">
if(nbt['TilePowerAcceptor']['energy']!=undefined){
return Math.floor(nbt['TilePowerAcceptor']['energy'])+GREEN+" EU"}
</line>
</tileentity>
</oo>
3 changes: 3 additions & 0 deletions src/main/resources/assets/omniocular/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ hud.msg.switch.on=ON
hud.msg.switch.off=OFF
hud.msg.state=State
hud.msg.state2=State
hud.msg.energy=Energy
hud.msg.currentTickTime=Progress Time
hud.msg.TR.energyOutput=Energy Output

hud.msg.immersiveengineering.state.on=ON
hud.msg.immersiveengineering.state.off=OFF
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/omniocular/lang/zh_CN.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ hud.msg.switch.on=闭合
hud.msg.switch.off=断开
hud.msg.state=运转情况
hud.msg.state2=通断情况
hud.msg.energy=能量
hud.msg.currentTickTime=加工进度
hud.msg.TR.energyOutput=输出电压

hud.msg.immersiveengineering.state.on=运转
hud.msg.immersiveengineering.state.off=停止
Expand Down

0 comments on commit 97e8003

Please sign in to comment.