General Fixes (#1702)

* Fix missing machine recipes due to load order.

* Fix missing compressor recipe

* Add new compressor recipe adder method

* Line

* Narrow crafting restrictions on pipes

* Crafting working, assembler not

* Nonuple working

* Spotless

* Both assembler recipes exist

* Pipe recipes finally working as they should.

* Spotless

* Working still

* T-2 materials

* Tier -> TierEU and a few corrections on recipes using full amps.

* Fix comment

* spotlessApply (#1703)

Co-authored-by: GitHub GTNH Actions <>

* Spotless

* Remove comment

* T-2

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

15 files changed, 110 insertions, 108 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index c893d75674..a4619d2ea2 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -1,5 +1,7 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
@@ -16,7 +18,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
     public void registerOre(
             OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
         if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) {
-            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+            if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 GT_Values.RA.addCutterRecipe(
                         GT_Utility.copyAmount(1L, aStack),
                         aMaterial == MaterialsBotania.Livingrock
@@ -50,7 +52,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
 
         if (aMaterial.mStandardMoltenFluid != null) {
             if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_Values.RA.addFluidSolidifierRecipe(
                             ItemList.Shape_Mold_Block.get(0L),
                             aMaterial.getMolten(1296L),
@@ -96,11 +98,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
         }
 
         if (!OrePrefixes.block.isIgnored(aMaterial)) {
-            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
-                GT_ModHandler.addCompressionRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L),
-                        GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L));
-            }
+            GT_ModHandler.addCompressionRecipe(
+                    GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L),
+                    GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L),
+                    300,
+                    calculateRecipeEU(aMaterial, 2));
         }
 
         switch (aMaterial.mName) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
index 1234d3fc53..a758148e5f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
@@ -1,9 +1,6 @@
 package gregtech.loaders.oreprocessing;
 
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.enums.Tier;
+import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy;
@@ -17,7 +14,7 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr
     @Override
     public void registerOre(
             OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+        if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
             if ((aMaterial.mUnificatable)
                     && (aMaterial.mMaterialInto == aMaterial)
                     && !aMaterial.contains(SubTag.NO_WORKING)) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
index f5f9a1688a..606d3f0245 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java
@@ -64,7 +64,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
                                     });
                             break;
                         default:
-                            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                            if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                                 GT_ModHandler.addCraftingRecipe(
                                         GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L),
                                         GT_Proxy.tBits,
@@ -108,7 +108,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr
                                     new Object[] {"P ", " f", 'P', OrePrefixes.stoneSmooth});
                             break;
                         default:
