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>

1 files changed, 56 insertions, 53 deletions

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;
         }
     }
 }