Skip to content

Commit 82d269e

Browse files
ghzdudeghzdude
committed
fix rebase
1 parent f2bd4f5 commit 82d269e

9 files changed

Lines changed: 58 additions & 69 deletions

File tree

‎src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.cleanroommc.modularui.api.drawable.IKey;
3333
import com.cleanroommc.modularui.factory.PosGuiData;
3434
import com.cleanroommc.modularui.screen.ModularPanel;
35+
import com.cleanroommc.modularui.screen.UISettings;
3536
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3637
import com.cleanroommc.modularui.widget.Widget;
3738
import org.jetbrains.annotations.NotNull;
@@ -142,7 +143,7 @@ public boolean usesMui2() {
142143
}
143144

144145
@Override
145-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
146+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
146147
RecipeMap<?> workableRecipeMap = Objects.requireNonNull(workable.getRecipeMap(), "recipe map is null");
147148
int yOffset = 0;
148149
if (workableRecipeMap.getMaxInputs() >= 6 || workableRecipeMap.getMaxFluidInputs() >= 6 ||
@@ -155,7 +156,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
155156
.constructPanel(this, workable::getProgressPercent,
156157
importItems, exportItems,
157158
importFluids, exportFluids,
158-
yOffset, guiSyncManager)
159+
yOffset, panelSyncManager)
159160
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
160161
.bindPlayerInventory();
161162

‎src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@
5454
import com.cleanroommc.modularui.api.drawable.IKey;
5555
import com.cleanroommc.modularui.factory.PosGuiData;
5656
import com.cleanroommc.modularui.screen.ModularPanel;
57+
import com.cleanroommc.modularui.screen.UISettings;
5758
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
5859
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5960
import com.cleanroommc.modularui.value.sync.SyncHandlers;
6061
import com.cleanroommc.modularui.widget.Widget;
61-
import com.cleanroommc.modularui.widgets.ItemSlot;
6262
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
6363
import com.cleanroommc.modularui.widgets.ToggleButton;
6464
import com.cleanroommc.modularui.widgets.layout.Flow;
65+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
6566
import org.jetbrains.annotations.NotNull;
6667
import org.jetbrains.annotations.Nullable;
6768

@@ -494,7 +495,7 @@ public boolean usesMui2() {
494495
}
495496

496497
@Override
497-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
498+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
498499
RecipeMap<?> workableRecipeMap = Objects.requireNonNull(workable.getRecipeMap(), "recipe map is null");
499500
int yOffset = 0;
500501
if (workableRecipeMap.getMaxInputs() >= 6 || workableRecipeMap.getMaxFluidInputs() >= 6 ||
@@ -503,29 +504,29 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
503504
}
504505

505506
Flow col = Flow.column()
506-
.debugName("col:special.buttons")
507+
.name("col:special.buttons")
507508
.right(7).bottom(7)
508509
.height(18 * 4 + 4)
509510
.width(18);
510511

511512
BooleanSyncValue hasEnergy = new BooleanSyncValue(workable::isHasNotEnoughEnergy);
512-
guiSyncManager.syncValue("has_energy", hasEnergy);
513+
panelSyncManager.syncValue("has_energy", hasEnergy);
513514

514515
ModularPanel panel = workableRecipeMap.getRecipeMapUI()
515516
.setSize(176 + 20, 166 + yOffset)
516517
.constructPanel(this, workable::getProgressPercent,
517518
importItems, exportItems,
518519
importFluids, exportFluids,
519-
yOffset, guiSyncManager)
520+
yOffset, panelSyncManager)
520521
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
521522
.child(GTGuiTextures.INDICATOR_NO_ENERGY.asWidget()
522-
.debugName("energy.indicator")
523+
.name("energy.indicator")
523524
.size(18)
524525
.alignX(0.5f)
525526
.top(42 + yOffset + 18)
526527
.setEnabledIf($ -> hasEnergy.getBoolValue()))
527528
.child(col)
528-
.child(SlotGroupWidget.playerInventory().left(7));
529+
.child(SlotGroupWidget.playerInventory(true).left(7));
529530

