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

3 files changed, 22 insertions, 22 deletions

diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
index a37b1ac329..f72a31ed65 100644
--- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
@@ -448,7 +448,7 @@ public class ComponentAssemblyLineRecipeLoader {
             double multiplier = magnetoConversionMultipliers.get(data.mPrefix);
             stacks.addAll(
                 getWrappedCircuits(
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1),
                     (int) (total * multiplier),
                     "circuitInfinite"));
         }
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index 11ecf7b701..d6f1682da9 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -97,7 +97,7 @@ public class RecipeLoader {
                 ItemRefer.Radiation_Protection_Plate.get(16),
                 ItemList.Field_Generator_ZPM.get(2),
                 ItemList.Electric_Pump_ZPM.get(8),
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8),
@@ -659,7 +659,7 @@ public class RecipeLoader {
                 ItemRefer.Advanced_Radiation_Protection_Plate.get(64),
                 ItemList.Field_Generator_UV.get(8),
                 ItemList.Electric_Pump_UHV.get(2),
-                new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
                 GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8),
                 ItemList.Circuit_Wafer_NPIC.get(16),
                 ItemList.UHV_Coil.get(64),
@@ -724,7 +724,7 @@ public class RecipeLoader {
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8),
                     GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16),
                     ItemList.Circuit_Wafer_PPIC.get(32),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L })
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L })
                 .fluidInputs(
                     WerkstoffLoader.Krypton.getFluidOrGas(1000),
                     Materials.ElectrumFlux.getMolten(9216),
@@ -746,7 +746,7 @@ public class RecipeLoader {
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8),
                     GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16),
                     ItemList.Circuit_Wafer_PPIC.get(48),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L })
+                    new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L })
                 .fluidInputs(
                     Materials.Radon.getPlasma(1000),
                     Materials.DraconiumAwakened.getMolten(9216),
@@ -768,7 +768,7 @@ public class RecipeLoader {
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8),
                     GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16),
                     ItemList.Circuit_Wafer_PPIC.get(64),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L })
+                    new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L })
                 .fluidInputs(
                     WerkstoffLoader.Oganesson.getFluidOrGas(1000),
                     Materials.Neutronium.getMolten(9216),
@@ -1017,7 +1017,7 @@ public class RecipeLoader {
                 .itemInputs(
                     ItemRefer.Quartz_Crystal_Resonator.get(2),
                     ItemRefer.Plastic_Case.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Cover_Screen.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.componentCircuit, Materials.Diode, 16L),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8))
@@ -1031,7 +1031,7 @@ public class RecipeLoader {
                 .itemInputs(
                     ItemRefer.Quartz_Crystal_Resonator.get(2),
                     ItemRefer.Plastic_Case.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Cover_Screen.get(1),
                     ItemList.Circuit_Parts_DiodeASMD.get(4),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8))
@@ -1180,7 +1180,7 @@ public class RecipeLoader {
                 ItemList.Cover_ActivityDetector.get(1L),
                 ItemList.Cover_Screen.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
                 ItemList.Sensor_HV.get(2),
                 GT_Utility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Helium.getGas(1000))
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 207868e59d..318e09a1f4 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -74,7 +74,7 @@ public class RecipeLoader_02 {
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1))
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1))
             .itemOutputs(ItemRefer.Speeding_Pipe.get(1))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_EV)
@@ -525,7 +525,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1),
                 ItemRefer.Fluid_Storage_Core_T3.get(10),
-                new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 },
+                new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 },
                 ItemList.Electric_Pump_IV.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 8),
                 MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 32))
@@ -544,7 +544,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1),
                 ItemRefer.Fluid_Storage_Core_T4.get(10),
-                new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 8 },
+                new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 8 },
                 ItemList.Electric_Pump_LuV.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 8),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 32))
@@ -563,7 +563,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1),
                 ItemRefer.Fluid_Storage_Core_T5.get(10),
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 },
                 ItemList.Electric_Pump_ZPM.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 8),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 64))
@@ -582,7 +582,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
                 ItemRefer.Fluid_Storage_Core_T6.get(2),
-                new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L },
+                new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L },
                 ItemList.Electric_Pump_UV.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64))
@@ -601,7 +601,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
                 ItemRefer.Fluid_Storage_Core_T7.get(2),
-                new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8L },
+                new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8L },
                 ItemList.Electric_Pump_UHV.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 16),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 32),
@@ -621,7 +621,7 @@ public class RecipeLoader_02 {
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
                 ItemRefer.Fluid_Storage_Core_T8.get(2),
-                new Object[] { OrePrefixes.circuit.get(Materials.Optical), 8L },
+                new Object[] { OrePrefixes.circuit.get(Materials.UIV), 8L },
                 ItemList.Electric_Pump_UEV.get(8),
                 GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12),
                 GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
@@ -643,7 +643,7 @@ public class RecipeLoader_02 {
                 .itemInputs(
                     GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2),
                     ItemRefer.Fluid_Storage_Core_T9.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 8L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UMV), 8L },
                     ItemList.Electric_Pump_UIV.get(8),
                     GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12),
                     GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
@@ -664,7 +664,7 @@ public class RecipeLoader_02 {
                 .itemInputs(
                     GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2),
                     ItemRefer.Fluid_Storage_Core_T10.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 12L },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UXV), 12L },
                     ItemList.Electric_Pump_UMV.get(8),
                     GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64),
                     GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12),
@@ -1139,7 +1139,7 @@ public class RecipeLoader_02 {
                 MyMaterial.marM200.get(OrePrefixes.plate, 2),
                 MyMaterial.marCeM200.get(OrePrefixes.gearGt, 2),
                 MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2),
                 ItemList.Hull_IV.get(1))
             .itemOutputs(ItemRefer.SC_Fluid_Turbine.get(1))
             .duration(15 * SECONDS)
@@ -1349,7 +1349,7 @@ public class RecipeLoader_02 {
                     ItemList.Robot_Arm_EV.get(2),
                     GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2),
                     MyMaterial.marM200.get(OrePrefixes.plateDouble, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
                     ELEMENT.getInstance().RUTHENIUM.getBolt(32),
                     GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8))
                 .fluidInputs(MyMaterial.zircaloy4.getMolten(576))
@@ -1465,7 +1465,7 @@ public class RecipeLoader_02 {
                 ItemList.FusionComputer_LuV.get(48),
                 ItemRefer.HiC_T1.get(8),
                 MyMaterial.marCeM200.get(OrePrefixes.plate, 32),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 8),
                 ItemList.Circuit_Wafer_HPIC.get(16),
                 ItemList.Field_Generator_LuV.get(4),
                 MyMaterial.marM200.get(OrePrefixes.stickLong, 8))
@@ -1568,7 +1568,7 @@ public class RecipeLoader_02 {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Casing_Fusion_Internal2.get(3),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1),
                 ItemRefer.HiC_T5.get(4),
                 CI.getEnergyCore(5, 1))
             .itemOutputs(ItemRefer.Compact_Fusion_Coil_T4.get(1))