Recipes ra2 (#1872)

* Recipes RA2 fixes

* Use \uXXXX for non-ASCII characters

* Misc cleanup (#1888)

* migrate away from addThermalCentrifugeRecipe

* split recipes of GT_Block_Stones_Abstract

* migrate away from addForgeHammerRecipe

* migrate away from addChemicalBathRecipe

* remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing

* Remove underground biomes ore classes, as it's not present in NH

* migrate away from addFluidCannerRecipe

* migrate away from addFluidExtractionRecipe

* migrate away from addChemicalRecipe

* migrate away from addMultiblockChemicalRecipe

* deprecate addChemicalRecipeForBasicMachineOnly

* migrate away from addCentrifugeRecipe

* spotlessApply

* fixing wrong merge conflict solving

* Add Tengam materials (#1891)

* Add Tengam materials

* Change new recipes to consume 15/16 Amp

* Remove now redundant `break` statements

* fix comb chances?

* fix centrifuge code not working

---------

Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 20 insertions, 20 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index d7600e0927..f2c2a65f3a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -10,7 +10,6 @@ import com.gtnewhorizons.modularui.api.math.MathExpression;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import com.gtnewhorizons.modularui.common.widget.textfield.BaseTextFieldWidget;
-import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 
 import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
 import gregtech.api.gui.modularui.GT_UITextures;
@@ -86,25 +85,23 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             toSlot = aCoverVariable & SLOT_ID_MASK;
         }
 
-        byte movedItems = 0;
         if (fromSlot > 0 && toSlot > 0) {
-            if (fromTile instanceof IInventory && toTile instanceof IInventory)
-                movedItems = GT_Utility.moveFromSlotToSlot(
-                    (IInventory) fromTile,
-                    (IInventory) toTile,
-                    fromSlot - 1,
-                    toSlot - 1,
-                    null,
-                    false,
-                    (byte) 64,
-                    (byte) 1,
-                    (byte) 64,
-                    (byte) 1);
+            if (fromTile instanceof IInventory && toTile instanceof IInventory) GT_Utility.moveFromSlotToSlot(
+                (IInventory) fromTile,
+                (IInventory) toTile,
+                fromSlot - 1,
+                toSlot - 1,
+                null,
+                false,
+                (byte) 64,
+                (byte) 1,
+                (byte) 64,
+                (byte) 1);
         } else if (toSlot > 0) {
             byte side;
             if ((aCoverVariable & EXPORT_MASK) > 0) side = aSide;
             else side = GT_Utility.getOppositeSide(aSide);
-            movedItems = GT_Utility.moveOneItemStackIntoSlot(
+            GT_Utility.moveOneItemStackIntoSlot(
                 fromTile,
                 toTile,
                 side,
@@ -119,7 +116,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             byte toSide;
             if ((aCoverVariable & EXPORT_MASK) > 0) toSide = aSide;
             else toSide = GT_Utility.getOppositeSide(aSide);
-            if (fromTile instanceof IInventory) movedItems = GT_Utility.moveFromSlotToSide(
+            if (fromTile instanceof IInventory) GT_Utility.moveFromSlotToSide(
                 (IInventory) fromTile,
                 toTile,
                 fromSlot - 1,
@@ -139,7 +136,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                 fromSide = GT_Utility.getOppositeSide(aSide);
                 toSide = aSide;
             }
-            movedItems = GT_Utility.moveOneItemStack(
+            GT_Utility.moveOneItemStack(
                 fromTile,
                 toTile,
                 fromSide,
@@ -348,7 +345,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                             .setValidator(val -> {
                                 final int valSlot = getIntFromText(val);
                                 if (valSlot > -1) {
-                                    return TextFieldWidget.format.format(Math.min(valSlot, maxSlot));
+                                    return widget.getDecimalFormatter()
+                                        .format(Math.min(valSlot, maxSlot));
                                 } else {
                                     return ANY_TEXT;
                                 }
@@ -380,7 +378,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                 adjacentMaxSlot = -1;
                             }
                             if (valSlot > -1) {
-                                return TextFieldWidget.format.format(Math.min(valSlot, adjacentMaxSlot));
+                                return widget.getDecimalFormatter()
+                                    .format(Math.min(valSlot, adjacentMaxSlot));
                             } else {
                                 return ANY_TEXT;
                             }
@@ -389,7 +388,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                 final int val = getIntFromText(text);
                                 int step = (GuiScreen.isShiftKeyDown() ? 50 : GuiScreen.isCtrlKeyDown() ? 5 : 1)
                                     * direction;
-                                return TextFieldWidget.format.format(val + step);
+                                return widget.getDecimalFormatter()
+                                    .format(val + step);
                             })
                             .setPattern(BaseTextFieldWidget.NATURAL_NUMS)
                             .setPos(spaceX * 0, spaceY * 2 + 2)