From aaf88d87a2111ced5c381a016dbed6c136edb7fc Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Sun, 4 Aug 2024 05:49:03 +0100
Subject: Circuit material overhaul (#2814)

* first push to use new Materials for circuits

* dont deprecate or redefine ultimate

* sa

* move it

* second round

* dont deprecate or redefine advanced

* part 3

* part 4

* part 5

* part 6

* mini fix
---
 src/main/java/kubatech/loaders/RecipeLoader.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/kubatech/loaders')

diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 9c3ded4992..5df6f8aa4f 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -111,7 +111,7 @@ public class RecipeLoader {
                 ItemList.ExtremeEntityCrusher.get(1),
                 bitsd,
                 new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C',
-                    OrePrefixes.circuit.get(Materials.Data), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V',
+                    OrePrefixes.circuit.get(Materials.EV), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V',
                     GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) });
         }
         if (registerMTE(
@@ -128,10 +128,10 @@ public class RecipeLoader {
                     gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L),
                     gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L),
                     gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L })
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L })
                 .fluidInputs(
                     FluidRegistry.getFluidStack("molten.indalloy140", 28800),
                     FluidRegistry.getFluidStack("for.honey", 20000))
@@ -155,7 +155,7 @@ public class RecipeLoader {
                     NewHorizonsCoreMod.isModLoaded()
                         ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 11104) // IV World Accelerator
                         : gregtech.api.enums.ItemList.Robot_Arm_IV,
-                    'Z', OrePrefixes.circuit.get(Materials.Ultimate) });
+                    'Z', OrePrefixes.circuit.get(Materials.ZPM) });
 
             // Vanilla should always be loaded
             GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15));
@@ -370,10 +370,10 @@ public class RecipeLoader {
                     GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1),
                     gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1),
                     GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 10, 11193), // UHV Fluid extractor
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L })
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L })
                 .fluidInputs(FluidRegistry.getFluidStack("molten.indalloy140", 28800))
                 .itemOutputs(TeaAcceptor.get(1))
                 .eut(2_048_000)
-- 
cgit