Downtier oreproc GT++ multis to EV and add new EV Mac Stack (#579)

* tier down Multiblock Ore Washer,
add Grisium EV mixer recipe to handle in EV

* Tier down Thermal Centrifuge

* Downgrade Centrifuge to EV
maybe we need to nerf other recipes use Inconel Steel 250 later (Solar Tower, Cryo Stuff)

* Downgrade Bender to EV

* add code for less powerful macerator

it has less parallel than original and must be upgraded (like the distillus) to regain the full parallel bonus

* update tooltip to reflect casing change for T=1

* spotlessApply (#580)

Co-authored-by: GitHub GTNH Actions <>

* fix a bunch of issues with macerators

* Spotless apply for branch Multiblock-EV-change for #579 (#581)

Co-authored-by: GitHub GTNH Actions <>

* add Upgrade T2 Card

* spotlessApply (#582)

Co-authored-by: GitHub GTNH Actions <>

* fix NPE upon placing a fresh maceration controller

* fix

* spotlessApply (#583)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

2 files changed, 64 insertions, 29 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 14d303ffe2..14b814be80 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -9,10 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
 import gregtech.api.util.*;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
@@ -1509,6 +1506,30 @@ public class RECIPES_GREGTECH {
                 MISC_MATERIALS.SOLAR_SALT_COLD.getCell(5),
                 20 * 10,
                 120);
+        GT_Values.RA.addMixerRecipe(
+                CI.getNumberedAdvancedCircuit(2),
+                Materials.Titanium.getDust(9),
+                Materials.Carbon.getDust(9),
+                Materials.Potassium.getDust(9),
+                Materials.Lithium.getDust(9),
+                Materials.Sulfur.getDust(9),
+                Materials.Hydrogen.getFluid(5000),
+                null,
+                ALLOY.LEAGRISIUM.getDust(50),
+                20 * 60,
+                (int) TierEU.RECIPE_EV);
+        GT_Values.RA.addMixerRecipe(
+                CI.getNumberedAdvancedCircuit(2),
+                Materials.Steel.getDust(16),
+                Materials.Molybdenum.getDust(1),
+                Materials.Titanium.getDust(1),
+                Materials.Nickel.getDust(4),
+                Materials.Cobalt.getDust(2),
+                GT_Values.NF,
+                null,
+                ALLOY.MARAGING250.getDust(24),
+                20 * 60,
+                (int) TierEU.RECIPE_EV);
     }
 
     private static void chemicalReactorRecipes() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 4786e67989..8ddcfc4112 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -172,18 +172,19 @@ public class RECIPES_Machines {
 
     // EV/IV MACHINES
     public static ItemStack IV_MACHINE_Electrolyzer;
-    public static ItemStack IV_MACHINE_Centrifuge;
-    public static ItemStack IV_MACHINE_BendingMachine;
+    public static ItemStack EV_MACHINE_Centrifuge;
+    public static ItemStack EV_MACHINE_BendingMachine;
     public static ItemStack IV_MACHINE_Wiremill;
+    public static ItemStack EV_MACHINE_Macerator;
     public static ItemStack IV_MACHINE_Macerator;
     public static ItemStack IV_MACHINE_Cutter;
     public static ItemStack IV_MACHINE_Extruder;
     public static ItemStack HV_MACHINE_Sifter;
-    public static ItemStack IV_MACHINE_ThermalCentrifuge;
-    public static ItemStack IV_MACHINE_OreWasher;
+    public static ItemStack EV_MACHINE_ThermalCentrifuge;
+    public static ItemStack EV_MACHINE_OreWasher;
     public static ItemStack IV_MACHINE_AlloySmelter;
     public static ItemStack IV_MACHINE_Mixer;
-    public static ItemStack IV_MACHINE_ChemicalBath;
+    public static ItemStack EV_MACHINE_ChemicalBath;
     // Cables
     public static String cableGt02Electrum = "cableGt02Electrum";
 
@@ -972,18 +973,19 @@ public class RECIPES_Machines {
 
         // IV/EV/HV MACHINES
         IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
-        IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1);
-        IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1);
+        EV_MACHINE_Centrifuge = ItemList.Machine_EV_Centrifuge.get(1);
+        EV_MACHINE_BendingMachine = ItemList.Machine_EV_Bender.get(1);
         IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1);
+        EV_MACHINE_Macerator = ItemList.Machine_EV_Macerator.get(1);
         IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1);
         IV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
         IV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
         HV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1);