530531
if (exportItems.getSlots() > 0) {
531532
col.child(new ToggleButton()
@@ -544,7 +545,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
544545
}
545546

546547
col.child(new ItemSlot()
547-
.debugName("charger.slot")
548+
.name("charger.slot")
548549
.slot(SyncHandlers.itemSlot(chargerInventory, 0))
549550
.background(GTGuiTextures.SLOT, GTGuiTextures.CHARGER_OVERLAY)
550551
.bottom(18 + 4)
@@ -561,7 +562,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
561562
if (hasGhostCircuitInventory() && circuitInventory != null) {
562563
col.child(new GhostCircuitSlotWidget()
563564
.bottom(0)
564-
.slot(SyncHandlers.itemSlot(circuitInventory, 0))
565+
.slot(circuitInventory, 0)
565566
.background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY));
566567
}
567568
return panel;

‎src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
import net.minecraft.entity.player.EntityPlayer;
2424
import net.minecraft.init.SoundEvents;
2525
import net.minecraft.item.ItemStack;
26-
import net.minecraft.util.*;
26+
import net.minecraft.util.EnumFacing;
27+
import net.minecraft.util.EnumHand;
28+
import net.minecraft.util.EnumParticleTypes;
29+
import net.minecraft.util.ResourceLocation;
30+
import net.minecraft.util.SoundCategory;
31+
import net.minecraft.util.SoundEvent;
2732
import net.minecraft.util.math.BlockPos;
2833
import net.minecraft.world.World;
2934
import net.minecraftforge.fluids.FluidTank;
@@ -38,6 +43,7 @@
3843
import com.cleanroommc.modularui.api.drawable.IKey;
3944
import com.cleanroommc.modularui.factory.PosGuiData;
4045
import com.cleanroommc.modularui.screen.ModularPanel;
46+
import com.cleanroommc.modularui.screen.UISettings;
4147
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
4248
import org.apache.commons.lang3.ArrayUtils;
4349
import org.apache.commons.lang3.tuple.Pair;
@@ -141,15 +147,15 @@ public boolean usesMui2() {
141147
}
142148

143149
@Override
144-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
150+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
145151
RecipeMap<?> map = Objects.requireNonNull(getRecipeMap());
146152

147153
// todo remove logo from background and use a widget
148154
return map.getRecipeMapUI()
149155
.constructPanel(this, workableHandler::getProgressPercent,
150156
importItems, exportItems,
151157
EMPTY, exportFluids,
152-
0, guiSyncManager)
158+
0, panelSyncManager)
153159
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
154160
.bindPlayerInventory();
155161
}

‎src/main/java/gregtech/api/mui/GTGuiTheme.java‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.function.Consumer;
2323
import java.util.function.Supplier;
2424

25-
import static gregtech.api.mui.GTGuiTextures.*;
25+
import static gregtech.api.mui.GTGuiTextures.IDs;
2626

