From 183b423bbb22e3a170c5545942648b34b4cae458 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 30 Jul 2022 19:47:29 +0200 Subject: [PATCH] Revert "Add an evaluate button for equation inputs" This reverts commit d976cbe8b9e8b5c9377200ff1aad984ec6891653. --- .../screen/AmountSpecifyingScreen.java | 39 ++++--------------- .../screen/FluidAmountScreen.java | 2 +- .../screen/ItemAmountScreen.java | 2 +- .../assets/refinedstorage/lang/en_us.json | 1 - .../assets/refinedstorage/lang/fr_fr.json | 1 - .../assets/refinedstorage/lang/zh_cn.json | 1 - .../assets/refinedstorage/lang/zh_tw.json | 1 - 7 files changed, 10 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java index cda1d0bd2..eb0a64874 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java @@ -20,7 +20,6 @@ public abstract class AmountSpecifyingScreen ex protected EditBox amountField; protected Button okButton; protected Button cancelButton; - protected Button evaluateButton; protected AmountSpecifyingScreen(BaseScreen parent, T container, int width, int height, Inventory playerInventory, Component title) { super(container, width, height, playerInventory, title); @@ -64,36 +63,22 @@ public abstract class AmountSpecifyingScreen ex } protected Pair getOkCancelPos() { - return Pair.of(114, 20); + return Pair.of(114, 33); } protected int getOkCancelButtonWidth() { return 50; } - protected int getOkCancelButtonHeight() { - return 20; - } - - public Button addActionButton(Pair absolutePos, int xOffset, int yOffset, ITextComponent text, - IPressable onPress) { - return addButton(absolutePos.getLeft() + xOffset, absolutePos.getRight() + yOffset, getOkCancelButtonWidth(), - getOkCancelButtonHeight(), text, true, true, onPress); - } - @Override public void onPostInit(int x, int y) { Pair pos = getOkCancelPos(); - Pair absolutePos = Pair.of(x + pos.getLeft(), y + pos.getRight()); - okButton = addActionButton(absolutePos, 0, 0, getOkButtonText(), btn -> onOkButtonPressed(hasShiftDown())); - cancelButton = addActionButton(absolutePos, 0, 24, new TranslationTextComponent("gui.cancel"), btn -> close()); - evaluateButton = addActionButton(absolutePos, 0, 48, new TranslationTextComponent("misc.refinedstorage.evaluate"), - btn -> onEvaluateButtonPressed(hasShiftDown())); + okButton = addButton(x + pos.getLeft(), y + pos.getRight(), getOkCancelButtonWidth(), 20, getOkButtonText(), true, true, btn -> onOkButtonPressed(hasShiftDown())); + cancelButton = addButton(x + pos.getLeft(), y + pos.getRight() + 24, getOkCancelButtonWidth(), 20, new TranslatableComponent("gui.cancel"), true, true, btn -> close()); - amountField = new TextFieldWidget(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6, - font.FONT_HEIGHT, new StringTextComponent("")); - amountField.setEnableBackgroundDrawing(false); + amountField = new EditBox(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6, font.lineHeight, new TextComponent("")); + amountField.setBordered(false); amountField.setVisible(true); amountField.setValue(String.valueOf(getDefaultAmount())); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); @@ -188,7 +173,7 @@ public abstract class AmountSpecifyingScreen ex try { int amount = parseAmount(); if (isAmountInBounds(amount)) { - onValidAmountSaved(shiftDown, amount); + onValidAmountSave(shiftDown, amount); close(); } } catch (IllegalArgumentException e) { @@ -196,16 +181,7 @@ public abstract class AmountSpecifyingScreen ex } } - private void onEvaluateButtonPressed(boolean shiftDown) { - try { - amountField.setText(String.valueOf(clampAmount(parseAmount()))); - } catch (IllegalArgumentException e) { - // NO OP - } - } - - protected void onValidAmountSaved(boolean shiftDown, int amount) { - } + protected void onValidAmountSave(boolean shiftDown, int amount) {} @Override public void tick(int x, int y) { @@ -226,6 +202,7 @@ public abstract class AmountSpecifyingScreen ex renderString(poseStack, 7, 7, title.getString()); } + @Override public boolean mouseScrolled(double x, double y, double delta) { if (delta > 0) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index f985d5bdc..ac84365ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -87,7 +87,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen