Merge pull request #109 from Kiwi233/master

2.1.1.0.V2
Kiwi233 · Aug 3, 2021 · f077ab2 · f077ab2
2 parents f8584bb + a63304e
commit f077ab2
Show file tree

Hide file tree

Showing 3 changed files with 151 additions and 79 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## GT New Horizons整合包的汉化工作
 
-2021-8-2 
+2021-8-3 
 
 2.1.1.0 版本的汉化全部完成。
 
@@ -44,12 +44,14 @@ PS：有时任务书无法正确汉化，可以尝试重载任务书，方法有
 
 `JackMeds` 汉化标题画面
 
-`YPXxiaoK` 介绍汉化
+`YPXxiaoK` GTNH介绍文本汉化
 
 `Wired` 语言文件提取脚本
 
 `albus12138` GT++手册汉化工具
 
+`Prim` 添加并汉化未能本地化的流体词条
+
 以及老版本翻译主要贡献者
 
 `anti`翻译GregTech.lang

diff --git a/resources/gtneioreplugin/lang/zh_CN.lang b/resources/gtneioreplugin/lang/zh_CN.lang
@@ -1,4 +1,4 @@
-# gui names
+# gui names
 gtnop.gui.veinStat.name=矿脉信息
 gtnop.gui.asteroidStat.name=小行星信息
 gtnop.gui.smallOreStat.name=贫瘠矿石信息
@@ -28,19 +28,48 @@ gtnop.gui.nei.ieVeinComponent=矿脉构成
 gtnop.gui.nei.fromMod=来自模组
 
 gtnop.gui.nei.seeAll=查看全部
-gtnop.gui.nei.vein=矿脉
+
 gtnop.gui.nei.oreOthers=伴随生成
 gtnop.nei.genPosition=生成位置
 gtnop.nei.genPositionInfo=各个区块的正中心
 
 
 # world names
-gtnop.world.overworld.name=主世界
-gtnop.world.nether.name=下界
-gtnop.world.end.name=末地
-gtnop.world.moon.name=月球
-gtnop.world.mars.name=火星
-gtnop.world.asteroid.name=星系mod小行星带
+gtnop.world.Overworld=主世界
+gtnop.world.Nether=下界
+gtnop.world.TheEnd=末地
+gtnop.world.Twilight=暮色森林
+gtnop.world.EndAsteroid=末地小行星
+gtnop.world.Vanilla EndAsteroids=原版末地小行星
+gtnop.world.Moon=月球
+gtnop.world.Mars=火星
+gtnop.world.Phobos=火卫一
+gtnop.world.Deimos=火卫二
+gtnop.world.Asteroids=小行星带
+gtnop.world.Ceres=谷神星
+gtnop.world.Europa=木卫二
+gtnop.world.Ganymede=木卫三
+gtnop.world.Callisto=木卫四
+gtnop.world.Io=木卫一
+gtnop.world.Venus=金星
+gtnop.world.Mercury=水星
+gtnop.world.Enceladus=土卫二
+gtnop.world.Titan=土卫六
+gtnop.world.Miranda=天卫五
+gtnop.world.Oberon=天卫四
+gtnop.world.Proteus=海卫八
+gtnop.world.Triton=海卫一
+gtnop.world.Pluto=冥王星
+gtnop.world.Kuiperbelt=柯伊伯带
+gtnop.world.Haumea=妊神星
+gtnop.world.MakeMake=鸟神星
+gtnop.world.CentauriA=半人马Bb
+gtnop.world.VegaB=织女B
+gtnop.world.BarnardC=巴纳德C
+gtnop.world.BarnardE=巴纳德E
+gtnop.world.BarnardF=巴纳德F
+gtnop.world.TcetiE=鲸鱼座T星E
+gtnop.world.Underdark=漆黑世界
 
 
 # biome names
@@ -54,42 +83,4 @@ gtnop.ore.null.name=无
 # vein types
 gtnop.ore.vein.name=矿脉
 gtnop.ore.asteroid.name=小行星
