Merge pull request #369 from m44ster/2.8

MI ore unification
TeamAOF · May 20, 2021 · 11d6475 · 11d6475
2 parents 06e4737 + c9c69ac
commit 11d6475
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/overrides/config/modern_industrialization.toml b/overrides/config/modern_industrialization.toml
@@ -1,12 +1,2 @@
 generateOres = true
-
-[ores]
-generateAntimony = true
-generateBauxite = false
-generateCopper = false
-generateLead = false
-generateLigniteCoal = true
-generateNickel = false
-generateSalt = false
-generateSilver = false
-generateTin = false
+blacklistedOres = ["bauxite","copper","lead","nickel","salt","silver","tin"]
diff --git a/overrides/kubejs/server_scripts/unification.js b/overrides/kubejs/server_scripts/unification.js
@@ -129,6 +129,7 @@ events.listen("recipes", function (event) {
     "steel",
     "tin",
     "titanium",
+    "tungsten"
   ];
 
   var modern_dusts = [
@@ -154,6 +155,7 @@ events.listen("recipes", function (event) {
     "steel",
     "tin",
     "titanium",
+    "tungsten"
   ];
 
   var modern_nuggets = [
@@ -169,7 +171,7 @@ events.listen("recipes", function (event) {
     "silver",
     "steel",
     "tin",
-    "titanium",
+    "titanium"
   ];
 
   var modern_metals = [
@@ -186,9 +188,18 @@ events.listen("recipes", function (event) {
     "steel",
     "tin",
     "titanium",
+    "tungsten"
   ];
 
-  var modern_ores = ["copper", "bauxite", "lead", "silver", "tin"];
+  var modern_ores = [
+    "copper",
+    "bauxite",
+    "iridium",
+    "lead",
+    "silver",
+    "tin",
+    "tungsten"
+  ];
 
   // Plates
   modern_materials.forEach(function (item, index) {
@@ -254,6 +265,12 @@ events.listen("recipes", function (event) {
     "croptopia:salt_ore"
   );
 
+  event.replaceOutput(
+    {},
+    "modern_industrialization:platinum_ore",
+    "techreborn:sheldonite_ore"
+  );
+
   // REI
   modern_materials.forEach(function (item, index) {
     event.remove({
@@ -318,24 +335,24 @@ events.listen("recipes", function (event) {
   });
 
     // --------- BEWITCHMENT --------- //
-  
+
     var bewitchment = ["silver"];
-  
+
     // Ingots
     bewitchment.forEach(function (item, index) {
       event.replaceOutput(
         {},
         "bewitchment:" + item + "_ingot",
         "techreborn:" + item + "_ingot"
       );
-  
+
       // Blocks
       event.replaceOutput(
         {},
         "bewitchment:" + item + "_block",
         "techreborn:" + item + "_storage_block"
       );
-  
+
       // REI
       event.remove({ id: "bewitchment:" + item + "_ingot_from" + item + "block" });
       event.remove({ id: "bewitchment:" + item + "_ingot_from_nuggets" });
@@ -424,6 +441,7 @@ events.listen("recipes", function (event) {
     "bronze",
     "electrum",
     "titanium",
+    "tungsten",
     "chrome",
   ];
 
@@ -458,6 +476,12 @@ events.listen("recipes", function (event) {
     );
   });
 
+  event.replaceInput(
+    {},
+    "#c:platinum_ores",
+    "techreborn:sheldonite_ore"
+  );
+
   // REI Ingots
   rei_ingots.forEach(function (item, index) {
     event.replaceInput(