From 0afadf4decef7368d265d58cec610e60f403bf78 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 30 Jul 2022 19:47:26 +0200
Subject: [PATCH] Revert "Add 1.18 port fixes"

This reverts commit b2f644156893d5415c69dea8b74105e44b20a289.
---
 .../screen/AmountSpecifyingScreen.java        | 19 ++++++++++---------
 .../refinedstorage/screen/PriorityScreen.java |  2 +-
 .../screen/grid/CraftingSettingsScreen.java   |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
index 4ad031361..cda1d0bd2 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
@@ -48,7 +48,7 @@ public abstract class AmountSpecifyingScreen<T extends AbstractContainerMenu> ex
     }
 
     protected int parseAmount() {
-        return (int) Math.ceil(EquationEvaluator.evaluate(amountField.getValue()));
+        return (int) Math.ceil(EquationEvaluator.evaluate(amountField.getText()));
     }
 
     protected int clampAmount(int amount) {
@@ -75,8 +75,8 @@ public abstract class AmountSpecifyingScreen<T extends AbstractContainerMenu> ex
         return 20;
     }
 
-    public Button addActionButton(Pair<Integer, Integer> absolutePos, int xOffset, int yOffset, Component text,
-            Button.OnPress onPress) {
+    public Button addActionButton(Pair<Integer, Integer> absolutePos, int xOffset, int yOffset, ITextComponent text,
+            IPressable onPress) {
         return addButton(absolutePos.getLeft() + xOffset, absolutePos.getRight() + yOffset, getOkCancelButtonWidth(),
                 getOkCancelButtonHeight(), text, true, true, onPress);
     }
@@ -87,12 +87,13 @@ public abstract class AmountSpecifyingScreen<T extends AbstractContainerMenu> ex
         Pair<Integer, Integer> absolutePos = Pair.of(x + pos.getLeft(), y + pos.getRight());
 
         okButton = addActionButton(absolutePos, 0, 0, getOkButtonText(), btn -> onOkButtonPressed(hasShiftDown()));
-        cancelButton = addActionButton(absolutePos, 0, 24, new TranslatableComponent("gui.cancel"), btn -> close());
-        evaluateButton = addActionButton(absolutePos, 0, 48, new TranslatableComponent("misc.refinedstorage.evaluate"),
+        cancelButton = addActionButton(absolutePos, 0, 24, new TranslationTextComponent("gui.cancel"), btn -> close());
+        evaluateButton = addActionButton(absolutePos, 0, 48, new TranslationTextComponent("misc.refinedstorage.evaluate"),
                 btn -> onEvaluateButtonPressed(hasShiftDown()));
 
-        amountField = new EditBox(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6, font.lineHeight, new TextComponent(""));
-        amountField.setBordered(false);
+        amountField = new TextFieldWidget(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6,
+                font.FONT_HEIGHT, new StringTextComponent(""));
+        amountField.setEnableBackgroundDrawing(false);
         amountField.setVisible(true);
         amountField.setValue(String.valueOf(getDefaultAmount()));
         amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor());
@@ -177,7 +178,7 @@ public abstract class AmountSpecifyingScreen<T extends AbstractContainerMenu> ex
             if (!canAmountGoNegative() && oldAmount == 1) {
                 newAmount--;
             }
-            amountField.setValue(String.valueOf(clampAmount(newAmount)));
+            amountField.setText(String.valueOf(clampAmount(newAmount)));
         } catch (IllegalArgumentException e) {
             // NO OP
         }
@@ -197,7 +198,7 @@ public abstract class AmountSpecifyingScreen<T extends AbstractContainerMenu> ex
 
     private void onEvaluateButtonPressed(boolean shiftDown) {
         try {
-            amountField.setValue(String.valueOf(clampAmount(parseAmount())));
+            amountField.setText(String.valueOf(clampAmount(parseAmount())));
         } catch (IllegalArgumentException e) {
             // NO OP
         }
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java
index 1b47e9d88..3742d9786 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java
@@ -67,7 +67,7 @@ public class PriorityScreen extends AmountSpecifyingScreen<AbstractContainerMenu
     }
 
     @Override
-    protected void onValidAmountSaved(boolean shiftDown, int amount) {
+    protected void onValidAmountSave(boolean shiftDown, int amount) {
         BlockEntitySynchronizationManager.setParameter(priority, amount);
     }
 }
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java
index 4211c1eb0..112dcff6b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java
@@ -62,7 +62,7 @@ public class CraftingSettingsScreen extends AmountSpecifyingScreen<CraftingSetti
     }
 
     @Override
-    protected void onValidAmountSaved(boolean shiftDown, int amount) {
+    protected void onValidAmountSave(boolean shiftDown, int amount) {
         RS.NETWORK_HANDLER.sendToServer(new GridCraftingPreviewRequestMessage(stack.getId(), amount, shiftDown, stack instanceof FluidGridStack));
 
         okButton.active = false;