From bd58b9072f45d647734ae66168cbd27bf9b2f220 Mon Sep 17 00:00:00 2001 From: htmlcsjs <46023024+htmlcsjs@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:01:55 +0100 Subject: [PATCH] update mods (#450) * Update mods: - foamfix-0.10.15-1.12.2.jar - multiblocktweaker-1.12.2-stable-gtceu-1.9.0.jar - devtech-2.1.4.jar - gregtech-1.12.2-2.7.3-beta.jar - GregicalityMultiblocks-1.2.5.jar - appliedenergistics2-rv6-stable-7-extended_life-v0.55.22.jar - modularui-2.1.0.jar - bogosorter-1.3.0.jar * Now launches * fix #381, and move mufflers * Mostly working scripts * fix lang * double plate flag addition * missed one --------- Co-authored-by: tracer4b <61507029+tracer4b@users.noreply.github.com> --- manifest.json | 16 +- .../config-overrides/expert/randompatches.cfg | 2 +- .../config-overrides/normal/randompatches.cfg | 2 +- overrides/config/randompatches.cfg | 2 +- .../resources/contenttweaker/lang/en_us.lang | 278 +++++++++--------- overrides/scripts/Earlygame.zs | 8 +- overrides/scripts/EnderIO.zs | 2 +- overrides/scripts/Endgame.zs | 2 +- overrides/scripts/_oreDict.zs | 3 - overrides/scripts/electronics.zs | 2 +- overrides/scripts/extendedcrafting.zs | 2 +- overrides/scripts/materials.zs | 22 +- overrides/scripts/multiblocks_expert.zs | 39 +-- overrides/scripts/multiblocks_normal.zs | 27 +- overrides/scripts/normalmode.zs | 38 +-- 15 files changed, 223 insertions(+), 222 deletions(-) diff --git a/manifest.json b/manifest.json index 575fd52..c2c4bea 100644 --- a/manifest.json +++ b/manifest.json @@ -494,7 +494,7 @@ }, { "projectID": 278494, - "fileID": 3327893, + "fileID": 3973967, "required": true }, { @@ -648,7 +648,7 @@ }, { "projectID": 386188, - "fileID": 4083612, + "fileID": 4673854, "required": true }, { @@ -668,7 +668,7 @@ }, { "projectID": 412037, - "fileID": 3787768, + "fileID": 4682339, "required": true }, { @@ -711,7 +711,7 @@ }, { "projectID": 557242, - "fileID": 4527757, + "fileID": 4701483, "required": true }, { @@ -721,12 +721,12 @@ }, { "projectID": 564858, - "fileID": 4529101, + "fileID": 4701685, "required": true }, { "projectID": 570458, - "fileID": 4688138, + "fileID": 4724395, "required": true }, { @@ -741,7 +741,7 @@ }, { "projectID": 624243, - "fileID": 4635658, + "fileID": 4692436, "required": true }, { @@ -751,7 +751,7 @@ }, { "projectID": 632327, - "fileID": 4635732, + "fileID": 4752339, "required": true }, { diff --git a/overrides/config-overrides/expert/randompatches.cfg b/overrides/config-overrides/expert/randompatches.cfg index d2b9e5f..313d20e 100644 --- a/overrides/config-overrides/expert/randompatches.cfg +++ b/overrides/config-overrides/expert/randompatches.cfg @@ -60,7 +60,7 @@ client { # Set this to false to disable the Minecraft class patches (the Toggle Narrator keybind and custom window title/icon). # Default: true - B:patchMinecraftClass=true + B:patchMinecraftClass=false # Set this to false to force disable the "force title screen on disconnect" patch. # Default: true diff --git a/overrides/config-overrides/normal/randompatches.cfg b/overrides/config-overrides/normal/randompatches.cfg index 6cf4142..ad6a08c 100644 --- a/overrides/config-overrides/normal/randompatches.cfg +++ b/overrides/config-overrides/normal/randompatches.cfg @@ -60,7 +60,7 @@ client { # Set this to false to disable the Minecraft class patches (the Toggle Narrator keybind and custom window title/icon). # Default: true - B:patchMinecraftClass=true + B:patchMinecraftClass=false # Set this to false to force disable the "force title screen on disconnect" patch. # Default: true diff --git a/overrides/config/randompatches.cfg b/overrides/config/randompatches.cfg index af64840..0a4c96c 100644 --- a/overrides/config/randompatches.cfg +++ b/overrides/config/randompatches.cfg @@ -60,7 +60,7 @@ client { # Set this to false to disable the Minecraft class patches (the Toggle Narrator keybind and custom window title/icon). # Default: true - B:patchMinecraftClass=true + B:patchMinecraftClass=false # Set this to false to force disable the "force title screen on disconnect" patch. # Default: true diff --git a/overrides/resources/contenttweaker/lang/en_us.lang b/overrides/resources/contenttweaker/lang/en_us.lang index fbc6abc..4986b59 100644 --- a/overrides/resources/contenttweaker/lang/en_us.lang +++ b/overrides/resources/contenttweaker/lang/en_us.lang @@ -1,147 +1,147 @@ item.material.oreprefix.gemPerfect=Perfect %s -material.conductive_iron=Conductive Iron -material.pulsating_iron=Pulsating Iron -material.energetic_alloy=Energetic Alloy -material.vibrant_alloy=Vibrant Alloy -material.dark_steel=Dark Steel -material.lumium=Lumium -material.signalum=Signalum -material.enderium=Enderium -material.electrical_steel=Electrical Steel -material.end_steel=End Steel -material.ardite=Ardite -material.manyullyn=Manyullyn -material.omnium=Omnium -material.draconium=Draconium -material.microversium=Microversium -material.awakened_draconium=Awakened Draconium -material.electrum_flux=Fluxed Electrum -material.mithril=Mana Infused -material.knightslime=Knightslime -material.crystal_matrix=Crystal Matrix -material.soularium=Soularium -material.infinity=Infinity -material.draconic_superconductor=Draconic Superconductor -material.fluix=Fluix -material.osmiridium_8020=Osmiridium 80/20 -material.iridosmine_8020=Iridosmine 80/20 -material.kaemanite=Kaemanite +gregtech.material.conductive_iron=Conductive Iron +gregtech.material.pulsating_iron=Pulsating Iron +gregtech.material.energetic_alloy=Energetic Alloy +gregtech.material.vibrant_alloy=Vibrant Alloy +gregtech.material.dark_steel=Dark Steel +gregtech.material.lumium=Lumium +gregtech.material.signalum=Signalum +gregtech.material.enderium=Enderium +gregtech.material.electrical_steel=Electrical Steel +gregtech.material.end_steel=End Steel +gregtech.material.ardite=Ardite +gregtech.material.manyullyn=Manyullyn +gregtech.material.omnium=Omnium +gregtech.material.draconium=Draconium +gregtech.material.microversium=Microversium +gregtech.material.awakened_draconium=Awakened Draconium +gregtech.material.electrum_flux=Fluxed Electrum +gregtech.material.mithril=Mana Infused +gregtech.material.knightslime=Knightslime +gregtech.material.crystal_matrix=Crystal Matrix +gregtech.material.soularium=Soularium +gregtech.material.infinity=Infinity +gregtech.material.draconic_superconductor=Draconic Superconductor +gregtech.material.fluix=Fluix +gregtech.material.osmiridium_8020=Osmiridium 80/20 +gregtech.material.iridosmine_8020=Iridosmine 80/20 +gregtech.material.kaemanite=Kaemanite -material.tungsten_trioxide=Tungsten Trioxide -material.beryllium_oxide=Beryllium Oxide -material.niobium_pentoxide=Niobium Pentoxide -material.tantalum_pentoxide=Tantalum Pentoxide -material.fluorite=Fluorite -material.manganese_difluoride=Manganese Difluoride -material.molybdenum_trioxide=Molybdenum Trioxide -material.lead_chloride=Lead Chloride -material.wollastonite=Wollastonite -material.sodium_metavanadate=Sodium Metavanadate -material.vanadium_pentoxide=Vanadium Pentoxide -material.ammonium_metavanadate=Ammonium Metavanadate -material.phthalic_anhydride=Phthalic Anhydride -material.ethylanthraquinone=2-Ethylanthraquinone -material.hydrogen_peroxide=Hydrogen Peroxide -material.hydrazine=Hydrazine -material.acetone_azine=Acetone Azine -material.graphene_oxide=Graphene Oxide -material.kapton_k=Kapton K -material.durene=Durene -material.pyromellitic_dianhydride=Pyromellitic Dianhydride -material.dimethylformamide=Dimethylformamide -material.aminophenol=4-Aminophenol -material.oxydianiline=4,4'-Oxydianiline -material.antimony_pentafluoride=Antimony Pentafluoride -material.naquadah_oxide=Naquadah Oxide -material.pyromorphite=Pyromorphite -material.snowchestite=Snowchestite -material.naquadah_hydroxide=Naquadah Hydroxide -material.caesium_hydroxide=Caesium Hydroxide -material.neocryolite=Neocryolite -material.naquadah_oxide_petro_solution=Naquadah Oxide Petro Solution -material.naquadah_oxide_aero_solution=Naquadah Oxide Aero Solution -material.hot_naquadah_oxide_neocryolite_solution=Hot Naquadah Oxide Neocryolite Solution -material.lead_metasilicate=Lead Metasilicate +gregtech.material.tungsten_trioxide=Tungsten Trioxide +gregtech.material.beryllium_oxide=Beryllium Oxide +gregtech.material.niobium_pentoxide=Niobium Pentoxide +gregtech.material.tantalum_pentoxide=Tantalum Pentoxide +gregtech.material.fluorite=Fluorite +gregtech.material.manganese_difluoride=Manganese Difluoride +gregtech.material.molybdenum_trioxide=Molybdenum Trioxide +gregtech.material.lead_chloride=Lead Chloride +gregtech.material.wollastonite=Wollastonite +gregtech.material.sodium_metavanadate=Sodium Metavanadate +gregtech.material.vanadium_pentoxide=Vanadium Pentoxide +gregtech.material.ammonium_metavanadate=Ammonium Metavanadate +gregtech.material.phthalic_anhydride=Phthalic Anhydride +gregtech.material.ethylanthraquinone=2-Ethylanthraquinone +gregtech.material.hydrogen_peroxide=Hydrogen Peroxide +gregtech.material.hydrazine=Hydrazine +gregtech.material.acetone_azine=Acetone Azine +gregtech.material.graphene_oxide=Graphene Oxide +gregtech.material.kapton_k=Kapton K +gregtech.material.durene=Durene +gregtech.material.pyromellitic_dianhydride=Pyromellitic Dianhydride +gregtech.material.dimethylformamide=Dimethylformamide +gregtech.material.aminophenol=4-Aminophenol +gregtech.material.oxydianiline=4,4'-Oxydianiline +gregtech.material.antimony_pentafluoride=Antimony Pentafluoride +gregtech.material.naquadah_oxide=Naquadah Oxide +gregtech.material.pyromorphite=Pyromorphite +gregtech.material.snowchestite=Snowchestite +gregtech.material.naquadah_hydroxide=Naquadah Hydroxide +gregtech.material.caesium_hydroxide=Caesium Hydroxide +gregtech.material.neocryolite=Neocryolite +gregtech.material.naquadah_oxide_petro_solution=Naquadah Oxide Petro Solution +gregtech.material.naquadah_oxide_aero_solution=Naquadah Oxide Aero Solution +gregtech.material.hot_naquadah_oxide_neocryolite_solution=Hot Naquadah Oxide Neocryolite Solution +gregtech.material.lead_metasilicate=Lead Metasilicate -material.platinum_metallic=Metallic Platinum -item.platinum_metallic.dust=Metallic Platinum Powder -item.platinum_metallic.dustSmall=Small Pile of Metallic Platinum Powder -item.platinum_metallic.dustTiny=Tiny Pile of Metallic Platinum Powder -material.palladium_metallic=Metallic Palladium -item.palladium_metallic.dust=Metallic Palladium Powder -item.palladium_metallic.dustSmall=Small Pile of Metallic Palladium Powder -item.palladium_metallic.dustTiny=Tiny Pile of Metallic Palladium Powder -material.ammonium_hexachloroplatinate=Ammonium Hexachloroplatinate -material.chloroplatinic_acid=Chloroplatinic Acid -material.potassium_bisulfate=Potassium Bisulfate -material.potassium_pyrosulfate=Potassium Pyrosulfate -material.potassium_sulfate=Potassium Sulfate -material.zinc_sulfate=Zinc Sulfate -material.sodium_nitrate=Sodium Nitrate -material.rhodium_nitrate=Rhodium Nitrate -material.sodium_ruthenate=Sodium Ruthenate -material.sodium_peroxide=Sodium Peroxide -material.iridium_dioxide_residue=Iridium Dioxide Residue -material.ammonium_hexachloroiridiate=Ammonium Hexachloroiridiate -material.platinum_group_residue=Platinum Group Residue -item.platinum_group_residue.dust=Platinum Group Residue -item.platinum_group_residue.dustSmall=Small Pile of Platinum Group Residue -item.platinum_group_residue.dustTiny=Tiny Pile of Platinum Group Residue -material.palladium_rich_ammonia=Palladium Rich Ammonia -material.crude_platinum_residue=Crude Platinum Residue -item.crude_platinum_residue.dust=Crude Platinum Residue -item.crude_platinum_residue.dustSmall=Small Pile of Crude Platinum Residue -item.crude_platinum_residue.dustTiny=Tiny Pile of Crude Platinum Residue -material.crude_palladium_residue=Crude Palladium Residue -item.crude_palladium_residue.dust=Crude Palladium Residue -item.crude_palladium_residue.dustSmall=Small Pile of Crude Palladium Residue -item.crude_palladium_residue.dustTiny=Tiny Pile of Crude Palladium Residue -material.iridium_group_sludge=Iridium Group Sludge -item.iridium_group_sludge.dust=Iridium Group Sludge -item.iridium_group_sludge.dustSmall=Small Pile of Iridium Group Sludge -item.iridium_group_sludge.dustTiny=Tiny Pile of Iridium Group Sludge -material.rhodium_sulfate_solution=Rhodium Sulfate Solution -material.crude_rhodium_residue=Crude Rhodium Residue -item.crude_rhodium_residue.dust=Crude Rhodium Residue -item.crude_rhodium_residue.dustSmall=Small Pile of Crude Rhodium Residue -item.crude_rhodium_residue.dustTiny=Tiny Pile of Crude Rhodium Residue -material.rhodium_salt=Rhodium Salt -material.acidic_sodium_ruthenate_solution=Acidic Sodium Ruthenate Solution -material.acidic_iridium_dioxide_solution=Acidic Iridium Dioxide Solution -material.platinum_palladium_leachate=Platinum-Palladium Leachate -material.rhodium_salt_solution=Rhodium Salt Solution -material.methyl_formate=Methyl Formate -material.formic_acid=Formic Acid -material.sodium_methoxide=Sodium Methoxide +gregtech.material.platinum_metallic=Metallic Platinum +item.gregtech.platinum_metallic.dust=Metallic Platinum Powder +item.gregtech.platinum_metallic.dustSmall=Small Pile of Metallic Platinum Powder +item.gregtech.platinum_metallic.dustTiny=Tiny Pile of Metallic Platinum Powder +gregtech.material.palladium_metallic=Metallic Palladium +item.gregtech.palladium_metallic.dust=Metallic Palladium Powder +item.gregtech.palladium_metallic.dustSmall=Small Pile of Metallic Palladium Powder +item.gregtech.palladium_metallic.dustTiny=Tiny Pile of Metallic Palladium Powder +gregtech.material.ammonium_hexachloroplatinate=Ammonium Hexachloroplatinate +gregtech.material.chloroplatinic_acid=Chloroplatinic Acid +gregtech.material.potassium_bisulfate=Potassium Bisulfate +gregtech.material.potassium_pyrosulfate=Potassium Pyrosulfate +gregtech.material.potassium_sulfate=Potassium Sulfate +gregtech.material.zinc_sulfate=Zinc Sulfate +gregtech.material.sodium_nitrate=Sodium Nitrate +gregtech.material.rhodium_nitrate=Rhodium Nitrate +gregtech.material.sodium_ruthenate=Sodium Ruthenate +gregtech.material.sodium_peroxide=Sodium Peroxide +gregtech.material.iridium_dioxide_residue=Iridium Dioxide Residue +gregtech.material.ammonium_hexachloroiridiate=Ammonium Hexachloroiridiate +gregtech.material.platinum_group_residue=Platinum Group Residue +item.gregtech.platinum_group_residue.dust=Platinum Group Residue +item.gregtech.platinum_group_residue.dustSmall=Small Pile of Platinum Group Residue +item.gregtech.platinum_group_residue.dustTiny=Tiny Pile of Platinum Group Residue +gregtech.material.palladium_rich_ammonia=Palladium Rich Ammonia +gregtech.material.crude_platinum_residue=Crude Platinum Residue +item.gregtech.crude_platinum_residue.dust=Crude Platinum Residue +item.gregtech.crude_platinum_residue.dustSmall=Small Pile of Crude Platinum Residue +item.gregtech.crude_platinum_residue.dustTiny=Tiny Pile of Crude Platinum Residue +gregtech.material.crude_palladium_residue=Crude Palladium Residue +item.gregtech.crude_palladium_residue.dust=Crude Palladium Residue +item.gregtech.crude_palladium_residue.dustSmall=Small Pile of Crude Palladium Residue +item.gregtech.crude_palladium_residue.dustTiny=Tiny Pile of Crude Palladium Residue +gregtech.material.iridium_group_sludge=Iridium Group Sludge +item.gregtech.iridium_group_sludge.dust=Iridium Group Sludge +item.gregtech.iridium_group_sludge.dustSmall=Small Pile of Iridium Group Sludge +item.gregtech.iridium_group_sludge.dustTiny=Tiny Pile of Iridium Group Sludge +gregtech.material.rhodium_sulfate_solution=Rhodium Sulfate Solution +gregtech.material.crude_rhodium_residue=Crude Rhodium Residue +item.gregtech.crude_rhodium_residue.dust=Crude Rhodium Residue +item.gregtech.crude_rhodium_residue.dustSmall=Small Pile of Crude Rhodium Residue +item.gregtech.crude_rhodium_residue.dustTiny=Tiny Pile of Crude Rhodium Residue +gregtech.material.rhodium_salt=Rhodium Salt +gregtech.material.acidic_sodium_ruthenate_solution=Acidic Sodium Ruthenate Solution +gregtech.material.acidic_iridium_dioxide_solution=Acidic Iridium Dioxide Solution +gregtech.material.platinum_palladium_leachate=Platinum-Palladium Leachate +gregtech.material.rhodium_salt_solution=Rhodium Salt Solution +gregtech.material.methyl_formate=Methyl Formate +gregtech.material.formic_acid=Formic Acid +gregtech.material.sodium_methoxide=Sodium Methoxide -material.hexafluorosilicic_acid=Hexafluorosilicic Acid -material.dirty_hexafluorosilicic_acid=Dirty Hexafluorosilicic Acid -material.stone_residue=Stone Residue -item.stone_residue.dust=Stone Residue -material.uncommon_residue=Uncommon Residue -item.uncommon_residue.dust=Uncommon Residue -material.oxidised_residue=Oxidised Residue -item.oxidised_residue.dust=Oxidised Residue -material.refined_residue=Refined Residue -item.refined_residue.dust=Refined Residue -material.clean_inert_residue=Clean Inert Residue -item.clean_inert_residue.dust=Clean Inert Residue -material.ultraacidic_residue=Ultra-acidic Residue -material.xenic_acid=Xenic Acid -material.dusty_helium=Dusty Helium -material.taranium_enriched_helium=Taranium Enriched Helium-3 -material.taranium_depleted_helium=Taranium Depleted Helium-3 -material.tritium_hydride=Tritium Hydride -material.helium_hydride=Helium-3 Hydride -material.dioxygen_difluoride=Dioxygen Difluoride -material.taranium=Taranium -material.darmstadtite=Darmstadtite -material.dulysite=Dulysite -material.butanol=Butanol -material.phosphorus_trichloride=Phosphorus Trichloride -material.phosphoryl_chloride=Phosphoryl Chloride -material.tributyl_phosphate=Tributyl Phosphate +gregtech.material.hexafluorosilicic_acid=Hexafluorosilicic Acid +gregtech.material.dirty_hexafluorosilicic_acid=Dirty Hexafluorosilicic Acid +gregtech.material.stone_residue=Stone Residue +item.gregtech.stone_residue.dust=Stone Residue +gregtech.material.uncommon_residue=Uncommon Residue +item.gregtech.uncommon_residue.dust=Uncommon Residue +gregtech.material.oxidised_residue=Oxidised Residue +item.gregtech.oxidised_residue.dust=Oxidised Residue +gregtech.material.refined_residue=Refined Residue +item.gregtech.refined_residue.dust=Refined Residue +gregtech.material.clean_inert_residue=Clean Inert Residue +item.gregtech.clean_inert_residue.dust=Clean Inert Residue +gregtech.material.ultraacidic_residue=Ultra-acidic Residue +gregtech.material.xenic_acid=Xenic Acid +gregtech.material.dusty_helium=Dusty Helium +gregtech.material.taranium_enriched_helium=Taranium Enriched Helium-3 +gregtech.material.taranium_depleted_helium=Taranium Depleted Helium-3 +gregtech.material.tritium_hydride=Tritium Hydride +gregtech.material.helium_hydride=Helium-3 Hydride +gregtech.material.dioxygen_difluoride=Dioxygen Difluoride +gregtech.material.taranium=Taranium +gregtech.material.darmstadtite=Darmstadtite +gregtech.material.dulysite=Dulysite +gregtech.material.butanol=Butanol +gregtech.material.phosphorus_trichloride=Phosphorus Trichloride +gregtech.material.phosphoryl_chloride=Phosphoryl Chloride +gregtech.material.tributyl_phosphate=Tributyl Phosphate item.contenttweaker.omnicoin.name=Nomipenny [1] item.contenttweaker.omnicoin5.name=Nominickel [5] diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index d5112ae..e3bdc56 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -420,11 +420,7 @@ recipes.addShaped(, [, , ], [, , ]]); -// Temp Iron Door Dupe Fix -.findRecipe(30, [], [ * 236]).remove(); -.findRecipe(8, [], null).remove(); - -arc_furnace.recipeBuilder() +/*arc_furnace.recipeBuilder() .inputs() .fluidInputs( * 236) .outputs( * 2) @@ -437,7 +433,7 @@ macerator.recipeBuilder() .outputs( * 2) .duration(236) .EUt(8) - .buildAndRegister(); + .buildAndRegister();*/ // Tooltips diff --git a/overrides/scripts/EnderIO.zs b/overrides/scripts/EnderIO.zs index aed9a68..72804ac 100644 --- a/overrides/scripts/EnderIO.zs +++ b/overrides/scripts/EnderIO.zs @@ -473,7 +473,7 @@ var capacitors as IItemStack[] = [ ]; var wafers as IItemStack[] = [ - , + , ]; diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 15019d6..3a19b84 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -100,7 +100,7 @@ makeShaped("of_elytra_wing", , "PE ", "PP "], { P : , - E : }); + E : }); recipes.remove(); makeShaped("of_elytra", , diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index 466d66c..7badb91 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -1349,7 +1349,6 @@ recipes.addShapeless(, []); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); @@ -1357,8 +1356,6 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); // Infinity Plate * 1 .findRecipe(24, [, .withTag({Configuration: 1})], null).remove(); -// Double Infinity Plate * 1 -.findRecipe(96, [ * 2, .withTag({Configuration: 2})], null).remove(); bender.recipeBuilder() .inputs() diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index 743b2e6..c8ce579 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -226,7 +226,7 @@ pyrolyse_oven.recipeBuilder() // force phenol for phenolic circuit board chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 100]).outputs([]).duration(100).EUt(8).buildAndRegister(); // remove Phenolic Circuit Board * 1 -.findRecipe(7, [, ], [ * 50]).remove(); +.findRecipe(30, [, .withTag({Configuration: 1})], [ * 50]).remove(); // make t1 circuits craftable w/o steam //recipes.removeByRecipeName("gregtech:electronic_circuit_lv"); diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs index 99da887..e355504 100644 --- a/overrides/scripts/extendedcrafting.zs +++ b/overrides/scripts/extendedcrafting.zs @@ -436,7 +436,7 @@ makeExtremeRecipe9(, recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index 7eca6fb..f60be87 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -21,14 +21,14 @@ var draconium = MaterialBuilder(32001, "draconium") .color(0xbe49ed).iconSet("metallic") .blastTemp(6800, "HIGHER") .cableProperties(524288, 1, 0, true) - .flags(["generate_plate", "generate_rod", "generate_gear", "generate_dense"]) + .flags(["generate_plate", "generate_double_plate", "generate_rod", "generate_gear", "generate_dense"]) .build(); var awakened_draconium = MaterialBuilder(32002, "awakened_draconium") .element("AwakenedDraconium") .ingot().fluid() .color(0xf58742).iconSet("metallic") - .flags(["no_smelting", "generate_plate", "generate_rod", "generate_gear"]) + .flags(["no_smelting", "generate_plate", "generate_frame", "generate_double_plate", "generate_rod", "generate_ring", "generate_gear"]) .build(); var dark_steel = MaterialBuilder(32003, "dark_steel") @@ -68,7 +68,7 @@ var signalum = MaterialBuilder(32010, "signalum") .ingot().fluid() .color(0xff7f0f).iconSet("shiny") .blastTemp(4000, "MID", 120, 12800) - .flags(["generate_plate", "generate_dense", "generate_rod", "generate_gear"]) + .flags(["generate_plate", "generate_double_plate", "generate_dense", "generate_rod", "generate_gear"]) .components([ * 4, * 2, * 2]) .cableProperties(32768, 1, 0, true) .build(); @@ -84,7 +84,7 @@ var conductive_iron = MaterialBuilder(32011, "conductive_iron") var energetic_alloy = MaterialBuilder(32012, "energetic_alloy") .ingot().fluid() .color(0xffb545).iconSet("shiny") - .flags("generate_plate", "generate_gear") + .flags("generate_plate", "generate_double_plate", "generate_gear") .blastTemp(1250, "LOW", 120, 400) .components([ * 2, * 1, * 1]) .cableProperties(128, 1, 0, true) @@ -93,7 +93,7 @@ var energetic_alloy = MaterialBuilder(32012, "energetic_alloy") var vibrant_alloy = MaterialBuilder(32013, "vibrant_alloy") .ingot().fluid() .color(0xa4ff70).iconSet("shiny") - .flags("generate_plate", "generate_gear", "generate_rod", "generate_bolt_screw") + .flags("generate_plate", "generate_double_plate", "generate_gear", "generate_rod", "generate_bolt_screw") .blastTemp(1350, "LOW", 120, 600) .components([ * 1, * 1]) .cableProperties(512, 1, 0, true) @@ -117,7 +117,7 @@ var electrical_steel = MaterialBuilder(32015, "electrical_steel") var lumium = MaterialBuilder(32017, "lumium") .ingot().fluid() .color(0xf6ff99).iconSet("bright") - .flags("generate_plate", "generate_gear", "generate_fine_wire") + .flags("generate_plate", "generate_double_plate", "generate_gear", "generate_fine_wire") .blastTemp(4500, "MID", 120, 14400) .components([ * 4, * 2]) .cableProperties(8192, 1, 0, true) @@ -126,7 +126,7 @@ var lumium = MaterialBuilder(32017, "lumium") var enderium = MaterialBuilder(32018, "enderium") .ingot().fluid() .color(0x1f6b62).iconSet("shiny") - .flags("generate_plate", "generate_gear", "generate_fine_wire") + .flags("generate_plate", "generate_double_plate", "generate_gear", "generate_fine_wire") .blastTemp(6400, "HIGHEST", 120, 20800) .components([ * 4, * 2, * 1, * 1]) .cableProperties(131072, 1, 0, true) @@ -135,7 +135,7 @@ var enderium = MaterialBuilder(32018, "enderium") var electrum_flux = MaterialBuilder(32019, "electrum_flux") .ingot().fluid() .color(0xf7be20).iconSet("bright") - .flags("generate_plate", "generate_gear") + .flags("generate_plate", "generate_double_plate", "generate_gear") .blastTemp(1100) .components([ * 6, * 1, * 1]) .build(); @@ -150,7 +150,7 @@ var mithril = MaterialBuilder(32021, "mithril") var crystal_matrix = MaterialBuilder(32023, "crystal_matrix") .ingot().fluid() .color(0x70ecff).iconSet("shiny") - .flags("generate_plate") + .flags("generate_plate", "generate_double_plate") .build(); var soularium = MaterialBuilder(32024, "soularium") @@ -813,13 +813,15 @@ var tributyl_phosphate = MaterialBuilder(32115, "tributyl_phosphate") .addFlags(["generate_bolt_screw"]); .addFlags(["generate_bolt_screw"]); .addFlags(["generate_dense"]); -.addFlags(["generate_dense"]); +.addFlags(["generate_double_plate", "generate_dense"]); .addFlags(["generate_dense"]); .addFlags(["generate_dense"]); .addFlags(["generate_foil"]); .addFlags(["generate_frame"]); .addFlags(["generate_frame"]); .addFlags(["generate_frame"]); +.addFlags(["generate_double_plate"]); +.addFlags(["generate_double_plate"]); // Prevent TE Gears from showing up .addFlags(["generate_gear"]); .addFlags(["generate_gear"]); diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index f6333d8..08d77df 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -26,13 +26,14 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle("CCC", "CVC", "CCC") - .aisle("CCC", "GDG", "CCC") + .aisle("CCC", "GDG", "CMC") .aisle("CSC", "CGC", "CCC") .where('S', controller.self()) .where('G', ) .where('V', ) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(12) | controller.autoAbilities(true, true, true, true, true, false, false)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -68,7 +69,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva "GDDDG", "CVCVC") .aisle( - "CCCCC", + "CCMCC", "GDDDG", "GD DG", "GDDDG", @@ -90,7 +91,8 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .where('D', ) .where('V', ) .where(' ', CTPredicate.getAny()) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(45) | controller.autoAbilities(true, true, true, true, false, false, false)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -117,7 +119,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a " ", " CCCCC ", " CVCVC ", - " CCCCC ", + " CCMCC ", " CVCVC ", " CCCCC ", " ", @@ -188,7 +190,8 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a .where('V', ) .where(' ', CTPredicate.getAny()) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(115) | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -532,7 +535,7 @@ microverse_projector_basic.recipeMap , ) .fluidInputs( * 8000) - .outputs( * 64, + .outputs( * 64, * 64, * 64, * 64) @@ -618,11 +621,11 @@ microverse_projector_basic.recipeMap * 4, ) .fluidInputs( * 20000) - .outputs( * 64, - * 32, - * 64, - * 48, - * 32, + .outputs( * 64, + * 32, + * 64, + * 48, + * 32, * 64, * 64, * 64) @@ -1190,7 +1193,7 @@ actualization_chamber.recipeMap .EUt(30720) .inputs() .circuit(2) - .outputs( * 64, + .outputs( * 64, * 64, * 64, * 64) @@ -1249,11 +1252,11 @@ actualization_chamber.recipeMap .EUt(30720) .inputs() .circuit(1) - .outputs( * 64, - * 32, - * 64, - * 48, - * 32, + .outputs( * 64, + * 32, + * 64, + * 48, + * 32, * 64, * 64, * 64) diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index c87d07c..3485c1b 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -25,13 +25,14 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") .withPattern(function(controller as IControllerTile) as IBlockPattern { return FactoryBlockPattern.start() .aisle("CCC", "CVC", "CCC") - .aisle("CCC", "GDG", "CCC") + .aisle("CCC", "GDG", "CMC") .aisle("CSC", "CGC", "CCC") .where('S', controller.self()) .where('G', ) .where('V', ) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, true, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(12) | controller.autoAbilities(true, true, true, true, true, false, false)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -67,7 +68,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva "GDDDG", "CVCVC") .aisle( - "CCCCC", + "CCMCC", "GDDDG", "GD DG", "GDDDG", @@ -89,7 +90,8 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva .where('D', ) .where('V', ) .where(' ', CTPredicate.getAny()) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(45) | controller.autoAbilities(true, true, true, true, false, false, false)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -116,7 +118,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a " ", " CCCCC ", " CVCVC ", - " CCCCC ", + " CCMCC ", " CVCVC ", " CCCCC ", " ", @@ -187,7 +189,8 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a .where('V', ) .where(' ', CTPredicate.getAny()) .where('D', ) - .where("C", CTPredicate.states() | controller.autoAbilities(true, true, true, true, false, false, true)) + .where('M', CTPredicate.abilities()) + .where("C", CTPredicate.states().setMinGlobalLimited(115) | controller.autoAbilities(true, true, true, true, false, false, true)) .build(); } as IPatternBuilderFunction) .withRecipeMap( @@ -432,7 +435,7 @@ microverse_projector_basic.recipeMap , ) .fluidInputs( * 8000) - .outputs( * 64, + .outputs( * 64, * 64, * 64, * 64) @@ -508,11 +511,11 @@ microverse_projector_basic.recipeMap * 4, ) .fluidInputs( * 20000) - .outputs( * 64, - * 32, - * 64, - * 48, - * 32, + .outputs( * 64, + * 32, + * 64, + * 48, + * 32, * 64, * 64, * 64) diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 992c478..413a09e 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -146,47 +146,47 @@ recipes.addShapeless("fireclay_dust", * 16, [); /* Start PBF Recipes */ /* Wrought Iron */ - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(400) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(400) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(400) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(400) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(600) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(600) @@ -194,42 +194,42 @@ helpers.clear(primitive_blast_furnace); .buildAndRegister(); /* Iron */ - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(900) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(900) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(900) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(900) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(1500) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(1500) @@ -237,42 +237,42 @@ helpers.clear(primitive_blast_furnace); .buildAndRegister(); /* Block Recipes */ - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(3600) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(3600) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(5400) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(8100) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([, ]) .outputs([, ]) .duration(8100) .EUt(1) .buildAndRegister(); - primitive_blast_furnace.recipeBuilder() + .recipeBuilder() .inputs([ * 2, ]) .outputs([ * 2, ]) .duration(13500)