Skip to content

Commit d5722de

Browse files
committed
switch to phantom item/fluid slot
delete unused classes
1 parent fc626a3 commit d5722de

5 files changed

Lines changed: 11 additions & 224 deletions

File tree

src/main/java/gregtech/api/mui/sync/MappedSyncHandler.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/main/java/gregtech/api/mui/widget/QuantumFluidRendererWidget.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/main/java/gregtech/api/mui/widget/QuantumItemRendererWidget.java

Lines changed: 0 additions & 99 deletions
This file was deleted.

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import gregtech.api.metatileentity.ITieredMetaTileEntity;
1010
import gregtech.api.metatileentity.MetaTileEntity;
1111
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
12-
import gregtech.api.mui.widget.QuantumItemRendererWidget;
1312
import gregtech.api.util.GTLog;
1413
import gregtech.api.util.GTTransferUtils;
1514
import gregtech.api.util.GTUtility;
@@ -47,6 +46,8 @@
4746
import com.cleanroommc.modularui.screen.ModularPanel;
4847
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
4948
import com.cleanroommc.modularui.value.sync.SyncHandler;
49+
import com.cleanroommc.modularui.widgets.ItemSlot;
50+
import com.cleanroommc.modularui.widgets.slot.ModularSlot;
5051
import org.apache.commons.lang3.ArrayUtils;
5152
import org.apache.commons.lang3.tuple.Pair;
5253
import org.jetbrains.annotations.NotNull;
@@ -316,8 +317,8 @@ protected void createWidgets(ModularPanel mainPanel, PanelSyncManager syncManage
316317
() -> IKey.lang(virtualItemStack.getTranslationKey()).get(),
317318
textWidget -> !virtualItemStack.isEmpty(),
318319
() -> TextFormattingUtil.formatNumbers(itemsStoredInside)))
319-
.child(new QuantumItemRendererWidget(() -> virtualItemStack)
320-
.onLock(() -> lockedStack, this::setLocked)
320+
.child(new ItemSlot()
321+
.slot(new ModularSlot(itemInventory, 0, true))
321322
.pos(148, 41));
322323
}
323324

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import gregtech.api.metatileentity.ITieredMetaTileEntity;
1515
import gregtech.api.metatileentity.MetaTileEntity;
1616
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
17-
import gregtech.api.mui.widget.QuantumFluidRendererWidget;
1817
import gregtech.api.util.GTLog;
1918
import gregtech.api.util.GTUtility;
2019
import gregtech.api.util.TextFormattingUtil;
@@ -55,7 +54,9 @@
5554
import com.cleanroommc.modularui.api.drawable.IKey;
5655
import com.cleanroommc.modularui.network.NetworkUtils;
5756
import com.cleanroommc.modularui.screen.ModularPanel;
57+
import com.cleanroommc.modularui.value.sync.FluidSlotSyncHandler;
5858
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
59+
import com.cleanroommc.modularui.widgets.FluidSlot;
5960
import org.apache.commons.lang3.ArrayUtils;
6061
import org.apache.commons.lang3.tuple.Pair;
6162
import org.jetbrains.annotations.NotNull;
@@ -318,7 +319,11 @@ protected void createWidgets(ModularPanel mainPanel, PanelSyncManager syncManage
318319
},
319320
textWidget -> fluidTank.getFluid() != null,
320321
() -> TextFormattingUtil.formatNumbers(fluidTank.getFluidAmount()) + " L"))
321-
.child(new QuantumFluidRendererWidget(fluidTank)
322+
.child(new FluidSlot()
323+
// todo use GTFluidSlot once rc2 pr is merged
324+
.syncHandler(new FluidSlotSyncHandler(fluidTank)
325+
.phantom(true)
326+
.controlsAmount(true))
322327
.pos(148, 41));
323328
}
324329

0 commit comments

Comments
 (0)