From d66962ed18b3f8d15889ce0b5545427311b24f94 Mon Sep 17 00:00:00 2001 From: botn365 <42187820+botn365@users.noreply.github.com> Date: Thu, 10 Dec 2020 12:45:04 +0100 Subject: add the option to disable input filter (#365) --- src/main/resources/assets/gregtech/lang/en_US.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index c3c5a574af..158d108278 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -66,7 +66,8 @@ GT5U.machines.minermulti=Multiblock Miner GT5U.machines.voidoveflow.enabled=Overflow voiding enabled GT5U.machines.voidoveflow.disabled=Overflow voiding disabled - +GT5U.hatch.disableFilter.true=Input Filter Off +GT5U.hatch.disableFilter.false=Input Filter On GT5U.multiblock.pollution=Pollution reduced to GT5U.multiblock.energy=Stored Energy -- cgit From 36406947fc5c0de1ee71da2644ec057b5fbc8d25 Mon Sep 17 00:00:00 2001 From: "[Kiwi233]" <[huaxia0611@qq.com]> Date: Sun, 13 Dec 2020 21:27:42 +0800 Subject: Update for 5.09.33.59 --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 +- src/main/resources/assets/gregtech/lang/zh_CN.lang | 42 ++++++++++++++++++---- 2 files changed, 37 insertions(+), 7 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 158d108278..5d7f6cf7dd 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -839,7 +839,7 @@ achievement.gt.blockmachines.multimachine.em.emtoessentia=Essentia Dequantizer achievement.gt.blockmachines.multimachine.em.emtoessentia.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.multimachine.em.scanner=Elemental Scanner achievement.gt.blockmachines.multimachine.em.scanner.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.multimachine.em.scanner=Data Bank +achievement.gt.blockmachines.multimachine.em.databank=Data Bank achievement.gt.blockmachines.multimachine.em.databank.desc=Pickup this item to see the recipe in NEI achievement.gt.blockcasingsTT.8=Hollow Casing achievement.gt.blockcasingsTT.8.desc=Pickup this item to see the recipe in NEI diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index ad44281efe..870dba96a5 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -1,3 +1,25 @@ +# Multiblock Tooltip Builder Keywords +# Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder +GT5U.MBTT.MachineType=机器类型 +GT5U.MBTT.Dimensions=大小 +GT5U.MBTT.Hollow=(中空) +GT5U.MBTT.Structure=结构 +GT5U.MBTT.Controller=控制器 +GT5U.MBTT.Minimum=(至少) +GT5U.MBTT.MaintenanceHatch=维护仓 +GT5U.MBTT.MufflerHatch=消声仓 +GT5U.MBTT.EnergyHatch=能源仓 +GT5U.MBTT.DynamoHatch=动力仓 +GT5U.MBTT.InputBus=输入总线 +GT5U.MBTT.InputHatch=输入仓 +GT5U.MBTT.OutputBus=输出总线 +GT5U.MBTT.OutputHatch=输出仓 +GT5U.MBTT.Causes=产生 +GT5U.MBTT.PPS=点/秒污染 +GT5U.MBTT.Hold=按住 +GT5U.MBTT.Display=以显示结构指导 +GT5U.MBTT.Mod=添加模组： + GT5U.turbine.running.true=涡轮运行 GT5U.turbine.running.false=涡轮停止 GT5U.turbine.maintenance.false=没有维护问题 @@ -41,9 +63,11 @@ GT5U.machines.separatebus=输入总线已独立 GT5U.machines.pumpareaset=工作区域设置为 GT5U.machines.oilfluidpump=石油/流体钻机 GT5U.machines.minermulti=采矿场 +GT5U.machines.voidoveflow.enabled=启用溢出销毁 +GT5U.machines.voidoveflow.disabled=禁用溢出销毁 - - +GT5U.hatch.disableFilter.true=关闭输入过滤 +GT5U.hatch.disableFilter.false=开启输入过滤 GT5U.multiblock.pollution=污染减少到 GT5U.multiblock.energy=存储能量 @@ -815,6 +839,8 @@ achievement.gt.blockmachines.multimachine.em.emtoessentia=源质反量子化仪 achievement.gt.blockmachines.multimachine.em.emtoessentia.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.multimachine.em.scanner=元物质扫描仪 achievement.gt.blockmachines.multimachine.em.scanner.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.databank=数据库 +achievement.gt.blockmachines.multimachine.em.databank.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockcasingsTT.8=中空机械方块 achievement.gt.blockcasingsTT.8.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockcasingsTT.7=分子线圈 @@ -824,11 +850,11 @@ achievement.gt.blockmachines.multimachine.em.infuser.desc=捡起这个物品以 achievement.gt.blockmachines.hatch.holder.tier.09=物品固定容器 achievement.gt.blockmachines.hatch.holder.tier.09.desc=捡起这个物品以在NEI内查看配方 -achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate +achievement.item.StargateShieldingFoil=星门辐射防护板 achievement.item.StargateShieldingFoil.desc=捡起这个物品以在NEI内查看配方 -achievement.item.StargateChevron=Stargate Chevron +achievement.item.StargateChevron=星门三角部件 achievement.item.StargateChevron.desc=捡起这个物品以在NEI内查看配方 -achievement.item.StargateFramePart=Stargate Frame Part +achievement.item.StargateFramePart=星门框架部件 achievement.item.StargateFramePart.desc=捡起这个物品以在NEI内查看配方 achievement.gt.metaitem.01.32605=终极电池 @@ -854,6 +880,9 @@ achievement.ic2.itemArmorQuantumBoots.desc=捡起这个物品以在NEI内查看 achievement.item.graviChestPlate=重力胸甲 achievement.item.graviChestPlate.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockreinforced.12=漆黑之门粗胚 +achievement.gt.blockreinforced.12.desc=捡起这个物品以在NEI内查看配方 + for.bees.species.clay=粘土 for.bees.species.slimeball=粘液球 for.bees.species.peat=泥炭 @@ -1011,4 +1040,5 @@ gregtech.areaExploratory=探索 gregtech.speedUnproductive=不生产 gregtech.speedAccelerated=加速 gregtech.lifeBlink=瞬灭 -gregtech.lifeEon=永生 \ No newline at end of file +gregtech.lifeEon=永生 + -- cgit From c189c8b8b4896d3f0470e94ee35cee06ece83430 Mon Sep 17 00:00:00 2001 From: Prometheus0000 Date: Tue, 5 Jan 2021 06:08:55 -0500 Subject: Add text for achievement --- src/main/resources/assets/gregtech/lang/en_US.lang | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 5d7f6cf7dd..8f7a7f6c39 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -883,6 +883,9 @@ achievement.item.graviChestPlate.desc=Pickup this item to see the recipe in NEI achievement.gt.blockreinforced.12=Raw Deep Dark Portal Block achievement.gt.blockreinforced.12.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.debug.tt.maintenance=Auto-Taping Maintenance Hatch +achievement.gt.blockmachines.debug.tt.maintenance.desc=Pickup this item to see the recipe in NEI + for.bees.species.clay=Clay for.bees.species.slimeball=Slimeball for.bees.species.peat=Peat -- cgit From d9566147b8abcc9ce150564302b5b89ec0ead54f Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 9 Jan 2021 14:21:11 +0100 Subject: fix entity.gregtech.GT_Entity_Arrow.name localization --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 8f7a7f6c39..54be49a61d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1044,3 +1044,5 @@ gregtech.speedUnproductive=Unproductive gregtech.speedAccelerated=Accelerated gregtech.lifeBlink=Blink gregtech.lifeEon=Eon + +entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow \ No newline at end of file -- cgit From 7fc66dbd10ec5bc71f9942e02f8d1b62a01b336b Mon Sep 17 00:00:00 2001 From: Elisis Date: Mon, 11 Jan 2021 19:21:26 +1100 Subject: Update en_US.lang Fix a whole slew of typos and general inaccuracies --- src/main/resources/assets/gregtech/lang/en_US.lang | 100 ++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 54be49a61d..5979ca680d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -22,8 +22,8 @@ GT5U.MBTT.Mod=Added by GT5U.turbine.running.true=Turbine running GT5U.turbine.running.false=Turbine stopped -GT5U.turbine.maintenance.false=No Maintainance issues -GT5U.turbine.maintenance.true=Needs Maintainance +GT5U.turbine.maintenance.false=No Maintenance issues +GT5U.turbine.maintenance.true=Needs Maintenance GT5U.turbine.efficiency=Current Speed GT5U.turbine.flow=Optimal Flow GT5U.turbine.fuel=Fuel Remaining @@ -41,7 +41,7 @@ GT5U.PA.discount=Discount GT5U.PA.parallel=Parallel processing GT5U.LHE.steam=(in steam) -GT5U.LHE.superheated=Super Heated +GT5U.LHE.superheated=Superheated GT5U.LHE.threshold=threshold GT5U.fusion.req=EU Required @@ -59,7 +59,7 @@ GT5U.machines.blocks=Blocks GT5U.machines.chunks=Chunks GT5U.machines.miner=Miner GT5U.machines.pump=Pump -GT5U.machines.separatebus=Input busses are separated +GT5U.machines.separatebus=Input buses are separated GT5U.machines.pumpareaset=Pumping area set to GT5U.machines.oilfluidpump=Oil/Fluid Pump GT5U.machines.minermulti=Multiblock Miner @@ -92,9 +92,9 @@ item.gregtech:modularelectric2_boots.name=Modular Nanosuit Boots achievement.Naquadah=Find Naquadah Ore achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// -achievement.NaquadahEnriched=Find NaquadahEnriched Ore +achievement.NaquadahEnriched=Find Enriched Naquadah Ore achievement.NaquadahEnriched.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// -achievement.Lignite=Find Lignite Ore +achievement.Lignite=Find Lignite Coal Ore achievement.Lignite.desc=Height: 30-210, Chance: 160, Overworld// achievement.Coal=Find Coal Ore achievement.Coal.desc=Height: 30-210, Chance: 160, Overworld/Twilight-Forest// @@ -102,15 +102,15 @@ achievement.Magnetite=Find Magnetite Ore achievement.Magnetite.desc=Height: 30-180, Chance: 160, Overworld/Twilight-Forest/End/End-Asteroids/Mars/Phobos/Deimos/Asteorids/IO/Triton/Pluto/Makamake/VegaB/BarnardE/BarnardF/Tceti// achievement.Iron=Find Iron Ore achievement.Iron.desc=Height: 5-180, Chance: 120, Overworld/Nether/Twilight-Forest/End/End-Asteroids/Moon/Deimos/Ceres/IO/Callisto/Enceladus/Proteus/Makemake/BarnardE/BarnardF/Tceti// -achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore +achievement.VanadiumMagnetite=Find Vanadium Magnetite Ore achievement.VanadiumMagnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forest/Deimos/IO/Makemake/BarnardE/Tceti/ achievement.Gold=Find Gold Ore achievement.Gold.desc=Height: 30-60, Chance: 160, Overworld/Twilight-Forest/End/End-Asteroids/Mars/Phobos/Asteroids/Callisto/Triton/Pluto/VegaB/BarnardF/Tceti/ -achievement.BrownLimonite=Find BrownLimonite Ore +achievement.BrownLimonite=Find Brown Limonite Ore achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// -achievement.YellowLimonite=Find YellowLimonite Ore +achievement.YellowLimonite=Find Yellow Limonite Ore achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// -achievement.BandedIron=Find BandedIron Ore +achievement.BandedIron=Find Banded Iron Ore achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Malachite=Find Malachite Ore achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// @@ -124,7 +124,7 @@ achievement.Copper=Find Copper Ore achievement.Copper.desc=Height: 5-120, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Mars/Deimos/Asteroids/Ceres/Ganymed/Callisto/Venus/Enceladus/Miranda/Proteus/KuiperBelt/VegaB/BarnardE/BarnardF// achievement.Stibnite=Find Stibnite Ore achievement.Stibnite.desc=Height: 80-120, Chance: 70, Nether/End/End-Asteroids/Mars/Deimos/Asteroids/Ganymed/Venus/Miranda/KuiperBelt/VegaB// -achievement.NetherQuartz=Find NetherQuartz Ore +achievement.NetherQuartz=Find Nether Quartz Ore achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether// achievement.Sulfur=Find Sulfur Ore achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// @@ -140,7 +140,7 @@ achievement.Aluminium=Find Aluminium Ore achievement.Aluminium.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto/KuiperBelt/Makemake/Haumea/Tceti// achievement.Ilmenite=Find Ilmenite Ore achievement.Ilmenite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto/KuiperBelt/Makemake/Haumea/Tceti// -achievement.RockSalt=Find RockSalt Ore +achievement.RockSalt=Find Rock Salt Ore achievement.RockSalt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forest/Mars/Tceti// achievement.Salt=Find Salt Ore achievement.Salt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forest/Mars/Tceti// @@ -212,7 +212,7 @@ achievement.Pyrope=Find Pyrope Ore achievement.Pyrope.desc=Height: 10-40, Chance: 60, Twilight-Forest// achievement.Sapphire=Find Sapphire Ore achievement.Sapphire.desc=Height: 10-40, Chance: 60, Twilight-Forest// -achievement.GreenSapphire=Find GreenSapphire Ore +achievement.GreenSapphire=Find Green Sapphire Ore achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Twilight-Forest// achievement.Grossular=Find Grossular Ore achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton/BarnardE/BarnardF// @@ -226,7 +226,7 @@ achievement.Quartzite=Find Quartzite Ore achievement.Quartzite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// achievement.Barite=Find Barite Ore achievement.Barite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// -achievement.CertusQuartz=Find CertusQuartz Ore +achievement.CertusQuartz=Find Certus Quartz Ore achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus/Tceti// achievement.Graphite=Find Graphite Ore achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forest/Phobos/Ganymed/Mercury/Titan/Miranda/Proteus/Pluto/KuiperBelt/BarnardF// @@ -240,7 +240,7 @@ achievement.Olivine=Find Olivine Ore achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forest/Makemake/Haumea/BarnardE// achievement.Apatite=Find Apatite Ore achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// -achievement.TricalciumPhosphate=Find TricalciumPhosphate Ore +achievement.TricalciumPhosphate=Find Tricalcium Phosphate Ore achievement.TricalciumPhosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// achievement.Phosphate=Find Phosphate Ore achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// @@ -304,13 +304,13 @@ achievement.Kaolinite=Find Kaolinite Ore achievement.Kaolinite.desc=Height: 50-70, Chance: 60, Overworld// achievement.Zeolite=Find Zeolite Ore achievement.Zeolite.desc=Height: 50-70, Chance: 60, Overworld// -achievement.GlauconiteSand=Find Glauconite Sand Ore +achievement.GlauconiteSand=Find Glauconite Sand achievement.GlauconiteSand.desc=Height: 50-70, Chance: 60, Overworld// achievement.Kyanite=Find Kyanite Ore achievement.Kyanite.desc=Height: 20-40, Chance: 20, Overworld// achievement.Mica=Find Mica Ore achievement.Mica.desc=Height: 20-40, Chance: 20, Overworld// -achievement.CassiteriteSand=Find Cassiterite Sand Ore +achievement.CassiteriteSand=Find Cassiterite Sand achievement.CassiteriteSand.desc=Height: 20-60, Chance: 20, Overworld// achievement.Pollucite=Find Pollucite Ore achievement.Pollucite.desc=Height: 20-40, Chance: 20, Overworld// @@ -322,7 +322,7 @@ achievement.Trona=Find Trona Ore achievement.Trona.desc=Height: 150-250, Chance: 40, Overworld// achievement.Andradite=Find Andradite Ore achievement.Andradite.desc=Height: 150-250, Chance: 40, Overworld// -achievement.GarnetSand=Find Garnet Sand Ore +achievement.GarnetSand=Find Garnet Sand achievement.GarnetSand.desc=Height: 20-60, Chance: 80, Overworld/Haumea/VegaB/BarnardsE/Tceti// achievement.Asbestos=Find Asbestos Ore achievement.Asbestos.desc=Height: 50-60, Chance: 80, Overworld// @@ -444,7 +444,7 @@ achievement.Naquadria=Naquadria Ore achievement.Naquadria.desc=Height: 5-15, Chance: 100, DeepDarkDim// achievement.DraconiumAwakened=Awakened Draconium achievement.DraconiumAwakened.desc=Height: 175-185, Chance: 100, DeepDarkDim// -achievement.Bedrockium=Bedrokium Ore +achievement.Bedrockium=Bedrockium Ore achievement.Bedrockium.desc=Height: 175-185, Chance: 100, DeepDarkDim// achievement.Cobalt=Cobalt Ore achievement.Cobalt.desc=Height: 170-180, Chance: 100, DeepDarkDim// @@ -466,19 +466,19 @@ achievement.flintpick.desc=Craft a flint pick achievement.crops=Farming achievement.crops.desc=Craft Crops achievement.havestlead=Harvest Lead -achievement.havestlead.desc=Get Plumbilia Leafs +achievement.havestlead.desc=Get Plumbilia Leaves achievement.havestcopper=Harvest Copper achievement.havestcopper.desc=Get Coppon Fiber achievement.havesttin=Harvest Tin achievement.havesttin.desc=Get Tine Twig achievement.havestoil=Harvest Oil -achievement.havestoil.desc=Get Oilberrys +achievement.havestoil.desc=Get Oilberries achievement.havestiron=Harvest Iron -achievement.havestiron.desc=Get Ferru Leafs +achievement.havestiron.desc=Get Ferru Leaves achievement.havestgold=Harvest Gold -achievement.havestgold.desc=Get Aurelia Leafs +achievement.havestgold.desc=Get Aurelia Leaves achievement.havestsilver=Harvest Silver -achievement.havestsilver.desc=Get Argentia Leafs +achievement.havestsilver.desc=Get Argentia Leaves achievement.havestemeralds=Harvest Emeralds achievement.havestemeralds.desc=Get Bobs yer uncle Berries achievement.tools=More Tools @@ -500,7 +500,7 @@ achievement.recycling.desc=Craft an Arc Furnace achievement.crushed=Crushed achievement.crushed.desc=Crush Ores with a Hammer achievement.cleandust=Clean -achievement.cleandust.desc=Clean a dust in a cauldron +achievement.cleandust.desc=Clean some dust in a cauldron achievement.washing=Washing achievement.washing.desc=Get purified crushed ores achievement.spinit=Spin it @@ -517,8 +517,8 @@ achievement.simplyeco=Simply Eco achievement.simplyeco.desc=Craft a Solar Boiler achievement.firststeam=First Steam achievement.firststeam.desc=Craft a Bronze Boiler -achievement.alloysmelter=Alloysmelter -achievement.alloysmelter.desc=Craft a Steam Alloysmelter +achievement.alloysmelter=Alloy Smelter +achievement.alloysmelter.desc=Craft a Steam Alloy Smelter achievement.macerator=Macerator achievement.macerator.desc=Craft a Steam Macerator achievement.extract=Extract @@ -526,21 +526,21 @@ achievement.extract.desc=Craft a Steam Extractor achievement.smallparts=Tubes achievement.smallparts.desc=Craft a Vacuum Tube achievement.gtbasiccircuit=Basic Circuit -achievement.gtbasiccircuit.desc=Craft a Electronic Circuit +achievement.gtbasiccircuit.desc=Craft an Electronic Circuit achievement.bettercircuits=Better Circuits achievement.bettercircuits.desc=Get Good Circuits achievement.stepforward=Step forward achievement.stepforward.desc=Obtain Advanced Circuits -achievement.gtmonosilicon=Monocrystaline Silicon Ingot -achievement.gtmonosilicon.desc=Produce a Monocrystaline Silicon Ingot +achievement.gtmonosilicon=Monocrystaline Silicon Boule +achievement.gtmonosilicon.desc=Produce a Monocrystaline Silicon Boule achievement.gtlogicwafer=Logic Circuit Wafer achievement.gtlogicwafer.desc=Produce a Logic Circuit Wafer achievement.gtlogiccircuit=Integrated Logic Circuit achievement.gtlogiccircuit.desc=Produce a Integrated Logic Circuit achievement.gtcleanroom=Cleanroom -achievement.gtcleanroom.desc=Craft a Cleanroomcontroller -achievement.gtquantumprocessor=Quantumprocessor -achievement.gtquantumprocessor.desc=Get Quantumprocessors +achievement.gtcleanroom.desc=Craft a Cleanroom Controller +achievement.gtquantumprocessor=Quantum Processor +achievement.gtquantumprocessor.desc=Get Quantum Processors achievement.energyflow=Nanoprocessor achievement.energyflow.desc=Get Nanoprocessors achievement.gtcrystalprocessor=Crystalprocessor @@ -554,9 +554,9 @@ achievement.orbs.desc=Get a Lapotronic Energy Orb achievement.thatspower=That is Power achievement.thatspower.desc=Get a Lapotronic Energy Orb Cluster achievement.datasaving=Datasaving -achievement.datasaving.desc=Get a Dataorb -achievement.superbuffer=Superbuffer -achievement.superbuffer.desc=Craft a LV Superbuffer +achievement.datasaving.desc=Get a Data Orb +achievement.superbuffer=Super Buffer +achievement.superbuffer.desc=Craft an LV Super Buffer achievement.newstorage=New Storage achievement.newstorage.desc=Craft a Quantum Chest achievement.whereistheocean=Where is the Ocean? @@ -564,7 +564,7 @@ achievement.whereistheocean.desc=Build a Quantum Tank achievement.luck=Real Luck achievement.luck.desc=Find a Zero Point Module in a Jungle Temple achievement.steel=Steel -achievement.steel.desc=Produce Steel in a Bronze Blast Furnace +achievement.steel.desc=Produce Steel in a Bricked Blast Furnace achievement.highpressure=High Pressure achievement.highpressure.desc=Craft a High Pressure Boiler achievement.extremepressure=Extreme Pressure @@ -575,10 +575,10 @@ achievement.complexalloys=Complex Alloys achievement.complexalloys.desc=Produce a Blue Steel Ingot achievement.magneticiron=Magnetic Iron achievement.magneticiron.desc=Craft a Magnetic Iron Rod with 4 Redstone -achievement.lvmotor=Low Voltage Motor -achievement.lvmotor.desc=Craft a Low Voltage Motor +achievement.lvmotor=LV Motor +achievement.lvmotor.desc=Craft an LV Motor achievement.pumpcover=Pump -achievement.pumpcover.desc=Craft a LV Pump +achievement.pumpcover.desc=Craft an LV Pump achievement.closeit=Close it! achievement.closeit.desc=Get a Shutter Cover achievement.slurp=Slurp @@ -592,15 +592,15 @@ achievement.buffer.desc=Craft a LV Chest Buffer achievement.complexmachines=Complex Machines achievement.complexmachines.desc=Craft a LV Robot Arm achievement.avengers=Avengers Assemble -achievement.avengers.desc=Craft a LV Assembler +achievement.avengers.desc=Craft a LV Assembling Machine achievement.filterregulate=Filter and Regulate achievement.filterregulate.desc=Get an Item Filter -achievement.steampower=Steampower +achievement.steampower=Steam Power! achievement.steampower.desc=Craft a Basic Steam Turbine achievement.batterys=Batteries achievement.batterys.desc=Craft a Battery Buffer achievement.badweather=Bad Weather -achievement.badweather.desc=Forget to build a Roof above your Machines +achievement.badweather.desc=Forgot to build a Roof above your Machines? achievement.electricproblems=Electric Problems achievement.electricproblems.desc=Lose a Machine due to Overvoltage achievement.ebf=Electric Blast Furnace @@ -640,15 +640,15 @@ achievement.tungsten.desc=Cool down a Hot Tungsten Ingot achievement.osmium=Osmium achievement.osmium.desc=Cool down a Hot Osmium Ingot achievement.hightech=Hightech -achievement.hightech.desc=Craft a Field Generator Tier 1 +achievement.hightech.desc=Craft a Tier 1 Field Generator achievement.amplifier=Amplifier achievement.amplifier.desc=Craft an Amp Fab achievement.scanning=Scanning achievement.scanning.desc=Complete an Element Scan achievement.alienpower=Alien Power -achievement.alienpower.desc=Craft a Naquadah Generator Mark I +achievement.alienpower.desc=Craft a Mark I Naquadah Generator achievement.universal=Universal -achievement.universal.desc=Craft a Mass Fab +achievement.universal.desc=Craft a Mass Fabricator achievement.replication=Replication achievement.replication.desc=Craft a Replicator achievement.tungstensteel=Tungstensteel @@ -686,11 +686,11 @@ achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium achievement.zpmage=Energy Module -achievement.zpmage.desc=Craft a Energy Module +achievement.zpmage.desc=Craft an Energy Module achievement.uvage=Energy Cluster -achievement.uvage.desc=Craft a Energy Cluster +achievement.uvage.desc=Craft an Energy Cluster achievement.whatnow=What now? -achievement.whatnow.desc=Craft a Ultimate Battery +achievement.whatnow.desc=Craft an Ultimate Battery achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -1045,4 +1045,4 @@ gregtech.speedAccelerated=Accelerated gregtech.lifeBlink=Blink gregtech.lifeEon=Eon -entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow \ No newline at end of file +entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow -- cgit From f6d73cd25aab6ed26b7980a7eeaa2f21de1bf3cb Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 17 Jan 2021 15:32:27 -0800 Subject: Remove assets --- src/main/resources/assets/gregtech/lang/en_US.lang | 13 ------------- src/main/resources/assets/gregtech/lang/zh_CN.lang | 13 ------------- .../gregtech/textures/items/modulararmor_boots.png | Bin 518 -> 0 bytes .../gregtech/textures/items/modulararmor_chestplate.png | Bin 504 -> 0 bytes .../gregtech/textures/items/modulararmor_helmet.png | Bin 469 -> 0 bytes .../gregtech/textures/items/modulararmor_leggings.png | Bin 466 -> 0 bytes .../gregtech/textures/items/modularelectric1_boots.png | Bin 593 -> 0 bytes .../textures/items/modularelectric1_chestplate.png | Bin 544 -> 0 bytes .../gregtech/textures/items/modularelectric1_helmet.png | Bin 574 -> 0 bytes .../textures/items/modularelectric1_leggings.png | Bin 482 -> 0 bytes .../gregtech/textures/items/modularelectric2_boots.png | Bin 668 -> 0 bytes .../textures/items/modularelectric2_chestplate.png | Bin 596 -> 0 bytes .../gregtech/textures/items/modularelectric2_helmet.png | Bin 576 -> 0 bytes .../textures/items/modularelectric2_leggings.png | Bin 542 -> 0 bytes .../textures/models/armor/basic_helmet_chest.png | Bin 1215 -> 0 bytes .../textures/models/armor/basic_leggings_boots.png | Bin 493 -> 0 bytes .../gregtech/textures/models/armor/e1_helmet_chest.png | Bin 1528 -> 0 bytes .../gregtech/textures/models/armor/e1_leggings_boots.png | Bin 588 -> 0 bytes .../gregtech/textures/models/armor/e2_helmet_chest.png | Bin 1792 -> 0 bytes .../gregtech/textures/models/armor/e2_leggings_boots.png | Bin 750 -> 0 bytes 20 files changed, 26 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png delete mode 100644 src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 5979ca680d..9d89ababc0 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -77,19 +77,6 @@ GT5U.multiblock.problems=Problems GT5U.multiblock.mei=Max Energy Income GT5U.multiblock.usage=Probably uses -item.gregtech:modulararmor_helmet.name=Basic Modular Armor Helmet -item.gregtech:modulararmor_chestplate.name=Basic Modular Armor Chestplate -item.gregtech:modulararmor_leggings.name=Basic Modular Armor Leggings -item.gregtech:modulararmor_boots.name=Basic Modular Armor Boots -item.gregtech:modularelectric1_helmet.name=Modular Exoskeleton Helmet -item.gregtech:modularelectric1_chestplate.name=Modular Exoskeleton Chestplate -item.gregtech:modularelectric1_leggings.name=Modular Exoskeleton Leggings -item.gregtech:modularelectric1_boots.name=Modular Exoskeleton Boots -item.gregtech:modularelectric2_helmet.name=Modular Nanosuit Helmet -item.gregtech:modularelectric2_chestplate.name=Modular Nanosuit Chestplate -item.gregtech:modularelectric2_leggings.name=Modular Nanosuit Leggings -item.gregtech:modularelectric2_boots.name=Modular Nanosuit Boots - achievement.Naquadah=Find Naquadah Ore achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto/KuiperBelt/VegaB/BarnardE/BarnardF// achievement.NaquadahEnriched=Find Enriched Naquadah Ore diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 870dba96a5..a77d59f0eb 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -77,19 +77,6 @@ GT5U.multiblock.problems=问题 GT5U.multiblock.mei=最大输入 GT5U.multiblock.usage=大概功率 -item.gregtech:modulararmor_helmet.name=基础模块化装甲头盔 -item.gregtech:modulararmor_chestplate.name=基础模块化装甲胸甲 -item.gregtech:modulararmor_leggings.name=基础模块化装甲护腿 -item.gregtech:modulararmor_boots.name=基础模块化装甲靴子 -item.gregtech:modularelectric1_helmet.name=模块化动力外骨骼头盔 -item.gregtech:modularelectric1_chestplate.name=模块化动力外骨骼胸甲 -item.gregtech:modularelectric1_leggings.name=模块化动力外骨骼护腿 -item.gregtech:modularelectric1_boots.name=模块化动力外骨骼靴子 -item.gregtech:modularelectric2_helmet.name=模块化纳米套装头盔 -item.gregtech:modularelectric2_chestplate.name=模块化纳米套装胸甲 -item.gregtech:modularelectric2_leggings.name=模块化纳米套装护腿 -item.gregtech:modularelectric2_boots.name=模块化纳米套装靴子 - achievement.Naquadah=找到硅岩矿石 achievement.Naquadah.desc=高度：10-90，几率：10，小行星/金星/土卫六/天卫四/冥王星/柯伊伯带/织女一B/巴德纳E/巴德纳F// achievement.NaquadahEnriched=找到富集硅岩矿石 diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png deleted file mode 100644 index 7b52d92dec..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png deleted file mode 100644 index 13f6818a37..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png deleted file mode 100644 index 3ce1283aca..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png deleted file mode 100644 index 6fa1775967..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png deleted file mode 100644 index 2ab5d64cd7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png deleted file mode 100644 index 25f89678d6..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png deleted file mode 100644 index 81ced7f3f3..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png deleted file mode 100644 index de6df23dff..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png deleted file mode 100644 index 4dc9d4cc11..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png deleted file mode 100644 index ac560c1841..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png deleted file mode 100644 index 48865fc947..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png deleted file mode 100644 index 6cdda7024f..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png deleted file mode 100644 index 6048db9ddb..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png deleted file mode 100644 index 841a7cbba6..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png deleted file mode 100644 index 287b037fff..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png deleted file mode 100644 index 83333001b7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png deleted file mode 100644 index b03c26c716..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png deleted file mode 100644 index 8c37fe80c2..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png and /dev/null differ -- cgit From e477a3ac6c3103d4d545a269fe679061e97d3a2b Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Sat, 26 Jun 2021 21:37:35 +0200 Subject: added missing assembly line achievements --- src/main/resources/assets/gregtech/lang/en_US.lang | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 9d89ababc0..51b792f44f 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -775,6 +775,12 @@ achievement.gt.blockmachines.hatch.energy.tier.08=UV Energy Hatch achievement.gt.blockmachines.hatch.energy.tier.08.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.hatch.energy.tier.09=UHV Energy Hatch achievement.gt.blockmachines.hatch.energy.tier.09.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.energy.tier.10=UEV Energy Hatch +achievement.gt.blockmachines.hatch.energy.tier.10.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.energy.tier.11=UIV Energy Hatch +achievement.gt.blockmachines.hatch.energy.tier.11.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.energy.tier.12=UMV Energy Hatch +achievement.gt.blockmachines.hatch.energy.tier.12.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.hatch.dynamo.tier.06=LuV Dynamo Hatch achievement.gt.blockmachines.hatch.dynamo.tier.06.desc=Pickup this item to see the recipe in NEI @@ -784,6 +790,12 @@ achievement.gt.blockmachines.hatch.dynamo.tier.08=UV Dynamo Hatch achievement.gt.blockmachines.hatch.dynamo.tier.08.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.hatch.dynamo.tier.09=UHV Dynamo Hatch achievement.gt.blockmachines.hatch.dynamo.tier.09.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.dynamo.tier.10=UEV Dynamo Hatch +achievement.gt.blockmachines.hatch.dynamo.tier.10.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.dynamo.tier.11=UIV Dynamo Hatch +achievement.gt.blockmachines.hatch.dynamo.tier.11.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.hatch.dynamo.tier.12=UMV Dynamo Hatch +achievement.gt.blockmachines.hatch.dynamo.tier.12.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.fusioncomputer.tier.06=Fusion Computer Mark I achievement.gt.blockmachines.fusioncomputer.tier.06.desc=Pickup this item to see the recipe in NEI @@ -809,6 +821,8 @@ achievement.item.PikoCircuit=Piko Circuit achievement.item.PikoCircuit.desc=Pickup this item to see the recipe in NEI achievement.item.QuantumCircuit=Quantum Circuit achievement.item.QuantumCircuit.desc=Pickup this item to see the recipe in NEI +achievement.item.relocator=Relocator +achievement.item.relocator.desc=Pickup this item to see the recipe in NEI achievement.gt.blockmachines.multimachine.em.computer=Quantum Computer achievement.gt.blockmachines.multimachine.em.computer.desc=Pickup this item to see the recipe in NEI -- cgit From 65e4a0fa613c53b725a1473682f518ce38eecf6c Mon Sep 17 00:00:00 2001 From: "[Kiwi233]" <[huaxia0611@qq.com]> Date: Mon, 5 Jul 2021 22:10:05 +0800 Subject: update for gregtech-5.09.35.00 --- src/main/resources/assets/gregtech/lang/en_US.lang | 84 ++++++++++++++ src/main/resources/assets/gregtech/lang/zh_CN.lang | 126 +++++++++++++++++++-- 2 files changed, 198 insertions(+), 12 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 51b792f44f..b0d0018312 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1047,3 +1047,87 @@ gregtech.lifeBlink=Blink gregtech.lifeEon=Eon entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow + +fluid.Xenon=Xenon +fluid.FermentedBacterialSludge=Fermented Bacterial Sludge +fluid.NitricAcid=Nitric Acid +fluid.EnrichedBacterialSludge=Enriched Bacterial Sludge +fluid.Ammonia=Ammonia +fluid.Neon=Neon +fluid.Oganesson=Oganesson +fluid.Aqua Regia=Aqua Regia +fluid.Ammonium Chloride=Ammonium Chloride +fluid.Platinum Concentrate=Platinum Concentrate +fluid.Sodium Formate=Sodium Formate +fluid.Formic Acid=Formic Acid +fluid.Palladium Enriched Ammonia=Palladium Enriched Ammonia +fluid.Ruthenium Tetroxide=Ruthenium Tetroxide +fluid.Hot Ruthenium Tetroxide Solution=Hot Ruthenium Tetroxide Solution +fluid.Ruthenium Tetroxide Solution=Ruthenium Tetroxide Solution +fluid.Rhodium Sulfate=Rhodium Sulfate +fluid.Rhodium Sulfate Solution=Rhodium Sulfate Solution +fluid.Calcium Chloride=Calcium Chloride +fluid.Acidic Osmium Solution=Acidic Osmium Solution +fluid.Osmium Solution=Osmium Solution +fluid.Acidic Iridium Solution=Acidic Iridium Solution +fluid.Rhodium Salt Solution=Rhodium Salt Solution +fluid.Rhodium Filter Cake Solution=Rhodium Filter Cake Solution +fluid.Pollution=Pollution +fluid.SodiumPotassium=Sodium Potassium +fluid.Concrete=Concrete +fluid.mushroomStew=Mushroom Stew + +fluid.Sodium Tungstate=Sodium Tungstate +fluid.Phosgene=Phosgene +fluid.Ethyl Chloroformate=Ethyl Chloroformate +fluid.Ethyl Carbamate=Ethyl Carbamate +fluid.Ethyl N-nitrocarbamate=Ethyl N-nitrocarbamate +fluid.Ammonium N-nitrourethane=Ammonium N-nitrourethane +fluid.Trinitramid=Trinitramid +fluid.Ammonia Boronfluoride Solution=Ammonia Boronfluoride Solution +fluid.Sodium Tetrafluoroborate=Sodium Tetrafluoroborate +fluid.Tetrafluoroborate=Tetrafluoroborate +fluid.Ethyl Acetate=Ethyl Acetate +fluid.Acetylhydrazine=Acetylhydrazine +fluid.Unsymmetrical Dimethylhydrazine=Unsymmetrical Dimethylhydrazine +fluid.Monomethylhydrazine Fuel Mix=Monomethylhydrazine Fuel Mix +fluid.Unsymmetrical Dimethylhydrazine Fuel Mix=Unsymmetrical Dimethylhydrazine Fuel Mix +fluid.Boron Trifluoride=Boron Trifluoride +fluid.Tert-Butylbenzene=Tert-Butylbenzene +fluid.2-tert-butyl-anthraquinone=2-tert-butyl-anthraquinone +fluid.2-tert-butyl-anthrahydroquinone=2-tert-butyl-anthrahydroquinone +fluid.Hydrogen Peroxide=Hydrogen Peroxide +fluid.hydrazine=hydrazine +fluid.Dimethyl Sulfate=Dimethyl Sulfate +fluid.Ethyl Dinitrocarbamate=Ethyl Dinitrocarbamate +fluid.Ammonium Dinitramide=Ammonium Dinitramide +fluid.LMP-103S=LMP-103S +fluid.Nitromethane=Nitromethane +fluid.O-Xylene=O-Xylene +//No cell, most from bart bio +fluid.Monomethylhydrazine=Monomethylhydrazine +fluid.binnibacteriafluid=binnibacteriafluid +fluid.SeaweedBroth=SeaweedBroth +fluid.barnadafisarboriatorisfluid=barnadafisarboriatorisfluid +fluid.Polymerase=Polymerase +fluid.GelatinMixture=GelatinMixture +fluid.FluorecentdDNA=FluorecentdDNA +fluid.Penicillin=Penicillin +fluid.sludge=sludge +fluid.EnzymesSollution=EnzymesSollution +fluid.Formaldehyde=Formaldehyde +fluid.tcetieisfucusserratusfluid=tcetieisfucusserratusfluid +fluid.MeatExtract=MeatExtract +fluid.UnknownNutrientAgar=UnknownNutrientAgar +//No recipe +fluid.CompressedOxygen=CompressedOxygen +fluid.CompressedNitrogen=CompressedNitrogen +fluid.redplasma=redplasma +fluid.tile.fluidBlockSludge=fluidBlockSludge +//No Textrue +fluid.guano=guano +fluid.poo=poo +fluid.sewerage=sewerage +fluid.fuelgc=fuelgc +fluid.dirtywater=dirtywater +fluid.oilgc=oilgc \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index a77d59f0eb..5d7ebab206 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -189,7 +189,7 @@ achievement.Powellite=找到钼钙矿矿石 achievement.Powellite.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Scheelite=找到白钨矿矿石 achievement.Scheelite.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// -achievement.Tungstate=找到钨酸盐矿石 +achievement.Tungstate=找到钨酸锂矿石 achievement.Tungstate.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// achievement.Lithium=找到锂矿石 achievement.Lithium.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// @@ -453,19 +453,19 @@ achievement.flintpick.desc=制造一把燧石镐 achievement.crops=农业 achievement.crops.desc=制造农作物 achievement.havestlead=收获铅 -achievement.havestlead.desc=得到铅叶花 +achievement.havestlead.desc=得到铅叶子 achievement.havestcopper=收获铜 achievement.havestcopper.desc=得到铜纤维 achievement.havesttin=收获锡 -achievement.havesttin.desc=得到锡叶花 +achievement.havesttin.desc=得到锡叶子 achievement.havestoil=收获石油 achievement.havestoil.desc=得到石油浆果 achievement.havestiron=收获铁 -achievement.havestiron.desc=得到铁叶花 +achievement.havestiron.desc=得到铁叶子 achievement.havestgold=收获金 -achievement.havestgold.desc=得到金叶花 +achievement.havestgold.desc=得到金叶子 achievement.havestsilver=收获银 -achievement.havestsilver.desc=得到银叶花 +achievement.havestsilver.desc=得到银叶子 achievement.havestemeralds=收获绿宝石 achievement.havestemeralds.desc=得到易如反掌浆果 achievement.tools=更多的工具 @@ -543,7 +543,7 @@ achievement.thatspower.desc=得到一个兰波顿能量球簇 achievement.datasaving=数据存储 achievement.datasaving.desc=得到一个数据球 achievement.superbuffer=超级缓冲 -achievement.superbuffer.desc=制造一个LV级大型缓冲器 +achievement.superbuffer.desc=制造一个LV超级缓冲器 achievement.newstorage=新型存储 achievement.newstorage.desc=制造一个量子箱 achievement.whereistheocean=大海在哪里? @@ -568,7 +568,7 @@ achievement.pumpcover=泵 achievement.pumpcover.desc=制造一个电动泵(LV) achievement.closeit=把它关了! achievement.closeit.desc=得到一块扇板 -achievement.slurp=Slurp +achievement.slurp=嘶溜嘶溜 achievement.slurp.desc=制造一台进阶泵 II achievement.transport=运输 achievement.transport.desc=制造一个输送机模块(LV) @@ -587,7 +587,7 @@ achievement.steampower.desc=制造一台基础蒸汽轮机 achievement.batterys=蓄电池 achievement.batterys.desc=制造一个电池箱 achievement.badweather=坏天气 -achievement.badweather.desc=忘记给机器上方建屋顶 +achievement.badweather.desc=忘记在机器上方建屋顶 achievement.electricproblems=电力问题 achievement.electricproblems.desc=因为超过电压损失一台机器 achievement.ebf=电力高炉 @@ -627,7 +627,7 @@ achievement.tungsten.desc=冷却一块热钨锭 achievement.osmium=锇 achievement.osmium.desc=冷却一块热锇锭 achievement.hightech=高科技 -achievement.hightech.desc=制造一台力场产生器(LV) +achievement.hightech.desc=制造一个力场发生器(LV) achievement.amplifier=增幅器 achievement.amplifier.desc=制造一台UU增幅液产生器 achievement.scanning=扫描 @@ -635,9 +635,9 @@ achievement.scanning.desc=完成一次成分扫描 achievement.alienpower=外星能量 achievement.alienpower.desc=制造一台硅岩反应堆Mk.I achievement.universal=通用的 -achievement.universal.desc=制造一台质量加工器 +achievement.universal.desc=制造一台质量发生器 achievement.replication=复制 -achievement.replication.desc=制造一台复制器 +achievement.replication.desc=制造一台复制机 achievement.tungstensteel=钨钢 achievement.tungstensteel.desc=冷却一块热钨钢锭 achievement.upgrade3=升级你的线圈(Lv.3) @@ -775,6 +775,12 @@ achievement.gt.blockmachines.hatch.energy.tier.08=能源仓(UV) achievement.gt.blockmachines.hatch.energy.tier.08.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.energy.tier.09=能源仓(UHV) achievement.gt.blockmachines.hatch.energy.tier.09.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.10=能源仓(UEV) +achievement.gt.blockmachines.hatch.energy.tier.10.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.11=能源仓(UIV) +achievement.gt.blockmachines.hatch.energy.tier.11.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.12=能源仓(UMV) +achievement.gt.blockmachines.hatch.energy.tier.12.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.dynamo.tier.06=动力仓(LuV) achievement.gt.blockmachines.hatch.dynamo.tier.06.desc=捡起这个物品以在NEI内查看配方 @@ -784,6 +790,12 @@ achievement.gt.blockmachines.hatch.dynamo.tier.08=动力仓(UV) achievement.gt.blockmachines.hatch.dynamo.tier.08.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.dynamo.tier.09=动力仓(UHV) achievement.gt.blockmachines.hatch.dynamo.tier.09.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.10=动力仓(UEV) +achievement.gt.blockmachines.hatch.dynamo.tier.10.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.11=动力仓(UIV) +achievement.gt.blockmachines.hatch.dynamo.tier.11.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.12=动力仓(UMV) +achievement.gt.blockmachines.hatch.dynamo.tier.12.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.fusioncomputer.tier.06=核聚变反应堆控制电脑Mk I achievement.gt.blockmachines.fusioncomputer.tier.06.desc=捡起这个物品以在NEI内查看配方 @@ -809,6 +821,8 @@ achievement.item.PikoCircuit=Piko电路 achievement.item.PikoCircuit.desc=捡起这个物品以在NEI内查看配方 achievement.item.QuantumCircuit=量子电路 achievement.item.QuantumCircuit.desc=捡起这个物品以在NEI内查看配方 +achievement.item.relocator=定位器 +achievement.item.relocator.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.multimachine.em.computer=量子计算机 achievement.gt.blockmachines.multimachine.em.computer.desc=捡起这个物品以在NEI内查看配方 @@ -870,6 +884,9 @@ achievement.item.graviChestPlate.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockreinforced.12=漆黑之门粗胚 achievement.gt.blockreinforced.12.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.debug.tt.maintenance=Debug维护仓 +achievement.gt.blockmachines.debug.tt.maintenance.desc=捡起这个物品以在NEI内查看配方 + for.bees.species.clay=粘土 for.bees.species.slimeball=粘液球 for.bees.species.peat=泥炭 @@ -1029,3 +1046,88 @@ gregtech.speedAccelerated=加速 gregtech.lifeBlink=瞬灭 gregtech.lifeEon=永生 +entity.gregtech.GT_Entity_Arrow.name=GT箭头 + +fluid.Xenon=氙气 +fluid.FermentedBacterialSludge=发酵的细菌污泥 +fluid.NitricAcid=硝酸 +fluid.EnrichedBacterialSludge=放射性细菌污泥 +fluid.Ammonia=氨气 +fluid.Neon=氖气 +fluid.Oganesson=<气奥> +fluid.Aqua Regia=王水 +fluid.Ammonium Chloride=氯化铵 +fluid.Platinum Concentrate=浓缩铂 +fluid.Sodium Formate=甲酸钠 +fluid.Formic Acid=甲酸 +fluid.Palladium Enriched Ammonia=富钯氨 +fluid.Ruthenium Tetroxide=四氧化钌 +fluid.Hot Ruthenium Tetroxide Solution=热四氧化钌溶液 +fluid.Ruthenium Tetroxide Solution=四氧化钌溶液 +fluid.Rhodium Sulfate=硫酸铑 +fluid.Rhodium Sulfate Solution=硫酸铑溶液 +fluid.Calcium Chloride=氯化钙 +fluid.Acidic Osmium Solution=酸性锇溶液 +fluid.Osmium Solution=锇溶液 +fluid.Acidic Iridium Solution=酸性铱溶液 +fluid.Rhodium Salt Solution=铑盐溶液 +fluid.Rhodium Filter Cake Solution=铑滤饼溶液 +fluid.Pollution=污染物 +fluid.SodiumPotassium=钠钾共晶合金(NaK) +fluid.Concrete=混凝土 +fluid.mushroomStew=蘑菇煲 + +fluid.Sodium Tungstate=钨酸钠 +fluid.Phosgene=碳酰氯 +fluid.Ethyl Chloroformate=氯基甲酸乙酯 +fluid.Ethyl Carbamate=氨基甲酸乙酯 +fluid.Ethyl N-nitrocarbamate=N-硝氨基甲酸乙酯 +fluid.Ammonium N-nitrourethane=N-硝氨基甲酸乙酯-铵 +fluid.Trinitramid=三硝基胺 +fluid.Ammonia Boronfluoride Solution=氟化硼氨溶液 +fluid.Sodium Tetrafluoroborate=氟硼酸钠 +fluid.Tetrafluoroborate=氟硼酸 +fluid.Ethyl Acetate=乙酸乙酯 +fluid.Acetylhydrazine=乙酰肼 +fluid.Unsymmetrical Dimethylhydrazine=偏二甲肼 +fluid.Monomethylhydrazine Fuel Mix=一甲基肼混合燃料 +fluid.Unsymmetrical Dimethylhydrazine Fuel Mix=偏二甲肼混合燃料 +fluid.Boron Trifluoride=三氟化硼 +fluid.Tert-Butylbenzene=叔丁基苯 +fluid.2-tert-butyl-anthraquinone=2-叔丁基蒽醌 +fluid.2-tert-butyl-anthrahydroquinone=2-叔丁基蒽氢醌 +fluid.Hydrogen Peroxide=过氧化氢 +fluid.hydrazine=肼 +fluid.Dimethyl Sulfate=硫酸二甲酯 +fluid.Ethyl Dinitrocarbamate=二硝氨基甲酸乙酯 +fluid.Ammonium Dinitramide=二硝酰胺铵 +fluid.LMP-103S=LMP-103S +fluid.Nitromethane=硝基甲烷 +fluid.O-Xylene=邻二甲苯 +//以下流体没有单元形式，大部分是bart的生物科技 +fluid.Monomethylhydrazine=一甲基肼 +fluid.binnibacteriafluid=双杆菌液体 +fluid.SeaweedBroth=海藻基质 +fluid.barnadafisarboriatorisfluid=巴纳德乔木培养液 +fluid.Polymerase=聚合酶 +fluid.GelatinMixture=明胶混合物 +fluid.FluorecentdDNA=荧光DNA +fluid.Penicillin=青霉素 +fluid.sludge=菌泥 +fluid.EnzymesSollution=酶溶液 +fluid.Formaldehyde=甲醛 +fluid.tcetieisfucusserratusfluid=鲸鱼座T星藻类培养液 +fluid.MeatExtract=肉汁 +fluid.UnknownNutrientAgar=未知营养琼脂 +//以下流体有贴图没有配方 +fluid.CompressedOxygen=压缩氧气 +fluid.CompressedNitrogen=压缩氮气 +fluid.redplasma=红等离子体 +fluid.tile.fluidBlockSludge=污泥 +//以下流体没有贴图 +fluid.guano=鸟粪 +fluid.poo=便便 +fluid.sewerage=下水 +fluid.fuelgc=GC燃油 +fluid.dirtywater=污水 +fluid.oilgc=GC石油 \ No newline at end of file -- cgit From 875ff766ce3801918c9d726a8a14a6710e655147 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Mon, 19 Jul 2021 19:25:36 +0800 Subject: Make block hint text more informative Also migrated from defer to lazy where possible Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 38 ++-- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 2 +- .../api/util/GT_Multiblock_Tooltip_Builder.java | 200 +++++++++++++++++++-- .../multi/GT_MetaTileEntity_AssemblyLine.java | 25 ++- .../GT_MetaTileEntity_ConcreteBackfillerBase.java | 10 +- .../multi/GT_MetaTileEntity_DieselEngine.java | 45 ++--- .../multi/GT_MetaTileEntity_DistillationTower.java | 18 +- .../multi/GT_MetaTileEntity_DrillerBase.java | 51 +++--- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 14 +- .../GT_MetaTileEntity_ExtremeDieselEngine.java | 12 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 129 ++++++------- .../multi/GT_MetaTileEntity_FusionComputer1.java | 6 +- .../multi/GT_MetaTileEntity_FusionComputer2.java | 6 +- .../multi/GT_MetaTileEntity_FusionComputer3.java | 6 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 11 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 10 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 61 ++++--- .../GT_MetaTileEntity_LargeChemicalReactor.java | 22 +-- .../multi/GT_MetaTileEntity_LargeTurbine.java | 41 +++-- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 8 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 8 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 12 +- .../multi/GT_MetaTileEntity_OilCracker.java | 13 +- .../multi/GT_MetaTileEntity_OilDrillBase.java | 8 +- .../GT_MetaTileEntity_OreDrillingPlantBase.java | 10 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 12 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 18 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 8 +- src/main/resources/assets/gregtech/lang/en_US.lang | 20 +++ 31 files changed, 531 insertions(+), 309 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java index c84ca61eec..5499e756ba 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java @@ -6,7 +6,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.item.ItemStack; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -16,7 +16,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; * A simple 3x3x3 hollow cubic multiblock, that can be arbitrarily rotated, made of a single type of machine casing and accepts hatches everywhere. * Controller will be placed in front center of the structure. *

- * Note: You cannot use different casing for the same Class. Make a new subclass for it. + * Note: You cannot use different casing for the same Class. Make a new subclass for it. You also should not change the casing + * dynamically, i.e. it should be a dumb method returning some sort of constant. *

* Implementation tips: * 1. To restrict hatches, override {@link #addDynamoToMachineList(IGregTechTileEntity, int)} and its cousins instead of overriding the whole @@ -28,20 +29,25 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; */ public abstract class GT_MetaTileEntity_CubicMultiBlockBase> extends GT_MetaTileEntity_EnhancedMultiBlockBase { protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final IStructureDefinition> STRUCTURE_DEFINITION = StructureDefinition.>builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - {"hhh", "hhh", "hhh"}, - {"h-h", "hhh", "hhh"}, - {"hhh", "hhh", "hhh"}, - })) - .addElement('h', ofChain( - defer(t -> ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, t.getHatchTextureIndex(), 1)), - onElementPass( - GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded, - defer(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement) - ) - )) - .build(); + protected static final ClassValue>> STRUCTURE_DEFINITION = new ClassValue>>() { + @Override + protected IStructureDefinition> computeValue(Class type) { + return StructureDefinition.>builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {"hhh", "hhh", "hhh"}, + {"h-h", "hhh", "hhh"}, + {"hhh", "hhh", "hhh"}, + })) + .addElement('h', ofChain( + lazy(t -> ofHatchAdder(GT_MetaTileEntity_CubicMultiBlockBase::addToMachineList, t.getHatchTextureIndex(), 1)), + onElementPass( + GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded, + lazy(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement) + ) + )) + .build(); + } + }; private int mCasingAmount = 0; protected GT_MetaTileEntity_CubicMultiBlockBase(int aID, String aName, String aNameRegional) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index a9b50e6662..cc2513f5c2 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -128,7 +128,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase * Info section order should be:
@@ -32,12 +39,16 @@ import net.minecraft.util.StatCollector; public class GT_Multiblock_Tooltip_Builder { private static final String TAB = " "; private static final String COLON = ": "; - + private static final String SEPARATOR = ", "; + private final List iLines; private final List sLines; - + private final List hLines; + private final SetMultimap hBlocks; + private String[] iArray; private String[] sArray; + private String[] hArray; //Localized tooltips private static final String TT_machineType = StatCollector.translateToLocal("GT5U.MBTT.MachineType"); @@ -58,11 +69,17 @@ public class GT_Multiblock_Tooltip_Builder { private static final String TT_pps = StatCollector.translateToLocal("GT5U.MBTT.PPS"); private static final String TT_hold = StatCollector.translateToLocal("GT5U.MBTT.Hold"); private static final String TT_todisplay = StatCollector.translateToLocal("GT5U.MBTT.Display"); + private static final String TT_structurehint = StatCollector.translateToLocal("GT5U.MBTT.StructureHint"); private static final String TT_mod = StatCollector.translateToLocal("GT5U.MBTT.Mod"); + private static final String TT_air = StatCollector.translateToLocal("GT5U.MBTT.Air"); + private static final String[] TT_dots = IntStream.range(0, 16).mapToObj(i -> StatCollector.translateToLocal("GT5U.MBTT.Dots." + i)).toArray(String[]::new); public GT_Multiblock_Tooltip_Builder() { iLines = new LinkedList<>(); sLines = new LinkedList<>(); + hLines = new LinkedList<>(); + hBlocks = Multimaps.newSetMultimap(new HashMap<>(), HashSet::new); + hBlocks.put(0, TT_air); } /** @@ -103,11 +120,10 @@ public class GT_Multiblock_Tooltip_Builder { } /** - * Add a line telling you what the machine type is. Usually, this will be the name of a SB version.
- * Machine Type: machine + * Add a line telling how much this machine pollutes. * - * @param machine - * Name of the machine type + * @param pollution + * Amount of pollution per second when active * * @return Instance this method was called on. */ @@ -307,7 +323,136 @@ public class GT_Multiblock_Tooltip_Builder { sLines.add(TAB + TT_outputhatch + COLON + info); return this; } - + + /** + * Use this method to add a structural part that isn't covered by the other methods.
+ * (indent)name: info + * @param name + * Name of the hatch or other component. + * @param info + * Positional information. + * @param dots + * The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addOtherStructurePart(String name, String info, int... dots) { + sLines.add(TAB + name + COLON + info); + for (int dot : dots) hBlocks.put(dot, name); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Maintenance Hatch: info + * + * @param info Positional information. + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addMaintenanceHatch(String info, int... dots) { + sLines.add(TAB + TT_maintenancehatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_maintenancehatch); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Muffler Hatch: info + * + * @param info Location where the hatch goes + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addMufflerHatch(String info, int... dots) { + sLines.add(TAB + TT_mufflerhatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_mufflerhatch); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Energy Hatch: info + * + * @param info Positional information. + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addEnergyHatch(String info, int... dots) { + sLines.add(TAB + TT_energyhatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_energyhatch); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Dynamo Hatch: info + * + * @param info Positional information. + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addDynamoHatch(String info, int... dots) { + sLines.add(TAB + TT_dynamohatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_dynamohatch); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Input Bus: info + * + * @param info Location where the bus goes + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addInputBus(String info, int... dots) { + sLines.add(TAB + TT_inputbus + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_inputbus); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Input Hatch: info + * + * @param info Location where the hatch goes + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addInputHatch(String info, int... dots) { + sLines.add(TAB + TT_inputhatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_inputhatch); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Output Bus: info + * + * @param info Location where the bus goes + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addOutputBus(String info, int... dots) { + sLines.add(TAB + TT_outputbus + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_outputbus); + return this; + } + + /** + * Add a line of information about the structure:
+ * (indent)Output Hatch: info + * + * @param info Location where the bus goes + * @param dots The valid locations for this part when asked to display hints + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addOutputHatch(String info, int... dots) { + sLines.add(TAB + TT_outputhatch + COLON + info); + for (int dot : dots) hBlocks.put(dot, TT_outputhatch); + return this; + } + /** * Use this method to add non-standard structural info.
* (indent)info @@ -319,6 +464,30 @@ public class GT_Multiblock_Tooltip_Builder { sLines.add(TAB + info); return this; } + + /** + * Use this method to add non-standard structural hint. This info will appear before the standard structural hint. + * @param info + * The line to be added. This should be an entry into minecraft's localization system. + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addStructureHint(String info) { + hLines.add(StatCollector.translateToLocal(info)); + return this; + } + + /** + * Use this method to add an entry to standard structural hint without creating a corresponding line in structure information + * @param name + * The name of block This should be an entry into minecraft's localization system. + * @param dots + * Possible locations of this block + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addStructureHint(String name, int... dots) { + for (int dot : dots) hBlocks.put(dot, StatCollector.translateToLocal(name)); + return this; + } /** * Call at the very end.
@@ -331,10 +500,10 @@ public class GT_Multiblock_Tooltip_Builder { public void toolTipFinisher(String mod) { iLines.add(TT_hold + " " + EnumChatFormatting.BOLD + "[LSHIFT]" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + " " + TT_todisplay); iLines.add(TT_mod + COLON + EnumChatFormatting.GREEN + mod + EnumChatFormatting.GRAY); - iArray = new String[iLines.size()]; - sArray = new String[sLines.size()]; - iLines.toArray(iArray); - sLines.toArray(sArray); + hLines.add(TT_structurehint); + iArray = iLines.toArray(new String[0]); + sArray = sLines.toArray(new String[0]); + hArray = Stream.concat(hLines.stream(), hBlocks.asMap().entrySet().stream().map(e -> TT_dots[e.getKey()] + COLON + String.join(SEPARATOR, e.getValue()))).toArray(String[]::new); } public String[] getInformation() { @@ -345,4 +514,7 @@ public class GT_Multiblock_Tooltip_Builder { return sArray; } + public String[] getStructureHint() { + return hArray; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index dd10b2465d..60aa372d20 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -69,18 +69,18 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu .addElement('m', ofBlock(GregTech_API.sBlockCasings2, 5)) // assembling line casing .addElement('g', ofBlockAnyMeta(GameRegistry.findBlock("IC2", "blockAlloyGlass"))) .addElement('e', ofHatchAdderOptional(GT_MetaTileEntity_AssemblyLine::addEnergyInputToMachineList, 16, 1, GregTech_API.sBlockCasings2, 0)) - .addElement('d', ofHatchAdderOptional(GT_MetaTileEntity_AssemblyLine::addDataAccessToMachineList, 42, 1, GregTech_API.sBlockCasings3, 10)) + .addElement('d', ofHatchAdderOptional(GT_MetaTileEntity_AssemblyLine::addDataAccessToMachineList, 42, 2, GregTech_API.sBlockCasings3, 10)) .addElement('b', ofChain( - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addMaintenanceToMachineList, 16, 2), - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputHatchToMachineList, 16, 2), + ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addMaintenanceToMachineList, 16, 3), + ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputHatchToMachineList, 16, 3), ofBlock(GregTech_API.sBlockCasings2, 0) )) .addElement('I', ofChain( // all blocks nearby use solid steel casing, so let's use the texture of that - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputToMachineList, 16, 2), - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 2) + ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputToMachineList, 16, 4), + ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16,4) )) - .addElement('i', ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputToMachineList, 16, 2)) + .addElement('i', ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputToMachineList, 16, 5)) .build(); public GT_MetaTileEntity_AssemblyLine(int aID, String aName, String aNameRegional) { @@ -111,15 +111,14 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu .addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing") .addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty") .addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes, aside from the last") - .addStructureInfo("Optional - Replace 1x Grate with (Advanced) Data Access Hatch next to the Controller") - .addStructureInfo("Optional - Replace 1x Grate with (Advanced) Data Access Hatch next to the Controller")//TT .addController("Either Grate on layer 3 of the first slice") - .addEnergyHatch("Any layer 4 casing") - .addMaintenanceHatch("Any layer 1 casing") - .addInputBus("As specified on layer 1") - .addInputHatch("Any layer 1 casing") - .addOutputBus("Replaces Input Bus on final slice") + .addEnergyHatch("Any layer 4 casing", 1) + .addMaintenanceHatch("Any layer 1 casing", 3) + .addInputBus("As specified on layer 1", 4, 5) + .addInputHatch("Any layer 1 casing", 3) + .addOutputBus("Replaces Input Bus on final slice", 4) + .addOtherStructurePart("Data Access Hatch", "Optional, next to controller", 2) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java index 2341452ebe..8c1f28dd1c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java @@ -39,11 +39,11 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi .addStructureInfo(casings + " form the 3x1x3 Base") .addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)") .addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing") - .addMaintenanceHatch("Any base casing") - .addInputBus("Mining Pipes, optional, any base casing") - .addInputHatch("GT Concrete, any base casing") - .addOutputBus("Mining Pipes, optional, any base casing") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes, optional, any base casing", 1) + .addInputHatch("GT Concrete, any base casing", 1) + .addOutputBus("Mining Pipes, optional, any base casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index 567297648a..8dfc605d6b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE; @@ -37,18 +37,23 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_EnhancedMultiBlockBase { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - {"---", "iii", "chc", "chc", "ccc", }, - {"---", "i~i", "hgh", "hgh", "cdc", }, - {"---", "iii", "chc", "chc", "ccc", }, - })) - .addElement('i', defer(t -> ofBlock(t.getIntakeBlock(), t.getIntakeMeta()))) - .addElement('c', defer(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('g', defer(t -> ofBlock(t.getGearboxBlock(), t.getGearboxMeta()))) - .addElement('d', defer(t -> ofHatchAdder(GT_MetaTileEntity_DieselEngine::addDynamoToMachineList, t.getCasingTextureIndex(), 0))) - .addElement('h', defer(t -> ofHatchAdderOptional(GT_MetaTileEntity_DieselEngine::addToMachineList, t.getCasingTextureIndex(), 0, t.getCasingBlock(), t.getCasingMeta()))) - .build(); + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + @Override + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {"---", "iii", "chc", "chc", "ccc", }, + {"---", "i~i", "hgh", "hgh", "cdc", }, + {"---", "iii", "chc", "chc", "ccc", }, + })) + .addElement('i', lazy(t -> ofBlock(t.getIntakeBlock(), t.getIntakeMeta()))) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('g', lazy(t -> ofBlock(t.getGearboxBlock(), t.getGearboxMeta()))) + .addElement('d', lazy(t -> ofHatchAdder(GT_MetaTileEntity_DieselEngine::addDynamoToMachineList, t.getCasingTextureIndex(), 2))) + .addElement('h', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_DieselEngine::addToMachineList, t.getCasingTextureIndex(), 1, t.getCasingBlock(), t.getCasingMeta()))) + .build(); + } + }; protected int fuelConsumption = 0; protected int fuelValue = 0; protected int fuelRemaining = 0; @@ -80,12 +85,12 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_EnhancedMu .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") .addOtherStructurePart("Engine Intake Machine Casing", "8x, ring around controller") .addStructureInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") - .addDynamoHatch("Back center") - .addMaintenanceHatch("One of the casings next to a Gear Box") - .addMufflerHatch("Top middle back, above the rear Gear Box") - .addInputHatch("Diesel Fuel, next to a Gear Box") - .addInputHatch("Lubricant, next to a Gear Box") - .addInputHatch("Oxygen, optional, next to a Gear Box") + .addDynamoHatch("Back center", 2) + .addMaintenanceHatch("One of the casings next to a Gear Box", 1) + .addMufflerHatch("Top middle back, above the rear Gear Box", 1) + .addInputHatch("Diesel Fuel, next to a Gear Box", 1) + .addInputHatch("Lubricant, next to a Gear Box", 1) + .addInputHatch("Oxygen, optional, next to a Gear Box", 1) .toolTipFinisher("Gregtech"); return tt; } @@ -192,7 +197,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_EnhancedMu @Override public IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION.get(getClass()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index b35d6e3c56..3710112c9b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -53,14 +53,14 @@ public class GT_MetaTileEntity_DistillationTower extends GT_MetaTileEntity_Enhan onElementPass(GT_MetaTileEntity_DistillationTower::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)) )) .addElement('l', ofChain( - ofHatchAdder(GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList, CASING_INDEX, 2), ofHatchAdder(GT_MetaTileEntity_DistillationTower::addLayerOutputHatch, CASING_INDEX, 2), - ofHatchAdder(GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, CASING_INDEX, 2), onElementPass(GT_MetaTileEntity_DistillationTower::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)) )) .addElement('c', ofChain( - onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GT_MetaTileEntity_DistillationTower::addOutputToMachineList, CASING_INDEX, 1)), - onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, CASING_INDEX, 1)), + onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GT_MetaTileEntity_DistillationTower::addOutputToMachineList, CASING_INDEX, 3)), + onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, CASING_INDEX, 3)), onElementPass(t -> t.onTopLayerFound(true), ofBlock(GregTech_API.sBlockCasings4, 1)), isAir() )) @@ -94,11 +94,11 @@ public class GT_MetaTileEntity_DistillationTower extends GT_MetaTileEntity_Enhan .beginVariableStructureBlock(3, 3, 3, 12, 3, 3, true) .addController("Front bottom") .addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)") - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addInputHatch("Any bottom layer casing") - .addOutputBus("Any bottom layer casing") - .addOutputHatch("2-11x Output Hatches (At least one per layer except bottom layer)") + .addEnergyHatch("Any casing", 1, 2) + .addMaintenanceHatch("Any casing", 1, 2, 3) + .addInputHatch("Any bottom layer casing", 1) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("2-11x Output Hatches (At least one per layer except bottom layer)", 2, 3) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index 0ea04f1cfa..a610a502f9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -30,7 +30,7 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -48,27 +48,32 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_En private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe); private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip); protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - {" ", " f ", " "}, - {" ", " f ", " "}, - {" ", " f ", " "}, - {" f ", "fcf", " f "}, - {" f ", "fcf", " f "}, - {" f ", "fcf", " f "}, - {"b~b", "bbb", "bbb"}, - })) - .addElement('f', defer(t -> ofBlock(GregTech_API.sBlockMachines, t.frameMeta))) - .addElement('c', defer(t -> ofBlock(t.casingBlock, t.casingMeta))) - .addElement('b', defer(t -> ofChain( - ofBlock(t.casingBlock, t.casingMeta), - ofHatchAdder(GT_MetaTileEntity_DrillerBase::addMaintenanceToMachineList, t.casingTextureIndex, 1), - ofHatchAdder(GT_MetaTileEntity_DrillerBase::addInputToMachineList, t.casingTextureIndex, 1), - ofHatchAdder(GT_MetaTileEntity_DrillerBase::addOutputToMachineList, t.casingTextureIndex, 1), - ofHatchAdder(GT_MetaTileEntity_DrillerBase::addEnergyInputToMachineList, t.casingTextureIndex, 1), - ofHatchAdder(GT_MetaTileEntity_DrillerBase::addDataAccessToMachineList, t.casingTextureIndex, 1) - ))) - .build(); + protected static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + @Override + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {" ", " f ", " "}, + {" ", " f ", " "}, + {" ", " f ", " "}, + {" f ", "fcf", " f "}, + {" f ", "fcf", " f "}, + {" f ", "fcf", " f "}, + {"b~b", "bbb", "bbb"}, + })) + .addElement('f', lazy(t -> ofBlock(GregTech_API.sBlockMachines, t.frameMeta))) + .addElement('c', lazy(t -> ofBlock(t.casingBlock, t.casingMeta))) + .addElement('b', lazy(t -> ofChain( + ofBlock(t.casingBlock, t.casingMeta), + ofHatchAdder(GT_MetaTileEntity_DrillerBase::addMaintenanceToMachineList, t.casingTextureIndex, 1), + ofHatchAdder(GT_MetaTileEntity_DrillerBase::addInputToMachineList, t.casingTextureIndex, 1), + ofHatchAdder(GT_MetaTileEntity_DrillerBase::addOutputToMachineList, t.casingTextureIndex, 1), + ofHatchAdder(GT_MetaTileEntity_DrillerBase::addEnergyInputToMachineList, t.casingTextureIndex, 1), + ofHatchAdder(GT_MetaTileEntity_DrillerBase::addDataAccessToMachineList, t.casingTextureIndex, 1) + ))) + .build(); + } + }; private Block casingBlock; private int casingMeta; @@ -355,7 +360,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_En @Override public final IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION.get(getClass()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index c7a3c3490d..d3c9e7176b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -90,13 +90,13 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends GT_MetaTileEntity_Ab .addController("Front bottom") .addCasingInfo("Heat Proof Machine Casing", 0) .addOtherStructurePart("Heating Coils", "Two middle Layers") - .addEnergyHatch("Any bottom layer casing") - .addMaintenanceHatch("Any bottom layer casing") - .addMufflerHatch("Top middle") - .addInputBus("Any bottom layer casing") - .addInputHatch("Any bottom layer casing") - .addOutputBus("Any bottom layer casing") - .addOutputHatch("Gasses, Any top layer casing") + .addEnergyHatch("Any bottom layer casing", 3) + .addMaintenanceHatch("Any bottom layer casing", 3) + .addMufflerHatch("Top middle", 2) + .addInputBus("Any bottom layer casing", 3) + .addInputHatch("Any bottom layer casing", 3) + .addOutputBus("Any bottom layer casing", 3) + .addOutputHatch("Gasses, Any top layer casing", 1) .addStructureInfo("Recovery amount scales with Muffler Hatch tier") .addOutputHatch("Platline fluids, Any bottom layer casing") .toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java index f85f27935e..1878f25a5f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java @@ -51,12 +51,12 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") .addOtherStructurePart("Extreme Engine Intake Machine Casing", "8x, ring around controller") .addStructureInfo("Extreme Engine Intake Casings must not be obstructed in front (only air blocks)") - .addDynamoHatch("Back center") - .addMaintenanceHatch("One of the casings next to a Gear Box") - .addMufflerHatch("Top middle back, above the rear Gear Box") - .addInputHatch("HOG, next to a Gear Box") - .addInputHatch("Lubricant, next to a Gear Box") - .addInputHatch("Liquid Oxygen, optional, next to a Gear Box") + .addDynamoHatch("Back center", 2) + .addMaintenanceHatch("One of the casings next to a Gear Box", 1) + .addMufflerHatch("Top middle back, above the rear Gear Box", 1) + .addInputHatch("HOG, next to a Gear Box", 1) + .addInputHatch("Lubricant, next to a Gear Box", 1) + .addInputHatch("Liquid Oxygen, optional, next to a Gear Box", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index bf2aeadcf8..88604979d2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -29,7 +29,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; @@ -39,66 +39,71 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity_EnhancedMultiBlockBase { public static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - { - " ", - " ihi ", - " hh hh ", - " h h ", - " h h ", - " h h ", - " i i ", - " h h ", - " i i ", - " h h ", - " h h ", - " h h ", - " hh hh ", - " ihi ", - " ", - }, - { - " xhx ", - " hhccchh ", - " eccxhxcce ", - " eceh hece ", - " hce ech ", - " hch hch ", - "xcx xcx", - "hch hch", - "xcx xcx", - " hch hch ", - " hce ech ", - " eceh hece ", - " eccx~xcce ", - " hhccchh ", - " xhx ", - }, - { - " ", - " ihi ", - " hh hh ", - " h h ", - " h h ", - " h h ", - " i i ", - " h h ", - " i i ", - " h h ", - " h h ", - " h h ", - " hh hh ", - " ihi ", - " ", - } - })) - .addElement('c', defer(t -> ofBlock(t.getFusionCoil(), t.getFusionCoilMeta()))) - .addElement('h', defer(t -> ofBlock(t.getCasing(), t.getCasingMeta()))) - .addElement('i', defer(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addInjector, 53, 1, t.getCasing(), t.getCasingMeta()))) - .addElement('e', defer(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addEnergyInjector, 53, 1, t.getCasing(), t.getCasingMeta()))) - .addElement('x', defer(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addExtractor, 53, 1, t.getCasing(), t.getCasingMeta()))) - .build(); + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + @Override + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + { + " ", + " ihi ", + " hh hh ", + " h h ", + " h h ", + " h h ", + " i i ", + " h h ", + " i i ", + " h h ", + " h h ", + " h h ", + " hh hh ", + " ihi ", + " ", + }, + { + " xhx ", + " hhccchh ", + " eccxhxcce ", + " eceh hece ", + " hce ech ", + " hch hch ", + "xcx xcx", + "hch hch", + "xcx xcx", + " hch hch ", + " hce ech ", + " eceh hece ", + " eccx~xcce ", + " hhccchh ", + " xhx ", + }, + { + " ", + " ihi ", + " hh hh ", + " h h ", + " h h ", + " h h ", + " i i ", + " h h ", + " i i ", + " h h ", + " h h ", + " h h ", + " hh hh ", + " ihi ", + " ", + } + })) + .addElement('c', lazy(t -> ofBlock(t.getFusionCoil(), t.getFusionCoilMeta()))) + .addElement('h', lazy(t -> ofBlock(t.getCasing(), t.getCasingMeta()))) + .addElement('i', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addInjector, 53, 1, t.getCasing(), t.getCasingMeta()))) + .addElement('e', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addEnergyInjector, 53, 2, t.getCasing(), t.getCasingMeta()))) + .addElement('x', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_FusionComputer::addExtractor, 53, 3, t.getCasing(), t.getCasingMeta()))) + .build(); + } + }; public GT_Recipe mLastRecipe; public int mEUStore; @@ -154,7 +159,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity @Override public IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION.get(getClass()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 2901a9e4f1..dd942d2635 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -75,9 +75,9 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC .addCasingInfo("LuV Machine Casing", 79) .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Superconducting Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings") - .addInputHatch("2-16, Specified casings") - .addOutputHatch("1-16, Specified casings") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be LuV or better") .toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 6cefdc6812..de9d863529 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -75,9 +75,9 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC .addCasingInfo("Fusion Machine Casing", 79) .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings") - .addInputHatch("2-16, Specified casings") - .addOutputHatch("1-16, Specified casings") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be ZPM or better") .toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index b879c7923b..4e5c6c3cad 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -75,9 +75,9 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC .addCasingInfo("Fusion Machine Casing Mk II", 79) .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings") - .addInputHatch("2-16, Specified casings") - .addOutputHatch("1-16, Specified casings") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UV or better") .toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java index 392726e13a..e8beb270e0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java @@ -52,7 +52,6 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_EnhancedM ofHatchAdder(GT_MetaTileEntity_HeatExchanger::addInputToMachineList, CASING_INDEX, 1), ofHatchAdder(GT_MetaTileEntity_HeatExchanger::addOutputToMachineList, CASING_INDEX, 1), ofHatchAdder(GT_MetaTileEntity_HeatExchanger::addMaintenanceToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_HeatExchanger::addEnergyInputToMachineList, CASING_INDEX, 1), onElementPass(GT_MetaTileEntity_HeatExchanger::onCasingAdded, ofBlock(GregTech_API.sBlockCasings4, (byte) 2)) )) .build(); @@ -87,11 +86,11 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_EnhancedM .addController("Front bottom") .addCasingInfo("Stable Titanium Machine Casing", 20) .addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks") - .addMaintenanceHatch("Any casing") - .addInputHatch("Hot fluid, bottom center") - .addInputHatch("Distilled water, any casing") - .addOutputHatch("Cold fluid, top center") - .addOutputHatch("Steam/SH Steam, any casing") + .addMaintenanceHatch("Any casing", 1) + .addInputHatch("Hot fluid, bottom center", 2) + .addInputHatch("Distilled water, any casing", 1) + .addOutputHatch("Cold fluid, top center", 3) + .addOutputHatch("Steam/SH Steam, any casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java index 41b40f56fa..17417a09c8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java @@ -51,11 +51,11 @@ public class GT_MetaTileEntity_ImplosionCompressor extends GT_MetaTileEntity_Cub .addController("Front center") .addCasingInfo("Solid Steel Machine Casing", 16) .addStructureInfo("Casings can be replaced with Explosion Warning Signs") - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addMufflerHatch("Any casing") - .addInputBus("Any casing") - .addOutputBus("Any casing") + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addMufflerHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index 7f409f38f4..8565ae8774 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -26,7 +26,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; @@ -40,26 +40,31 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; public abstract class GT_MetaTileEntity_LargeBoiler extends GT_MetaTileEntity_EnhancedMultiBlockBase { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - {"ccc", "ccc", "ccc"}, - {"ccc", "cPc", "ccc"}, - {"ccc", "cPc", "ccc"}, - {"ccc", "cPc", "ccc"}, - {"f~f", "fff", "fff"}, - })) - .addElement('P', defer(t -> ofBlock(t.getPipeBlock(), t.getPipeMeta()))) - .addElement('c', defer(t -> ofChain( - ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addOutputToMachineList, t.getCasingTextureIndex(), 2), - onElementPass(GT_MetaTileEntity_LargeBoiler::onCasingAdded, ofBlock(t.getCasingBlock(), t.getCasingMeta())) - ))) - .addElement('f', defer(t -> ofChain( - ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addMaintenanceToMachineList, t.getCasingTextureIndex(), 1), - ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addInputToMachineList, t.getCasingTextureIndex(), 1), - ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addMufflerToMachineList, t.getCasingTextureIndex(), 1), - onElementPass(GT_MetaTileEntity_LargeBoiler::onFireboxAdded, ofBlock(t.getCasingBlock(), t.getCasingMeta())) - ))) - .build(); + private static final ClassValue> STRUCTURE_DEFINITION =new ClassValue>() { + @Override + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {"ccc", "ccc", "ccc"}, + {"ccc", "cPc", "ccc"}, + {"ccc", "cPc", "ccc"}, + {"ccc", "cPc", "ccc"}, + {"f~f", "fff", "fff"}, + })) + .addElement('P', lazy(t -> ofBlock(t.getPipeBlock(), t.getPipeMeta()))) + .addElement('c', lazy(t -> ofChain( + ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addOutputToMachineList, t.getCasingTextureIndex(), 2), + onElementPass(GT_MetaTileEntity_LargeBoiler::onCasingAdded, ofBlock(t.getCasingBlock(), t.getCasingMeta())) + ))) + .addElement('f', lazy(t -> ofChain( + ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addMaintenanceToMachineList, t.getCasingTextureIndex(), 1), + ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addInputToMachineList, t.getCasingTextureIndex(), 1), + ofHatchAdder(GT_MetaTileEntity_LargeBoiler::addMufflerToMachineList, t.getCasingTextureIndex(), 1), + onElementPass(GT_MetaTileEntity_LargeBoiler::onFireboxAdded, ofBlock(t.getCasingBlock(), t.getCasingMeta())) + ))) + .build(); + } + }; private boolean firstRun = true; private int mSuperEfficencyIncrease = 0; private int integratedCircuitConfig = 0; //Steam output is reduced by 1000L per config @@ -92,13 +97,13 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends GT_MetaTileEntity_En .addCasingInfo(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24)//? .addOtherStructurePart(getCasingMaterial() + " Fire Boxes", "Bottom layer, 3 minimum") .addOtherStructurePart(getCasingMaterial() + " Pipe Casing Blocks", "Inner 3 blocks") - .addMaintenanceHatch("Any firebox") - .addMufflerHatch("Any firebox") - .addInputBus("Solid fuel, Any firebox") - .addInputHatch("Liquid fuel, Any firebox") + .addMaintenanceHatch("Any firebox", 1) + .addMufflerHatch("Any firebox", 1) + .addInputBus("Solid fuel, Any firebox", 1) + .addInputHatch("Liquid fuel, Any firebox", 1) .addStructureInfo("You can use either, or both") - .addInputHatch("Water, Any firebox") - .addOutputHatch("Steam, any casing") + .addInputHatch("Water, Any firebox", 1) + .addOutputHatch("Steam, any casing", 2) .toolTipFinisher("Gregtech"); return tt; } @@ -271,7 +276,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends GT_MetaTileEntity_En @Override public IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION.get(getClass()); } private void onCasingAdded() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index 072f54e4af..63b536fc72 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -47,10 +47,10 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_En onElementPass(GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, ofBlock(GregTech_API.sBlockCasings8, 0)) )) .addElement('x', ofChain( - ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addOutputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addMaintenanceToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addEnergyInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addInputToMachineList, CASING_INDEX, 2), + ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addOutputToMachineList, CASING_INDEX, 2), + ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addMaintenanceToMachineList, CASING_INDEX, 2), + ofHatchAdder(GT_MetaTileEntity_LargeChemicalReactor::addEnergyInputToMachineList, CASING_INDEX, 2), onElementPass(GT_MetaTileEntity_LargeChemicalReactor::onCoilAdded, ofBlock(GregTech_API.sBlockCasings5, 0)), onElementPass(GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, ofBlock(GregTech_API.sBlockCasings8, 0)) )) @@ -84,13 +84,13 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_En .addController("Front center") .addCasingInfo("Chemically Inert Machine Casing", 8) .addOtherStructurePart("PTFE Pipe Machine Casing", "Center") - .addOtherStructurePart("Cupronickel Coil Block", "Adjacent to the PTFE Pipe Machine Casing") - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addInputBus("Any casing") - .addInputHatch("Any casing") - .addOutputBus("Any casing") - .addOutputHatch("Any casing") + .addOtherStructurePart("Cupronickel Coil Block", "Adjacent to the PTFE Pipe Machine Casing", 1) + .addEnergyHatch("Any casing", 1, 2) + .addMaintenanceHatch("Any casing", 1, 2) + .addInputBus("Any casing", 1, 2) + .addInputHatch("Any casing", 1, 2) + .addOutputBus("Any casing", 1, 2) + .addOutputHatch("Any casing", 1, 2) .addStructureInfo("You can have multiple hatches/busses") .toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index fd3117e451..f0a5abbe62 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -22,7 +22,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.defer; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; @@ -30,22 +30,27 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_EnhancedMultiBlockBase { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ - {" ", "xxxxx", "xxxxx", "xxxxx", "xxxxx",}, - {" --- ", "xcccx", "xchcx", "xchcx", "xcccx",}, - {" --- ", "xc~cx", "xh-hx", "xh-hx", "xcdcx",}, - {" --- ", "xcccx", "xchcx", "xchcx", "xcccx",}, - {" ", "xxxxx", "xxxxx", "xxxxx", "xxxxx",}, - })) - .addElement('c', defer(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('d', defer(t -> ofHatchAdder(GT_MetaTileEntity_LargeTurbine::addDynamoToMachineList, t.getCasingTextureIndex(), 0))) - .addElement('h', defer(t -> ofHatchAdderOptional(GT_MetaTileEntity_LargeTurbine::addToMachineList, t.getCasingTextureIndex(), 0, t.getCasingBlock(), t.getCasingMeta()))) - .addElement('x', (IStructureElementCheckOnly) (aContext, aWorld, aX, aY, aZ) -> { - TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); - return !(tTile instanceof IGregTechTileEntity) || !(((IGregTechTileEntity) tTile).getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine); - }) - .build(); + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + @Override + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {" ", "xxxxx", "xxxxx", "xxxxx", "xxxxx",}, + {" --- ", "xcccx", "xchcx", "xchcx", "xcccx",}, + {" --- ", "xc~cx", "xh-hx", "xh-hx", "xcdcx",}, + {" --- ", "xcccx", "xchcx", "xchcx", "xcccx",}, + {" ", "xxxxx", "xxxxx", "xxxxx", "xxxxx",}, + })) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('d', lazy(t -> ofHatchAdder(GT_MetaTileEntity_LargeTurbine::addDynamoToMachineList, t.getCasingTextureIndex(), 1))) + .addElement('h', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_LargeTurbine::addToMachineList, t.getCasingTextureIndex(), 2, t.getCasingBlock(), t.getCasingMeta()))) + .addElement('x', (IStructureElementCheckOnly) (aContext, aWorld, aX, aY, aZ) -> { + TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); + return !(tTile instanceof IGregTechTileEntity) || !(((IGregTechTileEntity) tTile).getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine); + }) + .build(); + } + }; protected int baseEff = 0; protected int optFlow = 0; @@ -74,7 +79,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_E @Override public IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION.get(getClass()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 27e4bf7084..20f795572e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -46,10 +46,10 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfo("Stainless Steel Turbine Casing", 24) - .addDynamoHatch("Back center") - .addMaintenanceHatch("Side centered") - .addMufflerHatch("Side centered") - .addInputHatch("Gas Fuel, Side centered") + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addMufflerHatch("Side centered", 2) + .addInputHatch("Gas Fuel, Side centered", 2) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index 0d22271a34..2c803712f1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -54,10 +54,10 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfo("Titanium Turbine Casing", 24) - .addDynamoHatch("Back center") - .addMaintenanceHatch("Side centered") - .addInputHatch("Superheated Steam, Side centered") - .addOutputHatch("Steam, Side centered") + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Superheated Steam, Side centered", 2) + .addOutputHatch("Steam, Side centered", 2) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index d1bf1e7c0b..c34f190242 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -53,10 +53,10 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfo("Tungstensteel Turbine Casing", 24) - .addDynamoHatch("Back center") - .addMaintenanceHatch("Side centered") - .addInputHatch("Plasma Fluid, Side centered") - .addOutputHatch("Molten Fluid, optional, Side centered") + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Plasma Fluid, Side centered", 2) + .addOutputHatch("Molten Fluid, optional, Side centered", 2) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 8990ad3324..356dda9183 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -57,10 +57,10 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfo("Turbine Casing", 24) - .addDynamoHatch("Back center") - .addMaintenanceHatch("Side centered") - .addInputHatch("Steam, Side centered") - .addOutputHatch("Distilled Water, Side centered") + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Steam, Side centered", 2) + .addOutputHatch("Distilled Water, Side centered", 2) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index edfce02aad..907de38f6b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_MultiFurnace extends GT_MetaTileEntity_AbstractMu .addElement('c', ofBlock(GregTech_API.sBlockCasings1, CASING_INDEX)) .addElement('m', ofHatchAdder(GT_MetaTileEntity_MultiFurnace::addMufflerToMachineList, CASING_INDEX, 2)) .addElement('C', GT_StructureUtility.ofCoil(GT_MetaTileEntity_MultiFurnace::setCoilLevel, GT_MetaTileEntity_MultiFurnace::getCoilLevel)) - .addElement('b', ofHatchAdderOptional(GT_MetaTileEntity_MultiFurnace::addBottomHatch, CASING_INDEX, 3, GregTech_API.sBlockCasings1, CASING_INDEX)) + .addElement('b', ofHatchAdderOptional(GT_MetaTileEntity_MultiFurnace::addBottomHatch, CASING_INDEX, 1, GregTech_API.sBlockCasings1, CASING_INDEX)) .build(); public GT_MetaTileEntity_MultiFurnace(int aID, String aName, String aNameRegional) { @@ -80,11 +80,11 @@ public class GT_MetaTileEntity_MultiFurnace extends GT_MetaTileEntity_AbstractMu .addController("Front bottom") .addCasingInfo("Heat Proof Machine Casing", 8) .addOtherStructurePart("Heating Coils", "Middle layer") - .addEnergyHatch("Any bottom casing") - .addMaintenanceHatch("Any bottom casing") - .addMufflerHatch("Top Middle") - .addInputBus("Any bottom casing") - .addOutputBus("Any bottom casing") + .addEnergyHatch("Any bottom casing", 1) + .addMaintenanceHatch("Any bottom casing", 1) + .addMufflerHatch("Top Middle", 2) + .addInputBus("Any bottom casing", 1) + .addOutputBus("Any bottom casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index 8a257db8ee..c8dbe2321a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -52,7 +52,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult onElementPass(GT_MetaTileEntity_OilCracker::onCasingAdded, ofBlock(GregTech_API.sBlockCasings4, 1)) )) .addElement('r', ofChain( - ofHatchAdder(GT_MetaTileEntity_OilCracker::addRightHatchToMachineList, CASING_INDEX, 2), + ofHatchAdder(GT_MetaTileEntity_OilCracker::addRightHatchToMachineList, CASING_INDEX, 3), onElementPass(GT_MetaTileEntity_OilCracker::onCasingAdded, ofBlock(GregTech_API.sBlockCasings4, 1)) )) .addElement('m', ofChain( @@ -91,12 +91,13 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult .addCasingInfo("Clean Stainless Steel Machine Casing", 18) .addOtherStructurePart("2 Rings of 8 Coils", "Each side of the controller") .addInfo("Gets 5% EU/t reduction per coil tier") - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addInputHatch("Steam/Hydrogen ONLY, Any middle ring casing") - .addInputHatch("Any left/right side casing") - .addOutputHatch("Any left/right side casing") + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addInputHatch("Steam/Hydrogen ONLY, Any middle ring casing", 1) + .addInputHatch("Any left/right side casing",2, 3) + .addOutputHatch("Any right/left side casing", 2, 3) .addStructureInfo("Input/Output Hatches must be on opposite sides!") + .addStructureHint("GT5U.cracker.io_side") .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 554e5dfd63..76231980ec 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -92,10 +92,10 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D .addStructureInfo(casings + " form the 3x1x3 Base") .addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)") .addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing") - .addMaintenanceHatch("Any base casing") - .addInputBus("Mining Pipes or Circuits, optional, any base casing") - .addOutputHatch("Any base casing") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) + .addOutputHatch("Any base casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index 5b4444cec3..b168e44c41 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -350,11 +350,11 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile .addStructureInfo(casings + " form the 3x1x3 Base") .addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)") .addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing") - .addMaintenanceHatch("Any base casing") - .addInputBus("Mining Pipes, optional, any base casing") - .addInputHatch("Drilling Fluid, any base casing") - .addOutputBus("Any base casing") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes, optional, any base casing", 1) + .addInputHatch("Drilling Fluid, any base casing", 1) + .addOutputBus("Any base casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 0a46c47f7c..ea56266b41 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -76,12 +76,12 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMu .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfo("Robust Tungstensteel Machine Casing", 14) - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addInputBus("Any casing") - .addInputHatch("Any casing") - .addOutputBus("Any casing") - .addOutputHatch("Any casing") + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addInputHatch("Any casing", 1) + .addOutputBus("Any casing", 1) + .addOutputHatch("Any casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 7312e0d992..48da2c5dce 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -63,8 +63,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_EnhancedMu onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement) )) .addElement('t', ofChain( - ofHatchAdder(GT_MetaTileEntity_PyrolyseOven::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_PyrolyseOven::addMufflerToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_MetaTileEntity_PyrolyseOven::addInputToMachineList, CASING_INDEX, 2), + ofHatchAdder(GT_MetaTileEntity_PyrolyseOven::addMufflerToMachineList, CASING_INDEX, 2), onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement) )) .build(); @@ -95,13 +95,13 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_EnhancedMu .addController("Front center") .addCasingInfo("Pyrolyse Oven Casing", 60) .addOtherStructurePart("Heating Coils", "Center 3x1x3 of the bottom layer") - .addEnergyHatch("Any bottom layer casing") - .addMaintenanceHatch("Any bottom layer casing") - .addMufflerHatch("Center 3x1x3 area in top layer") - .addInputBus("Center 3x1x3 area in top layer") - .addInputHatch("Center 3x1x3 area in top layer") - .addOutputBus("Any bottom layer casing") - .addOutputHatch("Any bottom layer casing") + .addEnergyHatch("Any bottom layer casing", 1) + .addMaintenanceHatch("Any bottom layer casing", 1) + .addMufflerHatch("Center 3x1x3 area in top layer", 2) + .addInputBus("Center 3x1x3 area in top layer", 2) + .addInputHatch("Center 3x1x3 area in top layer", 2) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("Any bottom layer casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java index bef433e626..b7f24f7e7a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java @@ -47,10 +47,10 @@ public class GT_MetaTileEntity_VacuumFreezer extends GT_MetaTileEntity_CubicMult .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfo("Frost Proof Machine Casing", 16) - .addEnergyHatch("Any casing") - .addMaintenanceHatch("Any casing") - .addInputBus("Any casing") - .addOutputBus("Any casing") + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b0d0018312..ce60b8d70e 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -18,7 +18,27 @@ GT5U.MBTT.Causes=Causes GT5U.MBTT.PPS=pollution per second GT5U.MBTT.Hold=Hold GT5U.MBTT.Display=to display structure guidelines +GT5U.MBTT.StructureHint=Some blocks have multiple candidates or can use any tier GT5U.MBTT.Mod=Added by +GT5U.MBTT.Air=Mandatory Air +GT5U.MBTT.Dots.0=No Dot +GT5U.MBTT.Dots.1=Dot 1 +GT5U.MBTT.Dots.2=Dot 2 +GT5U.MBTT.Dots.3=Dot 3 +GT5U.MBTT.Dots.4=Dot 4 +GT5U.MBTT.Dots.5=Dot 5 +GT5U.MBTT.Dots.6=Dot 6 +GT5U.MBTT.Dots.7=Dot 7 +GT5U.MBTT.Dots.8=Dot 8 +GT5U.MBTT.Dots.9=Dot 9 +GT5U.MBTT.Dots.10=Dot 10 +GT5U.MBTT.Dots.11=Dot 11 +GT5U.MBTT.Dots.12=Dot 12 +GT5U.MBTT.Dots.13=Dot 13 +GT5U.MBTT.Dots.14=Dot 14 +GT5U.MBTT.Dots.15=Dot 15 + +GT5U.cracker.io_side=Input/Output Hatches must be on opposite sides! GT5U.turbine.running.true=Turbine running GT5U.turbine.running.false=Turbine stopped -- cgit From 9267016bf3a3e0ae90c89f3bfc61058f1275207d Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Wed, 21 Jul 2021 22:41:53 +0800 Subject: Use upstream existing localization instead of creating our own Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../gregtech/api/util/GT_Multiblock_Tooltip_Builder.java | 5 +++-- src/main/resources/assets/gregtech/lang/en_US.lang | 16 ---------------- 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java index 84d4bbbd48..9afb9e58c1 100644 --- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java +++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java @@ -2,6 +2,7 @@ package gregtech.api.util; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; +import com.gtnewhorizon.structurelib.StructureLibAPI; import gregtech.api.enums.Materials; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -72,14 +73,14 @@ public class GT_Multiblock_Tooltip_Builder { private static final String TT_structurehint = StatCollector.translateToLocal("GT5U.MBTT.StructureHint"); private static final String TT_mod = StatCollector.translateToLocal("GT5U.MBTT.Mod"); private static final String TT_air = StatCollector.translateToLocal("GT5U.MBTT.Air"); - private static final String[] TT_dots = IntStream.range(0, 16).mapToObj(i -> StatCollector.translateToLocal("GT5U.MBTT.Dots." + i)).toArray(String[]::new); + private static final String[] TT_dots = IntStream.range(0, 16).mapToObj(i -> StatCollector.translateToLocal("structurelib.blockhint." + i + ".name")).toArray(String[]::new); public GT_Multiblock_Tooltip_Builder() { iLines = new LinkedList<>(); sLines = new LinkedList<>(); hLines = new LinkedList<>(); hBlocks = Multimaps.newSetMultimap(new HashMap<>(), HashSet::new); - hBlocks.put(0, TT_air); + hBlocks.put(StructureLibAPI.HINT_BLOCK_META_AIR, TT_air); } /** diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index ce60b8d70e..e173f9cfea 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -21,22 +21,6 @@ GT5U.MBTT.Display=to display structure guidelines GT5U.MBTT.StructureHint=Some blocks have multiple candidates or can use any tier GT5U.MBTT.Mod=Added by GT5U.MBTT.Air=Mandatory Air -GT5U.MBTT.Dots.0=No Dot -GT5U.MBTT.Dots.1=Dot 1 -GT5U.MBTT.Dots.2=Dot 2 -GT5U.MBTT.Dots.3=Dot 3 -GT5U.MBTT.Dots.4=Dot 4 -GT5U.MBTT.Dots.5=Dot 5 -GT5U.MBTT.Dots.6=Dot 6 -GT5U.MBTT.Dots.7=Dot 7 -GT5U.MBTT.Dots.8=Dot 8 -GT5U.MBTT.Dots.9=Dot 9 -GT5U.MBTT.Dots.10=Dot 10 -GT5U.MBTT.Dots.11=Dot 11 -GT5U.MBTT.Dots.12=Dot 12 -GT5U.MBTT.Dots.13=Dot 13 -GT5U.MBTT.Dots.14=Dot 14 -GT5U.MBTT.Dots.15=Dot 15 GT5U.cracker.io_side=Input/Output Hatches must be on opposite sides! -- cgit