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, 42 insertions, 44 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 2435e1aad7..6bdf6cb776 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -348,6 +348,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Vyroxeres               = new Materials( 951, TextureSet.SET_METALLIC          ,  32.0F,   7680,  1, 1|2  |8      |64          ,  85, 224,   1,   0,   "Vyroxeres"               ,   "Vyroxeres"                     ,    0,       0,       5400, 5400, true, false,   1,   1,   1, Dyes._NULL          ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 3, 1);
     public static Materials Yellorium               = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2                       , 255, 255, 255,   0,   "Yellorium"               ,   "Yellorium"                     ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      );
     public static Materials Zectium                 = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2  |8                   , 255, 255, 255,   0,   "Zectium"                 ,   "Zectium"                       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeBlack       );
+    public static Materials Ultimate                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8)));
+    public static Materials Advanced                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Advanced"                ,   "Advanced"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 4)));
 
     /**
      * Tiered materials, primarily Circuitry, Batteries and other Technical things
@@ -360,13 +362,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials IV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Elite"                   ,   "Elite"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 6)));
     public static Materials LuV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Master"                  ,   "Master"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 7)));
     public static Materials ZPM                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Ultimate"                ,   "Ultimate"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8)));
-    public static Materials UV                      = Materials.SuperconductorUHV; //I hate this
-    public static Materials UHV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Infinite"                ,   "Infinite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 9)));
-    public static Materials UEV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Bio"                     ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10)));
-    public static Materials UIV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Optical"                 ,   "Optical"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13)));
-    public static Materials UMV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Exotic"                  ,   "Exotic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14)));
-    public static Materials UXV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Cosmic"                  ,   "Cosmic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15)));
-    public static Materials MAX                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transcendent"            ,   "Transcendent"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 16)));
+    public static Materials UV                      = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Superconductor"          ,   "Superconductor"                ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 9)));
+    public static Materials UHV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Infinite"                ,   "Infinite"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10)));
+    public static Materials UEV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Bio"                     ,   "Bio"                           ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 11)));
+    public static Materials UIV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Optical"                 ,   "Optical"                       ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12)));
+    public static Materials UMV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Exotic"                  ,   "Exotic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13)));
+    public static Materials UXV                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Cosmic"                  ,   "Cosmic"                        ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14)));
+    public static Materials MAX                     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Transcendent"            ,   "Transcendent"                  ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15)));
 
     public static Materials Resistor                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Resistor"                ,   "Resistor"                      ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
     public static Materials Diode                   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  0, 0                         , 255, 255, 255,   0,   "Diode"                   ,   "Diode"                         ,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
@@ -389,16 +391,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     @Deprecated
     public static Materials Good = Materials.MV;
     @Deprecated
-    public static Materials Advanced = Materials.HV;
-    @Deprecated
     public static Materials Data = Materials.EV;
     @Deprecated
     public static Materials Elite = Materials.IV;
     @Deprecated
     public static Materials Master = Materials.LuV;
     @Deprecated
-    public static Materials Ultimate = Materials.ZPM;
-    @Deprecated
     public static Materials Infinite = Materials.UHV;
     @Deprecated
     public static Materials Bio = Materials.UEV;
diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java
index 84e8344334..2d64444283 100644
--- a/src/main/java/gregtech/api/enums/Tier.java
+++ b/src/main/java/gregtech/api/enums/Tier.java
@@ -19,8 +19,8 @@ public class Tier {
             ItemList.Hull_ULV,
             OrePrefixes.cableGt01.get(Materials.Lead),
             OrePrefixes.cableGt04.get(Materials.Lead),
-            OrePrefixes.circuit.get(Materials.Primitive),
-            OrePrefixes.circuit.get(Materials.Basic)),
+            OrePrefixes.circuit.get(Materials.ULV),
+            OrePrefixes.circuit.get(Materials.LV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             1,
@@ -32,8 +32,8 @@ public class Tier {
             ItemList.Hull_LV,
             OrePrefixes.cableGt01.get(Materials.Tin),
             OrePrefixes.cableGt04.get(Materials.Tin),
-            OrePrefixes.circuit.get(Materials.Basic),
-            OrePrefixes.circuit.get(Materials.Good)),
+            OrePrefixes.circuit.get(Materials.LV),
+            OrePrefixes.circuit.get(Materials.MV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             2,
@@ -45,8 +45,8 @@ public class Tier {
             ItemList.Hull_MV,
             OrePrefixes.cableGt01.get(Materials.AnyCopper),
             OrePrefixes.cableGt04.get(Materials.AnyCopper),
-            OrePrefixes.circuit.get(Materials.Good),
-            OrePrefixes.circuit.get(Materials.Advanced)),
+            OrePrefixes.circuit.get(Materials.MV),
+            OrePrefixes.circuit.get(Materials.HV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             3,
@@ -58,8 +58,8 @@ public class Tier {
             ItemList.Hull_HV,
             OrePrefixes.cableGt01.get(Materials.Gold),
             OrePrefixes.cableGt04.get(Materials.Gold),
-            OrePrefixes.circuit.get(Materials.Advanced),
-            OrePrefixes.circuit.get(Materials.Data)),
+            OrePrefixes.circuit.get(Materials.HV),
+            OrePrefixes.circuit.get(Materials.EV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             4,
@@ -71,8 +71,8 @@ public class Tier {
             ItemList.Hull_EV,
             OrePrefixes.cableGt01.get(Materials.Aluminium),
             OrePrefixes.cableGt04.get(Materials.Aluminium),
-            OrePrefixes.circuit.get(Materials.Data),
-            OrePrefixes.circuit.get(Materials.Elite)),
+            OrePrefixes.circuit.get(Materials.EV),
+            OrePrefixes.circuit.get(Materials.IV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             5,
@@ -84,8 +84,8 @@ public class Tier {
             ItemList.Hull_IV,
             OrePrefixes.cableGt01.get(Materials.Platinum),
             OrePrefixes.cableGt04.get(Materials.Platinum),
-            OrePrefixes.circuit.get(Materials.Elite),
-            OrePrefixes.circuit.get(Materials.Master)),
+            OrePrefixes.circuit.get(Materials.IV),
+            OrePrefixes.circuit.get(Materials.LuV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             6,
@@ -97,8 +97,8 @@ public class Tier {
             ItemList.Hull_LuV,
             OrePrefixes.cableGt01.get(Materials.NiobiumTitanium),
             OrePrefixes.cableGt04.get(Materials.NiobiumTitanium),
-            OrePrefixes.circuit.get(Materials.Master),
-            OrePrefixes.circuit.get(Materials.Ultimate)),
+            OrePrefixes.circuit.get(Materials.LuV),
+            OrePrefixes.circuit.get(Materials.ZPM)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             7,
@@ -110,8 +110,8 @@ public class Tier {
             ItemList.Hull_ZPM,
             OrePrefixes.cableGt01.get(Materials.Naquadah),
             OrePrefixes.cableGt04.get(Materials.Naquadah),
-            OrePrefixes.circuit.get(Materials.Ultimate),
-            OrePrefixes.circuit.get(Materials.SuperconductorUHV)),
+            OrePrefixes.circuit.get(Materials.ZPM),
+            OrePrefixes.circuit.get(Materials.UV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             8,
@@ -123,8 +123,8 @@ public class Tier {
             ItemList.Hull_UV,
             OrePrefixes.cableGt04.get(Materials.NaquadahAlloy),
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             9,
@@ -136,8 +136,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             10,
@@ -149,8 +149,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             11,
@@ -162,8 +162,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             12,
@@ -175,8 +175,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             13,
@@ -188,8 +188,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             14,
@@ -201,8 +201,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
         new Tier(
             SubTag.ENERGY_ELECTRICITY,
             15,
@@ -214,8 +214,8 @@ public class Tier {
             ItemList.Hull_MAX,
             OrePrefixes.wireGt01.get(Materials.SuperconductorUHV),
             OrePrefixes.wireGt04.get(Materials.SuperconductorUHV),
-            OrePrefixes.circuit.get(Materials.Infinite),
-            OrePrefixes.circuit.get(Materials.Infinite)),
+            OrePrefixes.circuit.get(Materials.UHV),
+            OrePrefixes.circuit.get(Materials.UHV)),
 
         // READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in
         // GT but in GTNH core mod - that way we shouldnt need to set the tier class
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
index e1b5ee8f03..cdd289221a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
         if (sAutoMaintenanceInputs == null) sAutoMaintenanceInputs = new ItemStack[] { ItemList.Duct_Tape.get(4),
             GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2),
             GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-            GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2) };
+            GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) };
         return sAutoMaintenanceInputs;
     }