aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui/modularui/widget
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/gui/modularui/widget
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/gui/modularui/widget')
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java21
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java36
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java2
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java2
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java8
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java19
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/DataControllerWidget.java2
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java33
8 files changed, 55 insertions, 68 deletions
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<T extends ISerializableObject> extends Da
* @param coverBehavior cover this widget handles data update
*/
public CoverDataControllerWidget(Supplier<T> dataGetter, Function<T, Boolean> dataSetter,
- GT_CoverBehaviorBase<T> coverBehavior) {
+ GT_CoverBehaviorBase<T> coverBehavior) {
super(dataGetter, dataSetter);
this.coverBehavior = coverBehavior;
}
@Override
public <U, W extends Widget & IDataFollowerWidget<T, U>> CoverDataControllerWidget<T> addFollower(W widget,
- Function<T, U> dataToStateGetter, BiFunction<T, U, T> dataUpdater, Consumer<W> applyForWidget) {
+ Function<T, U> dataToStateGetter, BiFunction<T, U, T> dataUpdater, Consumer<W> applyForWidget) {
super.addFollower(widget, dataToStateGetter, dataUpdater, applyForWidget);
return this;
}
@@ -55,7 +55,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
* Uses int index to determine toggle button behaviors.
*/
public static class CoverDataIndexedControllerWidget_ToggleButtons<T extends ISerializableObject>
- extends CoverDataControllerWidget<T> {
+ extends CoverDataControllerWidget<T> {
private final BiFunction<Integer, T, Boolean> dataToStateGetter;
private final BiFunction<Integer, T, T> dataUpdater;
@@ -68,8 +68,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
* @param dataUpdater (index of button, current cover data) -> new cover data
*/
public CoverDataIndexedControllerWidget_ToggleButtons(Supplier<T> coverDataGetter,
- Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
- BiFunction<Integer, T, Boolean> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
+ Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+ BiFunction<Integer, T, Boolean> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
super(coverDataGetter, coverDataSetter, coverBehavior);
this.dataToStateGetter = dataToStateGetter;
this.dataUpdater = dataUpdater;
@@ -81,12 +81,12 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
* @param applyForWidget methods to call for widget to add
*/
public <W extends CoverDataFollower_ToggleButtonWidget<T>> CoverDataIndexedControllerWidget_ToggleButtons<T> addToggleButton(
- int index, W widget, Consumer<CoverDataFollower_ToggleButtonWidget<T>> applyForWidget) {
+ int index, W widget, Consumer<CoverDataFollower_ToggleButtonWidget<T>> 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<T extends ISerializableObject> extends Da
* Uses int index to determine cycle button behaviors.
*/
public static class CoverDataIndexedControllerWidget_CycleButtons<T extends ISerializableObject>
- extends CoverDataControllerWidget<T> {
+ extends CoverDataControllerWidget<T> {
private final BiFunction<Integer, T, Integer> dataToStateGetter;
private final BiFunction<Integer, T, T> dataUpdater;
@@ -108,8 +108,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
* @param dataUpdater (index of button, current cover data) -> new cover data
*/
public CoverDataIndexedControllerWidget_CycleButtons(Supplier<T> coverDataGetter,
- Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
- BiFunction<Integer, T, Integer> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
+ Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+ BiFunction<Integer, T, Integer> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
super(coverDataGetter, coverDataSetter, coverBehavior);
this.dataToStateGetter = dataToStateGetter;
this.dataUpdater = dataUpdater;
@@ -121,12 +121,12 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
* @param applyForWidget methods to call for the widget to add
*/
public <W extends CoverDataFollower_CycleButtonWidget<T>> CoverDataIndexedControllerWidget_CycleButtons<T> addCycleButton(
- int index, W widget, Consumer<CoverDataFollower_CycleButtonWidget<T>> applyForWidget) {
+ int index, W widget, Consumer<CoverDataFollower_CycleButtonWidget<T>> 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<T extends ISerializableObject> extends CoverCycleButtonWidget
- implements IDataFollowerWidget<T, Integer> {
+ implements IDataFollowerWidget<T, Integer> {
private Function<T, Integer> 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<T extends ISerializableObject> extends SlotWidget
- implements IDataFollowerWidget<T, ItemStack> {
+ implements IDataFollowerWidget<T, ItemStack> {
private Function<T, ItemStack> dataToStateGetter;
private Consumer<ItemStack> 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<T extends ISerializableObject> extends TextFieldWidget
- implements IDataFollowerWidget<T, String> {
+ implements IDataFollowerWidget<T, String> {
private Function<T, String> dataToStateGetter;
@@ -63,7 +63,7 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
public CoverDataFollower_TextFieldWidget<T> 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<T extends ISerializableObject> 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<T extends ISerializableObject> ex
public CoverDataFollower_TextFieldWidget<T> 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<T extends ISerializableObject> extends CoverCycleButtonWidget
- implements IDataFollowerWidget<T, Boolean> {
+ implements IDataFollowerWidget<T, Boolean> {
private Function<T, Boolean> dataToStateGetter;
@@ -44,21 +44,18 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
}
public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheckAndCross() {
- return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture(
- GT_UITextures.OVERLAY_BUTTON_CHECKMARK,
- GT_UITextures.OVERLAY_BUTTON_CROSS);
+ return new CoverDataFollower_ToggleButtonWidget<T>()
+ .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.OVERLAY_BUTTON_CROSS);
}
public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheck() {
- return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture(
- GT_UITextures.OVERLAY_BUTTON_CHECKMARK,
- GT_UITextures.TRANSPARENT);
+ return new CoverDataFollower_ToggleButtonWidget<T>()
+ .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT);
}
public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofRedstone() {
- return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture(
- GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON,
- GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF);
+ return new CoverDataFollower_ToggleButtonWidget<T>()
+ .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF);
}
public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofDisableable() {
@@ -69,7 +66,7 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
* Disables clicking if button is already pressed.
*/
public static class CoverDataFollower_DisableableToggleButtonWidget<T extends ISerializableObject>
- extends CoverDataFollower_ToggleButtonWidget<T> {
+ extends CoverDataFollower_ToggleButtonWidget<T> {
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<T> extends MultiChildWidget implement
* @param <W> widget type to add
*/
public <U, W extends Widget & IDataFollowerWidget<T, U>> DataControllerWidget<T> addFollower(W widget,
- Function<T, U> dataToStateGetter, BiFunction<T, U, T> dataUpdater, Consumer<W> applyForWidget) {
+ Function<T, U> dataToStateGetter, BiFunction<T, U, T> dataUpdater, Consumer<W> 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<ClickData, FluidDisplaySlotWidget, Boolean> beforeRealClick) {
+ BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> 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<ClickData, FluidDisplaySlotWidget, Boolean> beforeDragAndDrop) {
+ BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeDragAndDrop) {
this.beforeDragAndDrop = beforeDragAndDrop;
return this;
}