Skip to content

Commit a7f5c59

Browse files
ZorbatronZorbatron
committed
Post merge fixes
1 parent cfa9c54 commit a7f5c59

File tree

8 files changed

+23
-44
lines changed

8 files changed

+23
-44
lines changed

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,8 @@ private static String id(String path) {
709709

710710
// MISC
711711
public static final UITexture SPEAKER_ICON = fullImage("textures/gui/widget/speaker.png");
712-
public static final UITexture MAINTENANCE_ICON = fullImage("textures/gui/widget/button_maintenance.png", true);
712+
public static final UITexture MAINTENANCE_ICON = fullImage("textures/gui/widget/button_maintenance.png",
713+
ColorType.DEFAULT);
713714

714715
public static void init() {/**/}
715716

‎src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityAlarm.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.cleanroommc.modularui.api.widget.IWidget;
2929
import com.cleanroommc.modularui.factory.PosGuiData;
3030
import com.cleanroommc.modularui.screen.ModularPanel;
31+
import com.cleanroommc.modularui.screen.UISettings;
3132
import com.cleanroommc.modularui.value.IntValue;
3233
import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
3334
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
@@ -86,7 +87,7 @@ public boolean usesMui2() {
8687
}
8788

8889
@Override
89-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
90+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
9091
AlarmSyncHandler alarmSyncHandler = new AlarmSyncHandler();
9192
panelSyncManager.syncValue("alarm_data", 0, alarmSyncHandler);
9293
IPanelHandler soundSelector = panelSyncManager.panel("sound_selector_popup",

‎src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
import com.cleanroommc.modularui.api.drawable.IKey;
2121
import com.cleanroommc.modularui.factory.PosGuiData;
2222
import com.cleanroommc.modularui.screen.ModularPanel;
23+
import com.cleanroommc.modularui.screen.UISettings;
2324
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
2425
import com.cleanroommc.modularui.value.sync.SyncHandlers;
25-
import com.cleanroommc.modularui.widgets.ItemSlot;
2626
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
2727
import com.cleanroommc.modularui.widgets.layout.Grid;
28+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
2829
import org.jetbrains.annotations.NotNull;
2930
import org.jetbrains.annotations.Nullable;
3031

@@ -86,7 +87,7 @@ public boolean usesMui2() {
8687
}
8788

8889
@Override
89-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
90+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
9091
int rowSize = (int) Math.sqrt(inventorySize);
9192
panelSyncManager.registerSlotGroup("slots", rowSize);
9293

@@ -107,7 +108,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
107108
new BatteryIndicatorDrawable(
108109
() -> GTUtility.itemChargeLevel(importItems.getStackInSlot(index)),
109110
0.85f))))
110-
.child(SlotGroupWidget.playerInventory()
111+
.child(SlotGroupWidget.playerInventory(false)
111112
.bottom(7)
112113
.left(7));
113114
}

‎src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,18 @@
3737
import com.cleanroommc.modularui.api.drawable.IKey;
3838
import com.cleanroommc.modularui.factory.PosGuiData;
3939
import com.cleanroommc.modularui.screen.ModularPanel;
40+
import com.cleanroommc.modularui.screen.UISettings;
4041
import com.cleanroommc.modularui.utils.Alignment;
4142
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
4243
import com.cleanroommc.modularui.value.sync.IntSyncValue;
4344
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
4445
import com.cleanroommc.modularui.value.sync.SyncHandlers;
4546
import com.cleanroommc.modularui.widgets.ButtonWidget;
46-
import com.cleanroommc.modularui.widgets.ItemSlot;
4747
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
4848
import com.cleanroommc.modularui.widgets.ToggleButton;
4949
import com.cleanroommc.modularui.widgets.layout.Flow;
5050
import com.cleanroommc.modularui.widgets.layout.Grid;
51+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
5152
import org.jetbrains.annotations.NotNull;
5253
import org.jetbrains.annotations.Nullable;
5354

@@ -276,7 +277,7 @@ public boolean usesMui2() {
276277
}
277278

278279
@Override
279-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
280+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
280281
int rowSize = (int) Math.sqrt(exportItems.getSlots());
281282

