Deprecation cleanup (#637)

3 files changed, 4 insertions, 17 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 06a1fb2841..5654dd00cf 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -517,7 +517,7 @@ public class RECIPES_GREGTECH {
                         GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
                         ItemList.UV_Coil.get(16L, new Object() {}),
                         ItemList.Conveyor_Module_UV.get(4L, new Object() {}),
-                        new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8 },
+                        new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 },
                         new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 },
                         ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16),
                         ALLOY.CINOBITE.getScrew(32) },
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 57e7caf43f..f8c673de6c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -3416,23 +3416,11 @@ public class RECIPES_Machines {
     }
 
     private static void fakeMachineCasingCovers() {
-        GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV,
-                GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV,
-                GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV,
-                GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV,
-                GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV,
-                GregtechItemList.FakeMachineCasingPlate_MAX, };
         int aMaxTier = GT_Values.VOLTAGE_NAMES.length;
         ItemStack aTier[] = new ItemStack[aMaxTier];
         for (int i = 0; i < aMaxTier; i++) {
             aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7);
         }
-        // Deprecate old recipes
-        for (int i = 0; i < 10; i++) {
-            RecipeUtils.addShapelessGregtechRecipe(
-                    new ItemStack[] { mMachineCasingCovers[i].get(1) },
-                    ItemUtils.getSimpleStack(aTier[i], 1));
-        }
         // Add recipes for new ones
         for (int i = 0; i < aMaxTier; i++) {
             GT_Values.RA
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index bb7704e530..98c77865a3 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -301,7 +301,6 @@ public class CI {
         return Materials._NULL;
     }
 
-    @Deprecated
     public static String getTieredComponent(OrePrefixes type, int tier) {
         Object material = getMaterialFromTier(tier);
         if (material != null) {
@@ -445,11 +444,11 @@ public class CI {
 
     private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt,
             Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum,
-            Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.Superconductor, };
+            Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.SuperconductorUHV, };
 
     private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic,
             Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master,
-            Materials.Ultimate, Materials.Superconductor, Materials.Infinite, };
+            Materials.Ultimate, Materials.SuperconductorUHV, Materials.Infinite, };
 
     private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary,
             aMaterial_Tertiary };
@@ -608,7 +607,7 @@ public class CI {
             } else if (aTier == 8) {
                 return ItemUtils.getOrePrefixStack(aPrefix, Materials.Ultimate, aAmount);
             } else if (aTier == 9) {
-                return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, aAmount);
+                return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.SuperconductorUHV, aAmount);
             } else if (aTier == 10) {
                 return ItemUtils.getOrePrefixStack(aPrefix, Materials.Europium, aAmount);
             } else {