2727
public class GTGuiTheme {
2828

@@ -438,39 +438,12 @@ public Builder logo(Supplier<UITexture> logo) {
438438
return this;
439439
}
440440

441-
/**
442-
* Simple toggle button configuration for when you want a button with no texture changes on hover.
443-
*
444-
* @param backgroundId The unselected background texture
445-
* @param selectedBackgroundId The selected background texture
446-
* @param selectedColor The background color when the button is selected
447-
*/
448-
public Builder simpleToggleButton(String backgroundId, String selectedBackgroundId, int selectedColor) {
449-
return simpleToggleButton(backgroundId, selectedBackgroundId, selectedColor, 0xFFBBBBBB, false);
450-
}
451-
452-
/**
453-
* Simple toggle button configuration for when you want a button with no texture changes on hover.
454-
*
455-
* @param backgroundId The unselected background texture
456-
* @param selectedBackgroundId The selected background texture
457-
* @param selectedColor The background color when the button is selected
458-
* @param textColor The color for text overlaid on this button
459-
* @param textShadow Whether to apply text shadow to text overlaid on this button
460-
*/
461-
public Builder simpleToggleButton(String backgroundId, String selectedBackgroundId, int selectedColor,
462-
int textColor, boolean textShadow) {
463-
return toggleButton(
464-
backgroundId, backgroundId,
465-
selectedBackgroundId, selectedBackgroundId,
466-
selectedColor, textColor, textShadow);
467-
}
468-
469441
/**
470442
* Sets the display background for this theme.
471443
*/
472444
public Builder displayBackground(String displayBackground) {
473445
theme.displayBackground = displayBackground;
446+
return this;
474447
}
475448

476449
public GTGuiTheme build() {

‎src/main/java/gregtech/api/recipes/ui/RecipeMapUI.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import com.cleanroommc.modularui.value.sync.SyncHandlers;
2626
import com.cleanroommc.modularui.widget.Widget;
2727
import com.cleanroommc.modularui.widget.sizer.Area;
28-
import com.cleanroommc.modularui.widgets.ItemSlot;
2928
import com.cleanroommc.modularui.widgets.ProgressWidget;
3029
import com.cleanroommc.modularui.widgets.layout.Flow;
30+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
3131
import com.cleanroommc.modularui.widgets.slot.SlotGroup;
3232
import it.unimi.dsi.fastutil.bytes.Byte2ObjectArrayMap;
3333
import it.unimi.dsi.fastutil.bytes.Byte2ObjectMap;
@@ -571,7 +571,7 @@ public ModularPanel constructPanel(MetaTileEntity mte, DoubleSupplier progressSu
571571

572572
Flow row = Flow.row()
573573
.height(h)
574-
.debugName("row:recipemapui.parent")
574+
.name("row:recipemapui.parent")
575575
.alignX(0.5f)
576576
.crossAxisAlignment(Alignment.CrossAxis.CENTER)
577577
.top(23 - 7);
@@ -593,7 +593,7 @@ public ModularPanel constructPanel(MetaTileEntity mte, DoubleSupplier progressSu
593593
}
594594
row.child(progressWidget
595595
.recipeMap(recipeMap)
596-
.debugName("recipe.progress")
596+
.name("recipe.progress")
597597
.size(progressSize)
598598
.margin(margin, 0)
599599
.value(progressValue)
@@ -624,7 +624,7 @@ private Widget<?> makeItemGroup(CalculatedGrid grid, IItemHandlerModifiable hand
624624
Flow col = Flow.column()
625625
.mainAxisAlignment(Alignment.MainAxis.END)
626626
.coverChildren()
627-
.debugName("col:item_grid");
627+
.name("col:item_grid");
628628
int width = grid.getItemGridWidth();
629629
int height = grid.getItemGridHeight();
630630

@@ -633,7 +633,7 @@ private Widget<?> makeItemGroup(CalculatedGrid grid, IItemHandlerModifiable hand
633633
Flow row = Flow.row()
634634
.mainAxisAlignment(isOutputs ? Alignment.MainAxis.START : Alignment.MainAxis.END)
635635
.coverChildren()
636-
.debugName("row:item_" + i);
636+
.name("row:item_" + i);
637637
for (int j = 0; j < width; j++) {
638638
row.child(makeItemSlot(slotGroup, (i * height) + j, handler, isOutputs));
639639
}
@@ -646,7 +646,7 @@ private Widget<?> makeFluidGroup(CalculatedGrid grid, FluidTankList handler, boo
646646
Flow col = Flow.column()
647647
.mainAxisAlignment(Alignment.MainAxis.START)
648648
.coverChildren()
649-
.debugName("col:fluid_grid");
649+
.name("col:fluid_grid");
650650

651651
int width = grid.getFluidGridWidth();
652652
int height = grid.getFluidGridHeight();
@@ -655,7 +655,7 @@ private Widget<?> makeFluidGroup(CalculatedGrid grid, FluidTankList handler, boo
655655
Flow row = Flow.row()
656656
.mainAxisAlignment(isOutputs ? Alignment.MainAxis.START : Alignment.MainAxis.END)
657657
.coverChildren()
658-
.debugName("row:fluid_" + i);
658+
.name("row:fluid_" + i);
659659
for (int j = 0; j < width; j++) {
660660
row.child(makeFluidSlot((i * height) + j, handler, isOutputs));
661661
}
@@ -685,7 +685,7 @@ protected Widget<?> makeInventorySlotGroup(CalculatedGrid grid, @NotNull IItemHa
685685

686686
Flow flow = (singleRow ? Flow.row() : Flow.column())
687687
.coverChildren()
688-
.debugName(singleRow ? "row:parent" : "col:parent");
688+
.name(singleRow ? "row:parent" : "col:parent");
689689
flow.crossAxisAlignment(isOutputs ? Alignment.CrossAxis.START : Alignment.CrossAxis.END);
690690

691691
if (!onlyFluids && fluidGridHeight > 1) {
@@ -712,7 +712,7 @@ protected Widget<?> makeInventorySlotGroup(CalculatedGrid grid, @NotNull IItemHa
712712
protected ItemSlot makeItemSlot(SlotGroup group, int slotIndex, IItemHandlerModifiable itemHandler,
713713
boolean isOutputs) {
714714
return new ItemSlot()
715-
.debugName("item.slot." + slotIndex + ":" + group.getName())
715+
.name("item.slot." + slotIndex + ":" + group.getName())
716716
.slot(SyncHandlers.itemSlot(itemHandler, slotIndex)
717717
.slotGroup(group)
718718
.accessibility(!isOutputs, true))
@@ -721,7 +721,7 @@ protected ItemSlot makeItemSlot(SlotGroup group, int slotIndex, IItemHandlerModi
721721

722722
protected GTFluidSlot makeFluidSlot(int slotIndex, FluidTankList fluidHandler, boolean isOutputs) {
723723
return new GTFluidSlot()
724-
.debugName("fluid.slot." + slotIndex)
724+
.name("fluid.slot." + slotIndex)
725725
.syncHandler(GTFluidSlot.sync(fluidHandler.getTankAt(slotIndex))
726726
.accessibility(true, !isOutputs)
727727
.drawAlwaysFull(true))

‎src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
import net.minecraft.item.ItemStack;
3030
import net.minecraft.nbt.NBTTagCompound;
3131
import net.minecraft.network.PacketBuffer;
32-
import net.minecraft.util.*;
32+
import net.minecraft.util.EnumFacing;
33+
import net.minecraft.util.EnumParticleTypes;
34+
import net.minecraft.util.ResourceLocation;
35+
import net.minecraft.util.SoundCategory;
36+
import net.minecraft.util.SoundEvent;
3337
import net.minecraft.util.math.BlockPos;
3438
import net.minecraft.util.text.ITextComponent;
3539
import net.minecraft.util.text.TextComponentTranslation;
@@ -49,12 +53,13 @@
4953
import com.cleanroommc.modularui.drawable.UITexture;
5054
import com.cleanroommc.modularui.factory.PosGuiData;
5155
import com.cleanroommc.modularui.screen.ModularPanel;
56+
import com.cleanroommc.modularui.screen.UISettings;
5257
import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
5358
import com.cleanroommc.modularui.value.sync.IntSyncValue;
5459
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5560
import com.cleanroommc.modularui.widget.Widget;
56-
import com.cleanroommc.modularui.widgets.ItemSlot;
5761
import com.cleanroommc.modularui.widgets.ProgressWidget;
62+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
5863
import com.cleanroommc.modularui.widgets.slot.ModularSlot;
5964
import org.apache.commons.lang3.ArrayUtils;
6065
import org.apache.commons.lang3.tuple.Pair;
@@ -348,45 +353,45 @@ public boolean usesMui2() {
348353
}
349354

350355
@Override
351-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
356+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
352357
IntSyncValue temp = new IntSyncValue(this::getCurrentTemperature);
353-
guiSyncManager.syncValue("temperature", temp);
358+
panelSyncManager.syncValue("temperature", temp);
354359
return GTGuis.defaultPanel(this)
355360
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
356361
.child(new ProgressWidget()
357362
.texture(getEmptyBarDrawable(), GTGuiTextures.PROGRESS_BAR_BOILER_HEAT, -1)
358363
.direction(ProgressWidget.Direction.UP)
359-
.debugName("temp")
364+
.name("temp")
360365
.tooltipBuilder(
361366
tooltip -> tooltip.addLine(IKey.lang("gregtech.machine.steam_boiler.heat_tooltip",
362367
temp.getIntValue(), getMaxTemperate())))
363368
.value(new DoubleSyncValue(this::getTemperaturePercent))
364369
.pos(96, 26)
365370
.size(10, 54))
366371
.child(new GTFluidSlot()
367-
.debugName("water")
372+
.name("water")
368373
.background(getEmptyBarDrawable())
369374
.syncHandler(GTFluidSlot.sync(waterFluidTank)
370375
.showAmountOnSlot(false)
371376
.accessibility(false, false))
372377
.pos(83, 26)
373378
.size(10, 54))
374379
.child(new GTFluidSlot()
375-
.debugName("steam")
380+
.name("steam")
376381
.background(getEmptyBarDrawable())
377382
.syncHandler(GTFluidSlot.sync(steamFluidTank)
378383
.showAmountOnSlot(false)
379384
.accessibility(false, false))
380385
.pos(70, 26)
381386
.size(10, 54))
382387
.child(new ItemSlot()
383-
.debugName("fluid in")
388+
.name("fluid in")
384389
.background(getSlotBackground(false))
385390
.slot(new ModularSlot(containerInventory, 0)
386391
.singletonSlotGroup())
387392
.pos(43, 26))
388393
.child(new ItemSlot()
389-
.debugName("fluid out")
394+
.name("fluid out")
390395
.background(getSlotBackground(true))
391396
.slot(new ModularSlot(containerInventory, 1)
392397
.accessibility(false, true))

‎src/main/java/gregtech/common/metatileentities/steam/boiler/SteamCoalBoiler.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
import com.cleanroommc.modularui.factory.PosGuiData;
1818
import com.cleanroommc.modularui.screen.ModularPanel;
19+
import com.cleanroommc.modularui.screen.UISettings;
1920
import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
2021
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
21-
import com.cleanroommc.modularui.widgets.ItemSlot;
2222
import com.cleanroommc.modularui.widgets.ProgressWidget;
23+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
2324
import com.cleanroommc.modularui.widgets.slot.ModularSlot;
2425
import org.jetbrains.annotations.NotNull;
2526

@@ -87,8 +88,8 @@ public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate
8788
}
8889

8990
@Override
90-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
91-
return super.buildUI(guiData, guiSyncManager)
91+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
92+
return super.buildUI(guiData, panelSyncManager, settings)
9293
.child(new ItemSlot()
9394
.slot(this.importItems, 0)
9495
.pos(115, 62))

0 commit comments

Comments
 (0)