-gtnop.ore.custom.name=自定义
-
-# vein names
-# gregtech5.09
-gtnop.ore.mix.naquadah=硅岩
-gtnop.ore.mix.lignite=褐煤
-gtnop.ore.mix.coal=煤
-gtnop.ore.mix.magnetite=磁铁
-gtnop.ore.mix.gold=金
-gtnop.ore.mix.iron=铁
-gtnop.ore.mix.cassiterite=锡石
-gtnop.ore.mix.tetrahedrite=黝铜
-gtnop.ore.mix.netherquartz=下界石英
-gtnop.ore.mix.sulfur=硫
-gtnop.ore.mix.copper=铜
-gtnop.ore.mix.bauxite=铝土
-gtnop.ore.mix.salts=岩盐
-gtnop.ore.mix.redstone=红石
-gtnop.ore.mix.soapstone=皂石
-gtnop.ore.mix.nickel=镍
-gtnop.ore.mix.platinum=铂
-gtnop.ore.mix.pitchblende=沥青铀
-gtnop.ore.mix.uranium=铀
-gtnop.ore.mix.monazite=独居石
-gtnop.ore.mix.molybdenum=钼
-gtnop.ore.mix.tungstate=钨酸锂
-gtnop.ore.mix.sapphire=蓝宝石
-gtnop.ore.mix.manganese=锰
-gtnop.ore.mix.quartz=石英岩
-gtnop.ore.mix.diamond=钻石
-gtnop.ore.mix.olivine=橄榄石
-gtnop.ore.mix.apatite=磷灰石
-gtnop.ore.mix.galena=方铅矿
-gtnop.ore.mix.lapis=青金石
-gtnop.ore.mix.beryllium=铍
-gtnop.ore.mix.oilsand=油砂
-
-# gregtech5.08
-gtnop.ore.mix.plutonium=钚
+gtnop.ore.custom.name=自定义
diff --git a/scripts/AE2.zs b/scripts/AE2.zs
@@ -13,7 +13,8 @@ import mods.gregtech.ChemicalReactor;
 import mods.gregtech.Pulverizer;
 import mods.nei.NEI;
 import mods.gregtech.Wiremill;
-
+import minetweaker.item.IItemStack;
+import minetweaker.item.IIngredient;
 
 // --- Variables ---
 
@@ -136,7 +137,62 @@ val LuVMotor = <gregtech:gt.metaitem.01:32606>;
 val LuVConveyorbelt = <gregtech:gt.metaitem.01:32635>;
 val LuVRobotarm = <gregtech:gt.metaitem.01:32655>;
 
-
+var coveredColored = [
+<appliedenergistics2:item.ItemMultiPart:20>,
+<appliedenergistics2:item.ItemMultiPart:21>,
+<appliedenergistics2:item.ItemMultiPart:22>,
+<appliedenergistics2:item.ItemMultiPart:23>,
+<appliedenergistics2:item.ItemMultiPart:24>,
+<appliedenergistics2:item.ItemMultiPart:25>,
+<appliedenergistics2:item.ItemMultiPart:26>,
+<appliedenergistics2:item.ItemMultiPart:27>,
+<appliedenergistics2:item.ItemMultiPart:28>,
+<appliedenergistics2:item.ItemMultiPart:29>,
+<appliedenergistics2:item.ItemMultiPart:30>,
+<appliedenergistics2:item.ItemMultiPart:31>,
+<appliedenergistics2:item.ItemMultiPart:32>,
+<appliedenergistics2:item.ItemMultiPart:33>,
+<appliedenergistics2:item.ItemMultiPart:34>,
+<appliedenergistics2:item.ItemMultiPart:35>]
+as IItemStack[];
+
+var smartColored = [
+<appliedenergistics2:item.ItemMultiPart:40>,
+<appliedenergistics2:item.ItemMultiPart:41>,
+<appliedenergistics2:item.ItemMultiPart:42>,
+<appliedenergistics2:item.ItemMultiPart:43>,
+<appliedenergistics2:item.ItemMultiPart:44>,
+<appliedenergistics2:item.ItemMultiPart:45>,
+<appliedenergistics2:item.ItemMultiPart:46>,
+<appliedenergistics2:item.ItemMultiPart:47>,
+<appliedenergistics2:item.ItemMultiPart:48>,
+<appliedenergistics2:item.ItemMultiPart:49>,
+<appliedenergistics2:item.ItemMultiPart:50>,
+<appliedenergistics2:item.ItemMultiPart:51>,
+<appliedenergistics2:item.ItemMultiPart:52>,
+<appliedenergistics2:item.ItemMultiPart:53>,
+<appliedenergistics2:item.ItemMultiPart:54>,
+<appliedenergistics2:item.ItemMultiPart:55>]
+as IItemStack[];
+
+var denseColored = [
+<appliedenergistics2:item.ItemMultiPart:60>,
+<appliedenergistics2:item.ItemMultiPart:61>,
+<appliedenergistics2:item.ItemMultiPart:62>,
+<appliedenergistics2:item.ItemMultiPart:63>,
+<appliedenergistics2:item.ItemMultiPart:64>,
+<appliedenergistics2:item.ItemMultiPart:65>,
+<appliedenergistics2:item.ItemMultiPart:66>,
+<appliedenergistics2:item.ItemMultiPart:67>,
+<appliedenergistics2:item.ItemMultiPart:68>,
+<appliedenergistics2:item.ItemMultiPart:69>,
+<appliedenergistics2:item.ItemMultiPart:70>,
+<appliedenergistics2:item.ItemMultiPart:71>,
+<appliedenergistics2:item.ItemMultiPart:72>,
+<appliedenergistics2:item.ItemMultiPart:73>,
+<appliedenergistics2:item.ItemMultiPart:74>,
+<appliedenergistics2:item.ItemMultiPart:75>]
+as IItemStack[];
 
 // --- Removing Recipes ---
 mods.appeng.Grinder.removeRecipe(<*>);