-                            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                            if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                                 GT_ModHandler.addCraftingRecipe(
                                         GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L),
                                         GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 507a015950..929ad579ad 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -90,7 +90,7 @@ public class ProcessingGem
                 }
 
                 if (aNoWorking) {
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         GT_Values.RA.addLatheRecipe(
                                 GT_Utility.copyAmount(1L, aStack),
                                 GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
index bd98e6a162..aa8964f9be 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
@@ -73,7 +73,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                 }
 
                 if (!aNoSmashing) {
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         GT_Values.RA.addForgeHammerRecipe(
                                 GT_Utility.copyAmount(3L, aStack),
                                 GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
@@ -133,7 +133,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                             calculateRecipeEU(aMaterial, 96));
 
                     // Enable crafting with hammer if tier is < IV.
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         if (aSpecialRecipeReq
                                 && GregTech_API.sRecipeFile.get(
                                         ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
@@ -157,7 +157,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L),
                             (int) Math.max(aMaterialMass * 3L, 1L),
                             calculateRecipeEU(aMaterial, 96));
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         if (aSpecialRecipeReq
                                 && GregTech_API.sRecipeFile.get(
                                         ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
@@ -186,7 +186,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                             calculateRecipeEU(aMaterial, 96));
 
                     // If tier < IV add manual crafting.
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         if (aSpecialRecipeReq
                                 && GregTech_API.sRecipeFile.get(
                                         ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
@@ -214,7 +214,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
                             (int) Math.max(aMaterialMass, 1L),
                             calculateRecipeEU(aMaterial, 96));
 
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         if (aSpecialRecipeReq
                                 && GregTech_API.sRecipeFile.get(
                                         ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
index 7e2dfbd439..1a8e5011f1 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
@@ -50,7 +50,7 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
                     GT_Utility.copyAmount(9L, aStack),
                     100,
                     calculateRecipeEU(aMaterial, 1));
-            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+            if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 GT_ModHandler.addCraftingRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L),
                         GT_ModHandler.RecipeBits.BUFFERED,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
index f39e04d61e..62b623a8b1 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
@@ -1,5 +1,8 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.util.GT_Utility.calculateRecipeEU;
+
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -25,14 +28,14 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
     @Override
     public void registerOre(
             OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        // These are only generated if a materials tier is < IV.
-        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
-            switch (aPrefix) {
-                case pipeHuge:
-                case pipeLarge:
-                case pipeMedium:
-                case pipeSmall:
-                case pipeTiny:
+        switch (aPrefix) {
+            case pipeHuge:
+            case pipeLarge:
+            case pipeMedium:
+            case pipeSmall:
+            case pipeTiny:
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
+
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L),
                             GT_ModHandler.RecipeBits.BUFFERED,
@@ -101,44 +104,44 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
                             GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L),
                             GT_ModHandler.RecipeBits.BUFFERED,
                             new Object[] {"DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial)});
-                    break;
-                case pipeRestrictiveHuge:
-                case pipeRestrictiveLarge:
-                case pipeRestrictiveMedium:
-                case pipeRestrictiveSmall:
-                case pipeRestrictiveTiny:
-                    gregtech.api.enums.GT_Values.RA.addAssemblerRecipe(
-                            GT_OreDictUnificator.get(
-                                    aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true),
-                            GT_OreDictUnificator.get(
-                                    OrePrefixes.ring,
-                                    Materials.Steel,
-                                    aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount),
-                            GT_Utility.copyAmount(1L, aStack),
-                            (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount),
-                            4);
-                    break;
-                case pipeQuadruple:
+                }
+                break;
+            case pipeRestrictiveHuge:
+            case pipeRestrictiveLarge:
+            case pipeRestrictiveMedium:
+            case pipeRestrictiveSmall:
+            case pipeRestrictiveTiny:
+                RA.addAssemblerRecipe(
+                        GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true),
+                        GT_OreDictUnificator.get(
+                                OrePrefixes.ring,
+                                Materials.Steel,
+                                aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount),
+                        GT_Utility.copyAmount(1L, aStack),
+                        (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount),
+                        4);
+                break;
+            case pipeQuadruple:
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
+
                     GT_ModHandler.addCraftingRecipe(
-                            GT_Utility.copyAmount(1, aStack),
+                            GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1),
                             GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
                             new Object[] {
-                                "PP ",
-                                "PP ",
-                                "   ",
-                                'P',
-                                GT_OreDictUnificator.get(
-                                        aOreDictName.replaceFirst("Quadruple", "Medium"), null, 1L, false, true)
+                                "MM ", "MM ", "   ", 'M', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1)
                             });
-                    gregtech.api.enums.GT_Values.RA.addAssemblerRecipe(
-                            GT_OreDictUnificator.get(
-                                    aOreDictName.replaceFirst("Quadruple", "Medium"), null, 4L, false, true),
-                            ItemList.Circuit_Integrated.getWithDamage(0, 4),
-                            GT_Utility.copyAmount(1L, aStack),
-                            40,
-                            8);
-                    break;
-                case pipeNonuple:
+                }
+
+                RA.addAssemblerRecipe(
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4),
+                        GT_Utility.getIntegratedCircuit(9),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1),
+                        60,
+                        calculateRecipeEU(aMaterial, 4));
+                break;
+            case pipeNonuple:
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
+
                     GT_ModHandler.addCraftingRecipe(
                             GT_Utility.copyAmount(1, aStack),
                             GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
@@ -150,17 +153,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
                                 GT_OreDictUnificator.get(
                                         aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true)
                             });
