From 691c70fa8e60bda2139e71c968fd33c15047873e Mon Sep 17 00:00:00 2001
From: Horny-sh <62596799+Horny-sh@users.noreply.github.com>
Date: Fri, 19 Jan 2024 21:55:19 +0100
Subject: [PATCH] Update main.zs

Added MW firearm&stuff recipes requested by fellow lava enjoyer Arxaniys
---
 scripts/main.zs | 55 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/scripts/main.zs b/scripts/main.zs
index 4705219..b1f6fc6 100644
--- a/scripts/main.zs
+++ b/scripts/main.zs
@@ -393,6 +393,16 @@ for item in removedvanillagear {                                //Removed vanill
         recipes.addShapeless(<davincisvessels:balloon:15>, [<davincisvessels:balloon:*>,<ore:dyeBlack>]);
         recipes.addShaped(<davincisvessels:engine>, [[<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>],[<immersiveengineering:material:11>, <simplegenerators:combustion_upgradable>, <immersiveengineering:material:11>], [<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>]]);
         recipes.addShaped(<davincisvessels:marker>, [[<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>],[<immersiveengineering:material>, <minecraft:iron_block>, <immersiveengineering:material>], [<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>]]);
+	//ModularWarfare
+		//Firearms
+			recipes.addShaped(<modularwarfare:prototype.mosin_nagant>, [[null, <immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:14>, <immersiveengineering:material:9>], [<immersiveengineering:metal:38>, <immersiveengineering:material:16>, <immersiveengineering:material:13>]]);
+			recipes.addShaped(<modularwarfare:prototype.sks>, [[null, <immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:9>], [<immersiveengineering:metal:38>, <immersiveengineering:material:16>, <immersiveengineering:material:13>]]);
+			recipes.addShaped(<modularwarfare:prototype.mg42>, [[<immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "steel"}).onlyWithTag({Material: "steel"}), <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:16>], [<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:material:13>]]);
+			recipes.addShaped(<modularwarfare:prototype.mp40>, [[<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:material:2>],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:16>], [null, <immersiveengineering:metal:38>, <immersiveengineering:material:13>]]);
+		//Blueprints
+			recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Mags"}), [[<immersiveengineering:metal:38>, <immersiveengineering:material:9>, <immersiveengineering:metal:38>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
+			recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Clips"}), [[<immersiveengineering:metal:38>, <immersiveengineering:metal:39>, <immersiveengineering:metal:38>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
+			recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Ammo"}), [[<immersiveengineering:bullet>, <immersiveengineering:metal:28>, <minecraft:gunpowder>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
     //Transtructors
         recipes.addShaped(<similsaxtranstructors:similsaxtranstructorbasic>, [[<minecraft:prismarine_crystals>, null, <minecraft:prismarine_crystals>],[<minecraft:iron_ingot>, <minecraft:ender_pearl>, <minecraft:iron_ingot>], [null, <tconstruct:tool_rod>.withTag({Material: "copper"}).onlyWithTag({Material: "copper"}), null]]);
         recipes.addShaped(<similsaxtranstructors:similsaxtranstructoradvanced>, [[<minecraft:end_crystal>, null, <minecraft:end_crystal>],[<minecraft:diamond>, <minecraft:ender_pearl>, <minecraft:diamond>], [null, <tconstruct:tool_rod>.withTag({Material: "cobalt"}).onlyWithTag({Material: "cobalt"}), null]]);
@@ -413,29 +423,40 @@ for item in removedvanillagear {                                //Removed vanill
         mods.immersiveengineering.AlloySmelter.addRecipe(<immersiveengineering:material:19>, <immersiveengineering:material:17>*8, <forge:bucketfilled>.withTag({FluidName: "creosote", Amount: 1000}), 800);
         mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:ingot:8>*16, <nuclearcraft:gem_dust:7>*16, <nuclearcraft:dust:6>, 2000);
         mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:part:6>, <tconstruct:edible:3>*2, <minecraft:reeds>*2, 1000);
