diff --git a/dependencies.gradle b/dependencies.gradle index 77a59451..5a81b3f4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,6 +12,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.117:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.9:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:Backhand:1.8.2:dev") {transitive = false} compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false} compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false} diff --git a/gradle.properties b/gradle.properties index 82ebb64c..bdfb4709 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. developmentEnvironmentUserName = Developer -# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. -# See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = true +# Enables modern Java syntax support. Valid values: +# - false: No modern syntax, Java 8 only +# - jabel: Jabel syntax-only support, compiles to J8 bytecode +# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs) +# - modern: Native modern Java bytecode, no downgrading +enableModernJavaSyntax = jabel + +# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues, +# and should *not* be used in most situations. -1 disables this. +# forceToolchainVersion = -1 + +# Target JVM version for JVM Downgrader bytecode downgrading. +# Only used when enableModernJavaSyntax = jvmDowngrader +# downgradeTargetVersion = 8 + +# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only). +# Classes will be available in META-INF/versions/N/ for each version N in this list. +# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade). +# jvmDowngraderMultiReleaseVersions = 21,25 + +# Specifies how JVM Downgrader API stubs are provided. Options: +# - shade: Shade minimized stubs into the jar +# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint) +# - external: Another dependency provides stubs (no constraint, no warning) +# - (empty): Warning reminding you to configure stubs +# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md +# jvmDowngraderStubsProvider = # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. @@ -209,3 +233,6 @@ customArchiveBaseName = Draconic-Evolution # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true +# Non-GTNH properties +org.gradle.configuration-cache = true +org.gradle.parallel = true diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..9662408a --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3087f28f30be41ab6818c16a488f5f8a/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect +toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c..f8e1ee31 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da4..23449a2b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..c4bdd3ab 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index e883289b..23a58cee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19' } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelDraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelDraconicArmor.java index 9be486da..72845246 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelDraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelDraconicArmor.java @@ -9,6 +9,8 @@ import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import net.minecraft.entity.player.EntityPlayer; import xonin.backhand.api.core.BackhandUtils; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; + public class ModelDraconicArmor extends ModelBiped { public ModelRenderOBJ head; @@ -193,7 +195,6 @@ public class ModelDraconicArmor extends ModelBiped { this.bipedLeftLeg.render(1F / 16F); } - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { this.bipedRightArm.rotateAngleZ = 0.0F; diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 57da9b64..4347bf7a 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -427,7 +427,7 @@ item.draconicevolution:wyvernBow.lore=2Infusing Draconium in a mundane bow\nallo item.draconicevolution:wyvernHelm.lore=2Stronger than diamond\nyou can now withstand even greater blows item.draconicevolution:wyvernChest.lore=2Infusing the armor with Draconium\nyou vastly improve its resistance item.draconicevolution:wyvernLeggs.lore=2You feel even stronger and faster now\nthat you have infused diamond legs with Draconium -item.draconicevolution:wyvernBoots.lore=2You learn to improve the boots\nDraconium seems to have given you greater\nagility +item.draconicevolution:wyvernBoots.lore=2You learn to improve the boots\nDraconium seems to have given you greater agility item.draconicevolution:draconicPickaxe.lore=2Great care and research has\nallowed you to mine even larger areas item.draconicevolution:draconicAxe.lore=2After lots of trial and error\nyou can now feel an entire tree with one try @@ -436,10 +436,10 @@ item.draconicevolution:draconicHoe.lore=2Draconium even improves farming\nentire item.draconicevolution:draconicSword.lore=2Wyvern was good, but draconic weapons\nare even more powerful and hit more enemies item.draconicevolution:draconicBow.lore=2The peak of ranged perfection faster shooting,\nexplosive arrows, what more could you want? -item.draconicevolution:draconicHelm.lore=2No longer do you fear the night\nyou now can see all the time regardless\nof what is out there +item.draconicevolution:draconicHelm.lore=3No longer do you fear the night\nyou now can see all the time regardless\nof what is out there item.draconicevolution:draconicChest.lore=2Using the heart of a dragon\nyou are stronger and have the gift of flight item.draconicevolution:draconicLeggs.lore=2Even stronger armor\nthe soul of a dragon protects you and moves you even faster -item.draconicevolution:draconicBoots.lore=2Stronger, faster, better than before\nthe heart of a dragon grants you\nhigher jumping +item.draconicevolution:draconicBoots.lore=2Stronger, faster, better than before\nthe heart of a dragon grants you higher jumping item.draconicevolution:draconicDistructionStaff.lore=2A long and ardous road, true power!\none tool to do it all, mine, battle, and death! @@ -688,4 +688,4 @@ potion.de.flight.txt=Flight potion.de.highStep.txt=High Step potion.de.swiftness.txt=Swiftness potion.de.fireImmune.txt=Fire Immunity -potion.de.jumpBoost.txt=Jump Boost \ No newline at end of file +potion.de.jumpBoost.txt=Jump Boost diff --git a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang index a23907a9..6179c7aa 100644 --- a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang +++ b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang @@ -1,5 +1,5 @@ //Tile Information ---------------------------------------------------------------------------------------------------------------------------------------- -tile.draconicevolution:xRayBlock.name=透视方块 +tile.draconicevolution:xRayBlock.name=透视之火 tile.draconicevolution:sunDial.name=日晷 tile.draconicevolution:weatherController.name=气象控制器 tile.draconicevolution:draconiumOre.name=龙矿 @@ -10,13 +10,16 @@ tile.draconicevolution:particleGenerator.name=粒子发生器 tile.draconicevolution:playerDetector.name=玩家探测器 tile.draconicevolution:playerDetectorAdvanced.name=高级玩家探测器 tile.draconicevolution:energyInfuser.name=能量注入器 +tile.draconicevolution:earth.name=地 tile.draconicevolution:customSpawner.name=稳定刷怪笼 +tile.draconicevolution:longRangeDislocator.name=长距离错位宝石 tile.draconicevolution:longRangeDislocator1.name=创造错位宝石 tile.draconicevolution:longRangeDislocator0.name=长距离错位宝石 tile.draconicevolution:generator.name=发电机 tile.draconicevolution:energyStorageCore.name=能量核心 tile.draconicevolution:invisibleMultiblock.name=能量核心(隐藏) tile.draconicevolution:energyPylon.name=能量塔 +tile.draconicevolution:draconium.name=龙块 tile.draconicevolution:draconium0.name=龙块 tile.draconicevolution:draconium1.name=复活石 tile.draconicevolution:draconium2.name=充能龙块 @@ -28,6 +31,7 @@ tile.draconicevolution:draconicBlock.name=觉醒龙块 tile.draconicevolution:infusedObsidian.name=注入龙力的黑曜石 tile.draconicevolution:dislocatorReceptacle.name=错位容器 tile.draconicevolution:portal.name=门 +tile.draconicevolution:flowGate.name=门 tile.draconicevolution:flowGateFlux.name=能量阀门 tile.draconicevolution:flowGateFluid.name=流体阀门 tile.draconicevolution:reactorCore.name=反应堆核心 @@ -35,13 +39,18 @@ tile.draconicevolution:reactorStabilizer.name=反应堆稳定器 tile.draconicevolution:reactorEnergyInjector.name=反应堆能量喷射器 tile.draconicevolution:chaosCrystal.name=混沌晶体 tile.draconicevolution:upgradeModifier.name=升级调整器 +tile.draconicevolution:chaosShardAtmos.name=混沌碎片 +tile.draconicevolution:placedItem.name=放置的物品 +tile.draconicevolution:safetyFlame.name=安全的火焰 +tile.draconicevolution:energyCrystal.name=能量中继器/收发器 tile.draconicevolution:energyCrystal0.name=能量中继器 tile.draconicevolution:energyCrystal1.name=高级能量中继器 tile.draconicevolution:energyCrystal2.name=能量收发器 tile.draconicevolution:energyCrystal3.name=高级能量收发器 tile.draconicevolution:energyCrystal4.name=无线能量收发器 tile.draconicevolution:energyCrystal5.name=高级无线收发器 +tile.draconicevolution:dislocatorInhibitor.name=错位宝石抑制器 //Item Information ---------------------------------------------------------------------------------------------------------------------------------------- @@ -84,16 +93,20 @@ item.draconicevolution:enderArrow.name=末影箭 item.draconicevolution:safetyMatch.name=安全火柴 item.draconicevolution:safetyMatchBox.name=安全火柴盒 item.draconicevolution:key.name=钥匙 +item.draconicevolution:draconiumEnergyCore.name=能量核心 item.draconicevolution:draconiumEnergyCore0.name=双足飞龙能量核心 item.draconicevolution:draconiumEnergyCore1.name=龙之能量核心 +item.draconicevolution:draconiumFluxCapacitor.name=通量电容器 item.draconicevolution:draconiumFluxCapacitor0.name=双足飞龙通量电容器 item.draconicevolution:draconiumFluxCapacitor1.name=龙之通量电容器 item.draconicevolution:draconicIngot.name=觉醒龙锭 +item.draconicevolution:creativeStructureSpawner.name=结构生成器 item.draconicevolution:creativeStructureSpawnerComet.name=生成彗星 item.draconicevolution:creativeStructureSpawnerEnderIsland.name=生成末影岛 item.draconicevolution:infoTablet.name=龙之研究信息板 item.draconicevolution:wrench.name=连接扳手 item.draconicevolution:dezilsMarshmallow.name=Dezil的棉花糖 +item.draconicevolution:reactorCraftingPart.name=反应堆稳定器 item.draconicevolution:reactorCraftingPart.frame.name=反应堆稳定器支架 item.draconicevolution:reactorCraftingPart.rotorInner.name=反应堆稳定器转子 item.draconicevolution:reactorCraftingPart.rotorOuter.name=反应堆稳定器外转子 @@ -101,13 +114,17 @@ item.draconicevolution:reactorCraftingPart.rotorAssembly.name=反应堆稳定器 item.draconicevolution:reactorCraftingPart.stabilizerRing.name=反应堆稳定器聚能环 item.draconicevolution:chaoticCore.name=混沌核心 item.draconicevolution:chaosShard.name=混沌碎片 +item.draconicevolution:chaosFragment.name=混沌片段 item.draconicevolution:chaosFragment0.name=微小混沌片段 item.draconicevolution:chaosFragment1.name=小混沌片段 -item.draconicevolution:chaosFragment2.name=大混乱片段 +item.draconicevolution:chaosFragment2.name=大混沌片段 +item.draconicevolution:nugget.name=龙粒 item.draconicevolution:nugget.draconium.name=龙粒 item.draconicevolution:nugget.awakened.name=觉醒龙粒 +item.draconicevolution:magnet.name=物品错位器 item.draconicevolution:magnet.wyvern.name=物品错位器 item.draconicevolution:magnet.draconic.name=觉醒物品错位器 +item.draconicevolution:adminSpawnEgg.name=刷怪蛋 //Item Groups ---------------------------------------------------------------------------------------------------------------------------------------- itemGroup.toolsAndWeapons=龙之研究工具和武器 @@ -134,7 +151,7 @@ msg.teleporterEntityDimensional.txt=§c你不能把生物跨纬度传送! msg.teleporterAlreadySet.txt=§c[错误]传送石只能被绑定到一个位置! msg.teleporterOutOfFuel.txt=§c燃料耗尽! ! ! msg.teleporterOutOfPearls.txt=§c末影珍珠耗尽! ! ! -msg.teleporterPlayerT1.txt=你需要一个更强大的错位宝石 +msg.teleporterPlayerT1.txt=你需要一个更强大的传送符咒 msg.teleporterPlayerConsent.txt=玩家必须用潜行(Shift)同意他们 msg.spawnerInfo1.txt=生物类型 msg.spawnerInfo2.txt=需要玩家 @@ -201,7 +218,7 @@ msg.de.reactorRSMode.7.txt=比较器模式: 燃料转换[反转] //Tool Tips/other localizations ---------------------------------------------------------------------------------------------------------------------------------------- info.teleporterInfUnset1.txt=未绑定 -info.teleporterInfUnset2.txt=单机右键以绑定当前 +info.teleporterInfUnset2.txt=Shift+右键以绑定当前 info.teleporterInfUnset3.txt=x, y, z 坐标 info.teleporterInfUnset4.txt=以及你所面对的方向 info.teleporterInfUnset5.txt=和你当前的次元 @@ -244,7 +261,7 @@ info.de.sword.txt=你敌人的力量使这把剑变得更强了! info.de.safetyMatch.txt=生出一种不会把你的房子烧光的火 -info.draconiumChestInfo1.txt=空手按住Shift右键 +info.draconiumChestInfo1.txt=空手Shift+右键 info.draconiumChestInfo2.txt=以访问颜色设置 info.de.capacitorMode.txt=模式 @@ -275,11 +292,20 @@ info.de.manual.contributorsButton.txt=贡献者 info.de.manual.contributorsButtonInfo.txt=那些对龙之研究有贡献的人 info.de.shiftRightClickToActivate.txt=Shift + 右键来激活 info.de.blockRange.txt=方块范围 +info.de.status.txt=状态 +info.de.statusActive.txt=激活 +info.de.statusInactive.txt=停用 +info.de.selfPickup.txt=拾取自己的掉落物 +info.de.selfPickupAlways.txt=总是 +info.de.selfPickupDelay.txt=延迟 +info.de.selfPickupNever.txt=从不 info.de.manual.nav1.txt=导航提示 info.de.manual.nav2.txt=按退格键(Backspace)回到上一页 info.de.manual.nav3.txt=按住Shift快速浏览 +info.de.dislocatorInhibitor.txt=磁力屏蔽器 + //Energy Net info.de.modeIn.txt=模式:输入 info.de.modeOut.txt=模式:输出 @@ -292,6 +318,8 @@ info.infusedObsidian.txt=这个方块可以抵抗凋灵 enchantment.draconicevolution.reaperEnchant=收割者 +nei.recipe.reactor.category=反应堆 + //Achievements ---------------------------------------------------------------------------------------------------------------------------------------- draconicevolution.achievementPage.name=龙之研究 @@ -381,6 +409,7 @@ achievement.draconicevolution.manual=智慧已经满了! achievement.draconicevolution.manual.desc=创造龙之研究信息板 //InfoHelper ---------------------------------------------------------------------------------------------------------------------------------------- +info.de.tier.txt=等级 info.de.charge.txt=充能 info.de.hold.txt=按住 info.de.shift.txt=Shift @@ -390,29 +419,29 @@ info.de.forUpgrades.txt=查看有关属性 info.de.useUpgradeModifier.txt=用升级调整器加强那些属性! //Lore ---------------------------------------------------------------------------------------------------------------------------------------- -item.draconicevolution:wyvernPickaxe.lore=普通的镐子太菜了,使用龙力,你能增加开采面积和开采速度 -item.draconicevolution:wyvernShovel.lore=一次一个方块?不是龙力的风格!更快,面积更大,这只是一个开始! -item.draconicevolution:wyvernSword.lore=龙力开始解开剑的潜力,剑的范围和攻击力提高了 -item.draconicevolution:wyvernBow.lore=向一个普通的弓里注入龙力,你会射的更快更强 +item.draconicevolution:wyvernPickaxe.lore=2普通的镐子太菜了\n通过使用龙力,你提升了开采面积和开采速度 +item.draconicevolution:wyvernShovel.lore=2一次一个方块?不是龙力的风格!\n更快、面积更大,这只是一个开始! +item.draconicevolution:wyvernSword.lore=2龙力开始解放剑的潜力\n剑的范围和攻击力提高了 +item.draconicevolution:wyvernBow.lore=2向普通的弓里注入龙力\n使你能够射得更快、更强 -item.draconicevolution:wyvernHelm.lore=比钻石更强大,现在可以承受更大的打击 -item.draconicevolution:wyvernChest.lore=用龙力注入的钻石盔甲,大大增强了防御力 -item.draconicevolution:wyvernLeggs.lore=钻石护腿也注入了龙力,你现在感到更强更快 -item.draconicevolution:wyvernBoots.lore=你改善了靴子,它似乎让你更加敏捷 +item.draconicevolution:wyvernHelm.lore=2比钻石更强大\n现在你可以承受更强的打击了 +item.draconicevolution:wyvernChest.lore=2通过向盔甲里注入龙力\n你大大增强了它的防御力 +item.draconicevolution:wyvernLeggs.lore=2向钻石护腿中注入龙力后\n你感觉自己进一步变强变快了 +item.draconicevolution:wyvernBoots.lore=2你学会了改良靴子\n龙力似乎让你更加身手敏捷 -item.draconicevolution:draconicPickaxe.lore=细心的研究,让你可以挖更大的区域 -item.draconicevolution:draconicAxe.lore=在大量的试验和错误中,你现在可以一下子砍下一整棵树 -item.draconicevolution:draconicShovel.lore=更好的效率,你现在可以挖更大的区域 -item.draconicevolution:draconicHoe.lore=龙力甚至能改善农业,只需点一下整个农田就能耕好 -item.draconicevolution:draconicSword.lore=双足飞龙是不错,但龙力武器攻击力更加强大,能击杀更多的敌人 -item.draconicevolution:draconicBow.lore=完美的距离,更快的射击频率,爆炸性的箭头,堪比机枪,你还有什么想要的吗? +item.draconicevolution:draconicPickaxe.lore=2细心的研究\n为你带来了挖掘更大区域的能力 +item.draconicevolution:draconicAxe.lore=2在大量的试错后\n你现在可以一次砍下一整棵树 +item.draconicevolution:draconicShovel.lore=2效率进一步提升\n你现在可以挖更大的区域了 +item.draconicevolution:draconicHoe.lore=2龙力甚至能改善农业\n只需一次点击就能耕好整个农田 +item.draconicevolution:draconicSword.lore=2双足飞龙是不错,但龙力武器\n攻击力更加强大,还能击中更多的敌人 +item.draconicevolution:draconicBow.lore=2顶级的距离,更快的射击频率\n还有爆炸性的箭头,夫复何求? -item.draconicevolution:draconicHelm.lore=麻麻我再也不怕黑夜啦,你现在无论什么时候都看得见了 -item.draconicevolution:draconicChest.lore=龙心使得你更强大,拥有了飞行的能力 -item.draconicevolution:draconicLeggs.lore=更强的装备,龙力灵魂保护着你,使你跑得更快 -item.draconicevolution:draconicBoots.lore=更强,更快,更好,龙的心脏授予了你跳的更高的权力 +item.draconicevolution:draconicHelm.lore=2畏惧黑夜的日子一去不复返\n你现在无论什么时候都看得见了 +item.draconicevolution:draconicChest.lore=2龙心使你变得更加强大\n还拥有了飞行的能力 +item.draconicevolution:draconicLeggs.lore=2盔甲强度,更上一层楼\n龙的灵魂保护着你,使你跑得更快 +item.draconicevolution:draconicBoots.lore=2更强,更快,更好\n龙的心脏让你能够跳得更高 -item.draconicevolution:draconicDistructionStaff.lore=通过一条又长又艰苦的路后,你发现了真正的力量!一个工具就能做所有事:挖矿、战斗和死亡! +item.draconicevolution:draconicDistructionStaff.lore=2在漫长而艰辛的旅程后,你发现了真正的力量!\n一把工具就能执行一切任务:挖矿、战斗和死亡! //Entity ---------------------------------------------------------------------------------------------------------------------------------------- entity.DraconicEvolution.EnderDragon.name=上古末影龙 @@ -425,20 +454,21 @@ key.toolConfig=工具和装甲配置 GUI key.toolProfileChange=更改工具配置 key.toggleFlight=切换创造飞行模式 key.toggleMagnet=开关物品错位器 +key.toggleMagnetSelfPickup=切换磁铁拾取功能 //Damage ---------------------------------------------------------------------------------------------------------------------------------------- -death.attack.chaos=被混沌守卫撕裂 -death.attack.damage.de.fusionExplode=被爆发的高能量融合物蒸发 -death.attack.chaosBurst=被暗能量毁灭 +death.attack.chaos=%1$s被混沌守卫撕裂 +death.attack.damage.de.fusionExplode=%1$s被爆发的高能量融合物蒸发 +death.attack.chaosBurst=%1$s被暗能量毁灭 -death.attack.de.GuardianFireball=被混沌守卫燃烧炸死 -death.attack.de.GuardianEnergyBall=像一只小虫子一样被混沌守卫击溃 -death.attack.de.GuardianChaosBall=被混沌守卫的暗能量覆灭 +death.attack.de.GuardianFireball=%1$s被混沌守卫燃烧炸死 +death.attack.de.GuardianEnergyBall=%1$s像一只小虫子一样被混沌守卫击溃 +death.attack.de.GuardianChaosBall=%1$s被混沌守卫的暗能量覆灭 -death.attack.chaosImplosion=被拉进一个能量漩涡,被永远的遗忘 -death.attack.chrystalMoved=太顽皮而被龙息惩罚 +death.attack.chaosImplosion=%1$s被拉进一个能量漩涡后泯灭了 +death.attack.chrystalMoved=%1$s太顽皮而被龙之研究惩罚了! -death.attack.administrative.kill=%1$s 被不可阻止的力量打倒了 +death.attack.administrative.kill=%1$s被不可阻止的力量打倒了 //Buttons ---------------------------------------------------------------------------------------------------------------------------------------- button.de.chestAutoFeed0.txt=关闭.关闭自动补充燃料 @@ -484,6 +514,12 @@ button.de.EffectiveOnSprint.name=有效的冲刺 button.de.GogglesOfRevealing.name=神奇的感觉 button.de.ApiaristArmor.name=养蜂员护甲 button.de.NaturalistArmor.name=自然科学家视角 +button.de.HazmatElectrical.name=电气危险防护 +button.de.HazmatBiological.name=生物危害防护 +button.de.HazmatFrost.name=霜冻危害防护 +button.de.HazmatGas.name=气体危害防护 +button.de.HazmatHeat.name=高温危害防护 +button.de.HazmatRadiological.name=辐射危害防护 button.de.BowArrowSpeedModifier.name=弓箭速率调整器 button.de.BowAutoFire.name=自动开火 button.de.BowArrowDamage.name=基本伤害 @@ -491,6 +527,8 @@ button.de.BowExplosionPower.name=爆炸性的力量 button.de.BowShockWavePower.name=激波力量 button.de.BowEnergyBolt.name=龙火之矢 button.de.BowZoomModifier.name=放大 +button.de.Enabled.name=启用 +button.de.MagnetSneak.name=潜行时禁用 button.de.reactorCharge.txt=反应堆充能 button.de.reactorStart.txt=激活 @@ -525,6 +563,50 @@ gui.de.genRate.name=产生效率 gui.de.fieldInputRate.name=场输入率 gui.de.fuelConversion.name=燃料转化率 +gui.de.particleGenerator.random.name=随机: +gui.de.particleGenerator.red.name=红: +gui.de.particleGenerator.green.name=绿: +gui.de.particleGenerator.blue.name=蓝: +gui.de.particleGenerator.motionX.name=移动 X: +gui.de.particleGenerator.motionY.name=移动 Y: +gui.de.particleGenerator.motionZ.name=移动 Z: +gui.de.particleGenerator.scale.name=放缩: +gui.de.particleGenerator.life.name=生命(T): +gui.de.particleGenerator.spawnX.name=生成 X: +gui.de.particleGenerator.spawnY.name=生成 Y: +gui.de.particleGenerator.spawnZ.name=生成 Z: +gui.de.particleGenerator.delay.name=延迟: +gui.de.particleGenerator.fade.name=淡出: +gui.de.particleGenerator.gravity.name=重力: +gui.de.particleGenerator.pitch.name=俯仰: +gui.de.particleGenerator.yaw.name=偏航: +gui.de.particleGenerator.rotation.name=旋转: +gui.de.particleGenerator.length.name=长度: + +gui.de.particleGenerator.main.title=粒子发生器 +gui.de.particleGenerator.beam.title=光束发生器 +gui.de.particleGenerator.info.title=信息 + +gui.de.particleGenerator.hold.name=按住: +gui.de.particleGenerator.info.name=i +gui.de.particleGenerator.back.name=后退 +gui.de.particleGenerator.page.name=页码:%d +gui.de.particleGenerator.blockCollision.name=方块碰撞: %s +gui.de.particleGenerator.particleSelected.name=选择的粒子:%d +gui.de.particleGenerator.enabled.name=启用:%s +gui.de.particleGenerator.renderCore.name=渲染核心:%s +gui.de.particleGenerator.saveSettings.name=记录数值 + +gui.de.particleGenerator.info.1= 粒子发生器是可以让你自由创建粒子特效的装饰性设备。\n 这个设备用起来非常简单,你只要修改界面上的一些字段(变量)就能改变生成的粒子的样式和行为。\n 这个方块仍在开发中,新的特性和粒子可能会在未来的版本中加入。\n 下面的列表包含了所有的字段以及它们的用途。 +gui.de.particleGenerator.info.2= 首先需要关注的是大多数字段后都跟着一个随机值,可以给字段加上一个从0到最大(或者最小)的随机值。\n -开头的三个字段(红,绿,蓝)控制粒子的颜色。大多数人应该都熟悉这套颜色系统,如果不熟悉的话就百度一下。注意:每个颜色的最大值不能超过255,因此颜色字段限制了随机值。例如如果颜色值被设置为255,而随机值被设置为20,那么实际值永远还是255。 +gui.de.particleGenerator.info.3= - 接下来的三个字段(移动X,Y,Z)控制粒子的方向和移动速度。\n -“生存时间”字段设定粒子消失前能存在多久(单位tick)。\n -“放缩”字段设定粒子的大小。\n -接下来的三个字段(生成 X,Y,Z)控制粒子的生成位置(相对于粒子发生器的位置)。 +gui.de.particleGenerator.info.4= -“延迟”字段设定每个粒子生成的延迟时间(单位tick),例如1=20/s,20=1/s,100=1/5s。\n -“淡出”字段设定粒子消失时的淡出时间(单位tick)。注意:这会加到粒子的生存时间上。\n -“重力”字段设定粒子如何被重力影响。\n -“方块碰撞”决定粒子是否会与方块碰撞。\n -“选择的粒子”可以在不同的可选的粒子间切换。 +gui.de.particleGenerator.info.5.title=红石控制\n\n +gui.de.particleGenerator.info.5= 默认情况下需要红石信号来让发生器工作。\n 然而如果你空手按住shift右击发生器,会让它进入反转模式。\n 发生器的8个角上的小方块表示了当前的红石模式。 +gui.de.particleGenerator.info.6.title=计算机控制\n\n +gui.de.particleGenerator.info.6= 发生器可以被计算机控制。\n 它提供了一些相对直白的API:\n\n setGeneratorProperty(property, value)\n getGeneratorState()\n resetGeneratorState() +gui.de.particleGenerator.info.7= 发生器的整体状态可以通过getGeneratorState获得,使用setGeneratorProperty可以一次修改一个属性。属性名字是字符串,而且几乎都与英文版 GUI 上的标签相同。 + gui.de.insert.txt=插入 gui.de.extract.txt=提取 gui.de.fuel.txt=燃料 @@ -589,6 +671,16 @@ gui.de.ShieldRecovery.txt=护甲回复 gui.de.MoveSpeed.txt=移动速度 gui.de.JumpBoost.txt=跳跃提升 +gui.de.dislocatorInhibitor.range.txt=范围: +gui.de.dislocatorInhibitor.tooltip.range.increase.txt=增加范围 +gui.de.dislocatorInhibitor.tooltip.range.decrease.txt=减少范围 +gui.de.dislocatorInhibitor.tooltip.activity.always.txt=总是激活 +gui.de.dislocatorInhibitor.tooltip.activity.with.txt=红石信号激活 +gui.de.dislocatorInhibitor.tooltip.activity.without.txt=无红石信号时激活 +gui.de.dislocatorInhibitor.tooltip.activity.never.txt=总是停用 +gui.de.dislocatorInhibitor.tooltip.activity.cycle.txt=点击循环切换激活控制 +gui.de.dislocatorInhibitor.tooltip.whitelist.txt=过滤器内的物品不会被磁铁吸走 +gui.de.dislocatorInhibitor.tooltip.blacklist.txt=只有过滤器里的物品才会被磁铁吸走 //Potions ---------------------------------------------------------------------------------------------------------------------------------------- potion.de.effect.txt=效果 @@ -597,5 +689,3 @@ potion.de.highStep.txt=自动跳跃 potion.de.swiftness.txt=速度 potion.de.fireImmune.txt=抗火 potion.de.jumpBoost.txt=跳跃提升 - -item.draconicevolution:draconicAxe.lore=2经过多次尝试与失败后\n你现在可以一下就砍倒一整棵树 \ No newline at end of file