Skip to content

Commit f568a9b

Browse files
committed
fix fluid related covers
1 parent 06d82bd commit f568a9b

4 files changed

Lines changed: 10 additions & 25 deletions

File tree

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import net.minecraftforge.fml.relauncher.SideOnly;
2121

2222
import com.cleanroommc.modularui.api.drawable.IKey;
23-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2423
import com.cleanroommc.modularui.screen.ModularPanel;
2524
import com.cleanroommc.modularui.utils.Color;
2625
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
@@ -242,12 +241,12 @@ private boolean shouldDisplayAmountSlider() {
242241
}
243242

244243
@Override
245-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
246-
return super.buildUI(guiData, guiSyncManager).height(192 + 36);
244+
public int getHeight() {
245+
return super.getHeight() + 36;
247246
}
248247

249248
@Override
250-
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
249+
public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
251250
var transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode, this::setTransferMode);
252251
transferMode.updateCacheFromSource(true);
253252
syncManager.syncValue("transfer_mode", transferMode);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import codechicken.lib.vec.Cuboid6;
2626
import codechicken.lib.vec.Matrix4;
2727
import com.cleanroommc.modularui.api.drawable.IKey;
28-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2928
import com.cleanroommc.modularui.screen.ModularPanel;
3029
import com.cleanroommc.modularui.utils.Color;
3130
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
@@ -71,12 +70,12 @@ public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 tra
7170
}
7271

7372
@Override
74-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
75-
return super.buildUI(guiData, guiSyncManager).height(192 - 22);
73+
public int getHeight() {
74+
return super.getHeight() - 22;
7675
}
7776

7877
@Override
79-
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
78+
public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
8079
var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled);
8180

8281
return super.createUI(mainPanel, syncManager)

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import codechicken.lib.vec.Cuboid6;
2121
import codechicken.lib.vec.Matrix4;
2222
import com.cleanroommc.modularui.api.drawable.IKey;
23-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2423
import com.cleanroommc.modularui.screen.ModularPanel;
2524
import com.cleanroommc.modularui.utils.Color;
2625
import com.cleanroommc.modularui.value.sync.EnumSyncValue;
@@ -100,12 +99,12 @@ public VoidingMode getVoidingMode() {
10099
}
101100

102101
@Override
103-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
104-
return super.buildUI(guiData, guiSyncManager).height(192 + 20);
102+
public int getHeight() {
103+
return super.getHeight() + 42;
105104
}
106105

107106
@Override
108-
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
107+
public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
109108
var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode);
110109
syncManager.syncValue("voiding_mode", voidingMode);
111110

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

Lines changed: 1 addition & 13 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.client.renderer.texture.Textures;
1514
import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
@@ -43,7 +42,6 @@
4342
import com.cleanroommc.modularui.api.drawable.IDrawable;
4443
import com.cleanroommc.modularui.api.widget.Interactable;
4544
import com.cleanroommc.modularui.drawable.DynamicDrawable;
46-
import com.cleanroommc.modularui.factory.SidedPosGuiData;
4745
import com.cleanroommc.modularui.screen.ModularPanel;
4846
import com.cleanroommc.modularui.utils.Color;
4947
import com.cleanroommc.modularui.utils.MouseData;
@@ -189,18 +187,8 @@ public boolean usesMui2() {
189187
return true;
190188
}
191189

192-
@Override
193-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
194-
var panel = GTGuis.createPanel(this, 176, 192);
195-
190+
public @NotNull ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
196191
getFluidFilterContainer().setMaxTransferSize(getMaxTransferRate());
197-
198-
return panel.child(CoverWithUI.createTitleRow(getPickItem()))
199-
.child(createUI(panel, guiSyncManager))
200-
.bindPlayerInventory();
201-
}
202-
203-
public ParentWidget<?> createUI(ModularPanel mainPanel, PanelSyncManager syncManager) {
204192
var manualIOmode = new EnumSyncValue<>(ManualImportExportMode.class,
205193
this::getManualImportExportMode, this::setManualImportExportMode);
206194
manualIOmode.updateCacheFromSource(true);

0 commit comments

Comments
 (0)