282283
IntSyncValue rangeSync = SyncHandlers.intNumber(this::getItemSuckingRange, this::setItemSuckingRange);
@@ -346,7 +347,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
346347
.tooltipBuilder(tooltip -> tooltip.addLine(autoOutputSync.getBoolValue() ?
347348
IKey.lang("gregtech.gui.item_auto_output.tooltip.enabled") :
348349
IKey.lang("gregtech.gui.item_auto_output.tooltip.disabled"))))))
349-
.child(SlotGroupWidget.playerInventory()
350+
.child(SlotGroupWidget.playerInventory(false)
350351
.bottom(7)
351352
.left(7));
352353
}

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityDataAccessHatch.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@
4242
import com.cleanroommc.modularui.drawable.ItemDrawable;
4343
import com.cleanroommc.modularui.factory.PosGuiData;
4444
import com.cleanroommc.modularui.screen.ModularPanel;
45+
import com.cleanroommc.modularui.screen.UISettings;
4546
import com.cleanroommc.modularui.utils.Alignment;
4647
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
4748
import com.cleanroommc.modularui.value.sync.SyncHandlers;
4849
import com.cleanroommc.modularui.widget.Widget;
49-
import com.cleanroommc.modularui.widgets.ItemSlot;
5050
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
5151
import com.cleanroommc.modularui.widgets.layout.Flow;
5252
import com.cleanroommc.modularui.widgets.layout.Grid;
53+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
5354
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
5455
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
5556
import org.jetbrains.annotations.NotNull;
@@ -124,7 +125,7 @@ public boolean usesMui2() {
124125
}
125126

126127
@Override
127-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
128+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
128129
int rowSize = (int) Math.sqrt(getInventorySize());
129130
panelSyncManager.registerSlotGroup("slots", rowSize);
130131

@@ -174,7 +175,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
174175
}
175176
}))))
176177
.child(recipeLogo))
177-
.child(SlotGroupWidget.playerInventory()
178+
.child(SlotGroupWidget.playerInventory(false)
178179
.bottom(7)
179180
.left(7));
180181
}

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMaintenanceHatch.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package gregtech.common.metatileentities.multi.multiblockpart;
22

3-
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
4-
53
import gregtech.api.GTValues;
64
import gregtech.api.capability.IMaintenanceHatch;
75
import gregtech.api.capability.impl.FilteredItemHandler;
@@ -37,19 +35,21 @@
3735
import com.cleanroommc.modularui.drawable.Rectangle;
3836
import com.cleanroommc.modularui.factory.PosGuiData;
3937
import com.cleanroommc.modularui.screen.ModularPanel;
38+
import com.cleanroommc.modularui.screen.UISettings;
4039
import com.cleanroommc.modularui.utils.Color;
4140
import com.cleanroommc.modularui.value.DoubleValue;
41+
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
4242
import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
4343
import com.cleanroommc.modularui.value.sync.InteractionSyncHandler;
4444
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
4545
import com.cleanroommc.modularui.value.sync.SyncHandlers;
4646
import com.cleanroommc.modularui.widget.ParentWidget;
4747
import com.cleanroommc.modularui.widget.Widget;
4848
import com.cleanroommc.modularui.widgets.ButtonWidget;
49-
import com.cleanroommc.modularui.widgets.ItemSlot;
5049
import com.cleanroommc.modularui.widgets.SliderWidget;
5150
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
5251
import com.cleanroommc.modularui.widgets.layout.Flow;
52+
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
5353
import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
5454
import it.unimi.dsi.fastutil.doubles.DoubleList;
5555
import it.unimi.dsi.fastutil.doubles.DoubleLists;
@@ -350,7 +350,7 @@ public boolean usesMui2() {
350350
}
351351

352352
@Override
353-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
353+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
354354
BooleanSyncValue minigameSync = new BooleanSyncValue(GTValues.FOOLS);
355355
panelSyncManager.syncValue("wiringMinigame", 0, minigameSync);
356356
InteractionSyncHandler maintenanceClickSync = new InteractionSyncHandler()
@@ -437,7 +437,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
437437
.stopperTexture(IDrawable.EMPTY)
438438
.sliderHeight(8));
439439
})
440-
.child(SlotGroupWidget.playerInventory()
440+
.child(SlotGroupWidget.playerInventory(false)
441441
.left(7)
442442
.bottom(7));
443443
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.cleanroommc.modularui.drawable.Rectangle;
4141
import com.cleanroommc.modularui.factory.PosGuiData;
4242
import com.cleanroommc.modularui.screen.ModularPanel;
43+
import com.cleanroommc.modularui.screen.UISettings;
4344
import com.cleanroommc.modularui.utils.Alignment;
4445
import com.cleanroommc.modularui.utils.Color;
4546
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
@@ -122,7 +123,7 @@ public boolean usesMui2() {
122123
}
123124

124125
@Override
125-
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
126+
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
126127
ModularPanel panel = GTGuis.createPanel(this, 176, 140);
127128

128129
DoubleSyncValue tierSync = SyncHandlers.doubleNumber(() -> setTier, val -> {

0 commit comments

Comments
 (0)