@@ -299,7 +355,7 @@ recipes.remove(Pattern);
 recipes.remove(<appliedenergistics2:item.ItemMultiMaterial:25>);
 
 // --- Blank Pattern
-recipes.remove(<appliedenergistics2:item.ItemMultiPart:52>);
+recipes.remove(<appliedenergistics2:item.ItemMultiMaterial:52>);
 
 // --- Capacity Card
 recipes.remove(<appliedenergistics2:item.ItemMultiMaterial:27>);
@@ -448,12 +504,6 @@ recipes.remove(<appliedenergistics2:item.ItemMultiPart:76>);
 // --- ME Smart Cable
 recipes.remove(<appliedenergistics2:item.ItemMultiPart:56>);
 
-// --- Add Brown Smart Cable Recipe
-recipes.addShaped(<appliedenergistics2:item.ItemMultiPart:52> * 8, [
-[<appliedenergistics2:item.ItemMultiPart:56>, <appliedenergistics2:item.ItemMultiPart:56>, <appliedenergistics2:item.ItemMultiPart:56>],
-[<appliedenergistics2:item.ItemMultiPart:56>, <ore:dyeBrown>, <appliedenergistics2:item.ItemMultiPart:56>],
-[<appliedenergistics2:item.ItemMultiPart:56>, <appliedenergistics2:item.ItemMultiPart:56>, <appliedenergistics2:item.ItemMultiPart:56>]]);
-
 
 // --- Cells ---
 