-        mods.immersiveengineering.AlloySmelter.addRecipe(<minecraft:prismarine>, <minecraft:stone:3>, <tconstruct:edible:1>*2, 40);
     //IECrusher
         mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:8>, <minecraft:stone:1>, 8000, <nuclearcraft:gem_dust:1>*2, 0.5);            //Гранит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:8>, <minecraft:stone:2>, 8000, <immersiveengineering:material:25>*2, 0.7);    //Полированный гранит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:10>, <minecraft:stone:3>, 8000, <nuclearcraft:gem_dust:9>*2, 0.7);            //Диорит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:10>, <minecraft:stone:4>, 8000, <nuclearcraft:gem_dust:5>*2, 0.7);            //Полированный диорит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:10>, <minecraft:stone:5>, 8000, <nuclearcraft:compound:10>*2, 0.7);    //Андезит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:10>, <minecraft:stone:6>, 8000, <nuclearcraft:dust:9>*2, 0.7);            //Полированный андезит
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:flour>, <minecraft:wheat>, 1000);                                                //Мука
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:11>, <minecraft:end_stone>, 8000);                                    //Эндерняковая пыль
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:ground_cocoa_nibs>, <nuclearcraft:roasted_cocoa_beans>, 2000);                //Кокаинум
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:porkchop>, 2000);                                        //Желатин хохол
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:beef>, 2000);                                            //Желатин говядина
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:mutton>, 2000);                                        //Желатин cat's soul
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish>, 2000);                                            //Желатин рыба
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:1>, 2000);                                        //Желатин посося
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:2>, 2000);                                        //Желатин Нита
-        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:3>, 2000);                                        //Желатин фугу
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:8>, <minecraft:stone:2>, 8000, <immersiveengineering:material:25>*2, 0.7);       //Полированный гранит
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:10>, <minecraft:stone:3>, 8000, <nuclearcraft:gem_dust:9>*2, 0.7);               //Диорит
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:10>, <minecraft:stone:4>, 8000, <nuclearcraft:gem_dust:5>*2, 0.7);               //Полированный диорит
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:10>, <minecraft:stone:5>, 8000, <nuclearcraft:compound:10>*2, 0.7);          //Андезит
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:10>, <minecraft:stone:6>, 8000, <nuclearcraft:dust:9>*2, 0.7);               //Полированный андезит
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:flour>, <minecraft:wheat>, 1000);                                                     //Мука
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:11>, <minecraft:end_stone>, 8000);                                           //Эндерняковая пыль
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:ground_cocoa_nibs>, <nuclearcraft:roasted_cocoa_beans>, 2000);                        //Кокаинум
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:porkchop>, 2000);                                              //Желатин хохол
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:beef>, 2000);                                                  //Желатин говядина
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*8, <minecraft:mutton>, 2000);                                                //Желатин cat's soul
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish>, 2000);                                                  //Желатин рыба
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:1>, 2000);                                                //Желатин посося
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:2>, 2000);                                                //Желатин Нита
+        mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gelatin>*4, <minecraft:fish:3>, 2000);                                                //Желатин фугу
         mods.immersiveengineering.Crusher.addRecipe(<minecraft:prismarine_shard>*4, <minecraft:prismarine>, 500);
     //IEMetalPress
         mods.immersiveengineering.MetalPress.addRecipe(<academy:wafer>, <nuclearcraft:gem:6>, <immersiveengineering:mold>, 1000, 4);
     //IERefinery
-	mods.immersiveengineering.Refinery.addRecipe(<liquid:mana_fluid>, <liquid:biodiesel>, <liquid:blood>, 2048);
+	    mods.immersiveengineering.Refinery.addRecipe(<liquid:mana_fluid>, <liquid:biodiesel>, <liquid:blood>, 2048);
+	//IEBlueprints
+		//MW Ammo																																														//Патроны из MW
+			mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.9x19>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]);				//9x19(MP40)
+			mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x39>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]);			//7,62x39(SKS)
+			mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x54>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]);			//7,62x54(Mosin Nagant)
+			mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x57>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]);			//7,62x57(MG42)
+		//MW Clips																																														//Обоймы из MW
+			mods.immersiveengineering.Blueprint.addRecipe("MW Clips", <modularwarfare:prototype.sksammo>, [<immersiveengineering:metal:38>*3]);																//SKS x10
+			mods.immersiveengineering.Blueprint.addRecipe("MW Clips", <modularwarfare:prototype.mosin_nagantammo>, [<immersiveengineering:metal:38>*2]);													//Mosin Nagant x5
+		//MW Mags
+			mods.immersiveengineering.Blueprint.addRecipe("MW Mags", <modularwarfare:prototype.mg42ammo>, [<immersiveengineering:metal:38>*5,<immersiveengineering:metal:9>]);
+			mods.immersiveengineering.Blueprint.addRecipe("MW Mags", <modularwarfare:prototype.mp40ammo>, [<immersiveengineering:metal:38>*7,<immersiveengineering:metal:9>]);
     //TiC casting
         mods.tconstruct.Casting.addTableRecipe(<nuclearcraft:gem:6>, <minecraft:sand>, <liquid:glass>, 100, true, 20);
         mods.tconstruct.Casting.addTableRecipe(<academy:coin>, <tconstruct:cast_custom:2>, <liquid:iron>, 72, false, 10);