From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- .../modularui/widget/CoverCycleButtonWidget.java | 21 ++++--------- .../widget/CoverDataControllerWidget.java | 36 +++++++++++----------- .../CoverDataFollower_CycleButtonWidget.java | 2 +- .../widget/CoverDataFollower_SlotWidget.java | 2 +- .../widget/CoverDataFollower_TextFieldWidget.java | 8 ++--- .../CoverDataFollower_ToggleButtonWidget.java | 19 +++++------- .../gui/modularui/widget/DataControllerWidget.java | 2 +- .../modularui/widget/FluidDisplaySlotWidget.java | 33 ++++++++++---------- 8 files changed, 55 insertions(+), 68 deletions(-) (limited to 'src/main/java/gregtech/common/gui/modularui/widget') diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java index 28b495ce42..4d1c6649ae 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java @@ -16,22 +16,13 @@ import gregtech.api.gui.modularui.GT_UITextures; */ public class CoverCycleButtonWidget extends CycleButtonWidget { - private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea( - 0, - 0, - 1, - 0.5f); + private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL + .getSubArea(0, 0, 1, 0.5f); private static final UITexture BUTTON_NORMAL_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1); - private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED.getSubArea( - 0, - 0, - 1, - 0.5f); - private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED.getSubArea( - 0, - 0.5f, - 1, - 1); + private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED + .getSubArea(0, 0, 1, 0.5f); + private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED + .getSubArea(0, 0.5f, 1, 1); private boolean clickPressed; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java index 3fa25abdbf..4543980ce1 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java @@ -25,14 +25,14 @@ public class CoverDataControllerWidget extends Da * @param coverBehavior cover this widget handles data update */ public CoverDataControllerWidget(Supplier dataGetter, Function dataSetter, - GT_CoverBehaviorBase coverBehavior) { + GT_CoverBehaviorBase coverBehavior) { super(dataGetter, dataSetter); this.coverBehavior = coverBehavior; } @Override public > CoverDataControllerWidget addFollower(W widget, - Function dataToStateGetter, BiFunction dataUpdater, Consumer applyForWidget) { + Function dataToStateGetter, BiFunction dataUpdater, Consumer applyForWidget) { super.addFollower(widget, dataToStateGetter, dataUpdater, applyForWidget); return this; } @@ -55,7 +55,7 @@ public class CoverDataControllerWidget extends Da * Uses int index to determine toggle button behaviors. */ public static class CoverDataIndexedControllerWidget_ToggleButtons - extends CoverDataControllerWidget { + extends CoverDataControllerWidget { private final BiFunction dataToStateGetter; private final BiFunction dataUpdater; @@ -68,8 +68,8 @@ public class CoverDataControllerWidget extends Da * @param dataUpdater (index of button, current cover data) -> new cover data */ public CoverDataIndexedControllerWidget_ToggleButtons(Supplier coverDataGetter, - Function coverDataSetter, GT_CoverBehaviorBase coverBehavior, - BiFunction dataToStateGetter, BiFunction dataUpdater) { + Function coverDataSetter, GT_CoverBehaviorBase coverBehavior, + BiFunction dataToStateGetter, BiFunction dataUpdater) { super(coverDataGetter, coverDataSetter, coverBehavior); this.dataToStateGetter = dataToStateGetter; this.dataUpdater = dataUpdater; @@ -81,12 +81,12 @@ public class CoverDataControllerWidget extends Da * @param applyForWidget methods to call for widget to add */ public > CoverDataIndexedControllerWidget_ToggleButtons addToggleButton( - int index, W widget, Consumer> applyForWidget) { + int index, W widget, Consumer> applyForWidget) { addFollower( - widget, - data -> dataToStateGetter.apply(index, data), - (data, state) -> dataUpdater.apply(index, data), - applyForWidget); + widget, + data -> dataToStateGetter.apply(index, data), + (data, state) -> dataUpdater.apply(index, data), + applyForWidget); return this; } } @@ -95,7 +95,7 @@ public class CoverDataControllerWidget extends Da * Uses int index to determine cycle button behaviors. */ public static class CoverDataIndexedControllerWidget_CycleButtons - extends CoverDataControllerWidget { + extends CoverDataControllerWidget { private final BiFunction dataToStateGetter; private final BiFunction dataUpdater; @@ -108,8 +108,8 @@ public class CoverDataControllerWidget extends Da * @param dataUpdater (index of button, current cover data) -> new cover data */ public CoverDataIndexedControllerWidget_CycleButtons(Supplier coverDataGetter, - Function coverDataSetter, GT_CoverBehaviorBase coverBehavior, - BiFunction dataToStateGetter, BiFunction dataUpdater) { + Function coverDataSetter, GT_CoverBehaviorBase coverBehavior, + BiFunction dataToStateGetter, BiFunction dataUpdater) { super(coverDataGetter, coverDataSetter, coverBehavior); this.dataToStateGetter = dataToStateGetter; this.dataUpdater = dataUpdater; @@ -121,12 +121,12 @@ public class CoverDataControllerWidget extends Da * @param applyForWidget methods to call for the widget to add */ public > CoverDataIndexedControllerWidget_CycleButtons addCycleButton( - int index, W widget, Consumer> applyForWidget) { + int index, W widget, Consumer> applyForWidget) { addFollower( - widget, - data -> dataToStateGetter.apply(index, data), - (data, state) -> dataUpdater.apply(index, data), - applyForWidget); + widget, + data -> dataToStateGetter.apply(index, data), + (data, state) -> dataUpdater.apply(index, data), + applyForWidget); return this; } } diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java index 6e69b1ff79..ec7d31ca7e 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java @@ -10,7 +10,7 @@ import gregtech.api.util.ISerializableObject; * Determines button state with cover data. */ public class CoverDataFollower_CycleButtonWidget extends CoverCycleButtonWidget - implements IDataFollowerWidget { + implements IDataFollowerWidget { private Function dataToStateGetter; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java index c7795efbdc..8c19d65ba5 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java @@ -15,7 +15,7 @@ import gregtech.api.gui.modularui.IDataFollowerWidget; import gregtech.api.util.ISerializableObject; public class CoverDataFollower_SlotWidget extends SlotWidget - implements IDataFollowerWidget { + implements IDataFollowerWidget { private Function dataToStateGetter; private Consumer dataSetter; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java index 7d11656231..13628eb80f 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java @@ -15,7 +15,7 @@ import gregtech.api.gui.modularui.IDataFollowerWidget; import gregtech.api.util.ISerializableObject; public class CoverDataFollower_TextFieldWidget extends TextFieldWidget - implements IDataFollowerWidget { + implements IDataFollowerWidget { private Function dataToStateGetter; @@ -63,7 +63,7 @@ public class CoverDataFollower_TextFieldWidget ex public CoverDataFollower_TextFieldWidget setOnScrollNumbers(int baseStep, int ctrlStep, int shiftStep) { setOnScrollNumbers((val, direction) -> { int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep) - * direction; + * direction; try { val = Math.addExact(val, step); } catch (ArithmeticException ignored) { @@ -82,7 +82,7 @@ public class CoverDataFollower_TextFieldWidget ex setOnScroll((text, direction) -> { int val = (int) MathExpression.parseMathExpression(text, -1); int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep) - * direction; + * direction; try { val = Math.addExact(val, step); } catch (ArithmeticException ignored) { @@ -100,7 +100,7 @@ public class CoverDataFollower_TextFieldWidget ex public CoverDataFollower_TextFieldWidget setOnScrollNumbersLong(long baseStep, long ctrlStep, long shiftStep) { setOnScrollNumbersLong((val, direction) -> { long step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep) - * direction; + * direction; try { val = Math.addExact(val, step); } catch (ArithmeticException ignored) { diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java index 0547609022..6f798a93d5 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java @@ -10,7 +10,7 @@ import gregtech.api.gui.modularui.IDataFollowerWidget; import gregtech.api.util.ISerializableObject; public class CoverDataFollower_ToggleButtonWidget extends CoverCycleButtonWidget - implements IDataFollowerWidget { + implements IDataFollowerWidget { private Function dataToStateGetter; @@ -44,21 +44,18 @@ public class CoverDataFollower_ToggleButtonWidget } public static CoverDataFollower_ToggleButtonWidget ofCheckAndCross() { - return new CoverDataFollower_ToggleButtonWidget().setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_CHECKMARK, - GT_UITextures.OVERLAY_BUTTON_CROSS); + return new CoverDataFollower_ToggleButtonWidget() + .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.OVERLAY_BUTTON_CROSS); } public static CoverDataFollower_ToggleButtonWidget ofCheck() { - return new CoverDataFollower_ToggleButtonWidget().setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_CHECKMARK, - GT_UITextures.TRANSPARENT); + return new CoverDataFollower_ToggleButtonWidget() + .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT); } public static CoverDataFollower_ToggleButtonWidget ofRedstone() { - return new CoverDataFollower_ToggleButtonWidget().setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, - GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF); + return new CoverDataFollower_ToggleButtonWidget() + .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF); } public static CoverDataFollower_ToggleButtonWidget ofDisableable() { @@ -69,7 +66,7 @@ public class CoverDataFollower_ToggleButtonWidget * Disables clicking if button is already pressed. */ public static class CoverDataFollower_DisableableToggleButtonWidget - extends CoverDataFollower_ToggleButtonWidget { + extends CoverDataFollower_ToggleButtonWidget { public CoverDataFollower_DisableableToggleButtonWidget() { super(); diff --git a/src/main/java/gregtech/common/gui/modularui/widget/DataControllerWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/DataControllerWidget.java index 4e9ac4a245..959edb80fd 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/DataControllerWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/DataControllerWidget.java @@ -152,7 +152,7 @@ public abstract class DataControllerWidget extends MultiChildWidget implement * @param widget type to add */ public > DataControllerWidget addFollower(W widget, - Function dataToStateGetter, BiFunction dataUpdater, Consumer applyForWidget) { + Function dataToStateGetter, BiFunction dataUpdater, Consumer applyForWidget) { widget.setDataToStateGetter(dataToStateGetter); widget.setStateSetter(state -> { T newData = dataUpdater.apply(getLastData(), state); diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java index 4f9f19d49a..bc37f5c11a 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java @@ -141,16 +141,16 @@ public class FluidDisplaySlotWidget extends SlotWidget { ItemStack ret = null; if (actionRealClick == Action.TRANSFER) { if (fluidAccessConstructor == null) { - GT_Mod.GT_FML_LOGGER.warn( - "FluidDisplaySlotWidget is asked to transfer fluid, but fluidAccessConstructor is null!"); + GT_Mod.GT_FML_LOGGER + .warn("FluidDisplaySlotWidget is asked to transfer fluid, but fluidAccessConstructor is null!"); return null; } ret = transferFluid( - fluidAccessConstructor.get(), - getContext().getPlayer(), - clickData.mouseButton == 0, - canDrainGetter != null ? canDrainGetter.get() : true, - canFillGetter != null ? canFillGetter.get() : true); + fluidAccessConstructor.get(), + getContext().getPlayer(), + clickData.mouseButton == 0, + canDrainGetter != null ? canDrainGetter.get() : true, + canFillGetter != null ? canFillGetter.get() : true); } else if (actionRealClick == Action.LOCK) { lockFluid(getContext().getPlayer().inventory.getItemStack()); } @@ -160,7 +160,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { } protected ItemStack transferFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, boolean aProcessFullStack, - boolean aCanDrain, boolean aCanFill) { + boolean aCanDrain, boolean aCanFill) { ItemStack tStackHeld = aPlayer.inventory.getItemStack(); ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; @@ -235,11 +235,10 @@ public class FluidDisplaySlotWidget extends SlotWidget { } protected static ItemStack fillFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, FluidStack aFluidHeld, - boolean aProcessFullStack) { + boolean aProcessFullStack) { // we are not using aMachine.fill() here any more, so we need to check for fluid type here ourselves if (aFluidAccess.get() != null && !aFluidAccess.get() - .isFluidEqual(aFluidHeld)) - return null; + .isFluidEqual(aFluidHeld)) return null; ItemStack tStackHeld = aPlayer.inventory.getItemStack(); ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); if (tStackSizedOne == null) return null; @@ -340,10 +339,10 @@ public class FluidDisplaySlotWidget extends SlotWidget { mteToLock.lockFluid(true); mteToLock.setLockedFluidName(tFluid.getName()); GT_Utility.sendChatToPlayer( - getContext().getPlayer(), - String.format( - GT_Utility.trans("151.4", "Successfully locked Fluid to %s"), - new FluidStack(tFluid, 1).getLocalizedName())); + getContext().getPlayer(), + String.format( + GT_Utility.trans("151.4", "Successfully locked Fluid to %s"), + new FluidStack(tFluid, 1).getLocalizedName())); if (!isClient()) { mteToLock.onFluidLockPacketReceived(tFluid.getName()); @@ -418,7 +417,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { * @param beforeRealClick (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeRealClick( - BiFunction beforeRealClick) { + BiFunction beforeRealClick) { this.beforeRealClick = beforeRealClick; return this; } @@ -429,7 +428,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { * @param beforeDragAndDrop (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeDragAndDrop( - BiFunction beforeDragAndDrop) { + BiFunction beforeDragAndDrop) { this.beforeDragAndDrop = beforeDragAndDrop; return this; } -- cgit