diff --git a/src/generated/resources/assets/gtocore/lang/en_ud.json b/src/generated/resources/assets/gtocore/lang/en_ud.json index 5dc9a8b9e..af461c53d 100644 --- a/src/generated/resources/assets/gtocore/lang/en_ud.json +++ b/src/generated/resources/assets/gtocore/lang/en_ud.json @@ -135,6 +135,7 @@ "block.gtocore.ancient_reactor_core": "ǝɹoƆ ɹoʇɔɐǝᴚ ʇuǝıɔuⱯ", "block.gtocore.annihilate_core": "ǝɹoƆ ǝʇɐןıɥıuuⱯ", "block.gtocore.annihilate_generator": "ɹɐʇS ןɐıɔıɟıʇɹⱯ", + "block.gtocore.anode_adsorption_resin": "uısǝᴚ uoıʇdɹospⱯ ǝpouⱯ", "block.gtocore.anti_entropy_computer_condensation_matrix": "xıɹʇɐW uoıʇɐsuǝpuoƆ ɹǝʇndɯoƆ ʎdoɹʇuƎ ıʇuⱯ", "block.gtocore.antifreeze_heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɟooɹdʇɐǝH ǝzǝǝɹɟıʇuⱯ", "block.gtocore.antimatter_containment_casing": "buısɐƆ ʇuǝɯuıɐʇuoƆ ɹǝʇʇɐɯıʇuⱯ", @@ -173,6 +174,7 @@ "block.gtocore.calcium_oxide_ceramic_anti_metal_corrosion_mechanical_block": "ʞɔoןᗺ ןɐɔıuɐɥɔǝW uoısoɹɹoƆ ןɐʇǝW ıʇuⱯ ɔıɯɐɹǝƆ ǝpıxO ɯnıɔןɐƆ", "block.gtocore.carving_center": "ɹǝʇuǝƆ buıʌɹɐƆ", "block.gtocore.catalyst_hatch": "ɥɔʇɐH ʇsʎןɐʇɐƆ", + "block.gtocore.cathode_adsorption_resin": "uısǝᴚ uoıʇdɹospⱯ ǝpoɥʇɐƆ", "block.gtocore.celestial_condenser": "ɹǝsuǝpuoƆ ןɐıʇsǝןǝƆ", "block.gtocore.celestial_matter_guidance_casing": "buısɐƆ ǝɔuɐpın⅁ ɹǝʇʇɐW ןɐıʇsǝןǝƆ", "block.gtocore.central_graviton_flow_modulator": "ɹoʇɐןnpoW ʍoןℲ uoʇıʌɐɹ⅁ ןɐɹʇuǝƆ", @@ -5852,6 +5854,7 @@ "item.gtocore.dragon_heart": "ʇɹɐǝH uobɐɹᗡ", "item.gtocore.dragon_stabilizer_core": "ǝɹoƆ ɹǝzıןıqɐʇS uobɐɹᗡ", "item.gtocore.dragon_stem_cells": "sןןǝƆ ɯǝʇS uobɐɹᗡ", + "item.gtocore.dual_uv_light": "ʇɥbıꞀ ʌ∩ ןɐnᗡ", "item.gtocore.dust_blizz": "zzıןᗺ ʇsnᗡ", "item.gtocore.dust_cryotheum": "ɯnǝɥʇoʎɹƆ ʇsnᗡ", "item.gtocore.dyson_swarm_module": "ǝןnpoW ɯɹɐʍS uosʎᗡ", @@ -6041,6 +6044,7 @@ "item.gtocore.highly_dense_polymer_plate": "ǝʇɐןԀ ɹǝɯʎןoԀ ǝsuǝᗡ ʎןɥbıH", "item.gtocore.highly_insulating_foil": "ןıoℲ buıʇɐןnsuI ʎןɥbıH", "item.gtocore.highly_reflective_mirror": "ɹoɹɹıW ǝʌıʇɔǝןɟǝᴚ ʎןɥbıH", + "item.gtocore.homogeneous_membrane": "ǝuɐɹqɯǝW snoǝuǝboɯoH", "item.gtocore.hot_iron_ingot": "ʇobuI uoɹI ʇoH", "item.gtocore.hui_circuit_1": "I-ʞW uoıʇɐʇsʞɹoM uoıʇɐןnɔןɐƆ ɥbıH", "item.gtocore.hui_circuit_1.tooltip": "puoɔǝS/suoıʇɐɹǝdO ʇuıoԀ buıʇɐoןℲ-ϛƖ0Ɛ6ㄥ§", @@ -6067,6 +6071,7 @@ "item.gtocore.insanely_max_battery": "ʎɹǝʇʇɐᗺ XⱯW ʎןǝuɐsuI", "item.gtocore.insulation_wire_assembly": "ʎןqɯǝssⱯ ǝɹıM uoıʇɐןnsuI", "item.gtocore.inverter": "ɹǝʇɹǝʌuI", + "item.gtocore.ion_exchange_membrane": "ǝuɐɹqɯǝW ǝbuɐɥɔxƎ uoI", "item.gtocore.iron_kinetic_rotor": "ɹoʇoᴚ ɔıʇǝuıʞ uoɹI", "item.gtocore.iron_vein_essence": "ǝɔuǝssƎ uıǝΛ uoɹI", "item.gtocore.iv_drone": "ǝuoɹᗡ ǝʇɐɯıʇן∩", @@ -6153,6 +6158,7 @@ "item.gtocore.nm_chip": "dıɥƆ ɯN", "item.gtocore.nm_wafer": "ɹǝɟɐM ɯN", "item.gtocore.non_linear_optical_lens": "suǝꞀ ןɐɔıʇdO ɹɐǝuıꞀ uoN", + "item.gtocore.non_woven_fabric": "ɔıɹqɐℲ uǝʌoM uoN", "item.gtocore.nuclear_clock": "ʞɔoןƆ ɹɐǝןɔnN", "item.gtocore.nuclear_star": "ɹɐʇS ɹɐǝןɔnN", "item.gtocore.nuclear_waste": "ǝʇsɐM ɹɐǝןɔnN", @@ -6248,6 +6254,7 @@ "item.gtocore.resonating_gem": "ɯǝ⅁ buıʇɐuosǝᴚ", "item.gtocore.rhenium_plasma_containment_cell": "ןןǝƆ ʇuǝɯuıɐʇuoƆ ɐɯsɐןԀ ɯnıuǝɥᴚ", "item.gtocore.ribbon": "uoqqıᴚ", + "item.gtocore.ro_membrane": "ǝuɐɹqɯǝW oᴚ", "item.gtocore.rotating_transparent_surface": "ǝɔɐɟɹnS ʇuǝɹɐdsuɐɹ⟘ buıʇɐʇoᴚ", "item.gtocore.ruby_crystal_circuit": "ʇınɔɹıƆ ןɐʇsʎɹƆ ʎqnᴚ", "item.gtocore.ruby_crystal_circuit.tooltip": "ןoɹʇuoƆ - ʇınɔɹıƆ ןɐʇsʎɹƆㄥ§", @@ -6600,6 +6607,7 @@ "key.gtocore.vajra": "ʎǝʞ ɐɹظɐΛ", "key.keybinding.gtocore": "sbuıpuıᗺ ʎǝʞ O⟘⅁", "material.gtocore.1_octene": "ǝuǝʇɔO Ɩ", + "material.gtocore.Sodium_polystyrene_sulfonate": "ǝʇɐuoɟןnS ǝuǝɹʎʇsʎןoԀ ɯnıpoS", "material.gtocore.abs": "sqⱯ", "material.gtocore.absolute_ethanol": "ןouɐɥʇƎ ǝʇnןosqⱯ", "material.gtocore.abyssalalloy": "ʎoןןɐןɐssʎqⱯ", @@ -6669,6 +6677,7 @@ "material.gtocore.aniline": "ǝuıןıuⱯ", "material.gtocore.animal_cells": "sןןǝƆ ןɐɯıuⱯ", "material.gtocore.animium": "ɯnıɯıuⱯ", + "material.gtocore.anode_resin": "uısǝᴚ ǝpouⱯ", "material.gtocore.anthracene": "ǝuǝɔɐɹɥʇuⱯ", "material.gtocore.antihydrogen": "uǝboɹpʎɥıʇuⱯ", "material.gtocore.antimatter": "ɹǝʇʇɐɯıʇuⱯ", @@ -6782,6 +6791,7 @@ "material.gtocore.cas_9_protein": "uıǝʇoɹԀ-6-SⱯƆ", "material.gtocore.cascade_mfpc": "ɔdɟW ǝpɐɔsɐƆ", "material.gtocore.catalase": "ǝsɐןɐʇɐƆ", + "material.gtocore.cathode_resin": "uısǝᴚ ǝpoɥʇɐƆ", "material.gtocore.ce_ox_poly_dopamine_reinforced_polytetrafluoroethylene": "ǝuǝןʎɥʇǝoɹonןɟɐɹʇǝʇʎןoԀ pǝɔɹoɟuıǝᴚ ǝuıɯɐdoᗡ ʎןoԀ xO ǝƆ", "material.gtocore.celenegil": "ןıbǝuǝןǝƆ", "material.gtocore.celestial_tungsten": "uǝʇsbun⟘ ןɐıʇsǝןǝƆ", @@ -6883,6 +6893,7 @@ "material.gtocore.dichlorodiphenylsulfone": "ǝuoɟןnsןʎuǝɥdıpoɹoןɥɔıᗡ", "material.gtocore.dichloromethane": "ǝuɐɥʇǝɯoɹoןɥɔıᗡ", "material.gtocore.diethyl_ether": "ɹǝɥʇƎ ןʎɥʇǝıᗡ", + "material.gtocore.diethylbenzene_fraction": "uoıʇɔɐɹℲ ǝuǝzuǝqןʎɥʇǝıᗡ", "material.gtocore.diethyleneglycol": "ןoɔʎןbǝuǝןʎɥʇǝıᗡ", "material.gtocore.diethylthiourea": "ɐǝɹnoıɥʇןʎɥʇǝıᗡ", "material.gtocore.dietoxythiophene": "ǝuǝɥdoıɥʇʎxoʇǝıᗡ", @@ -6921,6 +6932,7 @@ "material.gtocore.disulfonate_dichlorodiphenylsulfone": "ǝuoɟןnsןʎuǝɥdıpoɹoןɥɔıᗡ ǝʇɐuoɟןnsıᗡ", "material.gtocore.ditert_butyl_1_methoxy_methoxyethoxy_benzene": "ǝuǝzuǝᗺ ʎxoɥʇǝʎxoɥʇǝW ʎxoɥʇǝW Ɩ ןʎʇnᗺ ʇɹǝʇıᗡ", "material.gtocore.ditertbutyl_dicarbonate": "ǝʇɐuoqɹɐɔıᗡ ןʎʇnqʇɹǝʇıᗡ", + "material.gtocore.divinylbenzene": "ǝuǝzuǝqןʎuıʌıᗡ", "material.gtocore.dmap": "dɐɯᗡ", "material.gtocore.dna_extraction_buffer": "ɹǝɟɟnᗺ uoıʇɔɐɹʇxƎ ɐuᗡ", "material.gtocore.dopamine": "ǝuıɯɐdoᗡ", @@ -6939,6 +6951,7 @@ "material.gtocore.dysprosium_extraction_nano_resin": "uısǝᴚ ouɐN uoıʇɔɐɹʇxƎ ɯnısoɹdsʎᗡ", "material.gtocore.dysprosium_oxide": "ǝpıxO ɯnısoɹdsʎᗡ", "material.gtocore.echoite": "ǝʇıoɥɔƎ", + "material.gtocore.edi_water": "ɹǝʇɐM ıpƎ", "material.gtocore.edta": "ɐʇpƎ", "material.gtocore.eglin_steel": "ןǝǝʇS uıןbƎ", "material.gtocore.electric_equilibrium_water": "ɹǝʇɐM ɯnıɹqıןınbƎ ɔıɹʇɔǝןƎ", @@ -7233,6 +7246,7 @@ "material.gtocore.mana_glass": "ssɐן⅁ ɐuɐW", "material.gtocore.manasteel": "ןǝǝʇsɐuɐW", "material.gtocore.mar_m_200_steel": "ןǝǝʇS 00ᄅ W ɹɐW", + "material.gtocore.mbp_water": "ɹǝʇɐM dqW", "material.gtocore.mercury_acetate": "ǝʇɐʇǝɔⱯ ʎɹnɔɹǝW", "material.gtocore.mestitylene": "ǝuǝןʎʇıʇsǝW", "material.gtocore.metal_compound_particle_front": "ʇuoɹℲ ǝןɔıʇɹɐԀ punodɯoƆ ןɐʇǝW", @@ -7380,9 +7394,12 @@ "material.gtocore.poly_aluminium_chloride": "ǝpıɹoןɥƆ ɯnıuıɯnןⱯ ʎןoԀ", "material.gtocore.poly_dopamine": "ǝuıɯɐdoᗡ ʎןoԀ", "material.gtocore.polyacrylonitrile": "ǝןıɹʇıuoןʎɹɔɐʎןoԀ", + "material.gtocore.polyamide": "ǝpıɯɐʎןoԀ", "material.gtocore.polycyclic_aromatic_mixture": "ǝɹnʇxıW ɔıʇɐɯoɹⱯ ɔıןɔʎɔʎןoԀ", "material.gtocore.polyetheretherketone": "ǝuoʇǝʞɹǝɥʇǝɹǝɥʇǝʎןoԀ", "material.gtocore.polyimide": "ǝpıɯıʎןoԀ", + "material.gtocore.polymer_backbone": "ǝuoqʞɔɐᗺ ɹǝɯʎןoԀ", + "material.gtocore.polypropylene": "ǝuǝןʎdoɹdʎןoԀ", "material.gtocore.polystyrene": "ǝuǝɹʎʇsʎןoԀ", "material.gtocore.polyurethane": "ǝuɐɥʇǝɹnʎןoԀ", "material.gtocore.polyurethaneresin": "uısǝɹǝuɐɥʇǝɹnʎןoԀ", @@ -7468,6 +7485,7 @@ "material.gtocore.rhodium_sulfate_gas": "sɐ⅁ ǝʇɐɟןnS ɯnıpoɥᴚ", "material.gtocore.rhodium_triphenylphosphine_chloride": "ǝpıɹoןɥƆ ǝuıɥdsoɥdןʎuǝɥdıɹ⟘ ɯnıpoɥᴚ", "material.gtocore.rhugnor": "ɹoubnɥᴚ", + "material.gtocore.ro_water": "ɹǝʇɐM oᴚ", "material.gtocore.rocket_fuel_cn3h7o3": "ƐoㄥɥƐuƆ ןǝnℲ ʇǝʞɔoᴚ", "material.gtocore.rocket_fuel_h8n4c2o4": "ㄣoᄅɔㄣu8H ןǝnℲ ʇǝʞɔoᴚ", "material.gtocore.rocket_fuel_rp_1": "Ɩ dᴚ ןǝnℲ ʇǝʞɔoᴚ", @@ -7709,6 +7727,7 @@ "material.gtocore.trifluoroacetic_phosphate_ester": "ɹǝʇsƎ ǝʇɐɥdsoɥԀ ɔıʇǝɔɐoɹonןɟıɹ⟘", "material.gtocore.trifluoromethanesulfonic_acid": "pıɔⱯ ɔıuoɟןnsǝuɐɥʇǝɯoɹonןɟıɹ⟘", "material.gtocore.trifluoromethanesulfonyl_chloride": "ǝpıɹoןɥƆ ןʎuoɟןnsǝuɐɥʇǝɯoɹonןɟıɹ⟘", + "material.gtocore.trimethy_lamine": "ǝuıɯɐꞀ ʎɥʇǝɯıɹ⟘", "material.gtocore.trimethylamine": "ǝuıɯɐןʎɥʇǝɯıɹ⟘", "material.gtocore.trimethylchlorosilane": "ǝuɐןısoɹoןɥɔןʎɥʇǝɯıɹ⟘", "material.gtocore.trimethylsilane": "ǝuɐןısןʎɥʇǝɯıɹ⟘", @@ -7748,6 +7767,7 @@ "material.gtocore.uranium_sulfate_waste_solution": "uoıʇnןoS ǝʇsɐM ǝʇɐɟןnS ɯnıuɐɹ∩", "material.gtocore.uruium": "ɯnınɹ∩", "material.gtocore.uu_amplifier": "ɹǝıɟıןdɯⱯ n∩", + "material.gtocore.uv_water": "ɹǝʇɐM ʌ∩", "material.gtocore.vanadium_pentoxide": "ǝpıxoʇuǝԀ ɯnıpɐuɐΛ", "material.gtocore.vibramantium": "ɯnıʇuɐɯɐɹqıΛ", "material.gtocore.vibranium": "ɯnıuɐɹqıΛ", diff --git a/src/generated/resources/assets/gtocore/lang/en_us.json b/src/generated/resources/assets/gtocore/lang/en_us.json index 079867623..e5421ba07 100644 --- a/src/generated/resources/assets/gtocore/lang/en_us.json +++ b/src/generated/resources/assets/gtocore/lang/en_us.json @@ -135,6 +135,7 @@ "block.gtocore.ancient_reactor_core": "Ancient Reactor Core", "block.gtocore.annihilate_core": "Annihilate Core", "block.gtocore.annihilate_generator": "Artificial Star", + "block.gtocore.anode_adsorption_resin": "Anode Adsorption Resin", "block.gtocore.anti_entropy_computer_condensation_matrix": "Anti Entropy Computer Condensation Matrix", "block.gtocore.antifreeze_heatproof_machine_casing": "Antifreeze Heatproof Machine Casing", "block.gtocore.antimatter_containment_casing": "Antimatter Containment Casing", @@ -173,6 +174,7 @@ "block.gtocore.calcium_oxide_ceramic_anti_metal_corrosion_mechanical_block": "Calcium Oxide Ceramic Anti Metal Corrosion Mechanical Block", "block.gtocore.carving_center": "Carving Center", "block.gtocore.catalyst_hatch": "Catalyst Hatch", + "block.gtocore.cathode_adsorption_resin": "Cathode Adsorption Resin", "block.gtocore.celestial_condenser": "Celestial Condenser", "block.gtocore.celestial_matter_guidance_casing": "Celestial Matter Guidance Casing", "block.gtocore.central_graviton_flow_modulator": "Central Graviton Flow Modulator", @@ -5852,6 +5854,7 @@ "item.gtocore.dragon_heart": "Dragon Heart", "item.gtocore.dragon_stabilizer_core": "Dragon Stabilizer Core", "item.gtocore.dragon_stem_cells": "Dragon Stem Cells", + "item.gtocore.dual_uv_light": "Dual Uv Light", "item.gtocore.dust_blizz": "Dust Blizz", "item.gtocore.dust_cryotheum": "Dust Cryotheum", "item.gtocore.dyson_swarm_module": "Dyson Swarm Module", @@ -6041,6 +6044,7 @@ "item.gtocore.highly_dense_polymer_plate": "Highly Dense Polymer Plate", "item.gtocore.highly_insulating_foil": "Highly Insulating Foil", "item.gtocore.highly_reflective_mirror": "Highly Reflective Mirror", + "item.gtocore.homogeneous_membrane": "Homogeneous Membrane", "item.gtocore.hot_iron_ingot": "Hot Iron Ingot", "item.gtocore.hui_circuit_1": "High Calculation Workstation MK-I", "item.gtocore.hui_circuit_1.tooltip": "§793015-Floating Point Operations/Second", @@ -6067,6 +6071,7 @@ "item.gtocore.insanely_max_battery": "Insanely MAX Battery", "item.gtocore.insulation_wire_assembly": "Insulation Wire Assembly", "item.gtocore.inverter": "Inverter", + "item.gtocore.ion_exchange_membrane": "Ion Exchange Membrane", "item.gtocore.iron_kinetic_rotor": "Iron Kinetic Rotor", "item.gtocore.iron_vein_essence": "Iron Vein Essence", "item.gtocore.iv_drone": "Ultimate Drone", @@ -6153,6 +6158,7 @@ "item.gtocore.nm_chip": "Nm Chip", "item.gtocore.nm_wafer": "Nm Wafer", "item.gtocore.non_linear_optical_lens": "Non Linear Optical Lens", + "item.gtocore.non_woven_fabric": "Non Woven Fabric", "item.gtocore.nuclear_clock": "Nuclear Clock", "item.gtocore.nuclear_star": "Nuclear Star", "item.gtocore.nuclear_waste": "Nuclear Waste", @@ -6248,6 +6254,7 @@ "item.gtocore.resonating_gem": "Resonating Gem", "item.gtocore.rhenium_plasma_containment_cell": "Rhenium Plasma Containment Cell", "item.gtocore.ribbon": "Ribbon", + "item.gtocore.ro_membrane": "Ro Membrane", "item.gtocore.rotating_transparent_surface": "Rotating Transparent Surface", "item.gtocore.ruby_crystal_circuit": "Ruby Crystal Circuit", "item.gtocore.ruby_crystal_circuit.tooltip": "§7Crystal Circuit - Control", @@ -6600,6 +6607,7 @@ "key.gtocore.vajra": "Vajra Key", "key.keybinding.gtocore": "GTO Key Bindings", "material.gtocore.1_octene": "1 Octene", + "material.gtocore.Sodium_polystyrene_sulfonate": "Sodium Polystyrene Sulfonate", "material.gtocore.abs": "Abs", "material.gtocore.absolute_ethanol": "Absolute Ethanol", "material.gtocore.abyssalalloy": "Abyssalalloy", @@ -6669,6 +6677,7 @@ "material.gtocore.aniline": "Aniline", "material.gtocore.animal_cells": "Animal Cells", "material.gtocore.animium": "Animium", + "material.gtocore.anode_resin": "Anode Resin", "material.gtocore.anthracene": "Anthracene", "material.gtocore.antihydrogen": "Antihydrogen", "material.gtocore.antimatter": "Antimatter", @@ -6782,6 +6791,7 @@ "material.gtocore.cas_9_protein": "CAS-9-Protein", "material.gtocore.cascade_mfpc": "Cascade Mfpc", "material.gtocore.catalase": "Catalase", + "material.gtocore.cathode_resin": "Cathode Resin", "material.gtocore.ce_ox_poly_dopamine_reinforced_polytetrafluoroethylene": "Ce Ox Poly Dopamine Reinforced Polytetrafluoroethylene", "material.gtocore.celenegil": "Celenegil", "material.gtocore.celestial_tungsten": "Celestial Tungsten", @@ -6883,6 +6893,7 @@ "material.gtocore.dichlorodiphenylsulfone": "Dichlorodiphenylsulfone", "material.gtocore.dichloromethane": "Dichloromethane", "material.gtocore.diethyl_ether": "Diethyl Ether", + "material.gtocore.diethylbenzene_fraction": "Diethylbenzene Fraction", "material.gtocore.diethyleneglycol": "Diethyleneglycol", "material.gtocore.diethylthiourea": "Diethylthiourea", "material.gtocore.dietoxythiophene": "Dietoxythiophene", @@ -6921,6 +6932,7 @@ "material.gtocore.disulfonate_dichlorodiphenylsulfone": "Disulfonate Dichlorodiphenylsulfone", "material.gtocore.ditert_butyl_1_methoxy_methoxyethoxy_benzene": "Ditert Butyl 1 Methoxy Methoxyethoxy Benzene", "material.gtocore.ditertbutyl_dicarbonate": "Ditertbutyl Dicarbonate", + "material.gtocore.divinylbenzene": "Divinylbenzene", "material.gtocore.dmap": "Dmap", "material.gtocore.dna_extraction_buffer": "Dna Extraction Buffer", "material.gtocore.dopamine": "Dopamine", @@ -6939,6 +6951,7 @@ "material.gtocore.dysprosium_extraction_nano_resin": "Dysprosium Extraction Nano Resin", "material.gtocore.dysprosium_oxide": "Dysprosium Oxide", "material.gtocore.echoite": "Echoite", + "material.gtocore.edi_water": "Edi Water", "material.gtocore.edta": "Edta", "material.gtocore.eglin_steel": "Eglin Steel", "material.gtocore.electric_equilibrium_water": "Electric Equilibrium Water", @@ -7233,6 +7246,7 @@ "material.gtocore.mana_glass": "Mana Glass", "material.gtocore.manasteel": "Manasteel", "material.gtocore.mar_m_200_steel": "Mar M 200 Steel", + "material.gtocore.mbp_water": "Mbp Water", "material.gtocore.mercury_acetate": "Mercury Acetate", "material.gtocore.mestitylene": "Mestitylene", "material.gtocore.metal_compound_particle_front": "Metal Compound Particle Front", @@ -7380,9 +7394,12 @@ "material.gtocore.poly_aluminium_chloride": "Poly Aluminium Chloride", "material.gtocore.poly_dopamine": "Poly Dopamine", "material.gtocore.polyacrylonitrile": "Polyacrylonitrile", + "material.gtocore.polyamide": "Polyamide", "material.gtocore.polycyclic_aromatic_mixture": "Polycyclic Aromatic Mixture", "material.gtocore.polyetheretherketone": "Polyetheretherketone", "material.gtocore.polyimide": "Polyimide", + "material.gtocore.polymer_backbone": "Polymer Backbone", + "material.gtocore.polypropylene": "Polypropylene", "material.gtocore.polystyrene": "Polystyrene", "material.gtocore.polyurethane": "Polyurethane", "material.gtocore.polyurethaneresin": "Polyurethaneresin", @@ -7468,6 +7485,7 @@ "material.gtocore.rhodium_sulfate_gas": "Rhodium Sulfate Gas", "material.gtocore.rhodium_triphenylphosphine_chloride": "Rhodium Triphenylphosphine Chloride", "material.gtocore.rhugnor": "Rhugnor", + "material.gtocore.ro_water": "Ro Water", "material.gtocore.rocket_fuel_cn3h7o3": "Rocket Fuel Cn3h7o3", "material.gtocore.rocket_fuel_h8n4c2o4": "Rocket Fuel H8n4c2o4", "material.gtocore.rocket_fuel_rp_1": "Rocket Fuel Rp 1", @@ -7709,6 +7727,7 @@ "material.gtocore.trifluoroacetic_phosphate_ester": "Trifluoroacetic Phosphate Ester", "material.gtocore.trifluoromethanesulfonic_acid": "Trifluoromethanesulfonic Acid", "material.gtocore.trifluoromethanesulfonyl_chloride": "Trifluoromethanesulfonyl Chloride", + "material.gtocore.trimethy_lamine": "Trimethy Lamine", "material.gtocore.trimethylamine": "Trimethylamine", "material.gtocore.trimethylchlorosilane": "Trimethylchlorosilane", "material.gtocore.trimethylsilane": "Trimethylsilane", @@ -7748,6 +7767,7 @@ "material.gtocore.uranium_sulfate_waste_solution": "Uranium Sulfate Waste Solution", "material.gtocore.uruium": "Uruium", "material.gtocore.uu_amplifier": "Uu Amplifier", + "material.gtocore.uv_water": "Uv Water", "material.gtocore.vanadium_pentoxide": "Vanadium Pentoxide", "material.gtocore.vibramantium": "Vibramantium", "material.gtocore.vibranium": "Vibranium", diff --git a/src/generated/resources/assets/gtocore/lang/zh_cn.json b/src/generated/resources/assets/gtocore/lang/zh_cn.json index 78e3b2d0c..72a22b553 100644 --- a/src/generated/resources/assets/gtocore/lang/zh_cn.json +++ b/src/generated/resources/assets/gtocore/lang/zh_cn.json @@ -135,6 +135,7 @@ "block.gtocore.ancient_reactor_core": "远古反应核", "block.gtocore.annihilate_core": "湮灭核心", "block.gtocore.annihilate_generator": "人造恒星", + "block.gtocore.anode_adsorption_resin": "阳极吸附树脂", "block.gtocore.anti_entropy_computer_condensation_matrix": "逆熵计算机冷凝矩阵", "block.gtocore.antifreeze_heatproof_machine_casing": "防冻隔热机械方块", "block.gtocore.antimatter_containment_casing": "反物质隔离机械方块", @@ -173,6 +174,7 @@ "block.gtocore.calcium_oxide_ceramic_anti_metal_corrosion_mechanical_block": "氧化钙陶瓷抗金属侵蚀机械方块", "block.gtocore.carving_center": "雕刻中心", "block.gtocore.catalyst_hatch": "催化剂仓", + "block.gtocore.cathode_adsorption_resin": "阴极吸附树脂", "block.gtocore.celestial_condenser": "苍穹凝聚器", "block.gtocore.celestial_matter_guidance_casing": "天体物质引导机械方块", "block.gtocore.central_graviton_flow_modulator": "中心引力流调节器", @@ -1021,7 +1023,7 @@ "block.gtocore.recycler": "回收机", "block.gtocore.red_steel_casing": "高气密红钢机器外壳", "block.gtocore.reinforced_epoxy_resin_mechanical_housing": "强化环氧树脂机械外壳", - "block.gtocore.reinforced_sterile_water_plant_casing": "加固无菌水处理机械方块", + "block.gtocore.reinforced_sterile_water_plant_casing": "加固光滑水处理机械方块", "block.gtocore.reinforced_wood_casing": "增强木制机械方块", "block.gtocore.remote_graviton_flow_modulator": "远程引力流调节器", "block.gtocore.research_holder": "研究支架", @@ -1124,7 +1126,7 @@ "block.gtocore.stellar_forge": "恒星炎炀锻炉", "block.gtocore.sterile_cleaning_maintenance_hatch": "无菌维护仓", "block.gtocore.sterile_configuration_cleaning_maintenance_hatch": "无菌可配置维护仓", - "block.gtocore.sterile_water_plant_casing": "无菌水处理机械方块", + "block.gtocore.sterile_water_plant_casing": "光滑水处理机械方块", "block.gtocore.strengthen_the_base_block": "强化基座方块", "block.gtocore.strontium_carbonate_ceramic_ray_absorbing_mechanical_cube": "碳酸锶陶瓷射线吸收机械方块", "block.gtocore.super_blast_smelter": "超级冶炼炉", @@ -5852,6 +5854,7 @@ "item.gtocore.dragon_heart": "龙之心", "item.gtocore.dragon_stabilizer_core": "龙之稳定核心", "item.gtocore.dragon_stem_cells": "龙干细胞", + "item.gtocore.dual_uv_light": "双波段紫外灯", "item.gtocore.dust_blizz": "暴雪粉", "item.gtocore.dust_cryotheum": "凛冰粉", "item.gtocore.dyson_swarm_module": "戴森球模块", @@ -6041,6 +6044,7 @@ "item.gtocore.highly_dense_polymer_plate": "高密度聚合物板", "item.gtocore.highly_insulating_foil": "高绝缘性箔", "item.gtocore.highly_reflective_mirror": "高反射率镜", + "item.gtocore.homogeneous_membrane": "均相膜", "item.gtocore.hot_iron_ingot": "热铁锭", "item.gtocore.hui_circuit_1": "高算力工作站 MK-I", "item.gtocore.hui_circuit_1.tooltip": "§793015-T浮点运算/秒", @@ -6067,6 +6071,7 @@ "item.gtocore.insanely_max_battery": "狂·终极电池", "item.gtocore.insulation_wire_assembly": "绝缘线团", "item.gtocore.inverter": "逆变器", + "item.gtocore.ion_exchange_membrane": "离子交换膜", "item.gtocore.iron_kinetic_rotor": "铁动力转子", "item.gtocore.iron_vein_essence": "铁精华", "item.gtocore.iv_drone": "终极无人机", @@ -6153,6 +6158,7 @@ "item.gtocore.nm_chip": "纳米功率集成电路", "item.gtocore.nm_wafer": "纳米功率集成电路晶圆", "item.gtocore.non_linear_optical_lens": "非线性光学透镜", + "item.gtocore.non_woven_fabric": "无纺布", "item.gtocore.nuclear_clock": "核时钟", "item.gtocore.nuclear_star": "核能之星", "item.gtocore.nuclear_waste": "核废料", @@ -6248,6 +6254,7 @@ "item.gtocore.resonating_gem": "共振宝石", "item.gtocore.rhenium_plasma_containment_cell": "铼等离子体密闭容器", "item.gtocore.ribbon": "绶带", + "item.gtocore.ro_membrane": "ro膜", "item.gtocore.rotating_transparent_surface": "旋转透明层", "item.gtocore.ruby_crystal_circuit": "红宝石晶体电路", "item.gtocore.ruby_crystal_circuit.tooltip": "§7晶体电路-控制", @@ -6600,6 +6607,7 @@ "key.gtocore.vajra": "金刚杵按键", "key.keybinding.gtocore": "GTO按键绑定", "material.gtocore.1_octene": "1-辛烯", + "material.gtocore.Sodium_polystyrene_sulfonate": "聚苯乙烯磺酸钠", "material.gtocore.abs": "ABS塑料", "material.gtocore.absolute_ethanol": "绝对乙醇", "material.gtocore.abyssalalloy": "渊狱合金", @@ -6669,6 +6677,7 @@ "material.gtocore.aniline": "苯胺", "material.gtocore.animal_cells": "动物细胞", "material.gtocore.animium": "灵髓液", + "material.gtocore.anode_resin": "阳极功能树脂", "material.gtocore.anthracene": "蒽", "material.gtocore.antihydrogen": "反氢", "material.gtocore.antimatter": "离散反物质", @@ -6782,6 +6791,7 @@ "material.gtocore.cas_9_protein": "CAS-9-蛋白", "material.gtocore.cascade_mfpc": "串级相变MFPC(Cascade-MFPC)", "material.gtocore.catalase": "过氧化氢酶", + "material.gtocore.cathode_resin": "阴极功能树脂", "material.gtocore.ce_ox_poly_dopamine_reinforced_polytetrafluoroethylene": "氧化铈-聚多巴胺增强聚四氟乙烯", "material.gtocore.celenegil": "幽冥毒晶", "material.gtocore.celestial_tungsten": "天体钨", @@ -6883,6 +6893,7 @@ "material.gtocore.dichlorodiphenylsulfone": "4,4'-二氯二苯砜", "material.gtocore.dichloromethane": "二氯甲烷", "material.gtocore.diethyl_ether": "二乙醚", + "material.gtocore.diethylbenzene_fraction": "富二乙烯苯馏分", "material.gtocore.diethyleneglycol": "二乙二醇", "material.gtocore.diethylthiourea": "二乙基硫脲", "material.gtocore.dietoxythiophene": "二乙氧基噻吩", @@ -6921,6 +6932,7 @@ "material.gtocore.disulfonate_dichlorodiphenylsulfone": "3,3′-二磺酸-4,4′-二氯二苯砜", "material.gtocore.ditert_butyl_1_methoxy_methoxyethoxy_benzene": "二叔丁基-1-甲氧基-甲氧基乙氧基苯", "material.gtocore.ditertbutyl_dicarbonate": "二碳酸二叔丁酯", + "material.gtocore.divinylbenzene": "二乙烯基苯", "material.gtocore.dmap": "二甲氨基吡啶", "material.gtocore.dna_extraction_buffer": "DNA提取缓冲液", "material.gtocore.dopamine": "多巴胺", @@ -6939,6 +6951,7 @@ "material.gtocore.dysprosium_extraction_nano_resin": "镝纳米萃取树脂", "material.gtocore.dysprosium_oxide": "氧化镝", "material.gtocore.echoite": "回响合金", + "material.gtocore.edi_water": "edi水", "material.gtocore.edta": "乙二胺四乙酸", "material.gtocore.eglin_steel": "埃格林钢", "material.gtocore.electric_equilibrium_water": "电平衡水", @@ -7233,6 +7246,7 @@ "material.gtocore.mana_glass": "魔力玻璃", "material.gtocore.manasteel": "魔力钢", "material.gtocore.mar_m_200_steel": "MAR-M200特种钢", + "material.gtocore.mbp_water": "混床抛光水", "material.gtocore.mercury_acetate": "醋酸汞", "material.gtocore.mestitylene": "间三甲苯", "material.gtocore.metal_compound_particle_front": "富集金属复合物泡沫", @@ -7380,9 +7394,12 @@ "material.gtocore.poly_aluminium_chloride": "聚合氯化铝", "material.gtocore.poly_dopamine": "聚多巴胺", "material.gtocore.polyacrylonitrile": "聚丙烯腈", + "material.gtocore.polyamide": "聚酰胺", "material.gtocore.polycyclic_aromatic_mixture": "多环芳香烃混合物", "material.gtocore.polyetheretherketone": "聚醚醚酮", "material.gtocore.polyimide": "聚酰亚胺", + "material.gtocore.polymer_backbone": "高分子骨架", + "material.gtocore.polypropylene": "聚丙烯", "material.gtocore.polystyrene": "聚苯乙烯", "material.gtocore.polyurethane": "聚氨基甲酸酯", "material.gtocore.polyurethaneresin": "聚氨酯树脂", @@ -7468,6 +7485,7 @@ "material.gtocore.rhodium_sulfate_gas": "气态硫酸铑", "material.gtocore.rhodium_triphenylphosphine_chloride": "三（三苯基膦）铑(I)氯化物", "material.gtocore.rhugnor": "鲁格诺", + "material.gtocore.ro_water": "ro水", "material.gtocore.rocket_fuel_cn3h7o3": "火箭燃料（硝酸甲肼）", "material.gtocore.rocket_fuel_h8n4c2o4": "火箭燃料（偏二甲肼-四氧化二氮）", "material.gtocore.rocket_fuel_rp_1": "火箭燃料 RP-1", @@ -7709,6 +7727,7 @@ "material.gtocore.trifluoroacetic_phosphate_ester": "三氟乙酸对磷脂", "material.gtocore.trifluoromethanesulfonic_acid": "三氟甲磺酸", "material.gtocore.trifluoromethanesulfonyl_chloride": "三氟甲磺酰氯", + "material.gtocore.trimethy_lamine": "三甲基铵", "material.gtocore.trimethylamine": "三甲胺", "material.gtocore.trimethylchlorosilane": "三甲基氯硅烷", "material.gtocore.trimethylsilane": "三甲基硅烷", @@ -7748,6 +7767,7 @@ "material.gtocore.uranium_sulfate_waste_solution": "硫酸铀废液", "material.gtocore.uruium": "乌鲁", "material.gtocore.uu_amplifier": "UU增幅液", + "material.gtocore.uv_water": "uv水", "material.gtocore.vanadium_pentoxide": "五氧化二钒", "material.gtocore.vibramantium": "艾德曼振金", "material.gtocore.vibranium": "振金", diff --git a/src/generated/resources/assets/gtocore/lang/zh_tw.json b/src/generated/resources/assets/gtocore/lang/zh_tw.json index d41cdfdd2..f58d45838 100644 --- a/src/generated/resources/assets/gtocore/lang/zh_tw.json +++ b/src/generated/resources/assets/gtocore/lang/zh_tw.json @@ -135,6 +135,7 @@ "block.gtocore.ancient_reactor_core": "遠古反應核", "block.gtocore.annihilate_core": "湮滅核心", "block.gtocore.annihilate_generator": "人造恆星", + "block.gtocore.anode_adsorption_resin": "陽極吸附樹脂", "block.gtocore.anti_entropy_computer_condensation_matrix": "逆熵計算機冷凝矩陣", "block.gtocore.antifreeze_heatproof_machine_casing": "防凍隔熱機械方塊", "block.gtocore.antimatter_containment_casing": "反物質隔離機械方塊", @@ -173,6 +174,7 @@ "block.gtocore.calcium_oxide_ceramic_anti_metal_corrosion_mechanical_block": "氧化鈣陶瓷抗金屬侵蝕機械方塊", "block.gtocore.carving_center": "鵰刻中心", "block.gtocore.catalyst_hatch": "催化劑倉", + "block.gtocore.cathode_adsorption_resin": "陰極吸附樹脂", "block.gtocore.celestial_condenser": "蒼穹凝聚器", "block.gtocore.celestial_matter_guidance_casing": "天體物質引導機械方塊", "block.gtocore.central_graviton_flow_modulator": "中心引力流調節器", @@ -1021,7 +1023,7 @@ "block.gtocore.recycler": "回收機", "block.gtocore.red_steel_casing": "高氣密紅鋼機器外殼", "block.gtocore.reinforced_epoxy_resin_mechanical_housing": "強化環氧樹脂機械外殼", - "block.gtocore.reinforced_sterile_water_plant_casing": "加固無菌水處理機械方塊", + "block.gtocore.reinforced_sterile_water_plant_casing": "加固光滑水處理機械方塊", "block.gtocore.reinforced_wood_casing": "增強木製機械方塊", "block.gtocore.remote_graviton_flow_modulator": "遠程引力流調節器", "block.gtocore.research_holder": "研究支架", @@ -1124,7 +1126,7 @@ "block.gtocore.stellar_forge": "恆星炎煬鍛爐", "block.gtocore.sterile_cleaning_maintenance_hatch": "無菌維護倉", "block.gtocore.sterile_configuration_cleaning_maintenance_hatch": "無菌可配置維護倉", - "block.gtocore.sterile_water_plant_casing": "無菌水處理機械方塊", + "block.gtocore.sterile_water_plant_casing": "光滑水處理機械方塊", "block.gtocore.strengthen_the_base_block": "強化基座方塊", "block.gtocore.strontium_carbonate_ceramic_ray_absorbing_mechanical_cube": "碳酸鍶陶瓷射線吸收機械方塊", "block.gtocore.super_blast_smelter": "超級冶鍊爐", @@ -5852,6 +5854,7 @@ "item.gtocore.dragon_heart": "龍之心", "item.gtocore.dragon_stabilizer_core": "龍之穩定核心", "item.gtocore.dragon_stem_cells": "龍乾細胞", + "item.gtocore.dual_uv_light": "雙波段紫外燈", "item.gtocore.dust_blizz": "暴雪粉", "item.gtocore.dust_cryotheum": "凜冰粉", "item.gtocore.dyson_swarm_module": "戴森球模塊", @@ -6041,6 +6044,7 @@ "item.gtocore.highly_dense_polymer_plate": "高密度聚合物板", "item.gtocore.highly_insulating_foil": "高絕緣性箔", "item.gtocore.highly_reflective_mirror": "高反射率鏡", + "item.gtocore.homogeneous_membrane": "均相膜", "item.gtocore.hot_iron_ingot": "熱鐵錠", "item.gtocore.hui_circuit_1": "高算力工作站 MK-I", "item.gtocore.hui_circuit_1.tooltip": "§793015-T浮點運算/秒", @@ -6067,6 +6071,7 @@ "item.gtocore.insanely_max_battery": "狂·終極電池", "item.gtocore.insulation_wire_assembly": "絕緣線糰", "item.gtocore.inverter": "逆變器", + "item.gtocore.ion_exchange_membrane": "離子交換膜", "item.gtocore.iron_kinetic_rotor": "鐵動力轉子", "item.gtocore.iron_vein_essence": "鐵精華", "item.gtocore.iv_drone": "終極無人機", @@ -6153,6 +6158,7 @@ "item.gtocore.nm_chip": "納米功率集成電路", "item.gtocore.nm_wafer": "納米功率集成電路晶圓", "item.gtocore.non_linear_optical_lens": "非線性光學透鏡", + "item.gtocore.non_woven_fabric": "無紡布", "item.gtocore.nuclear_clock": "核時鐘", "item.gtocore.nuclear_star": "核能之星", "item.gtocore.nuclear_waste": "核廢料", @@ -6248,6 +6254,7 @@ "item.gtocore.resonating_gem": "共振寶石", "item.gtocore.rhenium_plasma_containment_cell": "錸等離子體密閉容器", "item.gtocore.ribbon": "綬帶", + "item.gtocore.ro_membrane": "ro膜", "item.gtocore.rotating_transparent_surface": "旋轉透明層", "item.gtocore.ruby_crystal_circuit": "紅寶石晶體電路", "item.gtocore.ruby_crystal_circuit.tooltip": "§7晶體電路-控製", @@ -6600,6 +6607,7 @@ "key.gtocore.vajra": "金剛杵按鍵", "key.keybinding.gtocore": "GTO按鍵綁定", "material.gtocore.1_octene": "1-辛烯", + "material.gtocore.Sodium_polystyrene_sulfonate": "聚苯乙烯磺酸鈉", "material.gtocore.abs": "ABS塑料", "material.gtocore.absolute_ethanol": "絕對乙醇", "material.gtocore.abyssalalloy": "淵獄合金", @@ -6669,6 +6677,7 @@ "material.gtocore.aniline": "苯胺", "material.gtocore.animal_cells": "動物細胞", "material.gtocore.animium": "靈髓液", + "material.gtocore.anode_resin": "陽極功能樹脂", "material.gtocore.anthracene": "蒽", "material.gtocore.antihydrogen": "反氫", "material.gtocore.antimatter": "離散反物質", @@ -6782,6 +6791,7 @@ "material.gtocore.cas_9_protein": "CAS-9-蛋白", "material.gtocore.cascade_mfpc": "串級相變MFPC(Cascade-MFPC)", "material.gtocore.catalase": "過氧化氫酶", + "material.gtocore.cathode_resin": "陰極功能樹脂", "material.gtocore.ce_ox_poly_dopamine_reinforced_polytetrafluoroethylene": "氧化鈰-聚多巴胺增強聚四氟乙烯", "material.gtocore.celenegil": "幽冥毒晶", "material.gtocore.celestial_tungsten": "天體鎢", @@ -6883,6 +6893,7 @@ "material.gtocore.dichlorodiphenylsulfone": "4,4'-二氯二苯碸", "material.gtocore.dichloromethane": "二氯甲烷", "material.gtocore.diethyl_ether": "二乙醚", + "material.gtocore.diethylbenzene_fraction": "富二乙烯苯餾分", "material.gtocore.diethyleneglycol": "二乙二醇", "material.gtocore.diethylthiourea": "二乙基硫脲", "material.gtocore.dietoxythiophene": "二乙氧基噻吩", @@ -6921,6 +6932,7 @@ "material.gtocore.disulfonate_dichlorodiphenylsulfone": "3,3′-二磺酸-4,4′-二氯二苯碸", "material.gtocore.ditert_butyl_1_methoxy_methoxyethoxy_benzene": "二叔丁基-1-甲氧基-甲氧基乙氧基苯", "material.gtocore.ditertbutyl_dicarbonate": "二碳酸二叔丁酯", + "material.gtocore.divinylbenzene": "二乙烯基苯", "material.gtocore.dmap": "二甲氨基吡啶", "material.gtocore.dna_extraction_buffer": "DNA提取緩衝液", "material.gtocore.dopamine": "多巴胺", @@ -6939,6 +6951,7 @@ "material.gtocore.dysprosium_extraction_nano_resin": "鏑納米萃取樹脂", "material.gtocore.dysprosium_oxide": "氧化鏑", "material.gtocore.echoite": "回響合金", + "material.gtocore.edi_water": "edi水", "material.gtocore.edta": "乙二胺四乙酸", "material.gtocore.eglin_steel": "埃格林鋼", "material.gtocore.electric_equilibrium_water": "電平衡水", @@ -7233,6 +7246,7 @@ "material.gtocore.mana_glass": "魔力玻璃", "material.gtocore.manasteel": "魔力鋼", "material.gtocore.mar_m_200_steel": "MAR-M200特種鋼", + "material.gtocore.mbp_water": "混床拋光水", "material.gtocore.mercury_acetate": "醋酸汞", "material.gtocore.mestitylene": "間三甲苯", "material.gtocore.metal_compound_particle_front": "富集金屬複合物泡沫", @@ -7380,9 +7394,12 @@ "material.gtocore.poly_aluminium_chloride": "聚合氯化鋁", "material.gtocore.poly_dopamine": "聚多巴胺", "material.gtocore.polyacrylonitrile": "聚丙烯腈", + "material.gtocore.polyamide": "聚酰胺", "material.gtocore.polycyclic_aromatic_mixture": "多環芳香烴混合物", "material.gtocore.polyetheretherketone": "聚醚醚酮", "material.gtocore.polyimide": "聚酰亞胺", + "material.gtocore.polymer_backbone": "高分子骨架", + "material.gtocore.polypropylene": "聚丙烯", "material.gtocore.polystyrene": "聚苯乙烯", "material.gtocore.polyurethane": "聚氨基甲酸酯", "material.gtocore.polyurethaneresin": "聚氨酯樹脂", @@ -7468,6 +7485,7 @@ "material.gtocore.rhodium_sulfate_gas": "氣態硫酸銠", "material.gtocore.rhodium_triphenylphosphine_chloride": "三（三苯基膦）銠(I)氯化物", "material.gtocore.rhugnor": "魯格諾", + "material.gtocore.ro_water": "ro水", "material.gtocore.rocket_fuel_cn3h7o3": "火箭燃料（硝酸甲肼）", "material.gtocore.rocket_fuel_h8n4c2o4": "火箭燃料（偏二甲肼-四氧化二氮）", "material.gtocore.rocket_fuel_rp_1": "火箭燃料 RP-1", @@ -7709,6 +7727,7 @@ "material.gtocore.trifluoroacetic_phosphate_ester": "三氟乙酸對磷脂", "material.gtocore.trifluoromethanesulfonic_acid": "三氟甲磺酸", "material.gtocore.trifluoromethanesulfonyl_chloride": "三氟甲磺酰氯", + "material.gtocore.trimethy_lamine": "三甲基銨", "material.gtocore.trimethylamine": "三甲胺", "material.gtocore.trimethylchlorosilane": "三甲基氯硅烷", "material.gtocore.trimethylsilane": "三甲基硅烷", @@ -7748,6 +7767,7 @@ "material.gtocore.uranium_sulfate_waste_solution": "硫酸鈾廢液", "material.gtocore.uruium": "烏魯", "material.gtocore.uu_amplifier": "UU增幅液", + "material.gtocore.uv_water": "uv水", "material.gtocore.vanadium_pentoxide": "五氧化二釩", "material.gtocore.vibramantium": "艾德曼振金", "material.gtocore.vibranium": "振金", diff --git a/src/main/java/com/gtocore/common/data/GTOBlocks.java b/src/main/java/com/gtocore/common/data/GTOBlocks.java index ccbb49e88..5fc00a121 100644 --- a/src/main/java/com/gtocore/common/data/GTOBlocks.java +++ b/src/main/java/com/gtocore/common/data/GTOBlocks.java @@ -416,9 +416,9 @@ public static void init() { public static final BlockEntry QUARK_PIPE = createCasingBlock("quark_pipe", "夸克管道", GTOCore.id("block/quark_pipe")); public static final BlockEntry INERT_NEUTRALIZATION_WATER_PLANT_CASING = createCasingBlock("inert_neutralization_water_plant_casing", "惰性中和水处理机械方块", GTOCore.id("block/inert_neutralization_water_plant_casing")); public static final BlockEntry HIGH_ENERGY_ULTRAVIOLET_EMITTER_CASING = createCasingBlock("high_energy_ultraviolet_emitter_casing", "高能紫外线发射器机械方块", GTOCore.id("block/high_energy_ultraviolet_emitter_casing")); - public static final BlockEntry REINFORCED_STERILE_WATER_PLANT_CASING = createCasingBlock("reinforced_sterile_water_plant_casing", "加固无菌水处理机械方块", GTOCore.id("block/reinforced_sterile_water_plant_casing")); + public static final BlockEntry REINFORCED_STERILE_WATER_PLANT_CASING = createCasingBlock("reinforced_sterile_water_plant_casing", "加固光滑水处理机械方块", GTOCore.id("block/reinforced_sterile_water_plant_casing")); public static final BlockEntry NEUTRONIUM_STABLE_CASING = createCasingBlock("neutronium_stable_casing", "中子稳定机械方块", GTOCore.id("block/neutronium_stable_casing")); - public static final BlockEntry STERILE_WATER_PLANT_CASING = createCasingBlock("sterile_water_plant_casing", "无菌水处理机械方块", GTOCore.id("block/sterile_water_plant_casing")); + public static final BlockEntry STERILE_WATER_PLANT_CASING = createCasingBlock("sterile_water_plant_casing", "光滑水处理机械方块", GTOCore.id("block/sterile_water_plant_casing")); public static final BlockEntry STABILIZED_NAQUADAH_WATER_PLANT_CASING = createCasingBlock("stabilized_naquadah_water_plant_casing", "稳定硅岩水处理机械方块", GTOCore.id("block/stabilized_naquadah_water_plant_casing")); public static final BlockEntry STRENGTHEN_THE_BASE_BLOCK = createCasingBlock("strengthen_the_base_block", "强化基座方块", GTOCore.id("block/casings/strengthen_the_base_block")); @@ -489,6 +489,9 @@ public static void init() { public static final BlockEntry ACCELERATOR_ELECTROMAGNETIC_COIL_CONSTRAINT_CASING_UV = createCasingBlock("accelerator_electromagnetic_coil_constraint_casing_uv", "UV加速器磁约束线圈机械方块", GTOCore.id("block/casings/accelerator/accelerator_electromagnetic_coil_constraint_casing_uv")); public static final BlockEntry ACCELERATOR_ELECTROMAGNETIC_COIL_CONSTRAINT_CASING_UHV = createCasingBlock("accelerator_electromagnetic_coil_constraint_casing_uhv", "UHV加速器磁约束线圈机械方块", GTOCore.id("block/casings/accelerator/accelerator_electromagnetic_coil_constraint_casing_uhv")); + public static final BlockEntry ANODE_ADSORPTION_RESIN = createCasingBlock("anode_adsorption_resin", "阳极吸附树脂", GTOCore.id("block/anode_adsorption_resin")); + public static final BlockEntry CATHODE_ADSORPTION_RESIN = createCasingBlock("cathode_adsorption_resin", "阴极吸附树脂", GTOCore.id("block/cathode_adsorption_resin")); + // 耐高压管道机械方块 public static final BlockEntry HIGH_PRESSURE_PIPE_CASING = createCasingBlock("high_pressure_pipe_casing", "耐高压管道机械方块", GTOCore.id("block/casings/high_pressure_pipe_casing")); // 耐化学腐蚀管道机械方块 diff --git a/src/main/java/com/gtocore/common/data/GTOItems.java b/src/main/java/com/gtocore/common/data/GTOItems.java index dbf49cec2..49e67953e 100644 --- a/src/main/java/com/gtocore/common/data/GTOItems.java +++ b/src/main/java/com/gtocore/common/data/GTOItems.java @@ -928,6 +928,12 @@ public static ItemEntry[][] registerIndustrialComponents() { public static final ItemEntry WIRELESS_ME2IN1 = item("wireless_me2in1_terminal", "无线ME2合1终端", Wireless.Item::new).register(); + public static final ItemEntry RO_MEMBRANE = register("ro_membrane", "ro膜"); + public static final ItemEntry NON_WOVEN_FABRIC = register("non_woven_fabric", "无纺布"); + public static final ItemEntry ION_EXCHANGE_MEMBRANE = register("ion_exchange_membrane", "离子交换膜"); + public static final ItemEntry HOMOGENEOUS_MEMBRANE = register("homogeneous_membrane", "均相膜"); + public static final ItemEntry DUAL_UV_LIGHT = register("dual_uv_light", "双波段紫外灯"); + public static final ItemEntry SPACE_NANOMUSCLE_CHESTPLATE = item("space_nanomuscle_chestplate", "纳米肌体™套装太空胸甲", (p) -> new SpaceArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.CHESTPLATE, 8000, p) diff --git a/src/main/java/com/gtocore/common/data/GTOMaterials.java b/src/main/java/com/gtocore/common/data/GTOMaterials.java index 42253c7d5..87df10e2b 100644 --- a/src/main/java/com/gtocore/common/data/GTOMaterials.java +++ b/src/main/java/com/gtocore/common/data/GTOMaterials.java @@ -1235,6 +1235,21 @@ private GTOMaterials() {} public static Material Shadowium; public static Material Aerialite; public static Material PhantomicElectrolyteBuffer; + /// 新1-4级水 + public static Material ReverseOsmosisWater; + public static Material ElectrodeionizationWater; + public static Material UltravioletWater; + public static Material MixedBedPolishingWater; + /// 1-4级水新增 + public static Material Polyamide; + public static Material Polypropylene; + public static Material Divinylbenzene; + public static Material DiethylbenzeneFraction; + public static Material SodiumPolystyreneSulfonate; + public static Material TrimethyLamine; + public static Material CathodeResin; + public static Material AnodeResin; + public static Material PolymerBackbone; public static void init() { GTMaterialExtend.init(); diff --git a/src/main/java/com/gtocore/common/data/machines/MultiBlockB.java b/src/main/java/com/gtocore/common/data/machines/MultiBlockB.java index 446684ad2..6f03752c4 100644 --- a/src/main/java/com/gtocore/common/data/machines/MultiBlockB.java +++ b/src/main/java/com/gtocore/common/data/machines/MultiBlockB.java @@ -35,6 +35,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LightningBolt; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Blocks; import committee.nova.mods.avaritia.init.registry.ModBlocks; @@ -942,19 +943,29 @@ public static void init() {} .tooltips(GTOMachineTooltips.INSTANCE.getClarifierPurificationUnitTooltips().getSupplier()) .recipeTypes(WATER_PURIFICATION_PLANT_RECIPES) .block(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING) - .pattern(definition -> MultiBlockFileReader.start(definition) - .where('A', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get())) - .where('B', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get()) + .pattern(definition -> FactoryBlockPattern.start(definition) + .aisle(" AAAAA ", " AAAAA ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBBBB ", " B ", " ", " ", " ") + .aisle(" BBBBBBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBBBB ", " ", " ", " ") + .aisle("ABBBBBBBB D D D D D D ", "A B D D D D D D ", "B B BBB BBB BBB ", "B B ECE ECE ECE ", "B B ECE ECE ECE ", "B B ECE ECE ECE ", "B B BBB BBB BBB ", "B B ", "B B ", " BBB BBB ", " B ", " ", " ") + .aisle("ABBBBBBBBB D D D D D D", "A BB DBBBD DBBBD DBBBD", "B B BB BB BB BB BB BB", "B B E E E E E E", "B B E E E E E E", "B B E E E E E E", "B B BB BB BB BB BB BB", "B B EEE EEE EEE ", "B B ", " BB BB ", " BBB ", " B ", " ") + .aisle("AGGGGFFFFFFFFFFFFFFFFFFFFFFFF ", "A B BFB BFB BFB ", "C B B H B B H B B H B", "C B C H C C H C C H C", "C B C H C C H C C H C", "C B C H C C H C C H C", "C B B H B B H B B H B", "C B EGE EGE EGE ", "B B G G G ", "BB BB G G G ", " BBGBB G G G ", " BGB G G G ", " GGGGGGGGGGGGGGGGGGGGGGGGG ") + .aisle("ABBBFFBBBB D D D D D D", "A BB DBBBD DBBBD DBBBD", "B B BB BB BB BB BB BB", "B B E E E E E E", "B B E E E E E E", "B B E E E E E E", "B B BB BB BB BB BB BB", "B B EEE EEE EEE ", "B B ", " BB BB ", " BBB ", " B ", " ") + .aisle("ABBBFBBBB D D D D D D ", "A B D D D D D D ", "B B BBB BBB BBB ", "B B ECE ECE ECE ", "B B ECE ECE ECE ", "B B ECE ECE ECE ", "B B BBB BBB BBB ", "B B ", "B B ", " BBB BBB ", " B ", " ", " ") + .aisle(" BBBFBBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBBBB ", " ", " ", " ") + .aisle(" AAAAA ", " AAIAA ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBBBB ", " B ", " ", " ", " ") + .where('A', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get()) .or(abilities(IMPORT_FLUIDS).setMaxGlobalLimited(3)) - .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(2)) + .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(1)) .or(abilities(EXPORT_ITEMS).setMaxGlobalLimited(1)) .or(abilities(MAINTENANCE).setExactLimit(1))) - .where('C', controller(blocks(definition.get()))) - .where('D', blocks(GTBlocks.CASING_POLYTETRAFLUOROETHYLENE_PIPE.get())) - .where('E', air()) - .where('F', blocks(GTOBlocks.STERILE_WATER_PLANT_CASING.get())) - .where('G', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.StainlessSteel))) + .where('B', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get())) + .where('C', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) + .where('D', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.StainlessSteel))) + .where('E', blocks(GTOBlocks.STERILE_WATER_PLANT_CASING.get())) + .where('F', blocks(GTOBlocks.HIGH_PRESSURE_PIPE_CASING.get())) + .where('G', blocks(GTOBlocks.CHEMICAL_CORROSION_RESISTANT_PIPE_CASING.get())) .where('H', blocks(GTBlocks.FILTER_CASING.get())) + .where('I', controller(blocks(definition.get()))) .where(' ', any()) .build()) .renderer(FluidRenderer.create(GTOCore.id("block/reinforced_sterile_water_plant_casing"), GTCEu.id("block/multiblock/large_chemical_reactor"))) @@ -968,15 +979,25 @@ public static void init() {} .fromSourceTooltips("GTNH") .recipeTypes(WATER_PURIFICATION_PLANT_RECIPES) .block(GTOBlocks.OZONE_CASING) - .pattern(definition -> MultiBlockFileReader.start(definition) - .where('~', controller(blocks(definition.get()))) - .where('E', blocks(GTOBlocks.HIGH_PRESSURE_RESISTANT_CASING.get())) - .where('A', blocks(GTOBlocks.OZONE_CASING.get()) + .pattern(definition -> FactoryBlockPattern.start(definition) + .aisle(" ABBBA ", " CDC ", " CDC ", " CDC ", " CDC ", " CCC ", " ") + .aisle(" AA A AA AACECAA", " CCCCCCCCCCCCCCC F F ", " CFFFDDDDDDDFFFC F F ", " CCCCCCCCCCCCCCC F F ", " AA A AA F F ", " F F ", " ACCCA ") + .aisle("BBB CCCCCCCCCCCCCCC CCCECCB", "BBB C G H G C C C", "CCC C G H G C C C", "CCC C G H G C C C", " CCCCCCCCCCCCCCC C C", " C C", " CCCCC ") + .aisle("BCC CFFFFFFFFFFFFFC CCCEEEB", "B C CG H G HC C D", "CEEEEEEFFFFFFFFFFFEEEEEE D", "CCC CH G H GC CE D", " CFFFFFFFFFFFFFC CE D", " CEEE C", " CCCCC ") + .aisle("BBB CCCCCCCCCCCCCCC CCCECCB", "BIB C H G H C C C", "CCC C H G H C C C", "CCC C H G H C C C", " CCCCCCCCCCCCCCC C C", " C C", " CCCCC ") + .aisle(" AA A AA AACECAA", " CCCCCCCCCCCCCCC F F ", " CFFFDDDDDDDFFFC F F ", " CCCCCCCCCCCCCCC F F ", " AA A AA F F ", " F F ", " ACCCA ") + .aisle(" ABBBA ", " CDC ", " CDC ", " CDC ", " CDC ", " CCC ", " ") + .where('A', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.HSSE))) + .where('B', blocks(GTOBlocks.OZONE_CASING.get()) .or(abilities(IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) - .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1))) - .where('C', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.HSSE))) + .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1))) + .where('C', blocks(GTOBlocks.OZONE_CASING.get())) .where('D', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) - .where('F', blocks(GTBlocks.CASING_POLYTETRAFLUOROETHYLENE_PIPE.get())) + .where('E', blocks(GTOBlocks.CHEMICAL_CORROSION_RESISTANT_PIPE_CASING.get())) + .where('F', blocks(GTOBlocks.HIGH_PRESSURE_RESISTANT_CASING.get())) + .where('G', blocks(GTOBlocks.CATHODE_ADSORPTION_RESIN.get())) + .where('H', blocks(GTOBlocks.ANODE_ADSORPTION_RESIN.get())) + .where('I', controller(blocks(definition.get()))) .where(' ', any()) .build()) .workableCasingRenderer(GTOCore.id("block/ozone_casing"), GTCEu.id("block/multiblock/large_chemical_reactor")) @@ -989,19 +1010,27 @@ public static void init() {} .fromSourceTooltips("GTNH") .recipeTypes(WATER_PURIFICATION_PLANT_RECIPES) .block(GTOBlocks.FLOCCULATION_CASING) - .pattern(definition -> MultiBlockFileReader.start(definition) - .where('~', controller(blocks(definition.get()))) + .pattern(definition -> FactoryBlockPattern.start(definition) + .aisle(" AAAAA ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBBBB ", " ", " ", " ", " ") + .aisle(" AAAAA BBBBB BBBBB BBBDBBB ", " BE EB ", " B B ", " B B ", " B B ", " B B ", " B B ", " BB BB ", " BBBBB ", " ", " ", " ") + .aisle(" ABBBBBB BBBBBBB BBBBBBB BBBBDBBBA", " AAAAA BBBBB BBBBB BE EB", " B B", " B B", " B B", " B B", " B B", " BB BB", " BBB BBB ", " B ", " ", " ") + .aisle("ABBBBBBBBBBBBBBBBBBBBBBBBBBBBBDBBBA", " AFFFFFB BFFFFFB BFFFFFB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB BB BB ", " FFF FFF FFF BEB ", " B ", " ") + .aisle("ABBBDDDDDDDDDDDDDDDDDBBBBBBBBBDDDDA", " AFFDFFB BFFDFFB BFFDFFB B C", " GE EG GE EG GE EG B C", " BE EB BE EB BE EB B C", " BE EB BE EB BE EB B C", " BE EB BE EB BE EB B C", " BE EB BE EB BE EB B C", " BE EB BE EB BE EB B B", " GE EG GE EG GE EG B B ", " FFDFF FFDFF FFDFF BEDEB ", " D D D BDB ", " DDDDDDDDDDDDDDDDDDDDDDDDDDD ") + .aisle("ABBBDBBBBBBBBBBBBBBBBBBBBBBBBBDBBBA", " AFFFFFB BFFFFFB BFFFFFB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB B B", " BCB BCB BCB BB BB ", " FFF FFF FFF BEB ", " B ", " ") + .aisle(" ABBDBBB BBBBBBB BBBBBBB BBBBDBBBA", " AAHAA BBBBB BBBBB BE EB", " B B", " B B", " B B", " B B", " B B", " BB BB", " BBB BBB ", " B ", " ", " ") + .aisle(" AAAAA BBBBB BBBBB BBBDBBB ", " BE EB ", " B B ", " B B ", " B B ", " B B ", " B B ", " BB BB ", " BBBBB ", " ", " ", " ") + .aisle(" AAAAA ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBCBB ", " BBBBB ", " ", " ", " ", " ") .where('A', blocks(GTOBlocks.FLOCCULATION_CASING.get()) .or(abilities(IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) - .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(3).setPreviewCount(1))) - .where('H', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get())) - .where('F', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) - .where('D', air()) - .where('E', blocks(GTBlocks.FILTER_CASING.get())) - .where('G', frames(GTMaterials.StainlessSteel)) - .where('C', blocks(GTOBlocks.FLOCCULATION_CASING.get())) + .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1))) + .where('B', blocks(GTOBlocks.FLOCCULATION_CASING.get())) + .where('C', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) + .where('D', blocks(GTOBlocks.CHEMICAL_CORROSION_RESISTANT_PIPE_CASING.get())) + .where('E', blocks(GTOBlocks.HIGH_ENERGY_ULTRAVIOLET_EMITTER_CASING.get())) + .where('F', blocks(GTOBlocks.REINFORCED_STERILE_WATER_PLANT_CASING.get())) + .where('G', blocks(GTBlocks.LAMPS.get(DyeColor.PURPLE).get())) + .where('H', controller(blocks(definition.get()))) .where(' ', any()) - .where('#', air()) .build()) .workableCasingRenderer(GTOCore.id("block/flocculation_casing"), GTCEu.id("block/multiblock/large_chemical_reactor")) .register(); @@ -1013,17 +1042,31 @@ public static void init() {} .fromSourceTooltips("GTNH") .recipeTypes(WATER_PURIFICATION_PLANT_RECIPES) .block(GTOBlocks.STABILIZED_NAQUADAH_WATER_PLANT_CASING) - .pattern(definition -> MultiBlockFileReader.start(definition) - .where('~', controller(blocks(definition.get()))) - .where('A', frames(GTMaterials.Naquadah)) - .where('F', abilities(IMPORT_ITEMS)) - .where('G', abilities(IMPORT_FLUIDS)) - .where('B', blocks(GTOBlocks.INERT_NEUTRALIZATION_WATER_PLANT_CASING.get())) - .where('C', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) - .where('D', blocks(GTOBlocks.STABILIZED_NAQUADAH_WATER_PLANT_CASING.get()) - .or(blocks(GTOMachines.PH_SENSOR.get()).setMaxGlobalLimited(2).setPreviewCount(1)) + .pattern(definition -> FactoryBlockPattern.start(definition) + .aisle(" AAAAA ", " AABAA ", " AABAA ", " AABAA ", " CCBCC ", " AABAA ", " AABAA ", " AABAA ", " CCBCC ", " AABAA ", " AAAAA ", " ", " ") + .aisle("D D F AAAAAAA DEEED ", "GGG F A F F A ABA ", "GBG F AHHHHHA ABA ", "GBG F AIIIIIA ABA ", "GBG F C C ABA ", "CCC F AFF F A AAA ", "GBG F AHHHHHA ", "GBG F AJJJJJA ", "GBG F C C ", "GGG A A ", " A A ", " AAAAA ", " ") + .aisle(" AAAAAAAAA DDAKADD", "GGG A F F A C C ", "B B AHHHHHHHA C C ", "B B F AIIIIIIIA C C ", "B KKKKKKKKK C C C ", "C C AFFF F A C C ", "B B AHHHHHHHA DCCCD ", "B B F AJJJJJJJA ", "B KKKKKKKKK C ", "GGG A A ", " A A ", " AAA AAA ", " A ") + .aisle("D D AAAAAAAAA AAAKAAE", "GGG AFFFFFFFA A A", "GKG AHHHHHHHA A A", "GGG F AIIIIIIIA A A", "GGG C C A A", "CCC AFFFFFFFA A A", "GKG AHHHHHHHA CAAAC ", "GGG F AJJJJJJJA ", "GGG C C ", "GGG A A ", " A A ", " AA AA ", " AAA ") + .aisle(" F AAAAAAAAA AAAKKKE", " F B FKKKKKKKK B", " K F BHHHHHHHB B B", " F BIIIIIIIB B B", " F B B B B", " F BFFF F B A A", " K F BHHHHHHHB CAAAC ", " F BJJJJJJJB ", " B B ", " B B ", " A A ", " A A ", " AAAAA ") + .aisle("EAE AAAAAAAAA AAAKAAE", "EAE AFFFFFFFA A A", "EKE AHHHHHHHA A A", "AAA F AIIIIIIIA A A", " C C A A", " AFFFFFFFA A A", " K AHHHHHHHA CAAAC ", " F AJJJJJJJA ", " C C ", " A A ", " A A ", " AA AA ", " AAA ") + .aisle("EAE AAAAAAAAA DDAKADD", "E E A F F A C C ", "E KKK AHHHHHHHA C C ", "AKA KF AIIIIIIIA C C ", " K KKKKKKK C C C ", " K K AFFF F A C C ", " K K AHHHHHHHA DCCCD ", " KF AJJJJJJJA ", " KKKKKKK C ", " A A ", " A A ", " AAA AAA ", " A ") + .aisle("EEE F AAAAAAA DEEED ", "ELE F A F F A ABA ", "EEE F AHHHHHA ABA ", "AAA F AIIIIIA ABA ", " F C C ABA ", " F AFF F A AAA ", " F AHHHHHA ", " F AJJJJJA ", " F C C ", " A A ", " A A ", " AAAAA ", " ") + .aisle(" AAAAA ", " AABAA ", " AABAA ", " AABAA ", " CCBCC ", " AABAA ", " AABAA ", " AABAA ", " CCBCC ", " AABAA ", " AAAAA ", " ", " ") + .where('A', blocks(GTOBlocks.INERT_NEUTRALIZATION_WATER_PLANT_CASING.get())) + .where('B', blocks(GTOBlocks.CHEMICAL_GRADE_GLASS.get())) + .where('C', blocks(GTOBlocks.STABILIZED_NAQUADAH_WATER_PLANT_CASING.get())) + .where('D', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.Naquadah))) + .where('E', blocks(GTOBlocks.INERT_NEUTRALIZATION_WATER_PLANT_CASING.get()) + .or(blocks(GTOMachines.PH_SENSOR.getBlock()).setMaxGlobalLimited(2).setPreviewCount(1)) .or(abilities(IMPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1)) - .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1))) + .or(abilities(EXPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1))) + .where('F', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.StainlessSteel))) + .where('G', blocks(GTBlocks.CASING_PTFE_INERT.get())) + .where('H', blocks(GTBlocks.FILTER_CASING.get())) + .where('I', blocks(GTOBlocks.ANODE_ADSORPTION_RESIN.get())) + .where('J', blocks(GTOBlocks.CATHODE_ADSORPTION_RESIN.get())) + .where('K', blocks(GTOBlocks.CHEMICAL_CORROSION_RESISTANT_PIPE_CASING.get())) + .where('L', controller(blocks(definition.get()))) .where(' ', any()) .build()) .workableCasingRenderer(GTOCore.id("block/stabilized_naquadah_water_plant_casing"), GTCEu.id("block/multiblock/large_chemical_reactor")) diff --git a/src/main/java/com/gtocore/common/data/material/MaterialB.java b/src/main/java/com/gtocore/common/data/material/MaterialB.java index 9ddb70218..47fc9c940 100644 --- a/src/main/java/com/gtocore/common/data/material/MaterialB.java +++ b/src/main/java/com/gtocore/common/data/material/MaterialB.java @@ -5194,5 +5194,37 @@ public static void init() { .color(0x283301) .iconSet(DULL) .buildAndRegister().setFormula("YBa2Cu3O6"); + + ReverseOsmosisWater = material("ro_water", "ro水") + .fluid() + .components(Hydrogen, 2, Oxygen, 1) + .color(0x0058cd) + .iconSet(FLUID) + .flags(DISABLE_DECOMPOSITION) + .buildAndRegister(); + + ElectrodeionizationWater = material("edi_water", "edi水") + .fluid() + .components(Hydrogen, 2, Oxygen, 1) + .color(0x0058cd) + .iconSet(FLUID) + .flags(DISABLE_DECOMPOSITION) + .buildAndRegister(); + + UltravioletWater = material("uv_water", "uv水") + .fluid() + .components(Hydrogen, 2, Oxygen, 1) + .color(0x0058cd) + .iconSet(FLUID) + .flags(DISABLE_DECOMPOSITION) + .buildAndRegister(); + + MixedBedPolishingWater = material("mbp_water", "混床抛光水") + .fluid() + .components(Hydrogen, 2, Oxygen, 1) + .color(0x0058cd) + .iconSet(FLUID) + .flags(DISABLE_DECOMPOSITION) + .buildAndRegister(); } } diff --git a/src/main/java/com/gtocore/common/data/material/MaterialC.java b/src/main/java/com/gtocore/common/data/material/MaterialC.java index 2a5e60867..374207064 100644 --- a/src/main/java/com/gtocore/common/data/material/MaterialC.java +++ b/src/main/java/com/gtocore/common/data/material/MaterialC.java @@ -707,5 +707,70 @@ public static void init() { .color(0x8B00FF) .iconSet(FLUID) .buildAndRegister(); + + Polyamide = material("polyamide", "聚酰胺") + .fluid() + .polymer() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .flags(DISABLE_DECOMPOSITION, GENERATE_FOIL) + .color(0xff6730) + .iconSet(DULL) + .buildAndRegister(); + + Polypropylene = material("polypropylene", "聚丙烯") + .fluid() + .polymer() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .flags(DISABLE_DECOMPOSITION, GENERATE_FOIL) + .color(0x9f9f5f) + .iconSet(DULL) + .buildAndRegister(); + + Divinylbenzene = material("divinylbenzene", "二乙烯基苯") + .fluid() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .color(0xff6730) + .iconSet(DULL) + .buildAndRegister(); + + DiethylbenzeneFraction = material("diethylbenzene_fraction", "富二乙烯苯馏分") + .fluid() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .color(0xff6730) + .iconSet(DULL) + .buildAndRegister(); + + SodiumPolystyreneSulfonate = material("Sodium_polystyrene_sulfonate", "聚苯乙烯磺酸钠") + .fluid() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .iconSet(DULL) + .color(0XF59E0B) + .buildAndRegister(); + + TrimethyLamine = material("trimethy_lamine", "三甲基铵") + .fluid() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .iconSet(DULL) + .color(0x3BB2F6) + .buildAndRegister(); + + CathodeResin = material("cathode_resin", "阴极功能树脂") + .fluid() + .iconSet(DULL) + .color(0x3BB2F6) + .buildAndRegister(); + + AnodeResin = material("anode_resin", "阳极功能树脂") + .fluid() + .iconSet(DULL) + .color(0XF59E0B) + .buildAndRegister(); + + PolymerBackbone = material("polymer_backbone", "高分子骨架") + .fluid() + .components(Carbon, 22, Hydrogen, 12, Nitrogen, 2, Oxygen, 6) + .iconSet(DULL) + .color(0X808080) + .buildAndRegister(); } } diff --git a/src/main/java/com/gtocore/data/recipe/classified/AssemblyLine.java b/src/main/java/com/gtocore/data/recipe/classified/AssemblyLine.java index 623f1d939..7b48724d3 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/AssemblyLine.java +++ b/src/main/java/com/gtocore/data/recipe/classified/AssemblyLine.java @@ -4324,5 +4324,19 @@ public static void init() { .CWUt(512) .EUt(125829120)) .save(); + + ASSEMBLY_LINE_RECIPES.builder("dual_uv_light") + .inputItems(GTOTagPrefix.CURVED_PLATE, GTMaterials.TungstenCarbide, 2) + .inputItems(TagPrefix.plate, GTMaterials.TungstenCarbide) + .inputItems(CustomTags.LuV_CIRCUITS, 3) + .inputItems(GTItems.VOLTAGE_COIL_LuV.asStack(2)) + .inputItems(new ItemStack(AEBlocks.QUARTZ_GLASS.block().asItem())) + .inputItems(new ItemStack(AEBlocks.QUARTZ_VIBRANT_GLASS.block().asItem())) + .inputItems(TagPrefix.screw, GTMaterials.TungstenCarbide, 4) + .outputItems(GTOItems.DUAL_UV_LIGHT.asItem()) + .inputFluids(GTMaterials.Mercury, 100) + .EUt(30720) + .duration(200) + .save(); } } diff --git a/src/main/java/com/gtocore/data/recipe/classified/ChemicaRreactor.java b/src/main/java/com/gtocore/data/recipe/classified/ChemicaRreactor.java index f055ac835..e34655706 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/ChemicaRreactor.java +++ b/src/main/java/com/gtocore/data/recipe/classified/ChemicaRreactor.java @@ -3458,13 +3458,39 @@ public static void init() { .duration(300) .save(); + CHEMICAL_RECIPES.builder("divinylbenzene") + .inputItems(GTOTagPrefix.CATALYST, GTOMaterials.ZnFeAlClCatalyst) + .inputFluids(GTMaterials.Ethylbenzene, 1000) + .inputFluids(GTMaterials.Ethylene, 1000) + .outputFluids(GTOMaterials.Divinylbenzene, 2000) + .EUt(400) + .duration(100) + .save(); + + CHEMICAL_RECIPES.builder("sodium_polystyrene_sulfonate") + .inputFluids(GTOMaterials.Polystyrene, 1000) + .inputFluids(GTMaterials.Dichloroethane, 1000) + .inputFluids(GTMaterials.SulfuricAcid, 1000) + .outputFluids(GTOMaterials.SodiumPolystyreneSulfonate, 3000) + .EUt(400) + .duration(100) + .save(); + + CHEMICAL_RECIPES.builder("trimethy_lamine") + .inputFluids(GTOMaterials.Trimethylamine, 1000) + .inputFluids(GTMaterials.Chloromethane, 1000) + .outputFluids(GTOMaterials.TrimethyLamine, 1000) + .EUt(400) + .duration(100) + .save(); + LARGE_CHEMICAL_RECIPES.builder("osmium_tetroxide_dust") .inputItems(GTOTagPrefix.dust, GTMaterials.Osmium) .outputItems(GTOTagPrefix.dust, GTMaterials.OsmiumTetroxide, 5) .inputFluids(GTMaterials.Oxygen, 4000) .circuitMeta(3) - .EUt(20) - .duration(120) + .EUt(240) + .duration(320) .save(); } } diff --git a/src/main/java/com/gtocore/data/recipe/classified/Cluster.java b/src/main/java/com/gtocore/data/recipe/classified/Cluster.java index 4a78c8634..980b19c14 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/Cluster.java +++ b/src/main/java/com/gtocore/data/recipe/classified/Cluster.java @@ -1,6 +1,9 @@ package com.gtocore.data.recipe.classified; import com.gtocore.common.data.GTOItems; +import com.gtocore.common.data.GTOMaterials; + +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import static com.gtocore.common.data.GTORecipeTypes.CLUSTER_RECIPES; @@ -13,5 +16,12 @@ public static void init() { .EUt(30) .duration(100) .save(); + + CLUSTER_RECIPES.builder("non_woven_fabric") + .inputItems(TagPrefix.foil, GTOMaterials.Polypropylene, 4) + .outputItems(GTOItems.NON_WOVEN_FABRIC.asItem()) + .EUt(30) + .duration(100) + .save(); } } diff --git a/src/main/java/com/gtocore/data/recipe/classified/Distillery.java b/src/main/java/com/gtocore/data/recipe/classified/Distillery.java index 6c79df375..19eebfb06 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/Distillery.java +++ b/src/main/java/com/gtocore/data/recipe/classified/Distillery.java @@ -66,5 +66,12 @@ public static void init() { .EUt(120) .duration(400) .save(); + + DISTILLERY_RECIPES.builder("diethylbenzene_fraction") + .inputFluids(GTOMaterials.Divinylbenzene, 1000) + .outputFluids(GTOMaterials.DiethylbenzeneFraction, 800) + .EUt(400) + .duration(100) + .save(); } } diff --git a/src/main/java/com/gtocore/data/recipe/classified/FluidSolidfication.java b/src/main/java/com/gtocore/data/recipe/classified/FluidSolidfication.java index bcfe19749..51a7d6f04 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/FluidSolidfication.java +++ b/src/main/java/com/gtocore/data/recipe/classified/FluidSolidfication.java @@ -1,5 +1,6 @@ package com.gtocore.data.recipe.classified; +import com.gtocore.common.data.GTOBlocks; import com.gtocore.common.data.GTOItems; import com.gtocore.common.data.GTOMaterials; import com.gtocore.common.data.GTORecipeCategories; @@ -95,6 +96,22 @@ public static void init() { .duration(20) .save(); + FLUID_SOLIDFICATION_RECIPES.builder("cathode_adsorption_resin") + .inputItems(GTItems.SHAPE_MOLD_BLOCK.asStack()) + .outputItems(GTOBlocks.CATHODE_ADSORPTION_RESIN.asStack()) + .inputFluids(GTOMaterials.CathodeResin, 1000) + .EUt(30) + .duration(100) + .save(); + + FLUID_SOLIDFICATION_RECIPES.builder("anode_adsorption_resin") + .inputItems(GTItems.SHAPE_MOLD_BLOCK.asStack()) + .outputItems(GTOBlocks.ANODE_ADSORPTION_RESIN.asStack()) + .inputFluids(GTOMaterials.AnodeResin, 1000) + .EUt(30) + .duration(100) + .save(); + Map> toolToMoldMap = Map.of( DISPOSABLE_FILE_MOLD.get(), CustomTags.CRAFTING_FILES, DISPOSABLE_WRENCH_MOLD.get(), CustomTags.CRAFTING_WRENCHES, diff --git a/src/main/java/com/gtocore/data/recipe/classified/PolymerizationReactor.java b/src/main/java/com/gtocore/data/recipe/classified/PolymerizationReactor.java index 5f63a9a22..cb5bf68ba 100644 --- a/src/main/java/com/gtocore/data/recipe/classified/PolymerizationReactor.java +++ b/src/main/java/com/gtocore/data/recipe/classified/PolymerizationReactor.java @@ -1,5 +1,6 @@ package com.gtocore.data.recipe.classified; +import com.gtocore.common.data.GTOItems; import com.gtocore.common.data.GTOMaterials; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; @@ -247,5 +248,61 @@ public static void init() { .EUt(510) .duration(150) .save(); + + POLYMERIZATION_REACTOR_RECIPES.recipeBuilder("polypropylene_from_oxygen") + .circuitMeta(1) + .inputFluids(Oxygen.getFluid(1000)) + .inputFluids(Propene.getFluid(L)) + .outputFluids(Polypropylene.getFluid(216)) + .duration(160).EUt(VA[LV]).save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("ro_membrane") + .inputItems(GTOItems.NON_WOVEN_FABRIC.asItem()) + .inputItems(TagPrefix.foil, GTOMaterials.Polyamide) + .outputItems(GTOItems.RO_MEMBRANE.asItem()) + .EUt(400) + .duration(100) + .save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("polymer_backbone") + .inputFluids(GTMaterials.Styrene, 1000) + .inputFluids(GTOMaterials.DiethylbenzeneFraction, 1000) + .outputFluids(GTOMaterials.PolymerBackbone, 2000) + .EUt(400) + .duration(100) + .save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("cathode_resin") + .inputFluids(GTOMaterials.PolymerBackbone, 1000) + .inputFluids(GTOMaterials.TrimethyLamine, 1000) + .outputFluids(GTOMaterials.CathodeResin, 2000) + .EUt(400) + .duration(100) + .save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("anode_resin") + .inputFluids(GTOMaterials.PolymerBackbone, 1000) + .inputFluids(GTOMaterials.SodiumPolystyreneSulfonate, 1000) + .outputFluids(GTOMaterials.AnodeResin, 2000) + .EUt(400) + .duration(100) + .save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("ion_exchange_membrane") + .inputItems(GTOItems.HOMOGENEOUS_MEMBRANE.asItem()) + .outputItems(GTOItems.ION_EXCHANGE_MEMBRANE.asItem()) + .inputFluids(GTOMaterials.CathodeResin, 500) + .inputFluids(GTOMaterials.AnodeResin, 500) + .EUt(400) + .duration(100) + .save(); + + POLYMERIZATION_REACTOR_RECIPES.builder("homogeneous_membrane") + .outputItems(GTOItems.HOMOGENEOUS_MEMBRANE.asItem()) + .inputFluids(GTMaterials.Polytetrafluoroethylene, 500) + .inputFluids(GTMaterials.Styrene, 500) + .EUt(400) + .duration(100) + .save(); } } diff --git a/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png new file mode 100644 index 000000000..8cfecc04b Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png differ diff --git a/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png.mcmeta b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png.mcmeta new file mode 100644 index 000000000..e2d4fcd4d --- /dev/null +++ b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "gtocore:block/anode_adsorption_resin_ctm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin_ctm.png b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin_ctm.png new file mode 100644 index 000000000..b4fae4943 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/block/anode_adsorption_resin_ctm.png differ diff --git a/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png new file mode 100644 index 000000000..998e113ec Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png differ diff --git a/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png.mcmeta b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png.mcmeta new file mode 100644 index 000000000..a8974a561 --- /dev/null +++ b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "gtocore:block/cathode_adsorption_resin_ctm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin_ctm.png b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin_ctm.png new file mode 100644 index 000000000..0d544cf3c Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/block/cathode_adsorption_resin_ctm.png differ diff --git a/src/main/resources/assets/gtocore/textures/item/dual_uv_light.png b/src/main/resources/assets/gtocore/textures/item/dual_uv_light.png new file mode 100644 index 000000000..a65732f51 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/item/dual_uv_light.png differ diff --git a/src/main/resources/assets/gtocore/textures/item/homogeneous_membrane.png b/src/main/resources/assets/gtocore/textures/item/homogeneous_membrane.png new file mode 100644 index 000000000..7a22a0910 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/item/homogeneous_membrane.png differ diff --git a/src/main/resources/assets/gtocore/textures/item/ion_exchange_membrane.png b/src/main/resources/assets/gtocore/textures/item/ion_exchange_membrane.png new file mode 100644 index 000000000..b4b5ea025 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/item/ion_exchange_membrane.png differ diff --git a/src/main/resources/assets/gtocore/textures/item/non_woven_fabric.png b/src/main/resources/assets/gtocore/textures/item/non_woven_fabric.png new file mode 100644 index 000000000..8ffa69f01 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/item/non_woven_fabric.png differ diff --git a/src/main/resources/assets/gtocore/textures/item/ro_membrane.png b/src/main/resources/assets/gtocore/textures/item/ro_membrane.png new file mode 100644 index 000000000..1ecb93842 Binary files /dev/null and b/src/main/resources/assets/gtocore/textures/item/ro_membrane.png differ