diff --git a/src/main/java/gregtech/api/cover/CoverWithUI.java b/src/main/java/gregtech/api/cover/CoverWithUI.java index 8802f23fc2f..c6e5a6f954a 100644 --- a/src/main/java/gregtech/api/cover/CoverWithUI.java +++ b/src/main/java/gregtech/api/cover/CoverWithUI.java @@ -4,6 +4,7 @@ import gregtech.api.gui.ModularUI; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.GTGuiTheme; +import gregtech.api.mui.GTGuis; import gregtech.api.mui.GregTechGuiScreen; import gregtech.api.mui.factory.CoverGuiFactory; @@ -66,8 +67,8 @@ default GTGuiTheme getUITheme() { } @Override - default ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return null; + default ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return GTGuis.errorPanel(); } @Override diff --git a/src/main/java/gregtech/api/items/gui/ItemUIFactory.java b/src/main/java/gregtech/api/items/gui/ItemUIFactory.java index f1444152f5f..4a7ed287aa8 100644 --- a/src/main/java/gregtech/api/items/gui/ItemUIFactory.java +++ b/src/main/java/gregtech/api/items/gui/ItemUIFactory.java @@ -3,6 +3,7 @@ import gregtech.api.gui.ModularUI; import gregtech.api.items.metaitem.stats.IItemComponent; import gregtech.api.mui.GTGuiTheme; +import gregtech.api.mui.GTGuis; import gregtech.api.mui.GregTechGuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -10,14 +11,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; import com.cleanroommc.modularui.api.IGuiHolder; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.ModularScreen; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; import org.jetbrains.annotations.ApiStatus; -public interface ItemUIFactory extends IItemComponent, IGuiHolder { +public interface ItemUIFactory extends IItemComponent, IGuiHolder { /** * Creates new UI basing on given holder. Holder contains information @@ -31,7 +32,7 @@ default ModularUI createUI(PlayerInventoryHolder holder, EntityPlayer entityPlay @ApiStatus.NonExtendable @SideOnly(Side.CLIENT) @Override - default ModularScreen createScreen(HandGuiData creationContext, ModularPanel mainPanel) { + default ModularScreen createScreen(PlayerInventoryGuiData creationContext, ModularPanel mainPanel) { return new GregTechGuiScreen(mainPanel, getUITheme()); } @@ -40,7 +41,8 @@ default GTGuiTheme getUITheme() { } @Override - default ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return null; + default ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { + return GTGuis.errorPanel(); } } diff --git a/src/main/java/gregtech/api/items/toolitem/IGTTool.java b/src/main/java/gregtech/api/items/toolitem/IGTTool.java index d37e8ec3643..5f965cca99c 100644 --- a/src/main/java/gregtech/api/items/toolitem/IGTTool.java +++ b/src/main/java/gregtech/api/items/toolitem/IGTTool.java @@ -69,8 +69,8 @@ import cofh.api.item.IToolHammer; import com.cleanroommc.modularui.api.drawable.IKey; import com.cleanroommc.modularui.api.widget.IWidget; -import com.cleanroommc.modularui.factory.HandGuiData; import com.cleanroommc.modularui.factory.ItemGuiFactory; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.utils.Alignment; @@ -947,7 +947,7 @@ default void playSound(EntityPlayer player) { } @Override - default ModularPanel buildUI(HandGuiData guiData, PanelSyncManager manager, UISettings settings) { + default ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager manager, UISettings settings) { final var usedStack = guiData.getUsedItemStack(); final var behaviorsTag = getBehaviorsTag(usedStack); final var defaultDefinition = getMaxAoEDefinition(usedStack); diff --git a/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java b/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java index 6f0fd069c92..7f9613e78ac 100644 --- a/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java +++ b/src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java @@ -49,7 +49,7 @@ import net.minecraftforge.oredict.OreIngredient; import com.cleanroommc.modularui.api.drawable.IKey; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -107,18 +107,19 @@ public ItemStack getToolInSlot(@NotNull ItemStack toolbelt, int slot) { } @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { final var usedStack = guiData.getUsedItemStack(); final var handler = getHandler(usedStack); final var selected = handler.getSelectedStack(); if (!selected.isEmpty() && selected.getItem() instanceof ItemUIFactory factory) { - return factory.buildUI(guiData, guiSyncManager, settings); + return factory.buildUI(guiData, panelSyncManager, settings); } int heightBonus = (handler.getSlots() / 9) * 18; SlotGroup group = new SlotGroup("toolbelt_inventory", Math.min(handler.getSlots(), 9)); - guiSyncManager.registerSlotGroup(group); + panelSyncManager.registerSlotGroup(group); List slots = new ArrayList<>(); for (int i = 0; i < handler.getSlots(); i++) { @@ -141,8 +142,8 @@ public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager (newItem, onlyAmountChanged, client, init) -> handler .onContentsChanged(index))) .background(GTGuiTextures.SLOT, GTGuiTextures.TOOL_SLOT_OVERLAY) - .debugName("slot_" + index)) - .debugName("toolbelt_inventory")) + .name("slot_" + index)) + .name("toolbelt_inventory")) .bindPlayerInventory(); } diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ProgressBarMultiblock.java b/src/main/java/gregtech/api/metatileentity/multiblock/ProgressBarMultiblock.java index e8046b903b4..614da48ff35 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ProgressBarMultiblock.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ProgressBarMultiblock.java @@ -1,8 +1,7 @@ package gregtech.api.metatileentity.multiblock; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; - import com.cleanroommc.modularui.value.sync.PanelSyncManager; +import com.cleanroommc.modularui.widgets.ProgressWidget; import java.util.List; import java.util.function.UnaryOperator; @@ -13,7 +12,7 @@ public interface ProgressBarMultiblock { // the bar only needs three things // progress, texture, and tooltip - void registerBars(List> bars, PanelSyncManager syncManager); + void registerBars(List> bars, PanelSyncManager syncManager); default boolean hasBars() { return getProgressBarCount() > 0; diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java index bdd21a36b27..5dda371235c 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java @@ -67,7 +67,7 @@ public MultiblockUIFactory(@NotNull MultiblockWithDisplayBase mte) { private Widget createIndicator(PanelSyncManager syncManager) { if (warningText == NO_OP && errorText == NO_OP) { return new Widget<>() - .debugName("indicator_none") + .name("indicator_none") .size(18) .pos(174 - 5, screenHeight - 18 - 3) .overlay(GTGuiTextures.GREGTECH_LOGO_DARK); @@ -93,7 +93,7 @@ private Widget createIndicator(PanelSyncManager syncManager) { }); return new Widget<>() - .debugName("indicator") + .name("indicator") .size(18) .pos(174 - 5, screenHeight - 18 - 3) .overlay(indicator) @@ -234,7 +234,7 @@ public MultiblockUIFactory addScreenChildren(ScreenFunction function) { */ public @NotNull ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) { var panel = GTGuis.createPanel(mte, width, height) - .debugName("root_panel") + .name("root_panel") .childIf(!disableDisplay, () -> createScreen(panelSyncManager)); // TODO createExtras() hook for overrides? @@ -255,7 +255,7 @@ public MultiblockUIFactory addScreenChildren(ScreenFunction function) { } return panel.child(Flow.row() - .debugName("bottom_row") + .name("bottom_row") .bottom(7) .coverChildrenHeight() .margin(4, 0) @@ -299,13 +299,13 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti, final int calculatedRows = calculateRows(count); Flow column = Flow.column() - .debugName("bar_col") + .name("bar_col") .margin(4, 0) .top(5 + screenHeight) .widthRel(1f) .height(Bars.HEIGHT * calculatedRows); - List> barBuilders = new ArrayList<>(progressMulti.getProgressBarCount()); + List> barBuilders = new ArrayList<>(progressMulti.getProgressBarCount()); progressMulti.registerBars(barBuilders, panelSyncManager); for (int r = 0; r < calculatedRows; r++) { @@ -313,7 +313,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti, final int calculatedCols = calculateCols(count, r); Flow row = Flow.row() - .debugName("bar_row:" + r) + .name("bar_row:" + r) .widthRel(1f) .mainAxisAlignment(Alignment.MainAxis.SPACE_BETWEEN) .height(Bars.HEIGHT); @@ -330,8 +330,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti, ProgressWidget widget; if (i < barBuilders.size()) { widget = barBuilders.get(i) - .apply(new TemplateBarBuilder()) - .build(); + .apply(new ProgressWidget()); } else { widget = new ProgressWidget() .addTooltipLine("Error! no bar for index: " + i) @@ -339,7 +338,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti, } row.child(widget.size(barWidth, Bars.HEIGHT) - .debugName(mte.getClass().getSimpleName() + ":bar:" + i) + .name(mte.getClass().getSimpleName() + ":bar:" + i) .direction(ProgressWidget.Direction.RIGHT)); } @@ -357,7 +356,7 @@ protected Widget createScreen(PanelSyncManager syncManager) { display.sync("display", syncManager); parent.child(new ScrollableTextWidget() - .debugName("display_text") + .name("display_text") .sizeRel(1f) .alignment(Alignment.TopLeft) .margin(4) @@ -370,7 +369,7 @@ protected Widget createScreen(PanelSyncManager syncManager) { } return parent.childIf(!disableIndicator, () -> createIndicator(syncManager)) - .debugName("display_root") + .name("display_root") .background(getDisplayBackground()) .size(190, screenHeight) .pos(4, 4); @@ -386,7 +385,7 @@ protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSync IWidget flexButton = this.flexButton.apply(guiData, panelSyncManager); if (flexButton == null) { flexButton = new ToggleButton() - .debugName("flex_none") + .name("flex_none") .value(ALWAYS_ON) .overlay(GTGuiTextures.OVERLAY_NO_FLEX) .size(18) @@ -395,7 +394,7 @@ protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSync var powerButton = createPowerButton(mainPanel, panelSyncManager); return Flow.column() - .debugName("button_col") + .name("button_col") .right(4) .coverChildren() .child(createDistinctButton(mainPanel, panelSyncManager)) @@ -408,7 +407,7 @@ protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager) { if (!(mte instanceof IDistinctBusController distinct) || !distinct.canBeDistinct()) { return new ToggleButton() - .debugName("distinct_none") + .name("distinct_none") .value(ALWAYS_ON) .size(18) .overlay(GTGuiTextures.OVERLAY_DISTINCT_BUSES[0]) @@ -416,7 +415,7 @@ protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel, } return new ToggleButton() - .debugName("distinct_button") + .name("distinct_button") .size(18) .value(new BooleanSyncValue(distinct::isDistinct, distinct::setDistinct)) .disableHoverBackground() @@ -429,7 +428,7 @@ protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel, protected IWidget createVoidingButton(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager) { if (!mte.shouldShowVoidingModeButton()) { return new ToggleButton() - .debugName("voiding_none") + .name("voiding_none") .value(ALWAYS_ON) .size(18) .overlay(GTGuiTextures.OVERLAY_VOID_NONE) @@ -439,7 +438,7 @@ protected IWidget createVoidingButton(@NotNull ModularPanel mainPanel, @NotNull IntSyncValue voidingValue = new IntSyncValue(mte::getVoidingMode, mte::setVoidingMode); return new CycleButtonWidget() - .debugName("voiding_button") + .name("voiding_button") .size(18) .value(voidingValue) .length(4) @@ -458,7 +457,7 @@ protected Widget createPowerButton(@NotNull ModularPanel mainPanel, @NotNull controllable::setWorkingEnabled); return new ToggleButton() - .debugName("power_button") + .name("power_button") .size(18) .disableHoverBackground() .overlay(true, detail, GTGuiTextures.BUTTON_POWER[1]) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/TemplateBarBuilder.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/TemplateBarBuilder.java deleted file mode 100644 index e3ad7d60a67..00000000000 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/TemplateBarBuilder.java +++ /dev/null @@ -1,41 +0,0 @@ -package gregtech.api.metatileentity.multiblock.ui; - -import com.cleanroommc.modularui.api.value.IDoubleValue; -import com.cleanroommc.modularui.drawable.UITexture; -import com.cleanroommc.modularui.screen.RichTooltip; -import com.cleanroommc.modularui.value.DoubleValue; -import com.cleanroommc.modularui.widgets.ProgressWidget; - -import java.util.function.Consumer; -import java.util.function.DoubleSupplier; - -public final class TemplateBarBuilder { - - ProgressWidget widget = new ProgressWidget(); - - TemplateBarBuilder() {} - - public TemplateBarBuilder progress(DoubleSupplier supplier) { - return value(new DoubleValue.Dynamic(supplier, d -> {})); - } - - public TemplateBarBuilder value(IDoubleValue value) { - this.widget.value(value); - return this; - } - - public TemplateBarBuilder texture(UITexture texture) { - this.widget.texture(texture, -1); - return this; - } - - public TemplateBarBuilder tooltipBuilder(Consumer consumer) { - this.widget.tooltipAutoUpdate(true); - this.widget.tooltipBuilder(consumer); - return this; - } - - ProgressWidget build() { - return this.widget; - } -} diff --git a/src/main/java/gregtech/api/mui/GTGuis.java b/src/main/java/gregtech/api/mui/GTGuis.java index a8301981eaa..ed1886efc40 100644 --- a/src/main/java/gregtech/api/mui/GTGuis.java +++ b/src/main/java/gregtech/api/mui/GTGuis.java @@ -6,14 +6,17 @@ import gregtech.api.mui.factory.CoverGuiFactory; import gregtech.api.mui.factory.MetaItemGuiFactory; import gregtech.api.mui.factory.MetaTileEntityGuiFactory; +import gregtech.api.util.GTLog; import net.minecraft.item.ItemStack; import com.cleanroommc.modularui.api.IPanelHandler; +import com.cleanroommc.modularui.api.drawable.IKey; import com.cleanroommc.modularui.factory.GuiManager; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.utils.Alignment; import com.cleanroommc.modularui.widgets.ButtonWidget; +import com.cleanroommc.modularui.widgets.RichTextWidget; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -21,6 +24,23 @@ public class GTGuis { public static final int DEFAULT_WIDTH = 176, DEFAULT_HIEGHT = 166; + private static final ModularPanel ERROR = createPanel("error") + .size(100) + .child(new RichTextWidget() + .sizeRel(1) + .margin(6) + .align(Alignment.Center) + .alignment(Alignment.Center) + .textBuilder(richText -> { + richText.addLine(IKey.str("ERROR!").style(IKey.RED, IKey.ITALIC)).newLine(); + richText.addLine("You shouldn't be able to see this. If you do, report it to a dev."); + })); + + public static ModularPanel errorPanel() { + GTLog.logger.error("Error Panel Opened!", new Throwable()); + return ERROR; + } + @ApiStatus.Internal public static void registerFactories() { GuiManager.registerFactory(MetaTileEntityGuiFactory.INSTANCE); diff --git a/src/main/java/gregtech/api/mui/factory/MetaItemGuiFactory.java b/src/main/java/gregtech/api/mui/factory/MetaItemGuiFactory.java index 7fea957a5a1..c48b36326fc 100644 --- a/src/main/java/gregtech/api/mui/factory/MetaItemGuiFactory.java +++ b/src/main/java/gregtech/api/mui/factory/MetaItemGuiFactory.java @@ -3,7 +3,6 @@ import gregtech.api.items.metaitem.MetaItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumHand; @@ -11,12 +10,13 @@ import com.cleanroommc.modularui.api.IGuiHolder; import com.cleanroommc.modularui.factory.AbstractUIFactory; import com.cleanroommc.modularui.factory.GuiManager; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; +import com.cleanroommc.modularui.factory.inventory.InventoryTypes; import org.jetbrains.annotations.NotNull; import java.util.Objects; -public class MetaItemGuiFactory extends AbstractUIFactory { +public class MetaItemGuiFactory extends AbstractUIFactory { public static final MetaItemGuiFactory INSTANCE = new MetaItemGuiFactory(); @@ -27,12 +27,13 @@ private MetaItemGuiFactory() { public static void open(EntityPlayer player, EnumHand hand) { Objects.requireNonNull(player); Objects.requireNonNull(hand); - HandGuiData guiData = new HandGuiData(player, hand); - GuiManager.open(INSTANCE, guiData, (EntityPlayerMP) player); + int index = hand == EnumHand.OFF_HAND ? 40 : player.inventory.currentItem; + PlayerInventoryGuiData guiData = new PlayerInventoryGuiData(player, InventoryTypes.PLAYER, index); + GuiManager.open(INSTANCE, guiData, verifyServerSide(player)); } @Override - public @NotNull IGuiHolder getGuiHolder(HandGuiData data) { + public @NotNull IGuiHolder getGuiHolder(PlayerInventoryGuiData data) { ItemStack stack = data.getUsedItemStack(); if (!(stack.getItem() instanceof MetaItemmetaItem)) { throw new IllegalArgumentException("Found item is not a valid MetaItem!"); @@ -45,12 +46,12 @@ public static void open(EntityPlayer player, EnumHand hand) { } @Override - public void writeGuiData(HandGuiData guiData, PacketBuffer buffer) { - buffer.writeByte(guiData.getHand().ordinal()); + public void writeGuiData(PlayerInventoryGuiData guiData, PacketBuffer buffer) { + buffer.writeByte(guiData.getSlotIndex()); } @Override - public @NotNull HandGuiData readGuiData(EntityPlayer player, PacketBuffer buffer) { - return new HandGuiData(player, EnumHand.values()[buffer.readByte()]); + public @NotNull PlayerInventoryGuiData readGuiData(EntityPlayer player, PacketBuffer buffer) { + return new PlayerInventoryGuiData(player, InventoryTypes.PLAYER, buffer.readByte()); } } diff --git a/src/main/java/gregtech/api/mui/factory/MetaTileEntityGuiFactory.java b/src/main/java/gregtech/api/mui/factory/MetaTileEntityGuiFactory.java index 0363476a987..a6eb58e3946 100644 --- a/src/main/java/gregtech/api/mui/factory/MetaTileEntityGuiFactory.java +++ b/src/main/java/gregtech/api/mui/factory/MetaTileEntityGuiFactory.java @@ -4,7 +4,6 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -36,7 +35,7 @@ public static > void open(Enti } BlockPos pos = mte.getPos(); PosGuiData data = new PosGuiData(player, pos.getX(), pos.getY(), pos.getZ()); - GuiManager.open(INSTANCE, data, (EntityPlayerMP) player); + GuiManager.open(INSTANCE, data, verifyServerSide(player)); } @Override diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java index 8e10e7a0cc2..cb0fe398f70 100644 --- a/src/main/java/gregtech/common/covers/CoverConveyor.java +++ b/src/main/java/gregtech/common/covers/CoverConveyor.java @@ -504,17 +504,17 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var panel = GTGuis.createPanel(this, 176, 192 + 18); getItemFilterContainer().setMaxTransferSize(getMaxStackSize()); return panel.child(CoverWithUI.createTitleRow(getPickItem())) - .child(createUI(guiData, guiSyncManager)) + .child(createUI(guiData, panelSyncManager)) .bindPlayerInventory(); } - protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncManager) { + protected ParentWidget createUI(GuiData data, PanelSyncManager panelSyncManager) { var column = Flow.column().top(24).margin(7, 0) .widthRel(1f).coverChildrenHeight(); @@ -532,10 +532,10 @@ protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncMana EnumSyncValue distributionMode = new EnumSyncValue<>(DistributionMode.class, this::getDistributionMode, this::setDistributionMode); - guiSyncManager.syncValue("manual_io", manualIOmode); - guiSyncManager.syncValue("conveyor_mode", conveyorMode); - guiSyncManager.syncValue("distribution_mode", distributionMode); - guiSyncManager.syncValue("throughput", throughput); + panelSyncManager.syncValue("manual_io", manualIOmode); + panelSyncManager.syncValue("conveyor_mode", conveyorMode); + panelSyncManager.syncValue("distribution_mode", distributionMode); + panelSyncManager.syncValue("throughput", throughput); if (createThroughputRow()) column.child(Flow.row().coverChildrenHeight() @@ -564,7 +564,7 @@ protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncMana .onUpdateListener(w -> w.overlay(createAdjustOverlay(true))))); if (createFilterRow()) - column.child(getItemFilterContainer().initUI(data, guiSyncManager)); + column.child(getItemFilterContainer().initUI(data, panelSyncManager)); if (createManualIOModeRow()) column.child(new EnumRowBuilder<>(ManualImportExportMode.class) diff --git a/src/main/java/gregtech/common/covers/CoverFluidFilter.java b/src/main/java/gregtech/common/covers/CoverFluidFilter.java index e178b0441de..8f37094facd 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidFilter.java +++ b/src/main/java/gregtech/common/covers/CoverFluidFilter.java @@ -145,13 +145,13 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var filteringMode = new EnumSyncValue<>(FluidFilterMode.class, this::getFilterMode, this::setFilterMode); - guiSyncManager.syncValue("filtering_mode", filteringMode); + panelSyncManager.syncValue("filtering_mode", filteringMode); this.fluidFilterContainer.setMaxTransferSize(1); - return getFilter().createPanel(guiSyncManager) + return getFilter().createPanel(panelSyncManager) .size(176, 212).padding(7) .child(CoverWithUI.createTitleRow(getFilterContainer().getFilterStack())) .child(Flow.column().widthRel(1f).align(Alignment.TopLeft).top(22).coverChildrenHeight() @@ -180,7 +180,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan .alignX(1f))) .child(new Rectangle().setColor(UI_TEXT_COLOR).asWidget() .height(1).widthRel(0.95f).margin(0, 4)) - .child(getFilter().createWidgets(guiSyncManager))) + .child(getFilter().createWidgets(panelSyncManager))) .child(SlotGroupWidget.playerInventory(false).bottom(7).left(7)); } diff --git a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java index a3cf6bcbf96..8ec7d8c21f6 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java +++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java @@ -244,8 +244,8 @@ private boolean shouldDisplayAmountSlider() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 + 36); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 + 36); } @Override diff --git a/src/main/java/gregtech/common/covers/CoverFluidVoiding.java b/src/main/java/gregtech/common/covers/CoverFluidVoiding.java index 750a97de15f..99b4ef5f088 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidVoiding.java +++ b/src/main/java/gregtech/common/covers/CoverFluidVoiding.java @@ -73,8 +73,8 @@ public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 tra } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 - 22); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 - 22); } @Override diff --git a/src/main/java/gregtech/common/covers/CoverFluidVoidingAdvanced.java b/src/main/java/gregtech/common/covers/CoverFluidVoidingAdvanced.java index 84f722c39c6..d23a5778c8b 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidVoidingAdvanced.java +++ b/src/main/java/gregtech/common/covers/CoverFluidVoidingAdvanced.java @@ -102,8 +102,8 @@ public VoidingMode getVoidingMode() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 + 20); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 + 20); } @Override diff --git a/src/main/java/gregtech/common/covers/CoverItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java index 35a418d50cd..790dbff5fbf 100644 --- a/src/main/java/gregtech/common/covers/CoverItemFilter.java +++ b/src/main/java/gregtech/common/covers/CoverItemFilter.java @@ -148,12 +148,12 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var filteringMode = new EnumSyncValue<>(ItemFilterMode.class, this::getFilterMode, this::setFilterMode); - guiSyncManager.syncValue("filtering_mode", filteringMode); + panelSyncManager.syncValue("filtering_mode", filteringMode); - return getFilter().createPanel(guiSyncManager) + return getFilter().createPanel(panelSyncManager) .size(176, 212).padding(7) .child(CoverWithUI.createTitleRow(getFilterContainer().getFilterStack()).left(4)) .child(Flow.column().widthRel(1f).align(Alignment.TopLeft).top(22).coverChildrenHeight() @@ -182,7 +182,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan .alignX(1f))) .child(new Rectangle().setColor(UI_TEXT_COLOR).asWidget() .height(1).widthRel(0.95f).margin(0, 4)) - .child(getFilter().createWidgets(guiSyncManager).left(0))) + .child(getFilter().createWidgets(panelSyncManager).left(0))) .child(SlotGroupWidget.playerInventory(false).bottom(7).left(7)); } diff --git a/src/main/java/gregtech/common/covers/CoverItemVoiding.java b/src/main/java/gregtech/common/covers/CoverItemVoiding.java index 234ebb70fcc..08af30ddac7 100644 --- a/src/main/java/gregtech/common/covers/CoverItemVoiding.java +++ b/src/main/java/gregtech/common/covers/CoverItemVoiding.java @@ -74,15 +74,15 @@ void voidAny(IItemHandler myItemHandler) { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 - 22); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 - 22); } @Override - protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncManager) { + protected ParentWidget createUI(GuiData data, PanelSyncManager panelSyncManager) { var isWorking = new BooleanSyncValue(this::isWorkingEnabled, this::setWorkingEnabled); - return super.createUI(data, guiSyncManager) + return super.createUI(data, panelSyncManager) .child(Flow.row().height(18).widthRel(1f) .marginBottom(2) .child(new ToggleButton() diff --git a/src/main/java/gregtech/common/covers/CoverItemVoidingAdvanced.java b/src/main/java/gregtech/common/covers/CoverItemVoidingAdvanced.java index 1a716509505..360dffcd893 100644 --- a/src/main/java/gregtech/common/covers/CoverItemVoidingAdvanced.java +++ b/src/main/java/gregtech/common/covers/CoverItemVoidingAdvanced.java @@ -90,14 +90,14 @@ protected void voidOverflow(IItemHandler myItemHandler) { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 + 18); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 + 18); } @Override - protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncManager) { + protected ParentWidget createUI(GuiData data, PanelSyncManager panelSyncManager) { var voidingMode = new EnumSyncValue<>(VoidingMode.class, this::getVoidingMode, this::setVoidingMode); - guiSyncManager.syncValue("voiding_mode", voidingMode); + panelSyncManager.syncValue("voiding_mode", voidingMode); var filterTransferSize = new StringSyncValue( () -> String.valueOf(this.itemFilterContainer.getTransferSize()), @@ -107,7 +107,7 @@ protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncMana transferTextField.setEnabled(this.itemFilterContainer.showGlobalTransferLimitSlider() && this.voidingMode == VoidingMode.VOID_OVERFLOW); - return super.createUI(data, guiSyncManager) + return super.createUI(data, panelSyncManager) .child(new EnumRowBuilder<>(VoidingMode.class) .value(voidingMode) .lang("cover.voiding.voiding_mode") diff --git a/src/main/java/gregtech/common/covers/CoverMachineController.java b/src/main/java/gregtech/common/covers/CoverMachineController.java index 3a97582a9bc..cea0440a087 100644 --- a/src/main/java/gregtech/common/covers/CoverMachineController.java +++ b/src/main/java/gregtech/common/covers/CoverMachineController.java @@ -112,13 +112,13 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { EnumSyncValue controllerModeValue = new EnumSyncValue<>(ControllerMode.class, this::getControllerMode, this::setControllerMode); BooleanSyncValue invertedValue = new BooleanSyncValue(this::isInverted, this::setInverted); - guiSyncManager.syncValue("controller_mode", controllerModeValue); - guiSyncManager.syncValue("inverted", invertedValue); + panelSyncManager.syncValue("controller_mode", controllerModeValue); + panelSyncManager.syncValue("inverted", invertedValue); return GTGuis.createPanel(this, 176, 112) .child(CoverWithUI.createTitleRow(getPickItem())) diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java index 29bf0b2b52c..020cc6c11fa 100644 --- a/src/main/java/gregtech/common/covers/CoverPump.java +++ b/src/main/java/gregtech/common/covers/CoverPump.java @@ -190,13 +190,13 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var panel = GTGuis.createPanel(this, 176, 192); getFluidFilterContainer().setMaxTransferSize(getMaxTransferRate()); return panel.child(CoverWithUI.createTitleRow(getPickItem())) - .child(createUI(guiData, guiSyncManager)) + .child(createUI(guiData, panelSyncManager)) .bindPlayerInventory(); } diff --git a/src/main/java/gregtech/common/covers/CoverRoboticArm.java b/src/main/java/gregtech/common/covers/CoverRoboticArm.java index 31918dbcaac..d07b7bc9d6f 100644 --- a/src/main/java/gregtech/common/covers/CoverRoboticArm.java +++ b/src/main/java/gregtech/common/covers/CoverRoboticArm.java @@ -193,22 +193,22 @@ private boolean shouldDisplayAmountSlider() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - return super.buildUI(guiData, guiSyncManager, settings).height(192 + 36 + 18 + 2); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + return super.buildUI(guiData, panelSyncManager, settings).height(192 + 36 + 18 + 2); } @Override - protected ParentWidget createUI(GuiData data, PanelSyncManager guiSyncManager) { + protected ParentWidget createUI(GuiData data, PanelSyncManager panelSyncManager) { EnumSyncValue transferMode = new EnumSyncValue<>(TransferMode.class, this::getTransferMode, this::setTransferMode); - guiSyncManager.syncValue("transfer_mode", transferMode); + panelSyncManager.syncValue("transfer_mode", transferMode); var filterTransferSize = new StringSyncValue( () -> String.valueOf(this.itemFilterContainer.getTransferSize()), s -> this.itemFilterContainer.setTransferSize(Integer.parseInt(s))); filterTransferSize.updateCacheFromSource(true); - return super.createUI(data, guiSyncManager) + return super.createUI(data, panelSyncManager) .child(new EnumRowBuilder<>(TransferMode.class) .value(transferMode) .lang("cover.generic.transfer_mode") diff --git a/src/main/java/gregtech/common/covers/CoverStorage.java b/src/main/java/gregtech/common/covers/CoverStorage.java index addf992cd3b..1753cf4202e 100644 --- a/src/main/java/gregtech/common/covers/CoverStorage.java +++ b/src/main/java/gregtech/common/covers/CoverStorage.java @@ -87,8 +87,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", this.storageHandler.getSlots()); + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", this.storageHandler.getSlots()); int rowSize = this.storageHandler.getSlots(); List> widgets = new ArrayList<>(); diff --git a/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java b/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java index f37a17d39fd..dc4a77a012e 100644 --- a/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java +++ b/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java @@ -137,13 +137,13 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var panel = GTGuis.createPanel(this, 176, 192); this.playerUUID = guiData.getPlayer().getUniqueID(); return panel.child(CoverWithUI.createTitleRow(getPickItem())) - .child(createWidgets(guiData, guiSyncManager)) + .child(createWidgets(guiData, panelSyncManager)) .bindPlayerInventory(); } diff --git a/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java b/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java index 6cd084041a4..2958029c2f8 100644 --- a/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java +++ b/src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java @@ -24,7 +24,7 @@ import com.cleanroommc.modularui.api.widget.IWidget; import com.cleanroommc.modularui.api.widget.Interactable; import com.cleanroommc.modularui.drawable.ItemDrawable; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.InteractionSyncHandler; @@ -67,18 +67,19 @@ public ActionResult onItemRightClick(World world, EntityPlayer player } @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { var panel = GTGuis.createPanel(guiData.getUsedItemStack(), 176, 120); ItemDrawable circuitPreview = new ItemDrawable(guiData.getUsedItemStack()); for (int i = 0; i <= 32; i++) { int finalI = i; - guiSyncManager.syncValue("config", i, new InteractionSyncHandler() + panelSyncManager.syncValue("config", i, new InteractionSyncHandler() .setOnMousePressed(b -> { ItemStack item = IntCircuitIngredient.getIntegratedCircuit(finalI); item.setCount(guiData.getUsedItemStack().getCount()); circuitPreview.setItem(item); - if (Interactable.hasShiftDown()) panel.animateClose(); - guiData.getPlayer().setHeldItem(guiData.getHand(), item); + if (Interactable.hasShiftDown()) panel.closeIfOpen(); + guiData.setUsedItemStack(item); })); } diff --git a/src/main/java/gregtech/common/items/behaviors/filter/BaseFilterUIManager.java b/src/main/java/gregtech/common/items/behaviors/filter/BaseFilterUIManager.java index 91161663700..9d21e70c974 100644 --- a/src/main/java/gregtech/common/items/behaviors/filter/BaseFilterUIManager.java +++ b/src/main/java/gregtech/common/items/behaviors/filter/BaseFilterUIManager.java @@ -15,7 +15,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -37,7 +37,8 @@ public final ActionResult onItemRightClick(World world, EntityPlayer } @Override - public abstract ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings); + public abstract ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings); protected final ModularPanel createBasePanel(ItemStack stack) { return GTGuis.createPanel(stack, 176, 188) diff --git a/src/main/java/gregtech/common/items/behaviors/filter/OreDictFilterUIManager.java b/src/main/java/gregtech/common/items/behaviors/filter/OreDictFilterUIManager.java index 08e19f607cf..7a8169d96b5 100644 --- a/src/main/java/gregtech/common/items/behaviors/filter/OreDictFilterUIManager.java +++ b/src/main/java/gregtech/common/items/behaviors/filter/OreDictFilterUIManager.java @@ -2,7 +2,7 @@ import gregtech.common.covers.filter.BaseFilter; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -11,10 +11,11 @@ public class OreDictFilterUIManager extends BaseFilterUIManager { @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { var filter = BaseFilter.getFilterFromStack(guiData.getUsedItemStack()); return createBasePanel(filter.getContainerStack()).height(160) - .child(filter.createWidgets(guiSyncManager).top(22).margin(7, 0)) + .child(filter.createWidgets(panelSyncManager).top(22).margin(7, 0)) .child(SlotGroupWidget.playerInventory(true)); } } diff --git a/src/main/java/gregtech/common/items/behaviors/filter/SimpleFilterUIManager.java b/src/main/java/gregtech/common/items/behaviors/filter/SimpleFilterUIManager.java index eb33ca66fcb..a0261b45c89 100644 --- a/src/main/java/gregtech/common/items/behaviors/filter/SimpleFilterUIManager.java +++ b/src/main/java/gregtech/common/items/behaviors/filter/SimpleFilterUIManager.java @@ -2,7 +2,7 @@ import gregtech.common.covers.filter.BaseFilter; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -11,11 +11,12 @@ public class SimpleFilterUIManager extends BaseFilterUIManager { @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { var filter = BaseFilter.getFilterFromStack(guiData.getUsedItemStack()); return createBasePanel(filter.getContainerStack()) .height(166) - .child(filter.createWidgets(guiSyncManager) + .child(filter.createWidgets(panelSyncManager) .top(22) .left(7)) .child(SlotGroupWidget.playerInventory(true)); diff --git a/src/main/java/gregtech/common/items/behaviors/filter/SimpleFluidFilterUIManager.java b/src/main/java/gregtech/common/items/behaviors/filter/SimpleFluidFilterUIManager.java index 915746faacd..db940ce7ab5 100644 --- a/src/main/java/gregtech/common/items/behaviors/filter/SimpleFluidFilterUIManager.java +++ b/src/main/java/gregtech/common/items/behaviors/filter/SimpleFluidFilterUIManager.java @@ -2,7 +2,7 @@ import gregtech.common.covers.filter.BaseFilter; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -11,11 +11,12 @@ public class SimpleFluidFilterUIManager extends BaseFilterUIManager { @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { var filter = BaseFilter.getFilterFromStack(guiData.getUsedItemStack()); return createBasePanel(filter.getContainerStack()) .height(166) - .child(filter.createWidgets(guiSyncManager) + .child(filter.createWidgets(panelSyncManager) .top(22) .left(7)) .child(SlotGroupWidget.playerInventory(true)); diff --git a/src/main/java/gregtech/common/items/behaviors/filter/SmartFilterUIManager.java b/src/main/java/gregtech/common/items/behaviors/filter/SmartFilterUIManager.java index 0f8f96ed76a..deb9dca5310 100644 --- a/src/main/java/gregtech/common/items/behaviors/filter/SmartFilterUIManager.java +++ b/src/main/java/gregtech/common/items/behaviors/filter/SmartFilterUIManager.java @@ -2,7 +2,7 @@ import gregtech.common.covers.filter.BaseFilter; -import com.cleanroommc.modularui.factory.HandGuiData; +import com.cleanroommc.modularui.factory.PlayerInventoryGuiData; import com.cleanroommc.modularui.screen.ModularPanel; import com.cleanroommc.modularui.screen.UISettings; import com.cleanroommc.modularui.value.sync.PanelSyncManager; @@ -11,10 +11,11 @@ public class SmartFilterUIManager extends BaseFilterUIManager { @Override - public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager, + UISettings settings) { var filter = BaseFilter.getFilterFromStack(guiData.getUsedItemStack()); return createBasePanel(filter.getContainerStack()).height(166) - .child(filter.createWidgets(guiSyncManager).left(7).top(22)) + .child(filter.createWidgets(panelSyncManager).left(7).top(22)) .child(SlotGroupWidget.playerInventory(true)); } } diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java index ca26c1cba5c..68d56ff6e34 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java @@ -149,7 +149,7 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(inventorySize); int colSize = rowSize; if (inventorySize == 8) { @@ -157,7 +157,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, colSize = 2; } - guiSyncManager.registerSlotGroup("item_inv", rowSize); + panelSyncManager.registerSlotGroup("item_inv", rowSize); int index = 0; List> widgets = new ArrayList<>(); diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java index 65e4e3a76fb..f30277a9dbb 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java @@ -322,9 +322,9 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(getInventorySize()); - guiSyncManager.registerSlotGroup("item_inv", rowSize); + panelSyncManager.registerSlotGroup("item_inv", rowSize); List> widgets = new ArrayList<>(); for (int i = 0; i < rowSize; i++) { diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java index 44c55e814cf..e557a9c5b2f 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java @@ -71,10 +71,10 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(inventorySize); - guiSyncManager.registerSlotGroup("item_in", 1); - guiSyncManager.registerSlotGroup("item_out", rowSize); + panelSyncManager.registerSlotGroup("item_in", 1); + panelSyncManager.registerSlotGroup("item_out", rowSize); List> widgets = new ArrayList<>(); for (int i = 0; i < rowSize; i++) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java index da5afd69fdc..bcc2af4e6a5 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java @@ -12,7 +12,6 @@ import gregtech.api.metatileentity.multiblock.ui.KeyManager; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.metatileentity.multiblock.ui.UISyncer; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.GTGuiTheme; @@ -53,6 +52,7 @@ import com.cleanroommc.modularui.value.sync.PanelSyncManager; import com.cleanroommc.modularui.value.sync.StringSyncValue; import com.cleanroommc.modularui.widgets.ButtonWidget; +import com.cleanroommc.modularui.widgets.ProgressWidget; import com.cleanroommc.modularui.widgets.SliderWidget; import com.cleanroommc.modularui.widgets.layout.Flow; import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget; @@ -414,16 +414,16 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { IntSyncValue waterFilledValue = new IntSyncValue(this::getWaterFilled); IntSyncValue waterCapacityValue = new IntSyncValue(this::getWaterCapacity); syncManager.syncValue("water_filled", waterFilledValue); syncManager.syncValue("water_capacity", waterCapacityValue); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> waterCapacityValue.getIntValue() == 0 ? 0 : waterFilledValue.getIntValue() * 1.0 / waterCapacityValue.getIntValue()) - .texture(GTGuiTextures.PROGRESS_BAR_FLUID_RIG_DEPLETION) + .texture(GTGuiTextures.PROGRESS_BAR_FLUID_RIG_DEPLETION, -1) .tooltipBuilder(tooltip -> { if (isStructureFormed()) { if (waterFilledValue.getIntValue() == 0) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java index 4d841dc6582..98dd15a6a9a 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java @@ -126,8 +126,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 2); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 2); GTFluidSyncHandler tankSyncHandler = GTFluidSlot.sync(this.exportFluids.getTankAt(0)) .showAmountOnSlot(false) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java index 19c09a0def4..c01f9c6b8f0 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java @@ -13,7 +13,6 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.*; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.BlockPattern; import gregtech.api.pattern.FactoryBlockPattern; @@ -51,6 +50,7 @@ import com.cleanroommc.modularui.api.drawable.IKey; import com.cleanroommc.modularui.value.sync.IntSyncValue; import com.cleanroommc.modularui.value.sync.PanelSyncManager; +import com.cleanroommc.modularui.widgets.ProgressWidget; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -381,14 +381,14 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { IntSyncValue operationsValue = new IntSyncValue(() -> BedrockFluidVeinHandler.getOperationsRemaining(getWorld(), minerLogic.getChunkX(), minerLogic.getChunkZ())); syncManager.syncValue("operations_remaining", operationsValue); - bars.add(bar -> bar + bars.add(progressWidget -> progressWidget .progress(() -> operationsValue.getIntValue() * 1.0 / BedrockFluidVeinHandler.MAXIMUM_VEIN_OPERATIONS) - .texture(GTGuiTextures.PROGRESS_BAR_FLUID_RIG_DEPLETION) + .texture(GTGuiTextures.PROGRESS_BAR_FLUID_RIG_DEPLETION, -1) .tooltipBuilder(t -> { if (!isStructureFormed()) { t.addLine(IKey.lang("gregtech.multiblock.invalid_structure")); diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java index eb63793d711..d42d38eed5b 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java @@ -14,7 +14,6 @@ import gregtech.api.metatileentity.multiblock.ProgressBarMultiblock; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.BlockPattern; import gregtech.api.pattern.FactoryBlockPattern; @@ -402,7 +401,7 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { LongSyncValue capacity = new LongSyncValue(energyContainer::getEnergyCapacity); syncManager.syncValue("capacity", capacity); LongSyncValue stored = new LongSyncValue(energyContainer::getEnergyStored); @@ -410,17 +409,19 @@ public void registerBars(List> bars, PanelSync LongSyncValue heat = new LongSyncValue(this::getHeat); syncManager.syncValue("heat", heat); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> capacity.getLongValue() > 0 ? 1.0 * stored.getLongValue() / capacity.getLongValue() : 0) - .texture(GTGuiTextures.PROGRESS_BAR_FUSION_ENERGY) + .texture(GTGuiTextures.PROGRESS_BAR_FUSION_ENERGY, -1) .tooltipBuilder(tooltip -> tooltip .add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.energy_stored", stored.getLongValue(), capacity.getLongValue())))); - bars.add(barTest -> barTest - .texture(GTGuiTextures.PROGRESS_BAR_FUSION_HEAT) + bars.add(progressWidget -> progressWidget + .progress(() -> capacity.getLongValue() > 0 ? + 1.0 * heat.getLongValue() / capacity.getLongValue() : 0) + .texture(GTGuiTextures.PROGRESS_BAR_FUSION_HEAT, -1) .tooltipBuilder(tooltip -> { IKey heatInfo = KeyUtil.string(TextFormatting.AQUA, "%,d / %,d EU", @@ -428,9 +429,7 @@ public void registerBars(List> bars, PanelSync tooltip.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.fusion_reactor.heat", heatInfo)); - }) - .progress(() -> capacity.getLongValue() > 0 ? - 1.0 * heat.getLongValue() / capacity.getLongValue() : 0)); + })); } private class FusionRecipeLogic extends MultiblockRecipeLogic { diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityHPCA.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityHPCA.java index 80ba3026917..b11e6cd2336 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityHPCA.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityHPCA.java @@ -10,7 +10,6 @@ import gregtech.api.metatileentity.multiblock.ui.KeyManager; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.metatileentity.multiblock.ui.UISyncer; import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.BlockPattern; @@ -539,7 +538,7 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { IntSyncValue currentCWUtValue = new IntSyncValue(() -> hpcaHandler.cachedCWUt); IntSyncValue maxCWUtValue = new IntSyncValue(hpcaHandler::getMaxCWUt); syncManager.syncValue("current_cwut", currentCWUtValue); @@ -547,9 +546,9 @@ public void registerBars(List> bars, PanelSync DoubleSyncValue temperatureValue = new DoubleSyncValue(() -> temperature); syncManager.syncValue("temperature", temperatureValue); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> 1.0 * currentCWUtValue.getIntValue() / maxCWUtValue.getIntValue()) - .texture(GTGuiTextures.PROGRESS_BAR_HPCA_COMPUTATION) + .texture(GTGuiTextures.PROGRESS_BAR_HPCA_COMPUTATION, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { t.addLine(IKey.lang("gregtech.multiblock.hpca.computation", @@ -559,9 +558,9 @@ public void registerBars(List> bars, PanelSync } })); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> Math.min(1.0, temperatureValue.getDoubleValue() / DAMAGE_TEMPERATURE)) - .texture(GTGuiTextures.PROGRESS_BAR_FUSION_HEAT) + .texture(GTGuiTextures.PROGRESS_BAR_FUSION_HEAT, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { double temp = temperatureValue.getDoubleValue(); diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java index c3fdd2b18b6..f6a6b76ba82 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java @@ -15,7 +15,6 @@ import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase; import gregtech.api.metatileentity.multiblock.ProgressBarMultiblock; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.BlockPattern; import gregtech.api.pattern.FactoryBlockPattern; @@ -55,6 +54,7 @@ import com.cleanroommc.modularui.api.drawable.IKey; import com.cleanroommc.modularui.value.sync.BigIntSyncValue; import com.cleanroommc.modularui.value.sync.PanelSyncManager; +import com.cleanroommc.modularui.widgets.ProgressWidget; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; @@ -578,7 +578,7 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { BigIntSyncValue energyStoredValue = new BigIntSyncValue( () -> energyBank == null ? BigInteger.ZERO : energyBank.getStored(), null); BigIntSyncValue energyCapacityValue = new BigIntSyncValue( @@ -586,11 +586,11 @@ public void registerBars(List> bars, PanelSync syncManager.syncValue("energy_stored", energyStoredValue); syncManager.syncValue("energy_capacity", energyCapacityValue); - bars.add(b -> b.progress(() -> { + bars.add(progressWidget -> progressWidget.progress(() -> { if (energyCapacityValue.getValue().equals(BigInteger.ZERO)) return 0; return energyStoredValue.getValue().divide(energyCapacityValue.getValue()).doubleValue(); }) - .texture(GTGuiTextures.PROGRESS_BAR_MULTI_ENERGY_YELLOW) + .texture(GTGuiTextures.PROGRESS_BAR_MULTI_ENERGY_YELLOW, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { t.addLine(IKey.lang("gregtech.multiblock.energy_stored", energyStoredValue.getValue(), diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java index 7c367d349b6..87291c0ae38 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeCombustionEngine.java @@ -14,7 +14,6 @@ import gregtech.api.metatileentity.multiblock.MultiblockAbility; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.sync.FixedIntArraySyncValue; import gregtech.api.pattern.BlockPattern; @@ -47,6 +46,7 @@ import com.cleanroommc.modularui.value.sync.BooleanSyncValue; import com.cleanroommc.modularui.value.sync.PanelSyncManager; import com.cleanroommc.modularui.value.sync.StringSyncValue; +import com.cleanroommc.modularui.widgets.ProgressWidget; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -249,7 +249,7 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { FixedIntArraySyncValue fuelValue = new FixedIntArraySyncValue(this::getFuelAmount, null); syncManager.syncValue("fuel_amount", fuelValue); StringSyncValue fuelNameValue = new StringSyncValue(() -> { @@ -271,16 +271,16 @@ public void registerBars(List> bars, PanelSync BooleanSyncValue boostValue = new BooleanSyncValue(this::isBoostAllowed); syncManager.syncValue("boost_allowed", boostValue); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> fuelValue.getValue(1) == 0 ? 0 : 1.0 * fuelValue.getValue(0) / fuelValue.getValue(1)) - .texture(GTGuiTextures.PROGRESS_BAR_LCE_FUEL) + .texture(GTGuiTextures.PROGRESS_BAR_LCE_FUEL, -1) .tooltipBuilder(t -> createFuelTooltip(t, fuelValue, fuelNameValue))); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> lubricantValue.getValue(1) == 0 ? 0 : 1.0 * lubricantValue.getValue(0) / lubricantValue.getValue(1)) - .texture(GTGuiTextures.PROGRESS_BAR_LCE_LUBRICANT) + .texture(GTGuiTextures.PROGRESS_BAR_LCE_LUBRICANT, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { if (lubricantValue.getValue(0) == 0) { @@ -294,10 +294,10 @@ public void registerBars(List> bars, PanelSync } })); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> oxygenValue.getValue(1) == 0 ? 0 : 1.0 * oxygenValue.getValue(0) / oxygenValue.getValue(1)) - .texture(GTGuiTextures.PROGRESS_BAR_LCE_OXYGEN) + .texture(GTGuiTextures.PROGRESS_BAR_LCE_OXYGEN, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { if (boostValue.getBoolValue()) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java index 5a15302484d..71dcbb9b980 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/generator/MetaTileEntityLargeTurbine.java @@ -9,7 +9,6 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.*; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; -import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.sync.FixedIntArraySyncValue; import gregtech.api.pattern.BlockPattern; @@ -35,6 +34,7 @@ import com.cleanroommc.modularui.value.sync.IntSyncValue; import com.cleanroommc.modularui.value.sync.PanelSyncManager; import com.cleanroommc.modularui.value.sync.StringSyncValue; +import com.cleanroommc.modularui.widgets.ProgressWidget; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -271,7 +271,7 @@ public int getProgressBarCount() { } @Override - public void registerBars(List> bars, PanelSyncManager syncManager) { + public void registerBars(List> bars, PanelSyncManager syncManager) { FixedIntArraySyncValue fuelValue = new FixedIntArraySyncValue(this::getFuelAmount, null); StringSyncValue fuelNameValue = new StringSyncValue(() -> { FluidStack stack = ((MultiblockFuelRecipeLogic) recipeMapWorkable).getInputFluidStack(); @@ -323,16 +323,16 @@ public void registerBars(List> bars, PanelSync syncManager.syncValue("rotor_durability", durabilityValue); syncManager.syncValue("rotor_efficiency", efficiencyValue); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> fuelValue.getValue(1) == 0 ? 0 : 1.0 * fuelValue.getValue(0) / fuelValue.getValue(1)) - .texture(GTGuiTextures.PROGRESS_BAR_LCE_FUEL) + .texture(GTGuiTextures.PROGRESS_BAR_LCE_FUEL, -1) .tooltipBuilder(t -> createFuelTooltip(t, fuelValue, fuelNameValue))); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> rotorMaxSpeedValue.getIntValue() == 0 ? 0 : 1.0 * rotorSpeedValue.getIntValue() / rotorMaxSpeedValue.getIntValue()) - .texture(GTGuiTextures.PROGRESS_BAR_TURBINE_ROTOR_SPEED) + .texture(GTGuiTextures.PROGRESS_BAR_TURBINE_ROTOR_SPEED, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { int speed = rotorSpeedValue.getIntValue(); @@ -345,9 +345,9 @@ public void registerBars(List> bars, PanelSync } })); - bars.add(barTest -> barTest + bars.add(progressWidget -> progressWidget .progress(() -> durabilityValue.getIntValue() / 100.0) - .texture(GTGuiTextures.PROGRESS_BAR_TURBINE_ROTOR_DURABILITY) + .texture(GTGuiTextures.PROGRESS_BAR_TURBINE_ROTOR_DURABILITY, -1) .tooltipBuilder(t -> { if (isStructureFormed()) { if (efficiencyValue.getIntValue() <= 0) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java index a1e6ab43a3c..f810bd535e3 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java @@ -282,7 +282,7 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var fluidSyncHandler = GTFluidSlot.sync(fluidTank) .showAmountOnSlot(false) .accessibility(true, !isExportHatch); diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java index 31511ae2cb6..ea1f51763df 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java @@ -75,8 +75,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 1); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 1); // TODO: Change the position of the name when it's standardized. return GTGuis.createPanel(this, 176, 18 + 18 + 94) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiFluidHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiFluidHatch.java index dda4c982efc..643e23250f3 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiFluidHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiFluidHatch.java @@ -209,7 +209,7 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(numSlots); List fluidSlots = new ArrayList<>(); diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java index a486765725c..c4e55d32e9d 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java @@ -68,8 +68,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 2); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 2); // TODO: Change the position of the name when it's standardized. return GTGuis.createPanel(this, 176, 166) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchFluid.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchFluid.java index a047127d832..7195fc2c577 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchFluid.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchFluid.java @@ -139,7 +139,7 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(getTier() + 1); int backgroundWidth = 9 * 18 + 14; diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java index 4d02dba1e66..3fa3080f3d1 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java @@ -141,10 +141,10 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int rowSize = (int) Math.sqrt(getInventorySize()); - guiSyncManager.registerSlotGroup("item_inv", rowSize); + panelSyncManager.registerSlotGroup("item_inv", rowSize); int backgroundWidth = 9 * 18 + 14; int backgroundHeight = 18 + 18 * rowSize + 94; diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java index 00241591cf8..6224be423b7 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java @@ -150,8 +150,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 2); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 2); GTFluidSyncHandler tankSyncHandler = GTFluidSlot.sync(this.fluidTank) .showAmountOnSlot(false) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java index d82088dc81a..2746b2b7dff 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java @@ -87,8 +87,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 1); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 1); // TODO: Change the position of the name when it's standardized. return GTGuis.createPanel(this, 176, 166) .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5)) diff --git a/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java b/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java index 879cb9c2da0..9ab9f7fb6b6 100644 --- a/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java +++ b/src/main/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java @@ -141,8 +141,8 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.registerSlotGroup("item_inv", 2); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.registerSlotGroup("item_inv", 2); GTFluidSyncHandler tankSyncHandler = GTFluidSlot.sync(this.importFluids.getTankAt(0)) .showAmountOnSlot(false); diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java index 353cdf406c3..299cf3f336a 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java @@ -86,9 +86,9 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { int invTier = tier + 2; - guiSyncManager.registerSlotGroup("item_inv", invTier); + panelSyncManager.registerSlotGroup("item_inv", invTier); List> slotWidgets = new ArrayList<>(); for (int y = 0; y < invTier; y++) { diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeChest.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeChest.java index 29b350c41e9..146911268a1 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeChest.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeChest.java @@ -88,8 +88,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { - guiSyncManager.syncValue("handler", this.modifiableHandler); + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { + panelSyncManager.syncValue("handler", this.modifiableHandler); return appendCreativeUI(GTGuis.createPanel(this, 176, 166), false, new BoolValue.Dynamic(() -> active, b -> active = b), new IntSyncValue(() -> itemsPerCycle, v -> itemsPerCycle = v), diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java index a6218aa7323..c61c431922a 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java @@ -88,7 +88,7 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { return appendCreativeUI(GTGuis.createPanel(this, 176, 166), true, new BoolValue.Dynamic(() -> active, b -> active = b), new IntSyncValue(() -> mBPerCycle, v -> mBPerCycle = v), diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java index 440c4290075..ab0e63f4671 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java @@ -174,9 +174,9 @@ public boolean usesMui2() { } @Override - public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) { + public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) { var panel = GTGuis.createPanel(this, 176, 166); - createWidgets(panel, guiSyncManager); + createWidgets(panel, panelSyncManager); return panel.padding(4) .child(IKey.lang(getMetaFullName()).asWidget()) .child(createQuantumIO(importItems, exportItems)) diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java index 3483c603223..ad2a072d822 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java @@ -230,7 +230,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager syncManager, UI return GTGuis.createPanel(this, 176, 224) .child(Flow.row() - .debugName("tab row") + .name("tab row") .widthRel(1f) .leftRel(0.5f) .margin(3, 0) @@ -257,10 +257,10 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager syncManager, UI .coverChildrenHeight() // workstation page .addPage(Flow.column() - .debugName("crafting page") + .name("crafting page") .coverChildrenWidth() .child(Flow.row() - .debugName("crafting row") + .name("crafting row") .coverChildrenHeight() .widthRel(1f) // crafting grid @@ -365,7 +365,7 @@ public IWidget createRecipeMemoryGrid(PanelSyncManager syncManager) { public IWidget createInventoryPage(PanelSyncManager syncManager) { if (this.connectedInventory.getSlots() == 0) { return Flow.column() - .debugName("inventory page - empty") + .name("inventory page - empty") .leftRel(0.5f) .padding(2) .height(18 * 6) @@ -404,7 +404,7 @@ public IWidget createInventoryPage(PanelSyncManager syncManager) { }); return Flow.column() - .debugName("inventory page") + .name("inventory page") .padding(2) .leftRel(0.5f) .coverChildren()