@@ -838,6 +888,9 @@ recipes.addShapeless(<appliedenergistics2:item.ItemMultiMaterial:31>, [<appliede
 // --- Acceleration Card
 recipes.addShapeless(<appliedenergistics2:item.ItemMultiMaterial:30>, [<appliedenergistics2:item.ItemMultiMaterial:28>, DiamondCircuit, GoldCircuit, FluixCrystal]);
 
+// --- Ore dictionary filter card
+recipes.addShapeless(<appliedenergistics2:item.ItemMultiMaterial:55>, [<appliedenergistics2:item.ItemMultiMaterial:28>, DiamondCircuit, DiamondCircuit, <gregtech:gt.blockmachines:9255>]);
+
 // --- Wireless Booster
 recipes.addShaped(<appliedenergistics2:item.ItemMultiMaterial:42>, [
 [FluixDust, <ore:gemCertusQuartz>, <ore:plateEnderPearl>],
@@ -1160,16 +1213,19 @@ recipes.addShaped(<appliedenergistics2:item.ToolNetherQuartzCuttingKnife>, [
 [<ore:gemNetherQuartz>, <ore:stickWood>, <ore:screwTitanium>], 
 [<ore:plateNetherQuartz>, <ore:gemNetherQuartz>, <ore:craftingToolFile>]]);
 
+// --- Turn colored cables back to fluix cables
+for i, covered in coveredColored {
+recipes.addShapeless(<appliedenergistics2:item.ItemMultiPart:36>, [covered]);}
 
+for i, covered in smartColored {
+recipes.addShapeless(<appliedenergistics2:item.ItemMultiPart:56>, [covered]);}
 
-
+for i, covered in denseColored {
+recipes.addShapeless(<appliedenergistics2:item.ItemMultiPart:76>, [covered]);}
 
 
 // --- Avaritia Recipes ---
 
-
-
-
 // --- Creative ME Cell
 //mods.avaritia.ExtremeCrafting.addShaped(<appliedenergistics2:item.ItemCreativeStorageCell>, [
 //[null, null, null, null, null, null, null, null, null],
@@ -1207,20 +1263,16 @@ mods.avaritia.ExtremeCrafting.addShaped(<appliedenergistics2:tile.BlockCreativeE
 [<ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>, <ore:ingotInfinity>]]);
 
 
-
-
 // --- Alloy Smelter Recipes ---
 
 
 // --- Quartz Glass
-AlloySmelter.addRecipe(QuartzGlass * 4, <minecraft:glass> * 4, <gregtech:gt.metaitem.01:2516> * 4, 400, 16);
 
+AlloySmelter.addRecipe(QuartzGlass * 4, <minecraft:glass> * 4, <gregtech:gt.metaitem.01:2516> * 4, 400, 16);
 
 
 // --- Assembler Recipes ----
 
-
-
 // --- Vibrant Quartz Glass
 Assembler.addRecipe(<appliedenergistics2:tile.BlockQuartzLamp>, QuartzGlass, <minecraft:glowstone_dust> * 8, 200, 30);
 // -
@@ -1286,7 +1338,6 @@ Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.metaitem.01:163
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.metaitem.01:1633>, <liquid:molten.styrenebutadienerubber> * 36, 150, 120);
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.metaitem.01:1649>, <liquid:molten.silicone> * 36, 150, 120);
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.metaitem.01:1649>, <liquid:molten.styrenebutadienerubber> * 36, 150, 120);
-
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.integrated_circuit:24> * 0, <liquid:molten.silicone> * 72, 150, 120);
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.integrated_circuit:24> * 0, <liquid:molten.styrenebutadienerubber> * 108, 150, 120);
 Assembler.addRecipe(FluixCoveredC, FluixGlassCable, <gregtech:gt.integrated_circuit:24> * 0, <liquid:molten.rubber> * 144, 150, 120);
@@ -1297,13 +1348,50 @@ Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:76>, FluixCoveredC *
 // --- ME Smart Cable
 Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:56>, FluixCoveredC, <gregtech:gt.metaitem.01:17526>, <liquid:molten.redstone> * 144, 150, 120);
 
+// --- ME Storage Bus
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:220>, [<ore:chestWood>, CertusScrew * 2, <appliedenergistics2:item.ItemMultiPart:440>, NQuartzPlate * 2, <gregtech:gt.metaitem.01:32640>], null, 200, 120);
 
+// --- ME Import Bus
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:240>, [TitaniumPlate, CertusScrew * 2, <appliedenergistics2:item.ItemMultiMaterial:44>, NQuartzPlate * 2, <gregtech:gt.metaitem.01:32640>], null, 200, 120);
 
+// --- ME Export Bus
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:260>, [TitaniumPlate, CertusScrew * 2, <appliedenergistics2:item.ItemMultiMaterial:43>, NQuartzPlate * 2, <gregtech:gt.metaitem.01:32640>], null, 200, 120);
 
+// --- ME Terminal
+Assembler.addRecipe(Terminal, [NQuartzRod * 4, QuartziteScrew, Illuminated, GoodCircuit, CertusPlate], null, 400, 120);
 
-// --- Autoclave Recipes ---
+// --- ME Crafting Terminal
+Assembler.addRecipe(CraftingTerminal, [Terminal, CertusScrew * 2, SlabCTable, NQuartzPlate * 2, DiamondCircuit], null, 200, 120);
+
+// --- ME Processing Terminal
+Assembler.addRecipe(ProcessingTerminal, [CraftingTerminal, LuVConveyorbelt * 2, <dreamcraft:item.EngineeringProcessorItemAdvEmeraldCore>, LuVMotor * 2, LuVRobotarm], null, 200, 120);
+
+// --- Interface Terminal
+Assembler.addRecipe(InterfaceTerminal, [Terminal, CertusScrew * 2, NQuartzPlate * 2, DiamondCircuit], null, 200, 120);
 