-        IV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
-        IV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
+        EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1);
+        EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1);
         IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
         IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1);
-        IV_MACHINE_ChemicalBath = ItemList.Machine_IV_ChemicalBath.get(1);
+        EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1);
         if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
             if (LoadedMods.Railcraft) {
                 // Misc
@@ -1288,14 +1290,14 @@ public class RECIPES_Machines {
 
             // Industrial Centrifuge
             RecipeUtils.addShapedGregtechRecipe(
-                    CI.circuitTier5,
+                    CI.circuitTier4,
                     pipeHugeStainlessSteel,
-                    CI.circuitTier5,
+                    CI.circuitTier4,
                     CI.component_Plate[6],
-                    IV_MACHINE_Centrifuge,
+                    EV_MACHINE_Centrifuge,
                     CI.component_Plate[6],
                     CI.component_Plate[8],
-                    CI.machineCasing_IV,
+                    CI.machineCasing_EV,
                     CI.component_Plate[8],
                     RECIPE_IndustrialCentrifugeController);
             // Centrifuge Casing
@@ -1466,13 +1468,13 @@ public class RECIPES_Machines {
             // Industrial Material Press
             RecipeUtils.addShapedGregtechRecipe(
                     "plateTitanium",
-                    CI.circuitTier5,
+                    CI.circuitTier4,
                     "plateTitanium",
-                    CI.machineCasing_IV,
-                    IV_MACHINE_BendingMachine,
-                    CI.machineCasing_IV,
+                    CI.machineCasing_EV,
+                    EV_MACHINE_BendingMachine,
+                    CI.machineCasing_EV,
                     "plateTitanium",
-                    CI.circuitTier5,
+                    CI.circuitTier4,
                     "plateTitanium",
                     RECIPE_IndustrialMaterialPressController);
         }
@@ -1505,6 +1507,18 @@ public class RECIPES_Machines {
                     16);
             // Industrial Maceration stack
             RecipeUtils.addShapedGregtechRecipe(
+                    "plateTitanium",
+                    EV_MACHINE_Macerator,
+                    "plateTitanium",
+                    EV_MACHINE_Macerator,
+                    CI.circuitTier4,
+                    EV_MACHINE_Macerator,
+                    "plateTitanium",
+                    EV_MACHINE_Macerator,
+                    "plateTitanium",
+                    RECIPE_IndustrialMacerationStackController);
+            // T2-Upgrade Card
+            RecipeUtils.addShapedGregtechRecipe(
                     "plateTungstenCarbide",
                     IV_MACHINE_Macerator,
                     "plateTungstenCarbide",
@@ -1514,7 +1528,7 @@ public class RECIPES_Machines {
                     "plateTungstenCarbide",
                     IV_MACHINE_Macerator,
                     "plateTungstenCarbide",
-                    RECIPE_IndustrialMacerationStackController);
+                    GregtechItemList.Maceration_Upgrade_Chip.get(1));
         }
 
         if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
@@ -2579,10 +2593,10 @@ public class RECIPES_Machines {
 
             RecipeUtils.addShapedRecipe(
                     "plateRedSteel",
-                    "circuitElite",
+                    "circuitData",
                     "plateRedSteel",
                     "stickTalonite",
-                    IV_MACHINE_ThermalCentrifuge,
+                    EV_MACHINE_ThermalCentrifuge,
                     "stickTalonite",
                     "plateRedSteel",
                     "gearGtTalonite",
@@ -2612,13 +2626,13 @@ public class RECIPES_Machines {
 
             RecipeUtils.addShapedRecipe(
                     "plateGrisium",
-                    IV_MACHINE_OreWasher,
+                    EV_MACHINE_OreWasher,
                     "plateGrisium",
                     "plateTalonite",
-                    "circuitElite",
+                    "circuitData",
                     "plateTalonite",
                     "plateGrisium",
-                    IV_MACHINE_ChemicalBath,
+                    EV_MACHINE_ChemicalBath,
                     "plateGrisium",
                     GregtechItemList.Industrial_WashPlant.get(1));
         }