Skip to content

Commit 4cbcf15

Browse files
ghzdudeghzdude
committed
use flow as return type
1 parent 85abd43 commit 4cbcf15

File tree

8 files changed

+10
-16
lines changed

8 files changed

+10
-16
lines changed

‎src/main/java/gregtech/common/covers/CoverConveyor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import com.cleanroommc.modularui.value.sync.IntSyncValue;
5656
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5757
import com.cleanroommc.modularui.value.sync.StringSyncValue;
58-
import com.cleanroommc.modularui.widget.ParentWidget;
5958
import com.cleanroommc.modularui.widgets.ButtonWidget;
6059
import com.cleanroommc.modularui.widgets.layout.Flow;
6160
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -509,7 +508,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
509508
.bindPlayerInventory();
510509
}
511510

512-
protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
511+
protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
513512
var column = Flow.column().top(24).margin(7, 0)
514513
.widthRel(1f).coverChildrenHeight();
515514

‎src/main/java/gregtech/common/covers/CoverFluidRegulator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package gregtech.common.covers;
22

3+
import com.cleanroommc.modularui.widgets.layout.Flow;
34
import gregtech.api.cover.CoverDefinition;
45
import gregtech.api.cover.CoverableView;
56
import gregtech.api.mui.GTGuiTextures;
@@ -28,7 +29,6 @@
2829
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
2930
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3031
import com.cleanroommc.modularui.value.sync.StringSyncValue;
31-
import com.cleanroommc.modularui.widget.ParentWidget;
3232
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
3333
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
3434
import org.apache.logging.log4j.message.FormattedMessage;
@@ -249,7 +249,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
249249
}
250250

251251
@Override
252-
protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
252+
protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
253253
var transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode, this::setTransferMode);
254254
transferMode.updateCacheFromSource(true);
255255
syncManager.syncValue("transfer_mode", transferMode);

‎src/main/java/gregtech/common/covers/CoverFluidVoiding.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.cleanroommc.modularui.utils.Color;
3333
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
3434
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
35-
import com.cleanroommc.modularui.widget.ParentWidget;
3635
import com.cleanroommc.modularui.widgets.ToggleButton;
3736
import com.cleanroommc.modularui.widgets.layout.Flow;
3837
import org.jetbrains.annotations.NotNull;
@@ -78,7 +77,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
7877
}
7978

8079
@Override
81-
protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
80+
protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
8281
var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
8382

8483
return super.createUI(data, syncManager)

‎src/main/java/gregtech/common/covers/CoverFluidVoidingAdvanced.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package gregtech.common.covers;
22

3+
import com.cleanroommc.modularui.widgets.layout.Flow;
34
import gregtech.api.cover.CoverDefinition;
45
import gregtech.api.cover.CoverableView;
56
import gregtech.api.mui.GTGuiTextures;
@@ -28,7 +29,6 @@
2829
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
2930
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3031
import com.cleanroommc.modularui.value.sync.StringSyncValue;
31-
import com.cleanroommc.modularui.widget.ParentWidget;
3232
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
3333
import org.jetbrains.annotations.NotNull;
3434

@@ -107,7 +107,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
107107
}
108108

109109
@Override
110-
protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
110+
protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
111111
var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
112112
syncManager.syncValue("voiding_mode", voidingMode);
113113

‎src/main/java/gregtech/common/covers/CoverItemVoiding.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.cleanroommc.modularui.utils.Color;
3030
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
3131
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
32-
import com.cleanroommc.modularui.widget.ParentWidget;
3332
import com.cleanroommc.modularui.widgets.ToggleButton;
3433
import com.cleanroommc.modularui.widgets.layout.Flow;
3534
import org.jetbrains.annotations.NotNull;
@@ -79,7 +78,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
7978
}
8079

8180
@Override
82-
protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
81+
protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
8382
var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
8483

8584
return super.createUI(data, guiSyncManager)

‎src/main/java/gregtech/common/covers/CoverItemVoidingAdvanced.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
2626
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
2727
import com.cleanroommc.modularui.value.sync.StringSyncValue;
28-
import com.cleanroommc.modularui.widget.ParentWidget;
2928
import com.cleanroommc.modularui.widgets.layout.Flow;
3029
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
3130
import org.jetbrains.annotations.NotNull;
@@ -95,7 +94,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
9594
}
9695

9796
@Override
98-
protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
97+
protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
9998
var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
10099
guiSyncManager.syncValue("voiding_mode", voidingMode);
101100

‎src/main/java/gregtech/common/covers/CoverPump.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import com.cleanroommc.modularui.value.sync.IntSyncValue;
5454
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5555
import com.cleanroommc.modularui.value.sync.StringSyncValue;
56-
import com.cleanroommc.modularui.widget.ParentWidget;
5756
import com.cleanroommc.modularui.widgets.ButtonWidget;
5857
import com.cleanroommc.modularui.widgets.layout.Flow;
5958
import org.jetbrains.annotations.NotNull;
@@ -195,7 +194,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
195194
.bindPlayerInventory();
196195
}
197196

198-
protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
197+
protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
199198
var manualIOmode = new EnumSyncValue<>(ManualImportExportMode.class,
200199
this::getManualImportExportMode, this::setManualImportExportMode);
201200

‎src/main/java/gregtech/common/covers/CoverRoboticArm.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
2828
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
2929
import com.cleanroommc.modularui.value.sync.StringSyncValue;
30-
import com.cleanroommc.modularui.widget.ParentWidget;
3130
import com.cleanroommc.modularui.widgets.layout.Flow;
3231
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
3332
import org.jetbrains.annotations.NotNull;
@@ -198,7 +197,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
198197
}
199198

200199
@Override
201-
protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
200+
protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
202201
EnumSyncValue<TransferMode> transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode,
203202
this::setTransferMode);
204203
guiSyncManager.syncValue("transfer_mode", transferMode);

0 commit comments

Comments
 (0)