Bending fix (#1909)

* add circuits * more circuit * more circuits * sa * fix cell and bucket bending
GTNewHorizons · Apr 23, 2023 · 7740a6a · 7740a6a
1 parent 8f0c8f3
commit 7740a6a
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 45 deletions.
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java
@@ -29,7 +29,9 @@ public void registerOre(OrePrefixes prefix, Materials material, String oreDictNa
 
     private void registerBenderRecipe(Materials material) {
         GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)))
+            .itemInputs(
+                GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)),
+                GT_Utility.getIntegratedCircuit(1))
             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, material, 4L))
             .noFluidInputs()
             .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
@@ -46,7 +46,7 @@ private void registerSlicerRecipes(ItemStack stack) {
 
     private void registerBenderRecipes(ItemStack stack) {
         GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1L, stack))
+            .itemInputs(GT_Utility.copyAmount(1L, stack), GT_Utility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.Food_Flat_Dough.get(1L))
             .noFluidInputs()
             .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -104,7 +104,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     {
                         // Plate
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -114,7 +114,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
 
                         // Double plates
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -124,7 +124,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
 
                         // Triple plate
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(3L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -134,7 +134,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
 
                         // Quadruple plate
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -144,7 +144,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
 
                         // Quintuple plate
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(5L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -154,7 +154,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
 
                         // dense plate
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(9L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
@@ -102,7 +102,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // Bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -111,7 +111,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -120,7 +120,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(3L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -129,7 +129,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(4L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -138,7 +138,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(5L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -147,7 +147,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(9L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -172,7 +172,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -181,7 +181,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(2L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -207,7 +207,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // Bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -216,7 +216,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                             .addTo(sBenderRecipes);
 
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(3L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -242,7 +242,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // Bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()
@@ -269,7 +269,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // Bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L))
                             .noFluidInputs()
                             .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -165,7 +165,7 @@ private void registerPlateDouble(final Materials aMaterial, final ItemStack aSta
         if (!aNoSmashing) {
             // 2 double -> 1 quadruple plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(2L, aStack))
+                .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -192,7 +192,9 @@ private void registerPlateDouble(final Materials aMaterial, final ItemStack aSta
 
             // 2 plates -> 1 double plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L))
+                .itemInputs(
+                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L),
+                    GT_Utility.getIntegratedCircuit(2))
                 .itemOutputs(GT_Utility.copyAmount(1L, aStack))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -223,7 +225,7 @@ private void registerPlateTriple(final Materials aMaterial, final ItemStack aSta
 
             // 3 triple plates -> 1 dense plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.copyAmount(3L, aStack))
+                .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -256,7 +258,9 @@ private void registerPlateTriple(final Materials aMaterial, final ItemStack aSta
             }
 
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L))
+                .itemInputs(
+                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L),
+                    GT_Utility.getIntegratedCircuit(3))
                 .itemOutputs(GT_Utility.copyAmount(1L, aStack))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -322,7 +326,9 @@ private void registerPlateQuadruple(final Materials aMaterial, final ItemStack a
 
             // Quadruple plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L))
+                .itemInputs(
+                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L),
+                    GT_Utility.getIntegratedCircuit(4))
                 .itemOutputs(GT_Utility.copyAmount(1L, aStack))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -376,7 +382,9 @@ private void registerPlateQuintuple(final Materials aMaterial, final ItemStack a
 
             // quintuple plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L))
+                .itemInputs(
+                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L),
+                    GT_Utility.getIntegratedCircuit(5))
                 .itemOutputs(GT_Utility.copyAmount(1L, aStack))
                 .noFluidInputs()
                 .noFluidOutputs()
@@ -406,7 +414,9 @@ private void registerPlateDense(final Materials aMaterial, final ItemStack aStac
         if (!aNoSmashing) {
             // Dense plate
             GT_Values.RA.stdBuilder()
-                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L))
+                .itemInputs(
+                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L),
+                    GT_Utility.getIntegratedCircuit(9))
                 .itemOutputs(GT_Utility.copyAmount(1L, aStack))
                 .noFluidInputs()
                 .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
@@ -59,7 +59,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
             // bender recipe
             {
                 GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                    .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                     .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
                     .noFluidInputs()
                     .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
@@ -51,7 +51,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
             // Bender recipes
             {
                 GT_Values.RA.stdBuilder()
-                    .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                    .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                     .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L))
                     .noFluidInputs()
                     .noFluidOutputs()

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -58,7 +58,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                     // Bender recipes
                     {
                         GT_Values.RA.stdBuilder()
-                            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                            .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1))
                             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L))
                             .noFluidInputs()
                             .noFluidOutputs()