-                    gregtech.api.enums.GT_Values.RA.addAssemblerRecipe(
-                            GT_OreDictUnificator.get(
-                                    aOreDictName.replaceFirst("Nonuple", "Small"), null, 9L, false, true),
-                            ItemList.Circuit_Integrated.getWithDamage(0, 9),
-                            GT_Utility.copyAmount(1L, aStack),
-                            60,
-                            8);
-                    break;
-                default:
-                    break;
-            }
+                }
+
+                RA.addAssemblerRecipe(
+                        GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9),
+                        GT_Utility.getIntegratedCircuit(9),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1),
+                        60,
+                        calculateRecipeEU(aMaterial, 8));
+                break;
+            default:
+                break;
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index 2ec37ed6e9..7be8375605 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -127,7 +127,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
             if (!aNoSmashing
                     && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             aMaterial.getPlates(1),
                             tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
@@ -180,7 +180,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
             if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE))
                     && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             aMaterial.getDust(1),
                             tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
@@ -212,7 +212,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
 
                 Object aPlateStack = OrePrefixes.plate.get(aMaterial);
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] {
                                 "I",
@@ -272,7 +272,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                     OrePrefixes.plate.get(aMaterial).toString(),
                     true)) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     Object aPlateStack = OrePrefixes.plate.get(aMaterial);
 
@@ -346,7 +346,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                     OrePrefixes.plate.get(aMaterial).toString(),
                     true)) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     Object aPlateStack = OrePrefixes.plate.get(aMaterial);
 
                     GT_ModHandler.addCraftingRecipe(
@@ -403,7 +403,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                     OrePrefixes.plate.get(aMaterial).toString(),
                     true)) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     Object aPlateStack = OrePrefixes.plate.get(aMaterial);
 
                     GT_ModHandler.addCraftingRecipe(
@@ -484,7 +484,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
                 && !aNoSmashing
                 && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) {
 
-            if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+            if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                 GT_ModHandler.addCraftingRecipe(
                         GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L),
                         tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
index 7915b7915a..f150c073fa 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java
@@ -24,7 +24,7 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist
             ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L);
             if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) {
 
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[] {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
index eefad6af6b..4682394199 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java
@@ -25,7 +25,7 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist
                     (int) Math.max(aMaterial.getMass() / 8L, 1L),
                     calculateRecipeEU(aMaterial, 4));
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial))
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L),
                             GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 09f3936aad..b131b9273c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -43,7 +43,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                             calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier));
 
                     // Allow creation of alloy smelter recipes for material recycling if < IV tier.
-                    if (tTrueVoltage < Tier.IV) {
+                    if (tTrueVoltage < TierEU.IV) {
                         GT_Values.RA.addAlloySmelterRecipe(
                                 GT_Utility.copyAmount(9L, aStack),
                                 ItemList.Shape_Mold_Block.get(0L),
@@ -233,7 +233,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                             && !aMaterial.contains(SubTag.NO_SMASHING))
 
                         // If material tier < IV then add manual recipe.
-                        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                        if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                             GT_ModHandler.addCraftingRecipe(
                                     GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L),
                                     GT_Proxy.tBits,
@@ -297,7 +297,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                         calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier));
 
                 if (!(aMaterial == Materials.StyreneButadieneRubber || aMaterial == Materials.Silicone)) {
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         GT_Values.RA.addAlloySmelterRecipe(
                                 GT_Utility.copyAmount(2L, aStack),
                                 ItemList.Shape_Mold_Plate.get(0L),
@@ -307,7 +307,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                     }
                 } else {
                     // If tier < IV then add ability to turn ingots into plates via alloy smelter.
-                    if (tTrueVoltage < Tier.IV) {
+                    if (tTrueVoltage < TierEU.IV) {
                         GT_Values.RA.addAlloySmelterRecipe(
                                 GT_Utility.copyAmount(1L, aStack),
                                 ItemList.Shape_Mold_Plate.get(0L),
@@ -318,7 +318,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                 }
 
                 // If tier < IV then add ability to turn ingots into gears via alloy smelter.
-                if (tTrueVoltage < Tier.IV) {
+                if (tTrueVoltage < TierEU.IV) {
                     GT_Values.RA.addAlloySmelterRecipe(
                             GT_Utility.copyAmount(8L, aStack),
                             ItemList.Shape_Mold_Gear.get(0L),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
index a24a1b7866..69d7366c83 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
@@ -17,7 +17,7 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
     @Override
     public void registerOre(
             OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+        if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
             GT_ModHandler.addCraftingRecipe(
                     GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L),
                     GT_ModHandler.RecipeBits.BUFFERED,
@@ -39,7 +39,7 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
                     (int) Math.max(aMaterial.getMass() * 2L, 1L),
                     calculateRecipeEU(aMaterial, 4));
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L),
                             GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
index a3362ede85..0558310751 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
@@ -17,7 +17,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
     @Override
     public void registerOre(
             OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+        if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
             GT_ModHandler.addCraftingRecipe(
                     GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L),
                     GT_ModHandler.RecipeBits.BUFFERED,
@@ -31,7 +31,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
                     (int) Math.max(aMaterial.getMass(), 1L),
                     calculateRecipeEU(aMaterial, 4));
             if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
                             GT_Proxy.tBits,
@@ -50,7 +50,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe
                     200,
                     calculateRecipeEU(aMaterial, 16));
             if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial))
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L),
                             GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
index 867c528e46..25ebbe793c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
@@ -928,14 +928,14 @@ public class ProcessingToolHead
                 }
                 break;
             case toolHeadFile:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
                                     GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null),
                             new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)});
 
                     if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) {
-                        if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                        if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                             GT_ModHandler.addCraftingRecipe(
                                     GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
                                             GT_MetaGenerated_Tool_01.FILE,
@@ -973,7 +973,7 @@ public class ProcessingToolHead
 
                 break;
             case toolHeadHoe:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
                                     GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null),
@@ -1009,7 +1009,7 @@ public class ProcessingToolHead
                             new Object[] {"GG ", "f  ", "   ", 'G', OrePrefixes.gem.get(aMaterial)});
                 break;
             case toolHeadPickaxe:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
