Skip to content

Commit 4ee3ba1

Browse files
ghzdudeghzdude
committed
add new method to CoverWithUI
remove overrides to buildUI
1 parent 8d3b3da commit 4ee3ba1

9 files changed

Lines changed: 34 additions & 33 deletions

‎src/main/java/gregtech/api/cover/CoverWithUI.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,29 @@ default GTGuiTheme getUITheme() {
6969

7070
@Override
7171
default ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
72-
var w = constructWidgets(guiData, guiSyncManager);
73-
return GTGuis.createPanel(getPickItem(), 100, 100)
74-
.childIf(w != null, w);
72+
var panel = GTGuis.createPanel(getPickItem(), getWidth(), getHeight());
73+
var w = createUI(panel, guiSyncManager);
74+
return panel.childIf(w != null, w)
75+
.bindPlayerInventory();
76+
}
77+
78+
default int getWidth() {
79+
return 176;
80+
}
81+
82+
default int getHeight() {
83+
return 192;
7584
}
7685

7786
default @NotNull ModularPanel getSmallGUI(@NotNull SidedPosGuiData guiData,
7887
@NotNull PanelSyncManager guiSyncManager) {
79-
var w = constructWidgets(guiData, guiSyncManager);
80-
return GTGuis.createPopupPanel(getPickItem().getTranslationKey(), 100, 100)
81-
.childIf(w != null, w);
88+
var panel = GTGuis.createPopupPanel(getPickItem().getTranslationKey(), getWidth(), getHeight());
89+
var w = createUI(panel, guiSyncManager);
90+
return panel.childIf(w != null, w)
91+
.coverChildrenHeight();
8292
}
8393

84-
default @Nullable IWidget constructWidgets(SidedPosGuiData data, PanelSyncManager manager) {
94+
default @Nullable IWidget createUI(ModularPanel mainPanel, PanelSyncManager manager) {
8595
return null;
8696
}
8797

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import gregtech.api.cover.CoverWithUI;
1010
import gregtech.api.cover.CoverableView;
1111
import gregtech.api.mui.GTGuiTextures;
12-
import gregtech.api.mui.GTGuis;
1312
import gregtech.api.util.GTTransferUtils;
1413
import gregtech.api.util.ItemStackHashStrategy;
1514
import gregtech.client.renderer.texture.Textures;
@@ -45,7 +44,6 @@
4544
import com.cleanroommc.modularui.api.drawable.IDrawable;
4645
import com.cleanroommc.modularui.api.widget.Interactable;
4746
import com.cleanroommc.modularui.drawable.DynamicDrawable;
48-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
4947
import com.cleanroommc.modularui.screen.ModularPanel;
5048
import com.cleanroommc.modularui.utils.Color;
5149
import com.cleanroommc.modularui.utils.MouseData;
@@ -504,17 +502,13 @@ public boolean usesMui2() {
504502
}
505503

506504
@Override
507-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
508-
var panel = GTGuis.createPanel(this, 176, 192 + 18);
505+
public int getHeight() {
506+
return 192 + 18;
507+
}
509508

509+
public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
510510
getItemFilterContainer().setMaxTransferSize(getMaxStackSize());
511511

512-
return panel.child(CoverWithUI.createTitleRow(getPickItem()))
513-
.child(createUI(panel, guiSyncManager))
514-
.bindPlayerInventory();
515-
}
516-
517-
protected ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
518512
var column = new Column().top(24).margin(7, 0)
519513
.widthRel(1f).coverChildrenHeight();
520514

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
247247
}
248248

249249
@Override
250-
protected ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
250+
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
251251
var transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode, this::setTransferMode);
252252
transferMode.updateCacheFromSource(true);
253253
syncManager.syncValue("transfer_mode", transferMode);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
7676
}
7777

7878
@Override
79-
protected ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
79+
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
8080
var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
8181

8282
return super.createUI(mainPanel, syncManager)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
105105
}
106106

107107
@Override
108-
protected ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
108+
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
109109
var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
110110
syncManager.syncValue("voiding_mode", voidingMode);
111111

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import codechicken.lib.vec.Cuboid6;
2323
import codechicken.lib.vec.Matrix4;
2424
import com.cleanroommc.modularui.api.drawable.IKey;
25-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2625
import com.cleanroommc.modularui.screen.ModularPanel;
2726
import com.cleanroommc.modularui.utils.Color;
2827
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
@@ -73,12 +72,12 @@ void voidAny(IItemHandler myItemHandler) {
7372
}
7473

7574
@Override
76-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
77-
return super.buildUI(guiData, guiSyncManager).height(192 - 22);
75+
public int getHeight() {
76+
return 192 - 22;
7877
}
7978

8079
@Override
81-
protected ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
80+
public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
8281
var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
8382

8483
return super.createUI(mainPanel, guiSyncManager)

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import codechicken.lib.render.pipeline.IVertexOperation;
1818
import codechicken.lib.vec.Cuboid6;
1919
import codechicken.lib.vec.Matrix4;
20-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2120
import com.cleanroommc.modularui.screen.ModularPanel;
2221
import com.cleanroommc.modularui.utils.Color;
2322
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
@@ -89,12 +88,12 @@ protected void voidOverflow(IItemHandler myItemHandler) {
8988
}
9089

9190
@Override
92-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
93-
return super.buildUI(guiData, guiSyncManager).height(192 + 18);
91+
public int getHeight() {
92+
return 192 + 18;
9493
}
9594

9695
@Override
97-
protected ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
96+
public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
9897
var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
9998
guiSyncManager.syncValue("voiding_mode", voidingMode);
10099

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
200200
.bindPlayerInventory();
201201
}
202202

203-
protected ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
203+
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
204204
var manualIOmode = new EnumSyncValue<>(ManualImportExportMode.class,
205205
this::getManualImportExportMode, this::setManualImportExportMode);
206206
manualIOmode.updateCacheFromSource(true);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import codechicken.lib.render.pipeline.IVertexOperation;
2020
import codechicken.lib.vec.Cuboid6;
2121
import codechicken.lib.vec.Matrix4;
22-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2322
import com.cleanroommc.modularui.screen.ModularPanel;
2423
import com.cleanroommc.modularui.utils.Color;
2524
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
@@ -192,12 +191,12 @@ private boolean shouldDisplayAmountSlider() {
192191
}
193192

194193
@Override
195-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
196-
return super.buildUI(guiData, guiSyncManager).height(192 + 36 + 18 + 2);
194+
public int getHeight() {
195+
return 192 + 36 + 18 + 2;
197196
}
198197

199198
@Override
200-
protected ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
199+
public @NotNull ParentWidget<Column> createUI(ModularPanel mainPanel, PanelSyncManager guiSyncManager) {
201200
EnumSyncValue<TransferMode> transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode,
202201
this::setTransferMode);
203202
guiSyncManager.syncValue("transfer_mode", transferMode);

0 commit comments

Comments
 (0)