diff --git a/src/generated/resources/assets/ctnhcore/lang/en_ud.json b/src/generated/resources/assets/ctnhcore/lang/en_ud.json index d66294b0..471059f6 100644 --- a/src/generated/resources/assets/ctnhcore/lang/en_ud.json +++ b/src/generated/resources/assets/ctnhcore/lang/en_ud.json @@ -406,6 +406,7 @@ "ctnhcore.arc_generator.arcgeneratorinfo1": "%d :ʎʇısuǝʇuI ɔɹⱯ ʇuǝɹɹnƆ", "ctnhcore.arc_generator.arcgeneratorinfo2": "%%ɟᄅ˙% :ʎɔuǝıɔıɟɟƎ pǝʇɹoddnS xɐW", "ctnhcore.arc_generator.arcgeneratorinfo3": "%%ɟᄅ˙% :ʎɔuǝıɔıɟɟƎ ʇuǝɹɹnƆ", + "ctnhcore.arc_generator.arcintensityinsufficient": "%d ʎןʇuǝɹɹnɔ '%d spǝǝu ǝdıɔǝɹ sıɥʇ :ʎʇısuǝʇuı ɔɹɐ ʇuǝıɔıɟɟnsuI", "ctnhcore.arc_reactor.arcreactorarc": "%d :ʎʇısuǝʇuI ɔɹⱯ ʇndʇnO", "ctnhcore.arc_reactor.arcreactorconnect": "ɹ§pǝןqɐuƎ ǝbpıɹᗺq§", "ctnhcore.astronomicalmachine.astronomicalinfoinvalid": "ʇɥbıu ʇɐ pǝsn ǝq ʎןuo uɐƆ", @@ -510,6 +511,7 @@ "ctnhcore.idroneitem.itemdroneeut": "ʇ/∩Ǝ %d :ǝuoɹp ǝuo ʎq pǝʇɐɹǝuǝb ǝbɐʇןoΛ", "ctnhcore.idroneitem.itemdronetier": "%d :ɹǝı⟘ ǝuoɹᗡ", "ctnhcore.industrialprimitiveblastfurnacemachine.industrialprimitiveblastfurnaceinfoparallelcount": "%d :ʇunoɔ ןǝןןɐɹɐԀ", + "ctnhcore.kineticelectricmultiblockmachine.insufficientkineticspeed": "pǝɹınbǝɹ ㄣ9 ʇsɐǝן ʇɐ '%d ʎןʇuǝɹɹnɔ :pǝǝds ɔıʇǝuıʞ ʇuǝıɔıɟɟnsuI", "ctnhcore.largenaquadahreactormachine.power": "%s :ɹǝʍoԀ", "ctnhcore.machinemodefancyconfiguratortest.cryotheumfreezerui1": "ɟᄅ˙% / ɟᄅ˙% :pǝǝds ɹǝzǝǝɹɟ ʇuǝɹɹnƆ", "ctnhcore.machinemodefancyconfiguratortest.cryotheumfreezerui2": "ןǝuɐԀ ǝpɐɹbd∩ uǝdO", @@ -533,6 +535,7 @@ "ctnhcore.meadvancedterminalbehavior.itemmeadvancedterminalsetting7tooltip": "spınןɟ uı pǝɔɐןd ǝq ʇou ןןıʍ spınןɟ 'spınןℲ ǝɔɐןԀ ɥʇıʍ ɹǝɥʇǝboʇ pǝןqɐuǝ uǝɥM\nǝɔɐds ʎʇdɯǝ sɐ pǝʇɐǝɹʇ ǝɹɐ ǝɔɐds ǝɥʇ uı spınןɟ 'pǝןqɐuǝ uǝɥM\n)pǝןqɐuǝ :Ɩ 'pǝןqɐsıp :0( spınןɟ uı sʞɔoןq ǝɔɐןԀ", "ctnhcore.meadvancedterminalbehavior.itemmeadvancedterminalsettingtitle": "sbuıʇʇǝS uoıʇɐɯɹoℲ ʞɔoןqıʇןnW", "ctnhcore.mechanical.mechanicallathestructure": "uoıʇɐʇuǝıɹo puɐ uoıʇısod buıpnןɔuı 'uoıʇɐɯɹoɟuı ǝɹnʇɔnɹʇs s,IWƎ uı uʍoɥs sɐ ʎןʇɔɐxǝ pǝɔɐןd ǝq ʇsnɯ ǝɹnʇɔnɹʇs ǝɥʇ uı ǝɥʇɐן ǝɥ⟘", + "ctnhcore.megaturbinemachine.missingrotorholder": "ǝʇǝןdɯoɔuı sı ǝɹnʇɔnɹʇs ʞɔoןqıʇןnɯ ǝɥʇ ؛punoɟ ɹǝpןoɥ ɹoʇoɹ oN", "ctnhcore.multiblocksa.advancedcokeoventooltip0": "uǝʌO ǝʞoƆ pǝɔuɐʌpⱯ", "ctnhcore.multiblocksa.advancedcokeoventooltip1": "ɯsıןǝןןɐɹɐd ᄅƐ ɥʇıʍ sǝɯoƆן§9§", "ctnhcore.multiblocksa.advancedcokeoventooltip2": "spuoɔǝs ϛƖ ʇɐ pǝxıɟ sı ǝɯıʇ ǝdıɔǝɹ puɐ 'sǝdıɔǝɹ uǝʌo ǝʞoɔ unɹ ʎןuo uɐƆ", @@ -903,12 +906,15 @@ "ctnhcore.ore_vein.zanite_vein_at": "uıǝΛ ǝʇıuɐZ ɹǝɥʇǝⱯ", "ctnhcore.ore_vein.zinc_vein_ow": "uıǝΛ ɔuıZ pןɹoʍɹǝʌO", "ctnhcore.ore_vein.zirkelite_vein": "uıǝΛ ǝʇıןǝʞɹıZ", + "ctnhcore.photovoltaicdronestation.onlyinorbit": "suoısuǝɯıp ʇıqɹo uı unɹ ʎןuo uɐɔ sǝdıɔǝɹ buıuıW", "ctnhcore.photovoltaicdronestation.pvdroneinfot1": "%d :pǝıןddns ɹǝʍoԀ", "ctnhcore.photovoltaicdronestation.pvdroneinfot2": "ɟㄣ˙% :ǝɔuɐɥɔ uoıʇdɯnsuoɔ ǝuoɹᗡ", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfo1": "%s%% :ʎɔuǝıɔıɟɟƎ", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfo2": "ʇ/∩Ǝ %s/%s :buıʇɐɹǝuǝ⅁", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfoinvalid": "pǝʍopɐɥS", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfonight": "ʇɥbıu ʇⱯ", + "ctnhcore.plasmaalloyblast.coiltiertoolow": ")ʞ008Ɩ ʇsɐǝן ʇɐ ɟo ןıoɔ ɐ sǝɹınbǝɹ( ɹǝıʇ ןǝןןɐɹɐd ɐ ǝpıʌoɹd ʇouuɐɔ :ʍoן ooʇ ǝɹnʇɐɹǝdɯǝʇ ןıoƆ", + "ctnhcore.plasmaalloyblast.missingplasma": "pǝɯnsuoɔ sɐʍ ʇnduı ɐɯsɐןd pıןɐʌ ou :ɐɯsɐןd buıssıW", "ctnhcore.ponder.assembly_line_building.header": "ǝuıꞀ ʎןqɯǝssⱯ ǝʇɐɯoʇnɐ oʇ ʍoH", "ctnhcore.ponder.assembly_line_building.text_1": "˙ɹǝןןoɹʇuoɔ ǝuıꞀ ʎןqɯǝssⱯ uɐ ǝɔɐןd 'ʇsɹıℲ", "ctnhcore.ponder.assembly_line_building.text_10": "˙ʇɔnpoɹd uıɐɯ ǝɥʇ ɹoɟ ʇıɐʍ oʇ ǝpoɯ ʞɔoן ɹǝpıʌoɹd uɹǝʇʇɐd ǝɥʇ ʇǝs uǝɥʇ 'uoʇʇnq ,+, ǝɥʇ ɥʇıʍ uɹǝʇʇɐd ʞɔıןɔ-ǝuo ǝɥʇ ǝpoɔuƎ", @@ -971,8 +977,10 @@ "ctnhcore.scalablereservoircomputingmachine.ctnhsrcsacrificelocked": "ᗡƎʞƆOꞀ ǝɔıɟıɹɔɐS", "ctnhcore.scalablereservoircomputingmachine.ctnhsrcsacrificeunlocked": "ᗡƎʞƆOꞀN∩ ǝɔıɟıɹɔɐS", "ctnhcore.scalablereservoircomputingmachine.ctnhsrcwetwareduration": "sʞɔıʇ %s :uoıʇɐɹnp ǝɹɐʍʇǝM", + "ctnhcore.sinopechemical.coiltiertoolow": ")ʞ008Ɩ ʇsɐǝן ʇɐ ɟo ןıoɔ ɐ sǝɹınbǝɹ( ɹǝıʇ uoıʇɐɹǝןǝɔɔɐ ǝɥʇ ǝʇndɯoɔ ʇouuɐɔ :ʍoן ooʇ ǝɹnʇɐɹǝdɯǝʇ ןıoƆ", "ctnhcore.sinopechemical.sinopechemicalinfolevel": "%d :ǝʇɐᴚ buıʇɐɹǝןǝɔɔⱯ ןıoƆ", "ctnhcore.sinopechemical.sinopechemicalinfoparallel": "%d :ʇunoƆ ןǝןןɐɹɐԀ", + "ctnhcore.slaughterhousemachine.nomobtoslaughter": "ɐʇɐp ʎʇıʇuǝ buıpןoɥ ɹǝuʍɐds pǝɹǝʍod ɐ ʇɹǝsuı :ɹǝʇɥbnɐןs oʇ qoɯ oN", "ctnhcore.slaughterhousemachine.slaughterhouseinfomobcount": ")%s( %d :sǝdʎ⟘ qoW", "ctnhcore.spacephotovoltaicbasestation.orbit_only": "ǝdıɔǝɹ sıɥʇ unɹ oʇ ʇuǝɯoɹıʌuǝ ʇıqɹo spǝǝN", "ctnhcore.spacephotovoltaicbasestation.spacephotovoltaicbasestationinfopvctier0": "%d :ɹǝıʇ ʞɔoןq ɔıɐʇןoʌoʇoɥd ʇuǝɹɹnƆ", @@ -982,6 +990,7 @@ "ctnhcore.superconducting_penning_trap.antielectric": "%d :ʇunoɯɐ uoɹʇısoԀ", "ctnhcore.superconducting_penning_trap.antinu": "%d :ʇunoɯɐ uoɹʇnǝuıʇuⱯ", "ctnhcore.superconducting_penning_trap.antiproton": "%d :ʇunoɯɐ uoʇoɹdıʇuⱯ", + "ctnhcore.superconducting_penning_trap.insufficientpower": "unɹ ʇouuɐɔ ǝuıɥɔɐɯ ǝɥʇ 'ʎןddns ɹǝʍod snonuıʇuoɔ ɐ spǝǝu pןǝıɟ ʇuǝɯuıɐʇuoɔ ǝɥʇ :ɹǝʍod ʇuǝıɔıɟɟnsuI", "ctnhcore.superconducting_penning_trap.noenergywaring": "¡ןıɐɟ oʇ ʇnoqɐ sı pןǝıɟ ʇuǝɯuıɐʇuoɔ ǝɥʇ ؛ɹǝʍod ʇuǝıɔıɟɟnsuı :buıuɹɐMɔ§", "ctnhcore.superconducting_penning_trap.restoredanger": "sןɐıɹǝʇɐɯ snopɹɐzɐɥ uıɐʇuoƆ", "ctnhcore.superconducting_penning_trap.trapelectricmax": "∩Ǝ %d :ɹǝʍod pǝɹoʇs ɯnɯıxɐW", @@ -1000,6 +1009,9 @@ "ctnhcore.voidminerprocessingmachine.voidminerinfooverheat": "¡¡¡buıʇɐǝɥɹǝʌO", "ctnhcore.voidminerprocessingmachine.voidminerinfopyrotheum": " %d :uoıʇdɯnsuoɔ ɯnǝɥʇoɹʎԀ", "ctnhcore.wideparticleaccelerator.connect": "pǝɥsıןqɐʇsǝ uoıʇɔǝuuoƆ", + "ctnhcore.wideparticleaccelerator.electricspeedinsufficient": "ΛǝW ɟᄅ˙% ʎןuo ʎןʇuǝɹɹnɔ 'ΛǝW ɟᄅ˙% spǝǝu ǝdıɔǝɹ ǝɥʇ :ʍoן ooʇ ʎʇıɔoןǝʌ uoɹʇɔǝןƎ", + "ctnhcore.wideparticleaccelerator.nuspeedinsufficient": "ΛǝW ɟᄅ˙% ʎןuo ʎןʇuǝɹɹnɔ 'ΛǝW ɟᄅ˙% spǝǝu ǝdıɔǝɹ ǝɥʇ :ʍoן ooʇ ʎʇıɔoןǝʌ uoɹʇnǝN", + "ctnhcore.wideparticleaccelerator.protonspeedinsufficient": "ΛǝW ɟᄅ˙% ʎןuo ʎןʇuǝɹɹnɔ 'ΛǝW ɟᄅ˙% spǝǝu ǝdıɔǝɹ ǝɥʇ :ʍoן ooʇ ʎʇıɔoןǝʌ uoʇoɹԀ", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoconsume": "ɟᄅ˙% :ɹǝıןdıʇןnW uoıʇdɯnsuoƆ ɹǝʍoԀ", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoelectricspeed": "ΛǝW ɟᄅ˙% :ʎʇıɔoןǝΛ uoɹʇɔǝןƎ", "ctnhcore.wideparticleaccelerator.wideacceleratorinfonuspeed": "ΛǝW ɟᄅ˙% :ʎʇıɔoןǝΛ uoɹʇnǝN", @@ -1131,7 +1143,7 @@ "item.ctnhcore.circuit_board_m_two": "ᄅW pɹɐoᗺ ʇınɔɹıƆ", "item.ctnhcore.clgs": "ןןǝƆ S⅁ꞀƆ", "item.ctnhcore.clgs_electrode": "ǝpoɹʇɔǝןƎ S⅁ꞀƆ", - "item.ctnhcore.coke_oven_brick_mud": "pnW ʞɔıɹᗺ uǝʌO ǝʞoƆ", + "item.ctnhcore.coke_clay": "ʎɐןƆ ǝʞoƆ", "item.ctnhcore.colorful_soc": "ƆOS ןnɟɹoןoƆ", "item.ctnhcore.computer_advanced_circuit": "dıɥƆ ɹǝʇndɯoƆ pǝɔuɐʌpⱯ", "item.ctnhcore.computer_circuit": "dıɥƆ ɹǝʇndɯoƆ", diff --git a/src/generated/resources/assets/ctnhcore/lang/en_us.json b/src/generated/resources/assets/ctnhcore/lang/en_us.json index 70181964..dc34e3d3 100644 --- a/src/generated/resources/assets/ctnhcore/lang/en_us.json +++ b/src/generated/resources/assets/ctnhcore/lang/en_us.json @@ -406,6 +406,7 @@ "ctnhcore.arc_generator.arcgeneratorinfo1": "Current Arc Intensity: %d", "ctnhcore.arc_generator.arcgeneratorinfo2": "Max Supported Efficiency: %.2f%%", "ctnhcore.arc_generator.arcgeneratorinfo3": "Current Efficiency: %.2f%%", + "ctnhcore.arc_generator.arcintensityinsufficient": "Insufficient arc intensity: this recipe needs %d, currently %d", "ctnhcore.arc_reactor.arcreactorarc": "Output Arc Intensity: %d", "ctnhcore.arc_reactor.arcreactorconnect": "§bBridge Enabled§r", "ctnhcore.astronomicalmachine.astronomicalinfoinvalid": "Can only be used at night", @@ -510,6 +511,7 @@ "ctnhcore.idroneitem.itemdroneeut": "Voltage generated by one drone: %d EU/t", "ctnhcore.idroneitem.itemdronetier": "Drone Tier: %d", "ctnhcore.industrialprimitiveblastfurnacemachine.industrialprimitiveblastfurnaceinfoparallelcount": "Parallel count: %d", + "ctnhcore.kineticelectricmultiblockmachine.insufficientkineticspeed": "Insufficient kinetic speed: currently %d, at least 64 required", "ctnhcore.largenaquadahreactormachine.power": "Power: %s", "ctnhcore.machinemodefancyconfiguratortest.cryotheumfreezerui1": "Current freezer speed: %.2f / %.2f", "ctnhcore.machinemodefancyconfiguratortest.cryotheumfreezerui2": "Open Upgrade Panel", @@ -533,6 +535,7 @@ "ctnhcore.meadvancedterminalbehavior.itemmeadvancedterminalsetting7tooltip": "Place blocks in fluids (0: disabled, 1: enabled)\nWhen enabled, fluids in the space are treated as empty space\nWhen enabled together with Place Fluids, fluids will not be placed in fluids", "ctnhcore.meadvancedterminalbehavior.itemmeadvancedterminalsettingtitle": "Multiblock Formation Settings", "ctnhcore.mechanical.mechanicallathestructure": "The lathe in the structure must be placed exactly as shown in EMI's structure information, including position and orientation", + "ctnhcore.megaturbinemachine.missingrotorholder": "No rotor holder found; the multiblock structure is incomplete", "ctnhcore.multiblocksa.advancedcokeoventooltip0": "Advanced Coke Oven", "ctnhcore.multiblocksa.advancedcokeoventooltip1": "§6§lComes with 32 parallelism", "ctnhcore.multiblocksa.advancedcokeoventooltip2": "Can only run coke oven recipes, and recipe time is fixed at 15 seconds", @@ -903,12 +906,15 @@ "ctnhcore.ore_vein.zanite_vein_at": "Aether Zanite Vein", "ctnhcore.ore_vein.zinc_vein_ow": "Overworld Zinc Vein", "ctnhcore.ore_vein.zirkelite_vein": "Zirkelite Vein", + "ctnhcore.photovoltaicdronestation.onlyinorbit": "Mining recipes can only run in orbit dimensions", "ctnhcore.photovoltaicdronestation.pvdroneinfot1": "Power supplied: %d", "ctnhcore.photovoltaicdronestation.pvdroneinfot2": "Drone consumption chance: %.4f", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfo1": "Efficiency: %s%%", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfo2": "Generating: %s/%s EU/t", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfoinvalid": "Shadowed", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfonight": "At night", + "ctnhcore.plasmaalloyblast.coiltiertoolow": "Coil temperature too low: cannot provide a parallel tier (requires a coil of at least 1800K)", + "ctnhcore.plasmaalloyblast.missingplasma": "Missing plasma: no valid plasma input was consumed", "ctnhcore.ponder.assembly_line_building.header": "How to automate Assembly Line", "ctnhcore.ponder.assembly_line_building.text_1": "First, place an Assembly Line controller.", "ctnhcore.ponder.assembly_line_building.text_10": "Encode the one-click pattern with the '+' button, then set the pattern provider lock mode to wait for the main product.", @@ -971,8 +977,10 @@ "ctnhcore.scalablereservoircomputingmachine.ctnhsrcsacrificelocked": "Sacrifice LOCKED", "ctnhcore.scalablereservoircomputingmachine.ctnhsrcsacrificeunlocked": "Sacrifice UNLOCKED", "ctnhcore.scalablereservoircomputingmachine.ctnhsrcwetwareduration": "Wetware duration: %s ticks", + "ctnhcore.sinopechemical.coiltiertoolow": "Coil temperature too low: cannot compute the acceleration tier (requires a coil of at least 1800K)", "ctnhcore.sinopechemical.sinopechemicalinfolevel": "Coil Accelerating Rate: %d", "ctnhcore.sinopechemical.sinopechemicalinfoparallel": "Parallel Count: %d", + "ctnhcore.slaughterhousemachine.nomobtoslaughter": "No mob to slaughter: insert a powered spawner holding entity data", "ctnhcore.slaughterhousemachine.slaughterhouseinfomobcount": "Mob Types: %d (%s)", "ctnhcore.spacephotovoltaicbasestation.orbit_only": "Needs orbit enviroment to run this recipe", "ctnhcore.spacephotovoltaicbasestation.spacephotovoltaicbasestationinfopvctier0": "Current photovoltaic block tier: %d", @@ -982,6 +990,7 @@ "ctnhcore.superconducting_penning_trap.antielectric": "Positron amount: %d", "ctnhcore.superconducting_penning_trap.antinu": "Antineutron amount: %d", "ctnhcore.superconducting_penning_trap.antiproton": "Antiproton amount: %d", + "ctnhcore.superconducting_penning_trap.insufficientpower": "Insufficient power: the containment field needs a continuous power supply, the machine cannot run", "ctnhcore.superconducting_penning_trap.noenergywaring": "§cWarning: insufficient power; the containment field is about to fail!", "ctnhcore.superconducting_penning_trap.restoredanger": "Contain hazardous materials", "ctnhcore.superconducting_penning_trap.trapelectricmax": "Maximum stored power: %d EU", @@ -1000,6 +1009,9 @@ "ctnhcore.voidminerprocessingmachine.voidminerinfooverheat": "Overheating!!!", "ctnhcore.voidminerprocessingmachine.voidminerinfopyrotheum": "Pyrotheum consumption: %d ", "ctnhcore.wideparticleaccelerator.connect": "Connection established", + "ctnhcore.wideparticleaccelerator.electricspeedinsufficient": "Electron velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV", + "ctnhcore.wideparticleaccelerator.nuspeedinsufficient": "Neutron velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV", + "ctnhcore.wideparticleaccelerator.protonspeedinsufficient": "Proton velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoconsume": "Power Consumption Multiplier: %.2f", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoelectricspeed": "Electron Velocity: %.2f MeV", "ctnhcore.wideparticleaccelerator.wideacceleratorinfonuspeed": "Neutron Velocity: %.2f MeV", @@ -1131,7 +1143,7 @@ "item.ctnhcore.circuit_board_m_two": "Circuit Board M2", "item.ctnhcore.clgs": "CLGS Cell", "item.ctnhcore.clgs_electrode": "CLGS Electrode", - "item.ctnhcore.coke_oven_brick_mud": "Coke Oven Brick Mud", + "item.ctnhcore.coke_clay": "Coke Clay", "item.ctnhcore.colorful_soc": "Colorful SOC", "item.ctnhcore.computer_advanced_circuit": "Advanced Computer Chip", "item.ctnhcore.computer_circuit": "Computer Chip", diff --git a/src/generated/resources/assets/ctnhcore/lang/zh_cn.json b/src/generated/resources/assets/ctnhcore/lang/zh_cn.json index 6364e1d3..672a8bab 100644 --- a/src/generated/resources/assets/ctnhcore/lang/zh_cn.json +++ b/src/generated/resources/assets/ctnhcore/lang/zh_cn.json @@ -406,6 +406,7 @@ "ctnhcore.arc_generator.arcgeneratorinfo1": "电弧强度:%d", "ctnhcore.arc_generator.arcgeneratorinfo2": "支持最大效率:%.2f%%", "ctnhcore.arc_generator.arcgeneratorinfo3": "当前效率:%.2f%%", + "ctnhcore.arc_generator.arcintensityinsufficient": "电弧强度不足：本次配方需要 %d，当前仅有 %d", "ctnhcore.arc_reactor": "电弧发生", "ctnhcore.arc_reactor.arcreactorarc": "可输出的电弧强度:%d", "ctnhcore.arc_reactor.arcreactorconnect": "§b桥接已启用§r", @@ -541,6 +542,7 @@ "ctnhcore.industrial_altar": "§4工业血之祭坛§r", "ctnhcore.industrialprimitiveblastfurnacemachine.industrialprimitiveblastfurnaceinfoparallelcount": "并行数：%d", "ctnhcore.ion_exchanger": "离子交换", + "ctnhcore.kineticelectricmultiblockmachine.insufficientkineticspeed": "动力转速不足：当前 %d，至少需要 64", "ctnhcore.large_naquadah_reactor": "大型硅岩反应", "ctnhcore.largenaquadahreactormachine.power": "发电倍率: %s", "ctnhcore.laser_sorter_recipe": "激光分配", @@ -574,6 +576,7 @@ "ctnhcore.mechanical_mixer_recipes": "机械搅拌", "ctnhcore.mechanical_pressor_recipes": "机械辊压", "ctnhcore.mechanical_sifter_recipes": "机械筛选", + "ctnhcore.megaturbinemachine.missingrotorholder": "未找到涡轮转子支架，多方块结构不完整", "ctnhcore.multiblocksa.advancedcokeoventooltip0": "高级焦炉", "ctnhcore.multiblocksa.advancedcokeoventooltip1": "§6§l自带32并行", "ctnhcore.multiblocksa.advancedcokeoventooltip2": "只可运行焦炉配方,且运行配方时间固定为15s", @@ -954,6 +957,7 @@ "ctnhcore.phase_inversion": "反相蚀刻", "ctnhcore.photovoltaic_assember": "太空光伏组装", "ctnhcore.photovoltaic_generator": "光伏发电", + "ctnhcore.photovoltaicdronestation.onlyinorbit": "只能在轨道维度执行挖矿配方", "ctnhcore.photovoltaicdronestation.pvdroneinfot1": "提供的能量:%d", "ctnhcore.photovoltaicdronestation.pvdroneinfot2": "无人机消耗概率:%.4f", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfo1": "发电效率：%s%%", @@ -961,6 +965,8 @@ "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfoinvalid": "有方块阻挡", "ctnhcore.photovoltaicpowerstationmachine.photovoltaicpowerstationinfonight": "光照过于微弱", "ctnhcore.plasma_condenser": "等离子冷凝", + "ctnhcore.plasmaalloyblast.coiltiertoolow": "线圈温度不足：无法提供并行等级（至少需要 1800K 的线圈）", + "ctnhcore.plasmaalloyblast.missingplasma": "缺少等离子体：没有消耗任何有效的等离子体输入", "ctnhcore.ponder.assembly_line_building.header": "如何自动化装配线", "ctnhcore.ponder.assembly_line_building.text_1": "首先放置装配线主方块。", "ctnhcore.ponder.assembly_line_building.text_10": "使用“+”按钮编码一键模板，并将样板供应器锁定模式改为等待主产物返回。", @@ -1032,10 +1038,12 @@ "ctnhcore.scalablereservoircomputingmachine.ctnhsrcwetwareduration": "湿件剩余存活时间: %s ticks", "ctnhcore.silica_rock_fuel_refinery": "硅岩燃料精炼", "ctnhcore.sinope": "规模化化工", + "ctnhcore.sinopechemical.coiltiertoolow": "线圈温度不足：无法计算加速等级（至少需要 1800K 的线圈）", "ctnhcore.sinopechemical.sinopechemicalinfolevel": "线圈加速倍率:%d", "ctnhcore.sinopechemical.sinopechemicalinfoparallel": "并行数:%d", "ctnhcore.sintering_kiln": "烧结", "ctnhcore.slaughter_house": "屠宰场", + "ctnhcore.slaughterhousemachine.nomobtoslaughter": "没有可宰杀的怪物：请放入带有实体数据的电动刷怪笼", "ctnhcore.slaughterhousemachine.slaughterhouseinfomobcount": "怪物种类：%d (%s)", "ctnhcore.solvent_extraction": "溶剂萃取", "ctnhcore.spacephotovoltaicbasestation.orbit_only": "该配方需要在空间站维度运行", @@ -1046,6 +1054,7 @@ "ctnhcore.superconducting_penning_trap.antielectric": "反电子量:%d", "ctnhcore.superconducting_penning_trap.antinu": "反中子量:%d", "ctnhcore.superconducting_penning_trap.antiproton": "反质子量:%d", + "ctnhcore.superconducting_penning_trap.insufficientpower": "供电不足：约束场需要持续供电，机器无法运行", "ctnhcore.superconducting_penning_trap.noenergywaring": "§c警告：供电不足，约束场即将失效！", "ctnhcore.superconducting_penning_trap.restoredanger": "约束危险物质", "ctnhcore.superconducting_penning_trap.trapelectricmax": "允许存储电量上限:%deu", @@ -1069,6 +1078,9 @@ "ctnhcore.voidminerprocessingmachine.voidminerinfopyrotheum": "烈焰之炽焱消耗：%d ", "ctnhcore.water_power": "水力发电", "ctnhcore.wideparticleaccelerator.connect": "连接已搭建", + "ctnhcore.wideparticleaccelerator.electricspeedinsufficient": "电子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV", + "ctnhcore.wideparticleaccelerator.nuspeedinsufficient": "中子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV", + "ctnhcore.wideparticleaccelerator.protonspeedinsufficient": "质子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoconsume": "电量消耗倍率:%.2f", "ctnhcore.wideparticleaccelerator.wideacceleratorinfoelectricspeed": "电子速度:%.2fMev", "ctnhcore.wideparticleaccelerator.wideacceleratorinfonuspeed": "中子速度:%.2fMev", diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/KineticElectricMultiblockMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/KineticElectricMultiblockMachine.java index ef0d773b..c418bc6b 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/KineticElectricMultiblockMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/KineticElectricMultiblockMachine.java @@ -30,6 +30,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; +import com.ctnhlang.CN; +import com.ctnhlang.EN; import com.mo_guang.ctpp.common.blockentity.IKineticBlockEntityExtension; import com.mo_guang.ctpp.common.blockentity.KineticMachineBlockEntity; import com.mo_guang.ctpp.common.machine.IKineticMachine; @@ -38,6 +40,7 @@ import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.longs.LongSets; import org.jetbrains.annotations.NotNull; +import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; import java.util.ArrayList; import java.util.List; @@ -46,6 +49,10 @@ public class KineticElectricMultiblockMachine extends RecipeMultiblockMachine implements IFancyUIMachine, IDisplayUIMachine, ITieredMachine, IOverclockMachine { + @CN("动力转速不足：当前 %d，至少需要 64") + @EN("Insufficient kinetic speed: currently %d, at least 64 required") + public static Lang insufficientKineticSpeed; + public KineticElectricMultiblockMachine(IMachineBlockEntity holder) { super(holder, new Object[0]); } @@ -255,7 +262,7 @@ public Component beforeWorking(@NotNull GTRecipe recipe) { this.updateRotateBlocks(true); } if (this.speed < 64) { - return Component.translatable("gtceu.recipe_logic.insufficient_in"); + return insufficientKineticSpeed.translate((int) this.speed); } return null; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/SlaughterHouseMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/SlaughterHouseMachine.java index e0b33a32..c2e5b673 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/SlaughterHouseMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/SlaughterHouseMachine.java @@ -70,6 +70,10 @@ public class SlaughterHouseMachine extends RecipeElectricMultiblockMachine imple @EN("Mob Types: %d (%s)") public static Lang slaughterHouseInfoMobcount; + @CN("没有可宰杀的怪物：请放入带有实体数据的电动刷怪笼") + @EN("No mob to slaughter: insert a powered spawner holding entity data") + public static Lang noMobToSlaughter; + @Persisted public final NotifiableItemStackHandler machineStorage; public UUID uuid = UUID.randomUUID(); @@ -243,7 +247,7 @@ public Component beforeWorking(@NotNull GTRecipe recipe) { var failReason = super.beforeWorking(recipe); if (failReason != null) return failReason; ensureMobListUpToDate(); - return mobList.isEmpty() ? RecipeModifier.DEFAULT_FAILURE : null; + return mobList.isEmpty() ? noMobToSlaughter.translate() : null; } public void resetMobList() { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/BlazeBlastFurnaceMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/BlazeBlastFurnaceMachine.java index 126c1b14..cd8d3671 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/BlazeBlastFurnaceMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/BlazeBlastFurnaceMachine.java @@ -1,7 +1,6 @@ package io.github.cpearl0.ctnhcore.common.machine.multiblock.electric; import io.github.cpearl0.ctnhcore.registry.material.CTNHMaterials; -import io.github.cpearl0.ctnhcore.utils.CTNHCommonTooltips; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; @@ -88,9 +87,7 @@ public void addDisplayText(@NotNull List textList) { } public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { - int parallel = ParallelLogic.getParallelAmount(group, recipe, 8); - if (parallel == 0) - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + int parallel = Math.max(1, ParallelLogic.getParallelAmount(group, recipe, 8)); recipe.multiplyEUt(0.5); recipe.multiplyAllContents(parallel); recipe.parallels *= parallel; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/CryotheumFreezer.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/CryotheumFreezer.java index 223b840d..c1b78c6e 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/CryotheumFreezer.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/CryotheumFreezer.java @@ -102,7 +102,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.parallels *= parallel; return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(CryotheumFreezer.class, machine); } @Override diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/FactoryMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/FactoryMachine.java index 6d85bb4f..2e903eec 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/FactoryMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/FactoryMachine.java @@ -2,7 +2,6 @@ import io.github.cpearl0.ctnhcore.registry.CTNHItems; import io.github.cpearl0.ctnhcore.registry.CTNHRecipeModifiers; -import io.github.cpearl0.ctnhcore.utils.CTNHCommonTooltips; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.gui.GuiTextures; @@ -234,7 +233,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g var recipeType = recipe.recipeType; var recipeTier = recipe.tier; if (fmachine.basicRate == 0) { - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + return no_suitable_machine.translate(); } recipe.multiplyDuration(2 / fmachine.basicRate * Math.pow(recipeTier, 2)); if (recipeType.equals(GTRecipeTypes.CENTRIFUGE_RECIPES)) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/LaserSorter.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/LaserSorter.java index 46d6a133..d3719df4 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/LaserSorter.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/LaserSorter.java @@ -74,6 +74,6 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g } return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(LaserSorter.class, machine); } } diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/PlasmaAlloyBlast.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/PlasmaAlloyBlast.java index f1e79a1a..791f44d0 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/PlasmaAlloyBlast.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/PlasmaAlloyBlast.java @@ -17,6 +17,9 @@ import net.minecraft.network.chat.Component; +import com.ctnhlang.CN; +import com.ctnhlang.EN; +import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; import tech.vixhentx.mcmod.ctnhlib.utils.MachineUtils; import static com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys.PLASMA; @@ -24,6 +27,14 @@ public class PlasmaAlloyBlast extends CoilWorkableElectricMultiblockMachine { + @CN("线圈温度不足：无法提供并行等级（至少需要 1800K 的线圈）") + @EN("Coil temperature too low: cannot provide a parallel tier (requires a coil of at least 1800K)") + public static Lang coilTierTooLow; + + @CN("缺少等离子体：没有消耗任何有效的等离子体输入") + @EN("Missing plasma: no valid plasma input was consumed") + public static Lang missingPlasma; + public PlasmaAlloyBlast(IMachineBlockEntity holder) { super(holder); } @@ -48,6 +59,7 @@ public void onStructureFormed() { public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { if (machine instanceof PlasmaAlloyBlast pmachine) { + if (pmachine.machine_level <= 0) return coilTierTooLow.translate(); var speed = 1.0; var output = 1.0; var eut = 1.0; @@ -93,7 +105,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g output = 0.5 * (Math.random()); } if (speed <= 0.5) { - return RecipeModifier.DEFAULT_FAILURE; + return missingPlasma.translate(); } recipe.multiplyInputs(parallel); recipe.multiplyOutputs((int) (parallel * output)); @@ -102,6 +114,6 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.parallels *= parallel; return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(PlasmaAlloyBlast.class, machine); } } diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SinopeChemical.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SinopeChemical.java index 572f8be3..ebe9dfa5 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SinopeChemical.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SinopeChemical.java @@ -34,6 +34,9 @@ public class SinopeChemical extends CoilWorkableElectricMultiblockMachine implem @EN("Parallel Count: %d") public static Lang sinopeChemicalInfoParallel; + @CN("线圈温度不足：无法计算加速等级（至少需要 1800K 的线圈）") + @EN("Coil temperature too low: cannot compute the acceleration tier (requires a coil of at least 1800K)") + public static Lang coilTierTooLow; public int parallel = 0; public int machine_tier = 0; @@ -63,6 +66,7 @@ public void onStructureFormed() { public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { if (machine instanceof SinopeChemical zmachine) { + if (zmachine.machine_tier <= 0) return coilTierTooLow.translate(); var maxparallel = ParallelLogic.getParallelAmount(group, recipe, zmachine.parallel); if (maxparallel == 0) return null; var reduce = Math.max(1 - 0.005 * maxparallel, 0.75); @@ -73,7 +77,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.parallels *= maxparallel; return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(SinopeChemical.class, machine); } public void addDisplayText(List textList) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SpacePhotovoltaicBaseStation.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SpacePhotovoltaicBaseStation.java index 769b160e..6b65fb0a 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SpacePhotovoltaicBaseStation.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/SpacePhotovoltaicBaseStation.java @@ -187,7 +187,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g return null; } } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(SpacePhotovoltaicBaseStation.class, machine); } public void addDisplayText(List textList) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/Superconducting_Penning_Trap.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/Superconducting_Penning_Trap.java index 63f24730..c0aeb5e6 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/Superconducting_Penning_Trap.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/Superconducting_Penning_Trap.java @@ -55,6 +55,10 @@ public class Superconducting_Penning_Trap extends RecipeElectricMultiblockMachin @EN("Current stored power: %d EU") public static Lang trapElectric; + @CN("供电不足：约束场需要持续供电，机器无法运行") + @EN("Insufficient power: the containment field needs a continuous power supply, the machine cannot run") + public static Lang insufficientPower; + @CN("允许存储电量上限:%deu") @EN("Maximum stored power: %d EU") public static Lang trapElectricMax; @@ -150,7 +154,7 @@ private void consumeEnergy() { if (tickwarring >= 100) { doExplosion(3f); } - getRecipeLogic().setWaiting(Component.translatable("gtceu.recipe_logic.insufficient_in")); + getRecipeLogic().setWaiting(insufficientPower.translate()); } } else { this.energyContainer.removeEnergy(this.energyContainer.getEnergyStored()); @@ -159,7 +163,7 @@ private void consumeEnergy() { if (tickwarring > 200 && danger()) { doExplosion(9f); } - getRecipeLogic().setWaiting(Component.translatable("gtceu.recipe_logic.insufficient_in")); + getRecipeLogic().setWaiting(insufficientPower.translate()); } } diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/WideParticleAccelerator.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/WideParticleAccelerator.java index 8f85b6aa..2a8cdbaa 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/WideParticleAccelerator.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/electric/WideParticleAccelerator.java @@ -1,7 +1,6 @@ package io.github.cpearl0.ctnhcore.common.machine.multiblock.electric; import io.github.cpearl0.ctnhcore.common.gui.WPAAcceleratorGui; -import io.github.cpearl0.ctnhcore.utils.CTNHCommonTooltips; import com.gregtechceu.gtceu.api.capability.IParallelHatch; import com.gregtechceu.gtceu.api.gui.fancy.TabsWidget; @@ -18,6 +17,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.handler.RecipeHandlerGroup; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; +import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; @@ -66,6 +66,18 @@ public class WideParticleAccelerator extends RecipeElectricMultiblockMachine @EN("Proton Velocity: %.2f MeV") public static Lang wideAcceleratorInfoProtonSpeed; + @CN("中子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV") + @EN("Neutron velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV") + public static Lang nuSpeedInsufficient; + + @CN("电子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV") + @EN("Electron velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV") + public static Lang electricSpeedInsufficient; + + @CN("质子速度不足：配方需要 %.2f MeV，当前仅 %.2f MeV") + @EN("Proton velocity too low: the recipe needs %.2f MeV, currently only %.2f MeV") + public static Lang protonSpeedInsufficient; + @Persisted @Getter public double nu_speed = 0; @@ -250,15 +262,17 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g } // 速度不足 if (recipe.data.getString("type").equals("nu") && recipe.data.getDouble("speed") >= wmachine.nu_speed) { - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + return nuSpeedInsufficient.translate(recipe.data.getDouble("speed"), wmachine.nu_speed); } if (recipe.data.getString("type").equals("element") && recipe.data.getDouble("speed") >= wmachine.electric_speed) { - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + return electricSpeedInsufficient.translate(recipe.data.getDouble("speed"), + wmachine.electric_speed); } if (recipe.data.getString("type").equals("proton") && recipe.data.getDouble("speed") >= wmachine.proton_speed) { - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + return protonSpeedInsufficient.translate(recipe.data.getDouble("speed"), + wmachine.proton_speed); } // 计算并行 int parallel = 1; @@ -354,7 +368,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.multiplyDuration(Math.max(0.1, muti)); return null; } - return CTNHCommonTooltips.gtceuRecipeModifierDefaultFail.translate(); + return RecipeModifier.nullWrongType(WideParticleAccelerator.class, machine); } @Override diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/Arc_Generator.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/Arc_Generator.java index df009ab2..68929dd0 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/Arc_Generator.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/Arc_Generator.java @@ -35,6 +35,10 @@ public class Arc_Generator extends RecipeElectricMultiblockMachine implements IT @EN("Current Efficiency: %.2f%%") public static Lang arcgeneratorInfo3; + @CN("电弧强度不足：本次配方需要 %d，当前仅有 %d") + @EN("Insufficient arc intensity: this recipe needs %d, currently %d") + public static Lang arcIntensityInsufficient; + public int arc = 0; public int arc_max = 0; public double efficiency = 0; @@ -49,10 +53,11 @@ public Arc_Generator(IMachineBlockEntity holder, double efficiency, int arc_max) @Override public Component beforeWorking(@NotNull GTRecipe recipe) { - if (arc < recipe.data.getInt("requirearc")) { - return RecipeModifier.DEFAULT_FAILURE; + var requiredArc = recipe.data.getInt("requirearc"); + if (arc < requiredArc) { + return arcIntensityInsufficient.translate(requiredArc, arc); } - arc -= recipe.data.getInt("requirearc") / 10; + arc -= requiredArc / 10; arc = Math.max(0, arc); return super.beforeWorking(recipe); @@ -68,7 +73,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.multiplyEUt(rotor); return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(Arc_Generator.class, machine); } public void addDisplayText(List textList) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/ChemicalGeneratorMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/ChemicalGeneratorMachine.java index df4a995a..0fd29d6b 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/ChemicalGeneratorMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/ChemicalGeneratorMachine.java @@ -12,7 +12,6 @@ import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeCombustionEngineMachine; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.lowdragmc.lowdraglib.side.fluid.FluidHelper; @@ -64,20 +63,19 @@ protected GTRecipe getBoostRecipe() { public static Component recipeModifier(@NotNull MetaMachine machine, RecipeHandlerGroup group, @NotNull GTRecipe recipe) { if (!(machine instanceof ChemicalGeneratorMachine engineMachine)) { - return RecipeModifier.nullWrongType(LargeCombustionEngineMachine.class, machine); + return RecipeModifier.nullWrongType(ChemicalGeneratorMachine.class, machine); } long EUt = recipe.getOutputEUt(); - // has lubricant - if (EUt > 0) { - int maxParallel = (int) (engineMachine.getOverclockVoltage() / EUt); // get maximum parallel - int actualParallel = ParallelLogic.getParallelAmount(group, recipe, maxParallel); - double eutMultiplier = engineMachine.getProductionBoost(); - recipe.multiplyAllContents(actualParallel); - recipe.multiplyEUt(eutMultiplier); - recipe.parallels *= actualParallel; - return null; - } - return RecipeModifier.DEFAULT_FAILURE; + if (EUt <= 0) return null; + + int maxParallel = (int) (engineMachine.getOverclockVoltage() / EUt); // get maximum parallel + if (maxParallel <= 0) return null; + int actualParallel = ParallelLogic.getParallelAmount(group, recipe, maxParallel); + double eutMultiplier = engineMachine.getProductionBoost(); + recipe.multiplyAllContents(actualParallel); + recipe.multiplyEUt(eutMultiplier); + recipe.parallels *= actualParallel; + return null; } protected double getProductionBoost() { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/HyperPlasmaTurbineMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/HyperPlasmaTurbineMachine.java index a7af4965..61e0a139 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/HyperPlasmaTurbineMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/HyperPlasmaTurbineMachine.java @@ -171,12 +171,12 @@ public static Component recipeModifier(@NotNull MetaMachine machine, RecipeHandl final long EUt = recipe.getOutputEUt(); final long turbineMaxVoltage = hptm.getOverclockVoltage(); - - if (EUt <= 0 || turbineMaxVoltage <= EUt) return RecipeModifier.DEFAULT_FAILURE; + if (EUt <= 0) return null; // get the amount of parallel required to match the desired output voltage final double euMultiplier = getEfficiency(); final int maxParallel = (int) (turbineMaxVoltage / EUt); + if (maxParallel <= 0) return null; final int actualParallel = ParallelLogic.getParallelAmountFast(group, recipe, maxParallel); final long actualEUt = EUt * actualParallel; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java index 276fb7e1..132ddda5 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java @@ -1,6 +1,5 @@ package io.github.cpearl0.ctnhcore.common.machine.multiblock.generator; -import io.github.cpearl0.ctnhcore.registry.CTNHRecipeTypes; import io.github.cpearl0.ctnhcore.registry.material.CTNHMaterials; import com.gregtechceu.gtceu.api.capability.recipe.IO; @@ -60,7 +59,6 @@ public LargeNaquadahReactorMachine(IMachineBlockEntity holder, Object... args) { private Fluid lockFluid = null; public static Component modifyRecipe(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { - if (recipe.recipeType != CTNHRecipeTypes.LARGE_NAQUADAH_REACTOR_RECIPES) return RecipeModifier.DEFAULT_FAILURE; if (machine instanceof LargeNaquadahReactorMachine lmachine) { lmachine.checkHatch(lmachine, recipe.duration); if (!lmachine.hasAir) { @@ -71,7 +69,7 @@ public static Component modifyRecipe(MetaMachine machine, RecipeHandlerGroup gro recipe.multiplyEUt(lmachine.getFinalPowerRate()); return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(LargeNaquadahReactorMachine.class, machine); } private void checkHatch(LargeNaquadahReactorMachine machine, int duration) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/MegaTurbineMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/MegaTurbineMachine.java index d0770453..d4b01cad 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/MegaTurbineMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/MegaTurbineMachine.java @@ -20,14 +20,21 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; +import com.ctnhlang.CN; +import com.ctnhlang.EN; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; import java.util.List; public class MegaTurbineMachine extends RecipeElectricMultiblockMachine implements ITieredMachine { + @CN("未找到涡轮转子支架，多方块结构不完整") + @EN("No rotor holder found; the multiblock structure is incomplete") + public static Lang missingRotorHolder; + public static final int MIN_DURABILITY_TO_WARN = 10; private final long BASE_EU_OUTPUT; @@ -80,13 +87,16 @@ public static Component recipeModifier(@NotNull MetaMachine machine, RecipeHandl } var rotorHolder = turbineMachine.getRotorHolder(); - if (rotorHolder == null) return RecipeModifier.DEFAULT_FAILURE; + if (rotorHolder == null) return missingRotorHolder.translate(); + if (!rotorHolder.hasRotor()) { + return Component.translatable("gtceu.recipe_modifier.missing_valid_turbine_rotor"); + } long EUt = recipe.getOutputEUt(); long turbineMaxVoltage = turbineMachine.getOverclockVoltage(); double holderEfficiency = rotorHolder.getTotalEfficiency() / 100.0; - if (EUt <= 0 || turbineMaxVoltage <= EUt || holderEfficiency <= 0) return RecipeModifier.DEFAULT_FAILURE; + if (EUt <= 0 || turbineMaxVoltage <= EUt || holderEfficiency <= 0) return null; // get the amount of parallel required to match the desired output voltage int maxParallel = (int) (turbineMaxVoltage / EUt); diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/NanoscaleTriboelectricGenerator.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/NanoscaleTriboelectricGenerator.java index efcee56a..4ac58455 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/NanoscaleTriboelectricGenerator.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/NanoscaleTriboelectricGenerator.java @@ -155,7 +155,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g } } - if (maxParallel <= 0) return RecipeModifier.DEFAULT_FAILURE; + maxParallel = Math.max(1, maxParallel); recipe.multiplyAllContents(maxParallel); recipe.multiplyDuration(Math.sqrt(maxParallel)); @@ -163,7 +163,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.parallels *= maxParallel; return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(NanoscaleTriboelectricGenerator.class, machine); } @Override diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/PhotoVoltaicDroneStation.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/PhotoVoltaicDroneStation.java index b2ff4252..eb702b39 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/PhotoVoltaicDroneStation.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/PhotoVoltaicDroneStation.java @@ -37,6 +37,10 @@ public class PhotoVoltaicDroneStation extends RecipeElectricMultiblockMachine { @EN("Drone consumption chance: %.4f") public static Lang pvdroneInfoT2; + @CN("只能在轨道维度执行挖矿配方") + @EN("Mining recipes can only run in orbit dimensions") + public static Lang onlyInOrbit; + public PhotoVoltaicDroneStation(IMachineBlockEntity holder, Object... args) { super(holder, args); } @@ -184,7 +188,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g // 运行非挖矿配方时对光伏进行强化 lmachine.eut = (int) eut; else if (!lmachine.orbit) // 只能在轨道维度挖矿 - return RecipeModifier.DEFAULT_FAILURE; + return onlyInOrbit.translate(); else { recipe.multiplyOutputs((int) (0.1 * Math.sqrt(lmachine.GetDronePower()))); return null; @@ -194,7 +198,7 @@ else if (!lmachine.orbit) // 只能在轨道维度挖矿 } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(PhotoVoltaicDroneStation.class, machine); } public void addDisplayText(List textList) { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/WaterPowerStationMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/WaterPowerStationMachine.java index acc49930..605d5fc6 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/WaterPowerStationMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/generator/WaterPowerStationMachine.java @@ -34,7 +34,7 @@ public static Component recipeModifier(MetaMachine machine, RecipeHandlerGroup g recipe.multiplyEUt(wmachine.water * random * wmachine.efficiency / 100); return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(WaterPowerStationMachine.class, machine); } @Override diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/kinetic/MeadowMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/kinetic/MeadowMachine.java index 7215ff75..db36eed2 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/kinetic/MeadowMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/multiblock/kinetic/MeadowMachine.java @@ -67,6 +67,6 @@ public static Component stressCrossParallel(@NotNull MetaMachine machine, Recipe } return null; } - return RecipeModifier.DEFAULT_FAILURE; + return RecipeModifier.nullWrongType(KineticWorkableMultiblockMachine.class, machine); } } diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/simple/EfficiencyGeneratorMachine.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/simple/EfficiencyGeneratorMachine.java index f9a7bde8..4ee97f50 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/simple/EfficiencyGeneratorMachine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/simple/EfficiencyGeneratorMachine.java @@ -50,13 +50,12 @@ public static Component recipeModifier(@NotNull MetaMachine machine, RecipeHandl } long recipeEUt = recipe.getOutputEUt(); - if (recipeEUt <= 0) return RecipeModifier.DEFAULT_FAILURE; + if (recipeEUt <= 0) return null; int maxParallel = (int) (generator.getOverclockVoltage() / recipeEUt); - if (maxParallel <= 0) return RecipeModifier.DEFAULT_FAILURE; + if (maxParallel <= 0) return null; int parallels = ParallelLogic.getParallelAmountFast(group, recipe, maxParallel); - if (parallels <= 0) return RecipeModifier.DEFAULT_FAILURE; recipe.multiplyAllContents(parallels); recipe.parallels *= parallels; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/RecipeRemoval.java b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/RecipeRemoval.java index 07edb198..45ef4c52 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/RecipeRemoval.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/RecipeRemoval.java @@ -51,7 +51,6 @@ public static void remove(RecipeRemovalHelper.RemoveFilter filter) { * 最终在 {@code RecipeManagerApplyMixin} 中统一处理。 */ public static void init() { - // ===== 外部类删除（与 RecipeRemoval 同模块/相关模块） ===== EIORecipes.eioRemovals(); QuantumOmniRecipes.omniRemovals(); @@ -338,7 +337,6 @@ public static void functionalstorageRemovals() { } public static void gtceuRemovals() { - remove(new RemoveFilter().id("gtceu:shaped/ulv_machine_hull")); remove(new RemoveFilter().id("gtceu:large_chemical_reactor/hydrogen_peroxide")); remove(new RemoveFilter().id("gtceu:distillation/distill_fermented_biomass")); diff --git a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/PlatinumLine.java b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/PlatinumLine.java index f363a032..e67dc3d9 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/PlatinumLine.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/PlatinumLine.java @@ -71,7 +71,7 @@ public static void init(Consumer provider) { .duration(320) .save(provider); GTRecipeTypes.CHEMICAL_RECIPES.recipeBuilder(CTNHCore.id("ferrous_reduction_denitrated_solution")) - .inputFluids(PlatinumLineMaterials.DenitratedGoldPlatinumPalladiumSolution.getFluid(1000))//除硝金-铂-钯酸性溶液 + .inputFluids(PlatinumLineMaterials.DenitratedGoldPlatinumPalladiumSolution.getFluid(1000))// 除硝金-铂-钯酸性溶液 .inputFluids(PlatinumLineMaterials.FerrousSulfate.getFluid(1000))// 硫酸亚铁溶液 .outputFluids(PlatinumLineMaterials.FerricSulfate.getFluid(1000))// 硫酸铁溶液 .outputItems(dust, Gold, 1)// 金粉 @@ -428,4 +428,4 @@ public static void init(Consumer provider) { ChemicalHelper.get(TagPrefix.dust, PlatinumLineMaterials.PalladiumOre)) .EUt(60).save(provider); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/CTNHRecipeModifiers.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/CTNHRecipeModifiers.java index 014e53ad..98f9bc3a 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/CTNHRecipeModifiers.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/CTNHRecipeModifiers.java @@ -146,25 +146,6 @@ private static Component reduction(@NotNull GTRecipe recipe, double duration, do return null; } - public static Component naquadahReactor(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { - if (!(machine instanceof EfficiencyGeneratorMachine generator)) { - return RecipeModifier.nullWrongType(EfficiencyGeneratorMachine.class, machine); - } - - long recipeEUt = recipe.getOutputEUt(); - if (recipeEUt <= 0) return RecipeModifier.DEFAULT_FAILURE; - - int maxParallel = (int) (generator.getOverclockVoltage() / recipeEUt); - if (maxParallel <= 0) return RecipeModifier.DEFAULT_FAILURE; - - int multiplier = ParallelLogic.getParallelAmountFast(group, recipe, maxParallel); - if (multiplier <= 0) return RecipeModifier.DEFAULT_FAILURE; - - recipe.multiplyEUt(multiplier); - recipe.multiplyDuration(((double) generator.efficiency / 100) / multiplier); - return null; - } - public static Component rocketEngine(MetaMachine machine, RecipeHandlerGroup group, GTRecipe recipe) { return EfficiencyGeneratorMachine.recipeModifier(machine, group, recipe); } diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/CTNHMachines.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/CTNHMachines.java index c0279054..476acb24 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/CTNHMachines.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/CTNHMachines.java @@ -361,7 +361,7 @@ public static void init() { NAQUADAH_REACTOR = CTNHMachineUtils.registerEfficiencyGeneratorMachines( "naquadah_reactor", CTNHRecipeTypes.NAQUADAH_REACTOR_RECIPES, - CTNHRecipeModifiers::naquadahReactor, + EfficiencyGeneratorMachine::recipeModifier, tier -> tier * 32000, EfficiencyGeneratorMachine::naquadahReactor, tiersBetween(EV, UV)); diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/HyperPlasmaTurbineRegister.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/HyperPlasmaTurbineRegister.java index 2ce962e7..ca58c364 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/HyperPlasmaTurbineRegister.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/HyperPlasmaTurbineRegister.java @@ -16,6 +16,7 @@ import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.data.machines.GTResearchMachines; @@ -51,7 +52,7 @@ public static MultiblockMachineDefinition register() { .rotationState(RotationState.NON_Y_AXIS) .recipeType(GTRecipeTypes.PLASMA_GENERATOR_FUELS) .generator(true) - .recipeModifier(HyperPlasmaTurbineMachine::recipeModifier, true) + .recipeModifiers(true, GTRecipeModifiers.TIER_CHECK, HyperPlasmaTurbineMachine::recipeModifier) .appearanceBlock(NEUTRONIUM_REINFORCED_TURBINE_CASING) .pattern(definition -> { return FactoryBlockPattern.start() diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/MultiblocksA.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/MultiblocksA.java index 52fecd9d..a85dbed2 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/MultiblocksA.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/MultiblocksA.java @@ -2107,7 +2107,7 @@ public static MultiblockMachineDefinition registerChemicalGenerator(String name, .rotationState(RotationState.NON_Y_AXIS) .recipeType(CTNHRecipeTypes.CHEMICAL_GENERATOR) .generator(true) - .recipeModifier(ChemicalGeneratorMachine::recipeModifier, true) + .recipeModifiers(true, GTRecipeModifiers.TIER_CHECK, ChemicalGeneratorMachine::recipeModifier) .appearanceBlock(casing) .pattern(definition -> FactoryBlockPattern.start() .aisle("III", "PPP", "III") diff --git a/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java b/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java index ea6e3742..085fc38f 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java @@ -185,7 +185,7 @@ public static MachineDefinition[] registerEfficiencyGeneratorMachines(String nam .langValue("%s %s %s".formatted(VLVH[tier], toEnglishName(name), VLVT[tier])) .editableUI(SimpleGeneratorMachine.EDITABLE_UI_CREATOR.apply(CTNHCore.id(name), recipeType)) .rotationState(RotationState.NON_Y_AXIS) - .recipeModifier(recipeModifier) + .recipeModifiers(GTRecipeModifiers.TIER_CHECK, recipeModifier) .recipeType(recipeType) .simpleGeneratorModel(CTNHCore.id("block/generators/" + name)) .tooltips(