+// --- Conversion Monitor
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:420>, [<appliedenergistics2:item.ItemMultiPart:400>, CertusScrew * 2, <appliedenergistics2:item.ItemMultiMaterial:43>, NQuartzPlate * 2, <appliedenergistics2:item.ItemMultiMaterial:44>], null, 400, 120);
 
+// --- Pattern Terminal
+Assembler.addRecipe(PatternTerminal, [Terminal, CertusScrew * 2, Pattern, NQuartzPlate * 2, DiamondCircuit], null, 200, 120);
+
+// --- Formation Plane
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:320>, [<ore:blockHopper>, CertusScrew * 2, <appliedenergistics2:item.ItemMultiMaterial:43>, FluixCrystal * 3], null, 200, 120);
+
+// --- Annihilation Plane 
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:300>, [<appliedenergistics2:item.ToolCertusQuartzPickaxe>, CertusScrew * 2, <appliedenergistics2:item.ItemMultiMaterial:44>, <ore:gemFluix> * 3], null, 200, 120);
+
+// --- P2P Tunnel - ME
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:460>, [TitaniumPlate, CertusScrew * 2, DiamondCircuit, FluixCrystal * 3], null, 360, 120);
+
+// --- ME Storage Monitor
+Assembler.addRecipe(<appliedenergistics2:item.ItemMultiPart:400>, [<ore:itemIlluminatedPanel>, CertusScrew * 2, <appliedenergistics2:item.ItemMultiPart:280>, NQuartzPlate * 3], null, 200, 120);
+
+// --- ME Portable Cell
+Assembler.addRecipe(<appliedenergistics2:item.ToolPortableCell>, [<appliedenergistics2:item.ItemBasicStorageCell.1k>, <ore:screwTitanium> * 2, <appliedenergistics2:tile.BlockChest>, <appliedenergistics2:tile.BlockEnergyCell>], null, 200, 120);
+
+
+// --- Autoclave Recipes ---
 
 
 // --- Charged Certus Quartz
@@ -1314,24 +1402,18 @@ Autoclave.addRecipe(<appliedenergistics2:item.ItemMultiMaterial:1>, <dreamcraft:
 Autoclave.addRecipe(<appliedenergistics2:item.ItemMultiMaterial:1>, <dreamcraft:item.ChargedCertusQuartzDust>, <liquid:molten.void> * 72, 10000, 1000, 24);
 
 
-
 // --- Blast Furnace Recipes ---
 
 
-
-
 // --- Quartz Glass
 BlastFurnace.addRecipe([QuartzGlass * 4], [<minecraft:glass> * 4, <gregtech:gt.metaitem.01:2516> * 4], 200, 120, 1000);
 
 
-
-
-
 // --- Centrifuge Recipes ---
 
 
-
 // --- Tiny TNT
+
 Centrifuge.addRecipe([TinyTNT, TinyTNT], ITNT, 0, 600);
 
 
@@ -1347,14 +1429,12 @@ ChemicalReactor.addRecipe(<appliedenergistics2:item.ItemMultiMaterial:1> * 3, nu
 ChemicalReactor.addRecipe(<appliedenergistics2:item.ItemMultiMaterial:1> * 3, null, <dreamcraft:item.ChargedCertusQuartzDust> * 3, <gregtech:gt.metaitem.01:2017>, <liquid:ic2distilledwater> * 1000, 700, 30);
 
 
-
 // --- Pulverizer Recipes ---
 
 // --- Fluix Dust
 Pulverizer.addRecipe([FluixDust * 4], <appliedenergistics2:tile.BlockFluix>, [10000], 300, 2);
 
 
-
 // --- Wiremill Recipes ---
 
 //Quartz Fiber
@@ -1367,7 +1447,6 @@ Wiremill.addRecipe(<appliedenergistics2:item.ItemMultiPart:140>, <gregtech:gt.me
 Wiremill.addRecipe(<appliedenergistics2:item.ItemMultiPart:140>, <gregtech:gt.metaitem.01:23523>  * 4, 80, 120);
 
 
-
 // --- Hiding Stuff ---