aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui/modularui
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/gui/modularui')
-rw-r--r--src/main/java/gregtech/common/gui/modularui/UIHelper.java20
-rw-r--r--src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java44
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java21
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java15
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java8
5 files changed, 73 insertions, 35 deletions
diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java
index 8973992c28..2135d3686a 100644
--- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java
+++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java
@@ -26,7 +26,9 @@ public class UIHelper {
SteamVariant steamVariant, Pos2d offset) {
List<Pos2d> itemInputPositions = recipeMap != null ? recipeMap.getItemInputPositions(itemInputCount)
: UIHelper.getItemInputPositions(itemInputCount);
- itemInputPositions = itemInputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList());
+ itemInputPositions = itemInputPositions.stream()
+ .map(p -> p.add(offset))
+ .collect(Collectors.toList());
for (int i = 0; i < itemInputPositions.size(); i++) {
forEachItemInputSlot.accept(
i,
@@ -36,7 +38,9 @@ public class UIHelper {
List<Pos2d> itemOutputPositions = recipeMap != null ? recipeMap.getItemOutputPositions(itemOutputCount)
: UIHelper.getItemOutputPositions(itemOutputCount);
- itemOutputPositions = itemOutputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList());
+ itemOutputPositions = itemOutputPositions.stream()
+ .map(p -> p.add(offset))
+ .collect(Collectors.toList());
for (int i = 0; i < itemOutputPositions.size(); i++) {
forEachItemOutputSlot.accept(
i,
@@ -47,12 +51,14 @@ public class UIHelper {
forEachSpecialSlot.accept(
0,
getBackgroundsForSlot(itemSlotBackground, recipeMap, false, false, 0, true, steamVariant),
- (recipeMap != null ? recipeMap.getSpecialItemPosition() : UIHelper.getSpecialItemPosition())
- .add(offset));
+ (recipeMap != null ? recipeMap.getSpecialItemPosition() : UIHelper.getSpecialItemPosition()).add(
+ offset));
List<Pos2d> fluidInputPositions = recipeMap != null ? recipeMap.getFluidInputPositions(fluidInputCount)
: UIHelper.getFluidInputPositions(fluidInputCount);
- fluidInputPositions = fluidInputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList());
+ fluidInputPositions = fluidInputPositions.stream()
+ .map(p -> p.add(offset))
+ .collect(Collectors.toList());
for (int i = 0; i < fluidInputPositions.size(); i++) {
forEachFluidInputSlot.accept(
i,
@@ -62,7 +68,9 @@ public class UIHelper {
List<Pos2d> fluidOutputPositions = recipeMap != null ? recipeMap.getFluidOutputPositions(fluidOutputCount)
: UIHelper.getFluidOutputPositions(fluidOutputCount);
- fluidOutputPositions = fluidOutputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList());
+ fluidOutputPositions = fluidOutputPositions.stream()
+ .map(p -> p.add(offset))
+ .collect(Collectors.toList());
for (int i = 0; i < fluidOutputPositions.size(); i++) {
forEachFluidOutputSlot.accept(
i,
diff --git a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
index 00cfcf9d6d..c8e015d5b4 100644
--- a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
+++ b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
@@ -116,15 +116,21 @@ public class SelectItemUIFactory {
}
public ModularWindow createWindow(UIBuildContext buildContext) {
- ModularWindow.Builder builder = ModularWindow
- .builder(getGUIWidth(), 53 + 18 * ((stacks.size() - 1) / cols + 1));
+ ModularWindow.Builder builder = ModularWindow.builder(
+ getGUIWidth(),
+ 53 + 18 * ((stacks.size() - 1) / cols + 1));
builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
builder.setGuiTint(guiTint);
if (headerItem != null) {
- builder.widget(new ItemDrawable(headerItem).asWidget().setPos(5, 5).setSize(16, 16));
+ builder.widget(
+ new ItemDrawable(headerItem).asWidget()
+ .setPos(5, 5)
+ .setSize(16, 16));
}
- builder.widget(new TextWidget(header).setDefaultColor(COLOR_TITLE.get()).setPos(25, 9));
+ builder.widget(
+ new TextWidget(header).setDefaultColor(COLOR_TITLE.get())
+ .setPos(25, 9));
builder.widget(new SlotWidget(BaseSlot.phantom(currentDisplayItemHandler, 0)) {
@@ -137,12 +143,18 @@ public class SelectItemUIFactory {
}
super.draw(partialTicks);
}
- }.disableInteraction().setBackground(GT_UITextures.SLOT_DARK_GRAY).setPos(
- 9 + getFontRenderer().getStringWidth(StatCollector.translateToLocal("GT5U.gui.select.current")),
- 24)).widget(
- new TextWidget(StatCollector.translateToLocal("GT5U.gui.select.current"))
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(8, 25 + (18 - getFontRenderer().FONT_HEIGHT) / 2));
+ }.disableInteraction()
+ .setBackground(GT_UITextures.SLOT_DARK_GRAY)
+ .setPos(9 + getFontRenderer().getStringWidth(StatCollector.translateToLocal("GT5U.gui.select.current")), 24))
+ .widget(
+ new TextWidget(
+ StatCollector.translateToLocal("GT5U.gui.select.current"))
+ .setDefaultColor(
+ COLOR_TEXT_GRAY.get())
+ .setPos(
+ 8,
+ 25 + (18 - getFontRenderer().FONT_HEIGHT)
+ / 2));
for (int i = 0; i < stacks.size(); i++) {
final int index = i;
@@ -167,7 +179,8 @@ public class SelectItemUIFactory {
return new IDrawable[] {
index == selected ? GT_UITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT };
}
- }.disableInteraction().setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols)));
+ }.disableInteraction()
+ .setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols)));
}
if (anotherWindow) {
@@ -178,9 +191,12 @@ public class SelectItemUIFactory {
public void onDestroy() {
dialogOpened.set(false);
}
- }.setOnClick((clickData, widget) -> widget.getWindow().tryClose())
- .setBackground(ModularUITextures.VANILLA_BACKGROUND, new Text("x")).setPos(getGUIWidth() - 15, 3)
- .setSize(12, 12));
+ }.setOnClick(
+ (clickData, widget) -> widget.getWindow()
+ .tryClose())
+ .setBackground(ModularUITextures.VANILLA_BACKGROUND, new Text("x"))
+ .setPos(getGUIWidth() - 15, 3)
+ .setSize(12, 12));
}
return builder.build();
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 70978351c2..28b495ce42 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
@@ -16,13 +16,22 @@ 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/CoverDataFollower_ToggleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java
index cb5fbf7994..0547609022 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
@@ -44,18 +44,21 @@ 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() {
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 182f007b33..13bcc12504 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java
@@ -141,8 +141,8 @@ 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(
@@ -238,7 +238,9 @@ public class FluidDisplaySlotWidget extends SlotWidget {
protected static ItemStack fillFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, FluidStack aFluidHeld,
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;
+ if (aFluidAccess.get() != null && !aFluidAccess.get()
+ .isFluidEqual(aFluidHeld))
+ return null;
ItemStack tStackHeld = aPlayer.inventory.getItemStack();
ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld);
if (tStackSizedOne == null) return null;
generated by cgit (git 2.46.0) at 2025-05-29 18:35:48 +0000