@@ -1050,7 +1050,7 @@ public class ProcessingToolHead
 
                 break;
             case toolHeadPlow:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
@@ -1084,7 +1084,7 @@ public class ProcessingToolHead
 
                 break;
             case toolHeadSaw:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
@@ -1125,7 +1125,7 @@ public class ProcessingToolHead
 
                 break;
             case toolHeadSense:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
@@ -1195,7 +1195,7 @@ public class ProcessingToolHead
                             new Object[] {"fG", 'G', OrePrefixes.gem.get(aMaterial)});
                 break;
             case toolHeadSword:
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
@@ -1853,7 +1853,7 @@ public class ProcessingToolHead
                         calculateRecipeEU(aMaterial, 6400));
 
                 if (aSpecialRecipeReq2) {
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         GT_ModHandler.addCraftingRecipe(
                                 GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L),
                                 GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index f3b81834aa..ae1b476b94 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -67,7 +67,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 if (aMaterial.mUnificatable
                         && (aMaterial.mMaterialInto == aMaterial)
                         && !aMaterial.contains(SubTag.NO_WORKING)) {
-                    if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                    if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                         GT_ModHandler.addCraftingRecipe(
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L),
                                 GT_Proxy.tBits,
@@ -108,7 +108,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             case wireGt02:
                 cableWidth = 2;
                 correspondingCable = OrePrefixes.cableGt02;
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] {aOreDictName});
                     GT_ModHandler.addShapelessCraftingRecipe(
@@ -119,7 +119,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             case wireGt04:
                 cableWidth = 4;
                 correspondingCable = OrePrefixes.cableGt04;
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] {aOreDictName});
                     GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] {
@@ -136,7 +136,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             case wireGt08:
                 cableWidth = 8;
                 correspondingCable = OrePrefixes.cableGt08;
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] {aOreDictName});
                     GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] {
@@ -157,7 +157,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             case wireGt12:
                 cableWidth = 12;
                 correspondingCable = OrePrefixes.cableGt12;
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L),
                             new Object[] {aOreDictName});
@@ -169,7 +169,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
             case wireGt16:
                 cableWidth = 16;
                 correspondingCable = OrePrefixes.cableGt16;
-                if (aMaterial.getProcessingMaterialTierEU() < Tier.IV) {
+                if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
 
                     GT_ModHandler.addShapelessCraftingRecipe(
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L),