Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamically change the direction of the arrow in "Manual IO Mode" to reflect the direction of the "IO Mode" #2491

Merged
merged 4 commits into from
Jun 22, 2024
Merged

Dynamically change the direction of the arrow in "Manual IO Mode" to reflect the direction of the "IO Mode" #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01ea2b8
New textures
Zorbatron Jun 4, 2024
75cd1ab
The actual logic
Zorbatron Jun 4, 2024
6c933a6
Spotless :shakesfist:
Zorbatron Jun 4, 2024
da9ac0c
Spotless..
Zorbatron Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/gregtech/api/mui/GTGuiTextures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ public static class IDs {
public static final UITexture OREDICT_WAITING = fullImage("textures/gui/widget/ore_filter/waiting.png");
public static final UITexture OREDICT_WARN = fullImage("textures/gui/widget/ore_filter/warn.png");

public static final UITexture[] MANUAL_IO_OVERLAY = slice("textures/gui/overlay/manual_io_overlay.png",
public static final UITexture[] MANUAL_IO_OVERLAY_IN = slice("textures/gui/overlay/manual_io_overlay_in.png",
18, 18 * 3, 18, 18, true);
public static final UITexture[] MANUAL_IO_OVERLAY_OUT = slice("textures/gui/overlay/manual_io_overlay_out.png",
18, 18 * 3, 18, 18, true);
public static final UITexture[] CONVEYOR_MODE_OVERLAY = slice("textures/gui/overlay/conveyor_mode_overlay.png",
18, 18 * 2, 18, 18, true);
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/gregtech/common/covers/CoverConveyor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
import codechicken.lib.render.pipeline.IVertexOperation;
import codechicken.lib.vec.Cuboid6;
import codechicken.lib.vec.Matrix4;
import com.cleanroommc.modularui.api.drawable.IDrawable;
import com.cleanroommc.modularui.api.widget.Interactable;
import com.cleanroommc.modularui.drawable.DynamicDrawable;
import com.cleanroommc.modularui.factory.SidedPosGuiData;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.utils.Color;
Expand Down Expand Up @@ -571,7 +573,14 @@ protected ParentWidget<Column> createUI(ModularPanel mainPanel, GuiSyncManager g
column.child(new EnumRowBuilder<>(ManualImportExportMode.class)
.value(manualIOmode)
.lang("cover.generic.manual_io")
.overlay(GTGuiTextures.MANUAL_IO_OVERLAY)
.overlay(new IDrawable[] {
new DynamicDrawable(() -> conveyorMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[0] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[0]),
new DynamicDrawable(() -> conveyorMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[1] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[1]),
new DynamicDrawable(() -> conveyorMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[2] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[2])
})
.build());

if (createConveyorModeRow())
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/gregtech/common/covers/CoverPump.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
import codechicken.lib.render.pipeline.IVertexOperation;
import codechicken.lib.vec.Cuboid6;
import codechicken.lib.vec.Matrix4;
import com.cleanroommc.modularui.api.drawable.IDrawable;
import com.cleanroommc.modularui.api.widget.Interactable;
import com.cleanroommc.modularui.drawable.DynamicDrawable;
import com.cleanroommc.modularui.factory.SidedPosGuiData;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.utils.Color;
Expand Down Expand Up @@ -257,7 +259,14 @@ protected ParentWidget<?> createUI(ModularPanel mainPanel, GuiSyncManager syncMa
column.child(new EnumRowBuilder<>(ManualImportExportMode.class)
.value(manualIOmode)
.lang("cover.generic.manual_io")
.overlay(GTGuiTextures.MANUAL_IO_OVERLAY)
.overlay(new IDrawable[] {
new DynamicDrawable(() -> pumpMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[0] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[0]),
new DynamicDrawable(() -> pumpMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[1] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[1]),
new DynamicDrawable(() -> pumpMode.getValue().isImport() ?
GTGuiTextures.MANUAL_IO_OVERLAY_OUT[2] : GTGuiTextures.MANUAL_IO_OVERLAY_IN[2])
})
.build());

if (createPumpModeRow())
Expand Down
0 ...extures/gui/overlay/manual_io_overlay.png → ...ures/gui/overlay/manual_io_overlay_in.png
View file
Open in desktop
File renamed without changes
Binary file added src/main/resources/assets/gregtech/textures/gui/overlay/manual_io_overlay_out.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading