Skip to content

Commit adcbe0b

Browse files
ghzdudeghzdude
committed
"debugName()" -> "name()"
update IntCircuitBehaviour
1 parent e94e03d commit adcbe0b

File tree

4 files changed

+34
-32
lines changed

4 files changed

+34
-32
lines changed

‎src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import net.minecraftforge.oredict.OreIngredient;
5050

5151
import com.cleanroommc.modularui.api.drawable.IKey;
52-
import com.cleanroommc.modularui.factory.HandGuiData;
52+
import com.cleanroommc.modularui.factory.PlayerInventoryGuiData;
5353
import com.cleanroommc.modularui.screen.ModularPanel;
5454
import com.cleanroommc.modularui.screen.UISettings;
5555
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
@@ -107,18 +107,19 @@ public ItemStack getToolInSlot(@NotNull ItemStack toolbelt, int slot) {
107107
}
108108

109109
@Override
110-
public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
110+
public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager,
111+
UISettings settings) {
111112
final var usedStack = guiData.getUsedItemStack();
112113
final var handler = getHandler(usedStack);
113114
final var selected = handler.getSelectedStack();
114115
if (!selected.isEmpty() && selected.getItem() instanceof ItemUIFactory factory) {
115-
return factory.buildUI(guiData, guiSyncManager, settings);
116+
return factory.buildUI(guiData, panelSyncManager, settings);
116117
}
117118

118119
int heightBonus = (handler.getSlots() / 9) * 18;
119120

120121
SlotGroup group = new SlotGroup("toolbelt_inventory", Math.min(handler.getSlots(), 9));
121-
guiSyncManager.registerSlotGroup(group);
122+
panelSyncManager.registerSlotGroup(group);
122123

123124
List<ItemSlot> slots = new ArrayList<>();
124125
for (int i = 0; i < handler.getSlots(); i++) {
@@ -141,8 +142,8 @@ public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager
141142
(newItem, onlyAmountChanged, client, init) -> handler
142143
.onContentsChanged(index)))
143144
.background(GTGuiTextures.SLOT, GTGuiTextures.TOOL_SLOT_OVERLAY)
144-
.debugName("slot_" + index))
145-
.debugName("toolbelt_inventory"))
145+
.name("slot_" + index))
146+
.name("toolbelt_inventory"))
146147
.bindPlayerInventory();
147148
}
148149

‎src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public MultiblockUIFactory(@NotNull MultiblockWithDisplayBase mte) {
6767
private Widget<?> createIndicator(PanelSyncManager syncManager) {
6868
if (warningText == NO_OP && errorText == NO_OP) {
6969
return new Widget<>()
70-
.debugName("indicator_none")
70+
.name("indicator_none")
7171
.size(18)
7272
.pos(174 - 5, screenHeight - 18 - 3)
7373
.overlay(GTGuiTextures.GREGTECH_LOGO_DARK);
@@ -93,7 +93,7 @@ private Widget<?> createIndicator(PanelSyncManager syncManager) {
9393
});
9494

9595
return new Widget<>()
96-
.debugName("indicator")
96+
.name("indicator")
9797
.size(18)
9898
.pos(174 - 5, screenHeight - 18 - 3)
9999
.overlay(indicator)
@@ -234,7 +234,7 @@ public MultiblockUIFactory addScreenChildren(ScreenFunction function) {
234234
*/
235235
public @NotNull ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
236236
var panel = GTGuis.createPanel(mte, width, height)
237-
.debugName("root_panel")
237+
.name("root_panel")
238238
.childIf(!disableDisplay, () -> createScreen(panelSyncManager));
239239

240240
// TODO createExtras() hook for overrides?
@@ -255,7 +255,7 @@ public MultiblockUIFactory addScreenChildren(ScreenFunction function) {
255255
}
256256

257257
return panel.child(Flow.row()
258-
.debugName("bottom_row")
258+
.name("bottom_row")
259259
.bottom(7)
260260
.coverChildrenHeight()
261261
.margin(4, 0)
@@ -299,7 +299,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti,
299299
final int calculatedRows = calculateRows(count);
300300

301301
Flow column = Flow.column()
302-
.debugName("bar_col")
302+
.name("bar_col")
303303
.margin(4, 0)
304304
.top(5 + screenHeight)
305305
.widthRel(1f)
@@ -313,7 +313,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti,
313313
final int calculatedCols = calculateCols(count, r);
314314

315315
Flow row = Flow.row()
316-
.debugName("bar_row:" + r)
316+
.name("bar_row:" + r)
317317
.widthRel(1f)
318318
.mainAxisAlignment(Alignment.MainAxis.SPACE_BETWEEN)
319319
.height(Bars.HEIGHT);
@@ -339,7 +339,7 @@ protected Flow createBars(@NotNull ProgressBarMultiblock progressMulti,
339339
}
340340

341341
row.child(widget.size(barWidth, Bars.HEIGHT)
342-
.debugName(mte.getClass().getSimpleName() + ":bar:" + i)
342+
.name(mte.getClass().getSimpleName() + ":bar:" + i)
343343
.direction(ProgressWidget.Direction.RIGHT));
344344
}
345345

@@ -357,7 +357,7 @@ protected Widget<?> createScreen(PanelSyncManager syncManager) {
357357
display.sync("display", syncManager);
358358

359359
parent.child(new ScrollableTextWidget()
360-
.debugName("display_text")
360+
.name("display_text")
361361
.sizeRel(1f)
362362
.alignment(Alignment.TopLeft)
363363
.margin(4)
@@ -370,7 +370,7 @@ protected Widget<?> createScreen(PanelSyncManager syncManager) {
370370
}
371371

372372
return parent.childIf(!disableIndicator, () -> createIndicator(syncManager))
373-
.debugName("display_root")
373+
.name("display_root")
374374
.background(getDisplayBackground())
375375
.size(190, screenHeight)
376376
.pos(4, 4);
@@ -386,7 +386,7 @@ protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSync
386386
IWidget flexButton = this.flexButton.apply(guiData, panelSyncManager);
387387
if (flexButton == null) {
388388
flexButton = new ToggleButton()
389-
.debugName("flex_none")
389+
.name("flex_none")
390390
.value(ALWAYS_ON)
391391
.overlay(GTGuiTextures.OVERLAY_NO_FLEX)
392392
.size(18)
@@ -395,7 +395,7 @@ protected Flow createButtons(@NotNull ModularPanel mainPanel, @NotNull PanelSync
395395
var powerButton = createPowerButton(mainPanel, panelSyncManager);
396396

397397
return Flow.column()
398-
.debugName("button_col")
398+
.name("button_col")
399399
.right(4)
400400
.coverChildren()
401401
.child(createDistinctButton(mainPanel, panelSyncManager))
@@ -408,15 +408,15 @@ protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel,
408408
@NotNull PanelSyncManager panelSyncManager) {
409409
if (!(mte instanceof IDistinctBusController distinct) || !distinct.canBeDistinct()) {
410410
return new ToggleButton()
411-
.debugName("distinct_none")
411+
.name("distinct_none")
412412
.value(ALWAYS_ON)
413413
.size(18)
414414
.overlay(GTGuiTextures.OVERLAY_DISTINCT_BUSES[0])
415415
.addTooltipLine(IKey.lang("gregtech.multiblock.universal.distinct_not_supported"));
416416
}
417417

418418
return new ToggleButton()
419-
.debugName("distinct_button")
419+
.name("distinct_button")
420420
.size(18)
421421
.value(new BooleanSyncValue(distinct::isDistinct, distinct::setDistinct))
422422
.disableHoverBackground()
@@ -429,7 +429,7 @@ protected IWidget createDistinctButton(@NotNull ModularPanel mainPanel,
429429
protected IWidget createVoidingButton(@NotNull ModularPanel mainPanel, @NotNull PanelSyncManager panelSyncManager) {
430430
if (!mte.shouldShowVoidingModeButton()) {
431431
return new ToggleButton()
432-
.debugName("voiding_none")
432+
.name("voiding_none")
433433
.value(ALWAYS_ON)
434434
.size(18)
435435
.overlay(GTGuiTextures.OVERLAY_VOID_NONE)
@@ -439,7 +439,7 @@ protected IWidget createVoidingButton(@NotNull ModularPanel mainPanel, @NotNull
439439
IntSyncValue voidingValue = new IntSyncValue(mte::getVoidingMode, mte::setVoidingMode);
440440

441441
return new CycleButtonWidget()
442-
.debugName("voiding_button")
442+
.name("voiding_button")
443443
.size(18)
444444
.value(voidingValue)
445445
.length(4)
@@ -458,7 +458,7 @@ protected Widget<?> createPowerButton(@NotNull ModularPanel mainPanel, @NotNull
458458
controllable::setWorkingEnabled);
459459

460460
return new ToggleButton()
461-
.debugName("power_button")
461+
.name("power_button")
462462
.size(18)
463463
.disableHoverBackground()
464464
.overlay(true, detail, GTGuiTextures.BUTTON_POWER[1])

‎src/main/java/gregtech/common/items/behaviors/IntCircuitBehaviour.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.cleanroommc.modularui.api.widget.IWidget;
2525
import com.cleanroommc.modularui.api.widget.Interactable;
2626
import com.cleanroommc.modularui.drawable.ItemDrawable;
27-
import com.cleanroommc.modularui.factory.HandGuiData;
27+
import com.cleanroommc.modularui.factory.PlayerInventoryGuiData;
2828
import com.cleanroommc.modularui.screen.ModularPanel;
2929
import com.cleanroommc.modularui.screen.UISettings;
3030
import com.cleanroommc.modularui.value.sync.InteractionSyncHandler;
@@ -67,18 +67,19 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
6767
}
6868

6969
@Override
70-
public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
70+
public ModularPanel buildUI(PlayerInventoryGuiData guiData, PanelSyncManager panelSyncManager,
71+
UISettings settings) {
7172
var panel = GTGuis.createPanel(guiData.getUsedItemStack(), 176, 120);
7273
ItemDrawable circuitPreview = new ItemDrawable(guiData.getUsedItemStack());
7374
for (int i = 0; i <= 32; i++) {
7475
int finalI = i;
75-
guiSyncManager.syncValue("config", i, new InteractionSyncHandler()
76+
panelSyncManager.syncValue("config", i, new InteractionSyncHandler()
7677
.setOnMousePressed(b -> {
7778
ItemStack item = IntCircuitIngredient.getIntegratedCircuit(finalI);
7879
item.setCount(guiData.getUsedItemStack().getCount());
7980
circuitPreview.setItem(item);
80-
if (Interactable.hasShiftDown()) panel.animateClose();
81-
guiData.getPlayer().setHeldItem(guiData.getHand(), item);
81+
if (Interactable.hasShiftDown()) panel.closeIfOpen();
82+
guiData.setUsedItemStack(item);
8283
}));
8384
}
8485

‎src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager syncManager, UI
230230

231231
return GTGuis.createPanel(this, 176, 224)
232232
.child(Flow.row()
233-
.debugName("tab row")
233+
.name("tab row")
234234
.widthRel(1f)
235235
.leftRel(0.5f)
236236
.margin(3, 0)
@@ -257,10 +257,10 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager syncManager, UI
257257
.coverChildrenHeight()
258258
// workstation page
259259
.addPage(Flow.column()
260-
.debugName("crafting page")
260+
.name("crafting page")
261261
.coverChildrenWidth()
262262
.child(Flow.row()
263-
.debugName("crafting row")
263+
.name("crafting row")
264264
.coverChildrenHeight()
265265
.widthRel(1f)
266266
// crafting grid
@@ -365,7 +365,7 @@ public IWidget createRecipeMemoryGrid(PanelSyncManager syncManager) {
365365
public IWidget createInventoryPage(PanelSyncManager syncManager) {
366366
if (this.connectedInventory.getSlots() == 0) {
367367
return Flow.column()
368-
.debugName("inventory page - empty")
368+
.name("inventory page - empty")
369369
.leftRel(0.5f)
370370
.padding(2)
371371
.height(18 * 6)
@@ -404,7 +404,7 @@ public IWidget createInventoryPage(PanelSyncManager syncManager) {
404404
});
405405

406406
return Flow.column()
407-
.debugName("inventory page")
407+
.name("inventory page")
408408
.padding(2)
409409
.leftRel(0.5f)
410410
.coverChildren()

0 commit comments

Comments
 (0)