From 519b7aa3e08871de109c93cf20912d95a246247c Mon Sep 17 00:00:00 2001
From: Timo Ley <timo@leyt.xyz>
Date: Sat, 15 Aug 2020 00:26:43 +0200
Subject: [PATCH] More recipes

---
 modpacktoolsconfig.toml                       |   4 +-
 .../machinery/alloyfurnace.json               | 410 +++++++++++++++++
 .../modularmachinery/machinery/engine.json    | 419 ++++++++++++++++--
 src/overrides/scripts/recipes.zs              |  19 +
 4 files changed, 821 insertions(+), 31 deletions(-)
 create mode 100644 src/overrides/config/modularmachinery/machinery/alloyfurnace.json

diff --git a/modpacktoolsconfig.toml b/modpacktoolsconfig.toml
index 65ff88e..f611897 100644
--- a/modpacktoolsconfig.toml
+++ b/modpacktoolsconfig.toml
@@ -9,6 +9,6 @@
     selectedVersion = -1
 [Downloads]
     #The maximum number of threads that will be used for downloads
-    maxThreads = 5
+    maxThreads = 2
     #The timeout of http requests in ms
-    httpTimeout = 2147483647
\ No newline at end of file
+    httpTimeout = 2147483647
diff --git a/src/overrides/config/modularmachinery/machinery/alloyfurnace.json b/src/overrides/config/modularmachinery/machinery/alloyfurnace.json
new file mode 100644
index 0000000..df752ff
--- /dev/null
+++ b/src/overrides/config/modularmachinery/machinery/alloyfurnace.json
@@ -0,0 +1,410 @@
+{
+  "registryname": "alloyfurnace",
+  "localizedname": "Alloy Furnace",
+  "color": "52525B",
+    "parts": [
+        {
+            "x": -1,
+            "y": 0,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy_smelter@0"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 0,
+            "z": 2,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 0,
+            "z": 0,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 0,
+            "z": 2,
+            "elements": [
+                "modularmachinery:blockenergyinputhatch"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 0,
+            "z": 2,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 3,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 1,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": -1,
+            "z": 0,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 1,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 3,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": -1,
+            "z": 0,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 1,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 1,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": -1,
+            "z": 0,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -2,
+            "y": -1,
+            "z": 1,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 1,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": -1,
+            "z": 1,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 1,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": -1,
+            "z": 1,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 4,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 2,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 4,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 2,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 4,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 2,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 2,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 0,
+            "z": 1,
+            "elements": [
+                "modularmachinery:blockoutputbus"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 2,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 2,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 0,
+            "z": 1,
+            "elements": [
+                "modularmachinery:blockinputbus"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 3,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 3,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 3,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 3,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 1,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 3,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 3,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 1,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": -1,
+            "z": 2,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -1,
+            "y": -1,
+            "z": 2,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": 0,
+            "y": -1,
+            "z": 2,
+
+            "elements": [
+                "modularmachinery:blockcasing"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 4,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 4,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 4,
+            "z": 0,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 4,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -2,
+            "y": 2,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": -1,
+            "y": 4,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 4,
+            "z": 2,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        },
+        {
+            "x": 0,
+            "y": 2,
+            "z": 1,
+            "elements": [
+                "enderio:block_alloy@6"
+            ]
+        }
+    ]}
diff --git a/src/overrides/config/modularmachinery/machinery/engine.json b/src/overrides/config/modularmachinery/machinery/engine.json
index 53745ad..ff205d1 100644
--- a/src/overrides/config/modularmachinery/machinery/engine.json
+++ b/src/overrides/config/modularmachinery/machinery/engine.json
@@ -1,31 +1,392 @@
 {
-    "registryname": "engine",
-    "localizedname": "Electrical Engine",
-    "color": "52525B",
+  "registryname": "engine",
+  "localizedname": "Electrical Engine",
+  "color": "52525B",
     "parts": [
-        {
-            "x": 0,
-            "y": 0,
-            "z": 1,
-            "elements": [
-                "modulardiversity:blockmystmechoutput@0"
-            ]
-        },
-        {
-            "x": 0,
-            "y": -1,
-            "z": 1,
-            "elements": [
-                "libvulpes:coil0@4"
-            ]
-        },
-        {
-            "x": 0,
-            "y": -1,
-            "z": 0,
-            "elements": [
-                "modularmachinery:blockenergyinputhatch"
-            ]
-        }
-    ]
-  }
+      {
+          "x": -1,
+          "y": 0,
+          "z": 0,
+          "elements": [
+              "modularmachinery:blockoutputbus"
+          ]
+      },
+      {
+          "x": -1,
+          "y": 0,
+          "z": 1,
+          "elements": [
+              "gregtech:wire_coil"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 0,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": 0,
+          "z": 1,
+          "elements": [
+              "gregtech:wire_coil"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 0,
+          "z": 0,
+          "elements": [
+              "modularmachinery:blockinputbus"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 0,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": 0,
+          "z": 2,
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 0,
+          "z": 1,
+          "elements": [
+              "gregtech:wire_coil"
+          ]
+      },
+      {
+          "x": 0,
+          "y": 0,
+          "z": 2,
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 0,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 0,
+          "z": 1,
+          "elements": [
+              "modularmachinery:blockenergyinputhatch"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 0,
+          "z": 2,
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 0,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": -1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": -1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": -1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": 1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": -1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": 1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": 1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": 1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": -1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": -1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": 1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": 1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": -1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 1,
+          "z": 0,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": -1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": 1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": -1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -1,
+          "y": -1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": 1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 0,
+          "y": -1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": -1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 1,
+          "y": -1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": -1,
+          "z": 1,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": 2,
+          "y": -1,
+          "z": 2,
+
+          "elements": [
+              "modularmachinery:blockcasing"
+          ]
+      },
+      {
+          "x": -2,
+          "y": 0,
+          "z": 1,
+          "elements": [
+              "modulardiversity:blockmystmechoutput"
+          ]
+      }
+    ]}
diff --git a/src/overrides/scripts/recipes.zs b/src/overrides/scripts/recipes.zs
index de27ec7..7434a9b 100644
--- a/src/overrides/scripts/recipes.zs
+++ b/src/overrides/scripts/recipes.zs
@@ -8,6 +8,13 @@ blast_furnace.recipeBuilder()
     .duration(120)
     .EUt(120)
     .buildAndRegister();
+var ult = mods.modularmachinery.RecipeBuilder.newBuilder("ultimate", "alloyfurnace", 120);
+ult.addEnergyPerTickInput(1024);
+ult.addItemInput(<avaritia:resource:4> * 1);
+ult.addItemInput(<avaritia:resource:1> * 1);
+ult.addItemInput(<avaritia:resource:6> * 1);
+ult.addItemOutput(<extendedcrafting:material:32> * 3);
+ult.build();
 recipes.remove(<avaritia:extreme_crafting_table>);
 recipes.remove(<projecte:item.pe_philosophers_stone>);
 recipes.remove(<ageofminecraft:mob_spawner_spc>);
@@ -19,6 +26,10 @@ recipes.remove(<rftools:machine_frame>);
 recipes.remove(<rftoolsdim:empty_dimension_tab>);
 recipes.remove(<projecte:collector_mk1>);
 recipes.remove(<avaritia:resource:1>);
+recipes.remove(<ageofminecraft:commandingstaff>);
+recipes.remove(<ageofminecraft:convertingstaff>);
+recipes.remove(<ageofminecraft:heromaker>);
+recipes.remove(<deepmoblearning:machine_casing>);
 mods.bloodmagic.BloodAltar.addRecipe(<projecte:item.pe_philosophers_stone>, <botania:manaresource:9>, 4, 2000,30,40);
 mods.extendedcrafting.TableCrafting.addShaped(0, <ageofminecraft:mob_spawner_spc>, [
 	[<extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>],
@@ -82,3 +93,11 @@ mods.extendedcrafting.TableCrafting.addShaped(0, <avaritia:block_resource:1>, [
       	[<bloodmagic:slate:4>, <projecte:item.pe_matter:1>, <projecte:item.pe_matter:1>, <projecte:item.pe_matter:1>, <bloodmagic:slate:4>],
       	[<ore:ingotUnstable>, <bloodmagic:slate:4>, <ore:ingotMelodicAlloy>, <bloodmagic:slate:4>, <ore:ingotCrystallinePinkSlime>]
       ]);
+mods.extendedcrafting.EnderCrafting.addShaped(<ageofminecraft:heromaker>, [
+  [null, <ore:ingotUltimate>, null],
+  [<ore:ingotUltimate>, <ore:gemNetherStar>, <ore:ingotUltimate>],
+  [null, <ore:ingotUltimate>, null]
+], 10);
+recipes.addShaped(<minecraft:barrier>, [[null, <avaritia:resource:6>, null],[null, <minecraft:glass>, null], [null, <avaritia:resource:6>, null]]);
+recipes.addShaped(<projecte:item.pe_tome>, [[null, <avaritia:resource:6>, null],[<projecte:item.pe_klein_star:5>, <minecraft:book>, <projecte:item.pe_klein_star:5>], [null, <avaritia:resource:6>, null]]);
+recipes.addShaped(<deepmoblearning:machine_casing>, [[<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>],[<deepmoblearning:soot_covered_plate>, <enderio:item_material:53>, <deepmoblearning:soot_covered_plate>], [<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>]]);