From a5e31ad8ccc329ba5fc41b93fbb4bdc64e1c3028 Mon Sep 17 00:00:00 2001
From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com>
Date: Sat, 26 Mar 2022 10:45:46 +0800
Subject: [PATCH] mm ore adjustments

---
 overrides/scripts/Earlygame.zs          | 10 -------
 overrides/scripts/expertmode.zs         | 39 ++++++++++---------------
 overrides/scripts/multiblocks_expert.zs | 39 ++++++++++---------------
 overrides/scripts/multiblocks_normal.zs |  3 +-
 4 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index bae5cf8..e6c76ab 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -284,16 +284,6 @@ centrifuge.findRecipe(30, [<metaitem:dustBlackSteel> * 5], [null]).remove();
 electrolyzer.recipeBuilder().inputs([<ore:dustEnderPearl>]).outputs([<contenttweaker:pulsatingdust>]).duration(200).EUt(1000).buildAndRegister();
 electrolyzer.findRecipe(60, [<metaitem:dustEnderPearl> * 10], [null]).remove();
 
-
-
-mods.jei.JEI.removeAndHide(<ore:gemFlawedCoke>);
-mods.jei.JEI.removeAndHide(<ore:gemChippedCoke>);
-mods.jei.JEI.removeAndHide(<ore:gemFlawlessLapis>);
-mods.jei.JEI.removeAndHide(<ore:gemFlawlessCoke>);
-mods.jei.JEI.removeAndHide(<ore:gemExquisiteLapis>);
-mods.jei.JEI.removeAndHide(<ore:gemExquisiteCoke>);
-mods.jei.JEI.removeAndHide(<metaitem:gemGlass>);
-
 furnace.setFuel(<metaitem:dustGraphite>, 1200);
 
 recipes.removeByRecipeName("gregtech:block_decompress_clay");
diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs
index 33d156a..90b8c53 100644
--- a/overrides/scripts/expertmode.zs
+++ b/overrides/scripts/expertmode.zs
@@ -419,7 +419,8 @@ actualization_chamber.recipeMap
              <gregtech:ore_tin_0:1> * 64,
              <gregtech:ore_redstone_0:1> * 64,
              <gregtech:ore_certus_quartz_0:1> * 64,
-             <gregtech:ore_almandine_0:1> * 64)
+             <gregtech:ore_almandine_0:1> * 64,
+             <gregtech:ore_lepidolite_0:1> * 64)
     .buildAndRegister();
 
 // t3 magma
@@ -468,15 +469,13 @@ actualization_chamber.recipeMap
     .EUt(30720)
     .inputs(<contenttweaker:tierfourship_stabilized_matter>)
     .circuit(3)
-    .outputs(<gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64)
+    .outputs(<gregtech:ore_pentlandite_0:1> * 64,
+             <gregtech:ore_pentlandite_0:1> * 64,
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_sheldonite_0:1> * 64,
+             <gregtech:ore_osmiridium_8020_0> * 32,
+             <gregtech:ore_iridosmine_8020_0> * 8)
     .buildAndRegister();
 
 
@@ -580,16 +579,14 @@ actualization_chamber.recipeMap
              <gregtech:ore_beryllium_0> * 64)
     .buildAndRegister();
 
-// t5 nq pt ke
+// t5 nq ke
 actualization_chamber.recipeMap
     .recipeBuilder()
     .duration(780)
     .EUt(30720)
     .inputs(<contenttweaker:tierfiveship_stabilized_matter>)
     .circuit(2)
-    .outputs(<gregtech:ore_cooperite_0:2> * 64,
-             <gregtech:ore_cooperite_0:2> * 64,
-             <gregtech:ore_kaemanite_0:2> * 24,
+    .outputs(<gregtech:ore_kaemanite_0:2> * 24,
              <gregtech:ore_naquadah_0:2> * 48)
     .buildAndRegister();
 
@@ -603,16 +600,10 @@ actualization_chamber.recipeMap
     .circuit(1)
     .outputs(<gregtech:ore_uraninite_0:2> * 64,
              <gregtech:ore_uraninite_0:2> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64)
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_iridosmine_8020_0> * 32)
     .buildAndRegister();
 
 // t6 es
diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs
index 7d5cd36..43c77ff 100644
--- a/overrides/scripts/multiblocks_expert.zs
+++ b/overrides/scripts/multiblocks_expert.zs
@@ -512,7 +512,8 @@ microverse_projector_basic.recipeMap
              <gregtech:ore_tin_0:1> * 64,
              <gregtech:ore_redstone_0:1> * 64,
              <gregtech:ore_certus_quartz_0:1> * 64,
-             <gregtech:ore_almandine_0:1> * 64)
+             <gregtech:ore_almandine_0:1> * 64,
+             <gregtech:ore_lepidolite_0:1> * 64)
     .buildAndRegister();
 
 
@@ -583,15 +584,13 @@ microverse_projector_advanced.recipeMap
             <contenttweaker:quantumflux> * 8,
             <contenttweaker:witherrealmdata> * 4,
             <ore:dustPetrotheum> * 64) 
-    .outputs(<gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_pentlandite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_bornite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64,
-             <gregtech:ore_chalcocite_0> * 64)
+    .outputs(<gregtech:ore_pentlandite_0:1> * 64,
+             <gregtech:ore_pentlandite_0:1> * 64,
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_chalcocite_0:1> * 64,
+             <gregtech:ore_sheldonite_0:1> * 64,
+             <gregtech:ore_osmiridium_8020_0> * 32,
+             <gregtech:ore_iridosmine_8020_0> * 8)
     .buildAndRegister();
 
 
@@ -735,7 +734,7 @@ microverse_projector_advanced.recipeMap
     .buildAndRegister();
 
 
-// t5 naquadah sheldonite trinium
+// t5 naquadah trinium
 microverse_projector_advanced.recipeMap
     .recipeBuilder()
     .duration(1000)
@@ -743,9 +742,7 @@ microverse_projector_advanced.recipeMap
     .inputs(<contenttweaker:tierfiveship>,
             <contenttweaker:quantumflux> * 16,
             <contenttweaker:stabilizedplutonium> * 32)
-    .outputs(<gregtech:ore_cooperite_0:2> * 64,
-             <gregtech:ore_cooperite_0:2> * 64,
-             <gregtech:ore_kaemanite_0:2> * 24,
+    .outputs(<gregtech:ore_kaemanite_0:2> * 24,
              <gregtech:ore_naquadah_0:2> * 48)
              
     .buildAndRegister();
@@ -773,16 +770,10 @@ microverse_projector_advanced.recipeMap
             <contenttweaker:witherrealmdata> * 16)
     .outputs(<gregtech:ore_uraninite_0:2> * 64,
              <gregtech:ore_uraninite_0:2> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64,
-             <metaitem:dustPlatinumGroupSludge> * 64)
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_cooperite_0:2> * 64,
+             <gregtech:ore_iridosmine_8020_0> * 32)
     .buildAndRegister();
 
 
diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs
index 7c83501..7b4a785 100644
--- a/overrides/scripts/multiblocks_normal.zs
+++ b/overrides/scripts/multiblocks_normal.zs
@@ -485,7 +485,8 @@ microverse_projector_basic.recipeMap
              <gregtech:ore_tin_0> * 64,
              <gregtech:ore_redstone_0> * 64,
              <gregtech:ore_certus_quartz_0> * 64,
-             <gregtech:ore_almandine_0> * 64)
+             <gregtech:ore_almandine_0> * 64,
+             <gregtech:ore_lepidolite_0> * 64)
     .buildAndRegister();
 
 // advanced projector