mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-15 17:45:08 +00:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 DreamMasterXXL
|
2c714d4321 | ||
|
Martin Robertz
|
40462a06fd | ||
|
[Kiwi233]
|
eb83e72c74 | ||
|
Martin Robertz
|
6ed29e1ae1 | ||
|
bartimaeusnek
|
a388c7ed2d | ||
|
bartimaeusnek
|
d7080d356e | ||
|
DreamMasterXXL
|
f7c2a36e36 |
No files matched your search
+29
-3
@@ -6,11 +6,25 @@ buildscript {
|
||||
}
|
||||
dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' }
|
||||
}
|
||||
plugins {
|
||||
id 'idea'
|
||||
id 'java'
|
||||
}
|
||||
|
||||
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: 'curseforge'
|
||||
|
||||
idea.module.downloadJavadoc = true
|
||||
idea.module.downloadSources = true
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
compileJava.options.encoding = 'UTF-8'
|
||||
|
||||
ext.buildnumber = 0
|
||||
if (System.getenv('BUILD_NUMBER') != null)
|
||||
project.buildnumber = System.getenv('BUILD_NUMBER')
|
||||
@@ -46,6 +60,7 @@ configurations {
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
maven { url = "http://mobiusstrip.eu/maven" }
|
||||
maven { url = "http://chickenbones.net/maven/" }
|
||||
@@ -65,15 +80,26 @@ dependencies {
|
||||
compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api"
|
||||
compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
|
||||
compile "net.sengir.forestry:${forestry_version}:api"
|
||||
compile ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
|
||||
compileOnly ("com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev") {
|
||||
transitive = false
|
||||
}
|
||||
|
||||
// WAILA ships really old CCC/CCL versions, so we force the new versions
|
||||
compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev"
|
||||
compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev"
|
||||
|
||||
compile "li.cil.oc:OpenComputers:${opencomputers_version}:api"
|
||||
|
||||
compileOnly "li.cil.oc:OpenComputers:${opencomputers_version}:api"
|
||||
|
||||
// Missing Libs -_-' -bart
|
||||
compileOnly "mekanism:MekanismAll:1.7.10-9.1.1.283:dev"
|
||||
compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
|
||||
compileOnly "powercrystals:MineFactoryReloaded:[1.7.10]2.8.2B1-201:dev"
|
||||
compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
|
||||
compileOnly "dan200.computercraft:ComputerCraft:1.75"
|
||||
compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
|
||||
compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
|
||||
compileOnly "codechicken:ForgeMultipart:1.7.10-1.2.0.347:dev"
|
||||
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
|
||||
forge_version=10.13.4.1614-1.7.10
|
||||
forgeDep_version=10.13.4.1614
|
||||
|
||||
mod_version=2.3.1.10_beta
|
||||
mod_version=2.3.1.12_beta
|
||||
|
||||
#Comment out this line to get rid of the appendix
|
||||
#mod_appendix=beta
|
||||
@@ -10,7 +10,7 @@ mod_version=2.3.1.10_beta
|
||||
buildcraft_version=6.1.5
|
||||
waila_version=1.5.10
|
||||
ccc_version=1.0.7.46
|
||||
ccl_version=1.1.3.138
|
||||
ccl_version=1.1.3.140
|
||||
ae2_version=rv3-stable-24
|
||||
endercore_version=1.7.10-0.2.0.35_beta
|
||||
ee3_version=1.7.10-0.3.507
|
||||
|
||||
@@ -33,6 +33,19 @@ enderio.itemPowerConduit.name=能量导管
|
||||
enderio.itemPowerConduitEnhanced.name=强化能量导管
|
||||
enderio.itemPowerConduitEnder.name=末影能量导管
|
||||
|
||||
enderio.itemPowerConduitEndergyCrude.name=复合粘土能量导管
|
||||
enderio.itemPowerConduitEndergyIron.name=铁制能量导管
|
||||
enderio.itemPowerConduitEndergyAluminum.name=铝制能量导管
|
||||
enderio.itemPowerConduitEndergyGold.name=金制能量导管
|
||||
enderio.itemPowerConduitEndergyCopper.name=铜制能量导管
|
||||
enderio.itemPowerConduitEndergySilver.name=银制能量导管
|
||||
enderio.itemPowerConduitEndergyElectrum.name=琥珀金能量导管
|
||||
enderio.itemPowerConduitEndergyEnergeticSilver.name=充能银能量导管
|
||||
enderio.itemPowerConduitEndergyCrystalline.name=晶化合金能量导管
|
||||
enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=晶化粉红史莱姆能量导管
|
||||
enderio.itemPowerConduitEndergyMelodic.name=旋律合金能量导管
|
||||
enderio.itemPowerConduitEndergyStellar.name=恒星合金能量导管
|
||||
|
||||
enderio.itemRedstoneConduit.name=红石导管
|
||||
enderio.itemRedstoneConduitSwitch.name=导管开关
|
||||
enderio.itemRedstoneConduitInsulated.name=绝缘红石导管
|
||||
@@ -58,8 +71,9 @@ enderio.itemItemConduit.name=物品导管
|
||||
|
||||
enderio.filterUpgradeBasic.name=基础物品过滤器
|
||||
enderio.filterUpgradeAdvanced.name=高级物品过滤器
|
||||
enderio.filterUpgradeBig.name=大型物品过滤器
|
||||
enderio.filterUpgradeBigAdvanced.name=高级大型物品过滤器
|
||||
enderio.itemConduitFilterUpgrade=物品导管升级
|
||||
|
||||
enderio.itemConduitFilterUpgrade.configured=已配置
|
||||
enderio.itemConduitFilterUpgrade.clearConfigMethod=放到合成格里面清除
|
||||
enderio.itemConduitFilterUpgrade.clearConfigWarning=这会清除所有存储的数据!
|
||||
@@ -115,7 +129,7 @@ enderio.itemMEConduit.name=ME导管
|
||||
enderio.itemMEConduitDense.name=致密ME导管
|
||||
enderio.itemMEConduit.channelsUsed=第{0,number}频道, 共{1,number}频道
|
||||
|
||||
enderio.itemOCConduit.name=网络管道(OC)
|
||||
enderio.itemOCConduit.name=网络导管(OC)
|
||||
|
||||
//Entity
|
||||
entity.witherSkeleton.name=凋零骷髅
|
||||
@@ -127,6 +141,8 @@ enderio.conduitBinder.name=导管粘合剂
|
||||
enderio.binderComposite.name=粘合胚料
|
||||
enderio.phasedIronNugget.name=脉冲铁粒
|
||||
tile.blockDarkIronBars.name=玄铁栅栏
|
||||
tile.blockSoulariumBars.name=魂金栅栏
|
||||
tile.blockEndSteelBars.name=末影钢栅栏
|
||||
tile.blockEndermanSkull.name=末影人头颅
|
||||
tile.blockEndermanSkull.base.name=末影人头
|
||||
tile.blockEndermanSkull.reanimated.name=复苏末影人头
|
||||
@@ -173,6 +189,14 @@ fluid.cloud_seed_concentrated=浓缩云之精华
|
||||
tile.fluid.cloud_seed_concentrated.name=浓缩云之精华
|
||||
item.bucketCloud_seed_concentrated.name=桶装浓缩云之精华
|
||||
|
||||
fluid.ender_distillation=深渊露水
|
||||
tile.fluid.ender_distillation.name=深渊露水
|
||||
item.bucketEnder_distillation.name=桶装深渊露水
|
||||
|
||||
fluid.vapor_of_levity=轻盈之气
|
||||
tile.fluid.vapor_of_levity.name=轻盈之气
|
||||
item.bucketVapor_of_levity.name=桶装轻盈之气
|
||||
|
||||
fluid.eio.xpjuice=液态XP
|
||||
tile.fluid.eio.xpjuice.name=液态XP
|
||||
item.bucketXpjuice.name=桶装液态XP
|
||||
@@ -190,16 +214,29 @@ enderio.gas.gasTick=气体每t
|
||||
enderio.itemMachinePart.name=机器零件
|
||||
enderio.machineChassi.name=机器框架
|
||||
enderio.basicGear.name=基础齿轮
|
||||
enderio.soulMachineChassi.name=灵魂机器框架
|
||||
enderio.endSteelMachineChassi.name=末影钢机器底盘
|
||||
enderio.pulsatingCrystal.name=脉冲晶体
|
||||
enderio.vibrantCrystal.name=充能晶体
|
||||
enderio.enderCrystal.name=末影晶体
|
||||
enderio.attractorCrystal.name=诱引晶体
|
||||
enderio.weatherCrystal.name=天气晶体
|
||||
enderio.darkGrindingBall.name=玄铁钢珠
|
||||
|
||||
enderio.darkGrindingBall.name=玄铁磨球
|
||||
enderio.electricalGrindingBall.name=磁钢磨球
|
||||
enderio.energeticGrindingBall.name=充能合金磨球
|
||||
enderio.vibrantGrindingBall.name=脉冲合金磨球
|
||||
enderio.redstoneGrindingBall.name=红石合金磨球
|
||||
enderio.conductiveGrindingBall.name=导电铁磨球
|
||||
enderio.pulsatingGrindingBall.name=脉冲铁磨球
|
||||
enderio.soulariumGrindingBall.name=魂金磨球
|
||||
enderio.endSteelGrindingBall.name=末影钢磨球
|
||||
|
||||
enderio.darkGrindingBall.tooltip.detailed.line1=SAG磨粉机研磨球
|
||||
enderio.darkGrindingBall.tooltip.detailed.line2=最大输出
|
||||
enderio.darkGrindingBall.tooltip.detailed.line3=额外输出
|
||||
enderio.darkGrindingBall.tooltip.detailed.line4=功率降低
|
||||
enderio.darkSteelRod.name=玄钢杆
|
||||
|
||||
tile.blockReinforcedObsidian.name=强化黑曜石
|
||||
tile.blockReinforcedObsidian.tooltip.common.line1=能抵挡凋零
|
||||
@@ -227,6 +264,42 @@ enderio.phasedIron.name=脉冲铁锭
|
||||
enderio.vibrantNugget.name=脉冲合金粒
|
||||
enderio.darkSteel.name=玄钢锭
|
||||
enderio.soularium.name=魂金锭
|
||||
enderio.endSteel.name=末影钢锭
|
||||
enderio.endSteelNugget.name=末影钢粒
|
||||
|
||||
enderio.crudeSteel.name=复合粘土
|
||||
enderio.crystallineAlloy.name=晶化合金
|
||||
enderio.melodicAlloy.name=旋律合金
|
||||
enderio.stellarAlloy.name=恒星合金
|
||||
enderio.crystallinePinkSlime.name=晶化粉红史莱姆
|
||||
enderio.energeticSilver.name=充能银
|
||||
enderio.vividAlloy.name=生动合金
|
||||
|
||||
enderio.crudeSteelGrindingBall.name=复合粘土磨球
|
||||
enderio.crystallineAlloyGrindingBall.name=晶化合金磨球
|
||||
enderio.melodicAlloyGrindingBall.name=旋律合金磨球
|
||||
enderio.stellarAlloyGrindingBall.name=恒星合金磨球
|
||||
enderio.crystallinePinkSlimeGrindingBall.name=晶化粉红史莱姆磨球
|
||||
enderio.energeticSilverGrindingBall.name=充能银磨球
|
||||
enderio.vividAlloyGrindingBall.name=生动合金磨球
|
||||
|
||||
enderio.precientCrystal.name=预知晶体
|
||||
enderio.pulsatingPowder.name=脉冲晶体粉
|
||||
enderio.vibrantPowder.name=充能晶体粉
|
||||
enderio.enderCrystalPowder.name=末影晶体粉
|
||||
enderio.precientPowder.name=预知晶体粉
|
||||
|
||||
//Balls
|
||||
enderio.electricalSteel_ball.name=磁钢磨球
|
||||
enderio.energeticAlloy_ball.name=充能合金磨球
|
||||
enderio.phasedGold_ball.name=脉冲合金磨球
|
||||
enderio.redstoneAlloy_ball.name=红石合金磨球
|
||||
enderio.conductiveIron_ball.name=导电铁磨球
|
||||
enderio.phasedIron_ball.name=脉冲铁磨球
|
||||
enderio.vibrantNugget_ball.name=脉冲合金磨球
|
||||
enderio.darkSteel_ball.name=玄铁磨球
|
||||
enderio.soularium_ball.name=魂金磨球
|
||||
enderio.endSteel_ball.name=末影钢磨球
|
||||
|
||||
tile.blockIngotStorage.name=金属块
|
||||
tile.enderio.electricalSteel.name=磁钢块
|
||||
@@ -238,6 +311,15 @@ tile.enderio.phasedIron.name=脉冲铁块
|
||||
tile.enderio.vibrantNugget.name=脉冲合金粒块
|
||||
tile.enderio.darkSteel.name=玄钢块
|
||||
tile.enderio.soularium.name=魂金块
|
||||
tile.enderio.endSteel.name=末影钢块
|
||||
|
||||
tile.enderio.crudeSteel.name=复合粘土块
|
||||
tile.enderio.crystallineAlloy.name=晶化合金块
|
||||
tile.enderio.melodicAlloy.name=旋律合金块
|
||||
tile.enderio.stellarAlloy.name=恒星合金块
|
||||
tile.enderio.crystallinePinkSlime.name=晶化粉红史莱姆块
|
||||
tile.enderio.energeticSilver.name=充能银块
|
||||
tile.enderio.vividAlloy.name=生动合金块
|
||||
|
||||
//Powder / Ingot
|
||||
enderio.powderCoal.name=煤粉
|
||||
@@ -254,6 +336,13 @@ enderio.itemBasicCapacitor.name=电容
|
||||
enderio.basicCapacitor.name=基础电容
|
||||
enderio.activatedCapacitor.name=双层电容
|
||||
enderio.enderCapacitor.name=八位电容
|
||||
enderio.crystallineCapacitor.name=晶化合金电容
|
||||
enderio.melodicCapacitor.name=旋律合金电容
|
||||
enderio.stellarCapacitor.name=恒星合金电容
|
||||
enderio.silverCapacitor.name=银制电容
|
||||
enderio.endergeticCapacitor.name=充能银电容
|
||||
enderio.endergisedCapacitor.name=生动合金电容
|
||||
enderio.totemicCapacitor.name=不死图腾电容
|
||||
|
||||
enderio.machine.tooltip.upgrade=机器升级
|
||||
enderio.machine.tooltip.upgrade.tooltip.detailed.line1=增加机器能量存储与
|
||||
@@ -283,6 +372,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=增加速度与能量存储
|
||||
|
||||
tile.blockSolarPanel.name=光伏板
|
||||
tile.blockSolarPanel.advanced.name=高级光伏板
|
||||
tile.blockSolarPanel.vibrant.name=脉冲光伏板
|
||||
tile.blockSolarPanel.tooltip.common.line1=太阳能!
|
||||
tile.blockSolarPanel.tooltip.detailed.line1=白天产生能量
|
||||
tile.blockSolarPanel.tooltip.detailed.line2=顶部必须
|
||||
@@ -382,7 +472,7 @@ enderio.trans.item=物品
|
||||
enderio.trans.fluid=流体
|
||||
enderio.trans.rail=轨道
|
||||
|
||||
enderio.trans.recieving=接收
|
||||
enderio.trans.receiving=接收
|
||||
enderio.trans.sending=发送
|
||||
|
||||
tile.blockPowerMonitor.name=能量监控器
|
||||
@@ -398,8 +488,8 @@ tile.blockVat.tooltip.detailed.line1=用于生产末影接口中的流体
|
||||
|
||||
tile.blockEnchanter.name=附魔器
|
||||
tile.blockEnchanter.tooltip.detailed.line1=使用XP让物品与
|
||||
tile.blockEnchanter.tooltip.detailed.line2=一个书与笔结合
|
||||
tile.blockEnchanter.tooltip.detailed.line2=来制作附魔书
|
||||
tile.blockEnchanter.tooltip.detailed.line3=附魔书创造!
|
||||
|
||||
tile.blockCombustionGenerator.name=燃烧发电机
|
||||
tile.blockCombustionGenerator.tooltip.detailed.line1=燃烧液体燃料产生能量
|
||||
@@ -412,6 +502,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=来产生能量
|
||||
enderio.zombieGenerator.fuelTank=营养液水槽
|
||||
enderio.gui.fluid.minReq=激活需要 %s
|
||||
|
||||
tile.blockFrankenzombieGenerator.name=人造僵尸发电机
|
||||
tile.blockFrankenzombieGenerator.tooltip.detailed.line1=消耗营养精华液
|
||||
tile.blockFrankenzombieGenerator.tooltip.detailed.line2=产生更多能量
|
||||
enderio.frankenzombieGenerator.fuelTank=营养液槽
|
||||
|
||||
tile.blockEnderGenerator.name=末影人发电机
|
||||
tile.blockEnderGenerator.tooltip.detailed.line1=消耗深渊露水
|
||||
tile.blockEnderGenerator.tooltip.detailed.line2=来产生能量
|
||||
enderio.enderGenerator.fuelTank=深渊储罐
|
||||
|
||||
tile.blockKillerJoe.name=杀手乔
|
||||
tile.blockKillerJoe.tooltip.detailed.line1=当你提供一把剑和营养精华
|
||||
tile.blockKillerJoe.tooltip.detailed.line2=液时,这台机器就会自动攻
|
||||
@@ -698,6 +798,8 @@ skullZombieController.name=Z-逻辑控制器
|
||||
skullZombieFrankenstien.name=人造僵尸
|
||||
skullEnderResonator.name=末影谐振器
|
||||
skullSentientEnder.name=意识末影谐振器
|
||||
skullSkeletalContractor.name=骷髅契约板
|
||||
skullGuardianDiode.name=守卫者二极管
|
||||
|
||||
item.itemSpawnEggEnderIO.name=生成
|
||||
|
||||
@@ -711,13 +813,41 @@ item.darkSteel_pickaxe.name=玄钢镐
|
||||
item.darkSteel_axe.name=玄钢斧
|
||||
item.darkSteel_shears.name=玄钢剪
|
||||
|
||||
//End Steel
|
||||
item.endSteel_helmet.name=末影钢头盔
|
||||
item.endSteel_chestplate.name=末影钢胸甲
|
||||
item.endSteel_leggings.name=末影钢护腿
|
||||
item.endSteel_boots.name=末影钢靴子
|
||||
item.endSteel_sword.name=终结之剑 MK2
|
||||
item.endSteel_pickaxe.name=末影钢镐
|
||||
item.endSteel_axe.name=末影钢斧
|
||||
|
||||
//Stellar
|
||||
item.stellar_helmet.name=恒星合金头盔
|
||||
item.stellar_chestplate.name=恒星合金胸甲
|
||||
item.stellar_leggings.name=恒星合金护腿
|
||||
item.stellar_boots.name=恒星合金靴子
|
||||
item.stellar_sword.name=终结之剑 MK4
|
||||
item.stellar_pickaxe.name=恒星合金镐
|
||||
item.stellar_axe.name=恒星合金斧
|
||||
|
||||
enderio.item.darkSteel.tooltip.lvs=等级
|
||||
|
||||
enderio.item.darkSteel_pickaxe.tooltip.effPowered=充能后的效率
|
||||
enderio.item.darkSteel_pickaxe.tooltip.effObs=采集黑曜石的效率
|
||||
enderio.item.darkSteel_pickaxe.tooltip.cost=消耗
|
||||
|
||||
enderio.item.endSteel_pickaxe.tooltip.effPowered=充能后的效率
|
||||
enderio.item.endSteel_pickaxe.tooltip.effObs=采集黑曜石的效率
|
||||
enderio.item.endSteel_pickaxe.tooltip.cost=消耗
|
||||
|
||||
enderio.item.stellar_pickaxe.tooltip.effPowered=充能后的效率
|
||||
enderio.item.stellar_pickaxe.tooltip.effObs=采集黑曜石的效率
|
||||
enderio.item.stellar_pickaxe.tooltip.cost=消耗
|
||||
|
||||
enderio.item.darkSteel_axe.tooltip.multiHarvest=潜行时一次采集多个原木
|
||||
enderio.item.endSteel_axe.tooltip.multiHarvest=潜行时一次采集多个原木
|
||||
enderio.item.stellar_axe.tooltip.multiHarvest=潜行时一次采集多个原木
|
||||
|
||||
enderio.item.darkSteel_shears.tooltip.multiHarvest=激活后修剪多个方块/羊
|
||||
|
||||
@@ -725,12 +855,32 @@ enderio.item.darkSteel_sword.tooltip.line1=增加头颅与末影珍珠的掉落
|
||||
enderio.item.darkSteel_sword.tooltip.line2=击中后将阻止末影人传送
|
||||
enderio.item.darkSteel_sword.tooltip.line3=充能后伤害+2
|
||||
|
||||
enderio.item.endSteel_sword.tooltip.line1=增加头颅与末影珍珠的掉落
|
||||
enderio.item.endSteel_sword.tooltip.line2=击中后将阻止末影人传送
|
||||
enderio.item.endSteel_sword.tooltip.line3=充能后伤害+2
|
||||
|
||||
enderio.item.stellar_sword.tooltip.line1=增加头颅与末影珍珠的掉落
|
||||
enderio.item.stellar_sword.tooltip.line2=击中后将阻止末影人传送
|
||||
enderio.item.stellar_sword.tooltip.line3=充能后伤害+2
|
||||
|
||||
enderio.item.darkSteel_armor.tooltip.line1=充能后
|
||||
enderio.item.darkSteel_armor.tooltip.line2=钻石级别保护
|
||||
|
||||
enderio.item.endSteel_armor.tooltip.line1=钻石+级别保护
|
||||
enderio.item.endSteel_armor.tooltip.line2=免疫跌落伤害
|
||||
|
||||
enderio.item.stellar_armor.tooltip.line1=钻石+级别保护
|
||||
enderio.item.stellar_armor.tooltip.line2=免疫跌落伤害
|
||||
|
||||
enderio.item.darkSteel_boots.tooltip.line1=充能后
|
||||
enderio.item.darkSteel_boots.tooltip.line2=免疫跌落伤害
|
||||
|
||||
enderio.item.endSteel_boots.tooltip.line1=充能后
|
||||
enderio.item.endSteel_boots.tooltip.line2=免疫跌落伤害
|
||||
|
||||
enderio.item.stellar_boots.tooltip.line1=充能后
|
||||
enderio.item.stellar_boots.tooltip.line2=免疫跌落伤害
|
||||
|
||||
enderio.darksteel.upgrade.empowered_one.name=注能
|
||||
enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=能量: $P
|
||||
enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=能量将抵消
|
||||
@@ -751,6 +901,11 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=能量: $P
|
||||
enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=能量将抵消
|
||||
enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=$D%耐久损耗
|
||||
|
||||
enderio.darksteel.upgrade.empowered_five.name=注能 V
|
||||
enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=能量: $P
|
||||
enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=能量将抵消
|
||||
enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=$D%耐久损耗
|
||||
|
||||
enderio.darksteel.upgrade.travel.name=旅行
|
||||
enderio.darksteel.upgrade.travel.tooltip.detailed.line1=按住shift右击来传送或
|
||||
enderio.darksteel.upgrade.travel.tooltip.detailed.line2=激活旅行锚和末影接口
|
||||
@@ -834,6 +989,9 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=利用阳光产能.
|
||||
enderio.darksteel.upgrade.solar_two.name=太阳能 II
|
||||
enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=利用阳光产能.
|
||||
|
||||
enderio.darksteel.upgrade.solar_three.name=太阳能 III
|
||||
enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=利用阳光产能.
|
||||
|
||||
//------GUI
|
||||
|
||||
enderio.gui.simple.in=最大输入:
|
||||
@@ -999,7 +1157,7 @@ enderio.gui.telepad.configure.travel=旅行设置
|
||||
enderio.gui.telepad.configure.telepad=传送台设置
|
||||
enderio.gui.telepad.blocked=传送锁定!
|
||||
|
||||
//Spawn Gurad
|
||||
//Spawn Gurad [sic]
|
||||
enderio.gui.spawnGurad.showRange=显示范围
|
||||
enderio.gui.spawnGurad.hideRange=隐藏范围
|
||||
enderio.gui.spawnGurad.range=范围:
|
||||
@@ -1064,7 +1222,7 @@ enderio.gui.conduit.gas.autoExtract=自动提取
|
||||
enderio.gui.weather.task.clear=清除天气
|
||||
enderio.gui.weather.task.rain=雨天
|
||||
enderio.gui.weather.task.storm=雷暴天气
|
||||
enderio.gui.weather.requireditem=需要物品: %s
|
||||
enderio.gui.weather.requiredfluid=需要流体: %s mB
|
||||
enderio.weatherObelisk.fuelTank=大气通量仓
|
||||
|
||||
//Enchants
|
||||
@@ -1134,10 +1292,11 @@ enderio.nei.sagmill=SAG磨粉机
|
||||
enderio.nei.sagmill.outputchance=概率: {0,choice,0#'<1'|0<{0,number}}%
|
||||
enderio.nei.slicensplice=头颅装配机
|
||||
enderio.nei.soulbinder=灵魂绑定器
|
||||
enderio.nei.vat=酿液锅
|
||||
enderio.nei.vat=酿液桶
|
||||
enderio.tooltip.burntime=燃烧时间:
|
||||
enderio.tooltip.oredict=矿物辞典:
|
||||
enderio.tooltip.meta=Meta:
|
||||
enderio.tooltip.uid=UID:
|
||||
enderio.tooltip.anvilupgrades=铁砧升级:
|
||||
enderio.waila.config.hiddenfacades=隐形栅栏
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package crazypants.enderio;
|
||||
|
||||
public class Tst {
|
||||
|
||||
/**
|
||||
* @param args
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.machine;
|
||||
|
||||
import crazypants.enderio.power.*;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.MathHelper;
|
||||
@@ -8,13 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import com.enderio.core.common.vecmath.VecmathUtil;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.material.ItemCapacitor;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.enderio.power.Capacitors;
|
||||
import crazypants.enderio.power.ICapacitor;
|
||||
import crazypants.enderio.power.ICapacitorItem;
|
||||
import crazypants.enderio.power.IInternalPoweredTile;
|
||||
import crazypants.enderio.power.PowerHandlerUtil;
|
||||
|
||||
public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
|
||||
|
||||
@@ -188,15 +183,8 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void readCommon(NBTTagCompound nbtRoot) {
|
||||
super.readCommon(nbtRoot);
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
int energy;
|
||||
if(nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
energy = (int) (storedEnergyMJ * 10);
|
||||
} else {
|
||||
energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY);
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
handleCapacitorLoading(nbtRoot);
|
||||
handleStoredEnergyLoading(nbtRoot);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -205,8 +193,51 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void writeCommon(NBTTagCompound nbtRoot) {
|
||||
super.writeCommon(nbtRoot);
|
||||
|
||||
//Write Energy
|
||||
nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF);
|
||||
//Write Capacitor Type DEPRECATED
|
||||
nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal());
|
||||
//Write Actual Capacitor
|
||||
writeCap(nbtRoot);
|
||||
}
|
||||
|
||||
private static final String CAPACITOR_TAG_STRING = "internalCapacitor";
|
||||
|
||||
private void writeCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = new NBTTagCompound();
|
||||
cap.setInteger("MaxEnergyStored", capacitor.getMaxEnergyStored());
|
||||
cap.setInteger("MaxEnergyExtracted", capacitor.getMaxEnergyExtracted());
|
||||
cap.setInteger("MaxEnergyReceived", capacitor.getMaxEnergyReceived());
|
||||
cap.setInteger("Tier", capacitor.getTier());
|
||||
nbtRoot.setTag(CAPACITOR_TAG_STRING, cap);
|
||||
}
|
||||
|
||||
private void readCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING);
|
||||
setCapacitor(new BasicCapacitor(
|
||||
cap.getInteger("Tier"),
|
||||
cap.getInteger("MaxEnergyExtracted"),
|
||||
cap.getInteger("MaxEnergyStored"),
|
||||
cap.getInteger("MaxEnergyReceived")
|
||||
));
|
||||
}
|
||||
|
||||
private void handleCapacitorLoading(NBTTagCompound nbtRoot){
|
||||
if (nbtRoot.hasKey(CAPACITOR_TAG_STRING))
|
||||
readCap(nbtRoot);
|
||||
else //Read Capacitor Type DEPRECATED
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
}
|
||||
|
||||
private void handleStoredEnergyLoading(NBTTagCompound nbtRoot){
|
||||
int energy;
|
||||
if (nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
energy = (int) (storedEnergyMJ * 10);
|
||||
} else {
|
||||
energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY);
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
}
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
package crazypants.enderio.trigger;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import buildcraft.api.gates.ActionManager;
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import buildcraft.api.gates.ITriggerParameter;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.machine.power.TileCapacitorBank;
|
||||
|
||||
public class TriggerEnderIO implements ITrigger {
|
||||
|
||||
public static IIcon[] triggerIcons = new IIcon[5];
|
||||
public static String[] descriptions = new String[] { "Capacitor Bank has no energy stored", "Capacitor Bank has energy stored",
|
||||
"Capacitor Bank is full with energy", "Capacitor Bank is charging items", "Capacitor Bank finished charging items" };
|
||||
|
||||
public String uniqueTag;
|
||||
|
||||
public int triggerID;
|
||||
|
||||
public TriggerEnderIO(String uniqueTag, int triggerID) {
|
||||
this.uniqueTag = uniqueTag;
|
||||
this.triggerID = triggerID;
|
||||
ActionManager.registerTrigger(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return descriptions[triggerID];
|
||||
}
|
||||
|
||||
//@Override
|
||||
public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) {
|
||||
if(tile instanceof TileCapacitorBank) {
|
||||
TileCapacitorBank capacitorBank = (TileCapacitorBank) tile;
|
||||
|
||||
if(triggerID == 0) {
|
||||
return capacitorBank.getEnergyStored() == 0;
|
||||
}
|
||||
if(triggerID == 1) {
|
||||
return capacitorBank.getEnergyStored() != 0;
|
||||
}
|
||||
if(triggerID == 2) {
|
||||
return capacitorBank.getMaxEnergyStored() - capacitorBank.getEnergyStored() < 5;
|
||||
}
|
||||
if(triggerID == 3 || triggerID == 4) {
|
||||
ItemStack[] items = new ItemStack[capacitorBank.getSizeInventory()];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
items[i] = capacitorBank.getStackInSlot(i);
|
||||
}
|
||||
boolean capacitorBankEmpty = true;
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
|
||||
capacitorBankEmpty = false;
|
||||
}
|
||||
}
|
||||
if(capacitorBankEmpty) {
|
||||
return false;
|
||||
}
|
||||
boolean hasUnchargedItems = false;
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if(items[i] != null && items[i].getItem() instanceof IChargeableItem) {
|
||||
IChargeableItem item = (IChargeableItem) items[i].getItem();
|
||||
if(item.getEnergyStored(items[i]) < item.getMaxEnergyStored(items[i])) {
|
||||
hasUnchargedItems = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(hasUnchargedItems && triggerID == 3) {
|
||||
return true;
|
||||
}
|
||||
if(!hasUnchargedItems && triggerID == 4) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon() {
|
||||
return triggerIcons[triggerID];
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister iconRegistry) {
|
||||
triggerIcons[0] = iconRegistry.registerIcon("enderio:triggers/noEnergy");
|
||||
triggerIcons[1] = iconRegistry.registerIcon("enderio:triggers/hasEnergy");
|
||||
triggerIcons[2] = iconRegistry.registerIcon("enderio:triggers/fullEnergy");
|
||||
triggerIcons[3] = iconRegistry.registerIcon("enderio:triggers/charging");
|
||||
triggerIcons[4] = iconRegistry.registerIcon("enderio:triggers/chargingDone");
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public int getLegacyId() {
|
||||
// return 0;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public String getUniqueTag() {
|
||||
return this.uniqueTag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasParameter() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITriggerParameter createParameter() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean requiresParameter() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package crazypants.enderio.trigger;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import buildcraft.api.gates.IOverrideDefaultTriggers;
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import buildcraft.api.gates.ITriggerProvider;
|
||||
import buildcraft.api.transport.IPipeTile;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.machine.power.TileCapacitorBank;
|
||||
|
||||
public class TriggerProviderEIO implements ITriggerProvider {
|
||||
|
||||
@Override
|
||||
public LinkedList<ITrigger> getNeighborTriggers(Block block, TileEntity tile) {
|
||||
if (tile instanceof IOverrideDefaultTriggers) {
|
||||
return ((IOverrideDefaultTriggers) tile).getTriggers();
|
||||
}
|
||||
|
||||
LinkedList<ITrigger> triggers = new LinkedList<ITrigger>();
|
||||
|
||||
if (tile instanceof TileCapacitorBank) {
|
||||
triggers.add(EnderIO.triggerNoEnergy);
|
||||
triggers.add(EnderIO.triggerHasEnergy);
|
||||
triggers.add(EnderIO.triggerFullEnergy);
|
||||
triggers.add(EnderIO.triggerIsCharging);
|
||||
triggers.add(EnderIO.triggerFinishedCharging);
|
||||
}
|
||||
|
||||
return triggers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LinkedList<ITrigger> getPipeTriggers(IPipeTile pipe) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user