Skip to content

Commit 0003add

Browse files
ghzdudeghzdude
committed
spotless
delete commented code
1 parent 517a4a6 commit 0003add

9 files changed

Lines changed: 73 additions & 147 deletions

File tree

‎src/main/java/gregtech/common/covers/filter/BaseFilter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import gregtech.api.items.metaitem.stats.IItemComponent;
55
import gregtech.api.util.IDirtyNotifiable;
66
import gregtech.common.covers.filter.readers.BaseFilterReader;
7-
87
import gregtech.common.items.behaviors.filter.BaseFilterUIManager;
98

109
import net.minecraft.item.ItemStack;

‎src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,15 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
230230
AtomicReference<IPanelHandler> filterPanel = new AtomicReference<>();
231231
AtomicReference<ItemStack> oldStack = new AtomicReference<>(getFilterStack());
232232
AtomicInteger counter = new AtomicInteger();
233-
if (hasFilter()) filterPanel.set(getFilter().getUI().createPanelHandler(getFilterStack(), manager, counter.getAndIncrement()));
233+
if (hasFilter()) {
234+
filterPanel.set(getFilter().getUI()
235+
.createPanelHandler(getFilterStack(), manager, counter.getAndIncrement()));
236+
}
234237
manager.registerSyncedAction("update_filter_panel", packet -> {
235238
if (hasFilter()) {
236239
// make new panel handler only when we have a filter
237-
filterPanel.set(getFilter().getUI().createPanelHandler(getFilterStack(), manager, counter.getAndIncrement()));
240+
filterPanel.set(getFilter().getUI()
241+
.createPanelHandler(getFilterStack(), manager, counter.getAndIncrement()));
238242
}
239243
});
240244
ItemStackHashStrategy strategy = ItemStackHashStrategy.comparingItemDamageCount();

‎src/main/java/gregtech/common/covers/filter/readers/SimpleItemFilterReader.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package gregtech.common.covers.filter.readers;
22

33
import gregtech.api.util.GTUtility;
4-
54
import gregtech.common.covers.CoverItemVoidingAdvanced;
65
import gregtech.common.covers.CoverRoboticArm;
76
import gregtech.common.covers.TransferMode;
@@ -153,7 +152,7 @@ public boolean shouldShowCount() {
153152
return dirtyNotifiable instanceof CoverRoboticArm coverArm &&
154153
coverArm.getTransferMode() != TransferMode.TRANSFER_ANY ||
155154
dirtyNotifiable instanceof CoverItemVoidingAdvanced coverItem &&
156-
coverItem.getVoidingMode() != VoidingMode.VOID_ANY;
155+
coverItem.getVoidingMode() != VoidingMode.VOID_ANY;
157156
}
158157

159158
public int getStackCountInSlot(int slot) {

‎src/main/java/gregtech/common/items/MetaItem1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
import gregtech.common.items.behaviors.TricorderBehavior;
5252
import gregtech.common.items.behaviors.TurbineRotorBehavior;
5353
import gregtech.common.items.behaviors.filter.OreDictFilterUIManager;
54-
import gregtech.common.items.behaviors.filter.SimpleItemFilterUIManager;
5554
import gregtech.common.items.behaviors.filter.SimpleFluidFilterUIManager;
55+
import gregtech.common.items.behaviors.filter.SimpleItemFilterUIManager;
5656
import gregtech.common.items.behaviors.filter.SmartFilterUIManager;
5757
import gregtech.common.items.behaviors.monitorplugin.AdvancedMonitorPluginBehavior;
5858
import gregtech.common.items.behaviors.monitorplugin.FakeGuiPluginBehavior;

‎src/main/java/gregtech/common/items/behaviors/filter/BaseFilterUIManager.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
package gregtech.common.items.behaviors.filter;
22

3-
import com.cleanroommc.modularui.api.IPanelHandler;
4-
import com.cleanroommc.modularui.api.drawable.IKey;
5-
import com.cleanroommc.modularui.api.widget.IWidget;
6-
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
7-
import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
8-
import com.cleanroommc.modularui.widget.ParentWidget;
9-
import com.cleanroommc.modularui.widget.Widget;
10-
11-
import com.cleanroommc.modularui.widgets.CycleButtonWidget;
12-
133
import gregtech.api.cover.CoverWithUI;
144
import gregtech.api.items.gui.ItemUIFactory;
15-
import gregtech.api.items.metaitem.MetaItem;
165
import gregtech.api.items.metaitem.stats.IItemBehaviour;
176
import gregtech.api.mui.GTGuiTextures;
187
import gregtech.api.mui.GTGuiTheme;
198
import gregtech.api.mui.GTGuis;
209
import gregtech.api.mui.factory.MetaItemGuiFactory;
21-
2210
import gregtech.common.covers.filter.BaseFilter;
2311
import gregtech.common.covers.filter.readers.BaseFilterReader;
2412

@@ -30,14 +18,21 @@
3018
import net.minecraft.util.EnumHand;
3119
import net.minecraft.world.World;
3220

21+
import com.cleanroommc.modularui.api.IPanelHandler;
22+
import com.cleanroommc.modularui.api.drawable.IKey;
23+
import com.cleanroommc.modularui.api.widget.IWidget;
3324
import com.cleanroommc.modularui.factory.HandGuiData;
3425
import com.cleanroommc.modularui.screen.ModularPanel;
3526
import com.cleanroommc.modularui.screen.UISettings;
27+
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
28+
import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
3629
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
30+
import com.cleanroommc.modularui.widget.ParentWidget;
31+
import com.cleanroommc.modularui.widget.Widget;
32+
import com.cleanroommc.modularui.widgets.CycleButtonWidget;
3733
import org.jetbrains.annotations.NotNull;
3834

3935
import java.util.List;
40-
import java.util.Optional;
4136

4237
public abstract class BaseFilterUIManager implements IItemBehaviour, ItemUIFactory {
4338

@@ -58,7 +53,8 @@ public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager
5853
return buildUI(guiData.getUsedItemStack(), guiData, guiSyncManager, settings);
5954
}
6055

61-
public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManager syncManager, UISettings settings) {
56+
public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManager syncManager,
57+
UISettings settings) {
6258
return createBasePanel(stack)
6359
.child(CoverWithUI.createTitleRow(stack))
6460
.child(createWidgets(stack, syncManager)
@@ -69,14 +65,15 @@ public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManag
6965

7066
/**
7167
* Called when opening the filter panel from the hand
68+
*
7269
* @param stack filter stack
7370
* @return the sized panel
7471
*/
7572
// panel when opening ui in hand
7673
protected ModularPanel createBasePanel(ItemStack stack) {
7774
return GTGuis.createPanel(stack, 176, 166)
78-
// .child(CoverWithUI.createTitleRow(stack))
79-
;
75+
// .child(CoverWithUI.createTitleRow(stack))
76+
;
8077
}
8178

8279
@Override
@@ -96,8 +93,8 @@ public IPanelHandler createPanelHandler(ItemStack stack, PanelSyncManager syncMa
9693
return (PanelSyncHandler) syncManager.panel(key,
9794
(psm, $) -> createPopupPanel(stack, psm, key)
9895
.child(CoverWithUI.createTitleRow(stack))
99-
.child(createWidgets(stack, syncManager))
100-
, true);
96+
.child(createWidgets(stack, syncManager)),
97+
true);
10198
});
10299
}
103100

‎src/main/java/gregtech/common/items/behaviors/filter/OreDictFilterUIManager.java‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
package gregtech.common.items.behaviors.filter;
22

3-
import com.cleanroommc.modularui.api.drawable.IKey;
4-
import com.cleanroommc.modularui.drawable.UITexture;
5-
import com.cleanroommc.modularui.screen.RichTooltip;
6-
import com.cleanroommc.modularui.utils.BooleanConsumer;
7-
import com.cleanroommc.modularui.utils.Color;
8-
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
9-
import com.cleanroommc.modularui.value.sync.StringSyncValue;
10-
import com.cleanroommc.modularui.widget.Widget;
11-
import com.cleanroommc.modularui.widgets.CycleButtonWidget;
12-
import com.cleanroommc.modularui.widgets.layout.Flow;
13-
14-
import gregtech.api.cover.CoverWithUI;
153
import gregtech.api.mui.GTGuiTextures;
164
import gregtech.api.mui.GTGuis;
175
import gregtech.api.util.oreglob.OreGlobCompileResult;
186
import gregtech.common.covers.filter.BaseFilter;
19-
20-
import com.cleanroommc.modularui.factory.HandGuiData;
21-
import com.cleanroommc.modularui.screen.ModularPanel;
22-
import com.cleanroommc.modularui.screen.UISettings;
23-
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
24-
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
25-
267
import gregtech.common.covers.filter.OreDictionaryItemFilter;
278
import gregtech.common.covers.filter.readers.OreDictFilterReader;
289
import gregtech.common.mui.widget.HighlightedTextField;
@@ -32,21 +13,26 @@
3213
import net.minecraft.item.ItemStack;
3314
import net.minecraft.util.text.TextFormatting;
3415

16+
import com.cleanroommc.modularui.api.drawable.IKey;
17+
import com.cleanroommc.modularui.drawable.UITexture;
18+
import com.cleanroommc.modularui.screen.ModularPanel;
19+
import com.cleanroommc.modularui.screen.RichTooltip;
20+
import com.cleanroommc.modularui.utils.BooleanConsumer;
21+
import com.cleanroommc.modularui.utils.Color;
22+
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
23+
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
24+
import com.cleanroommc.modularui.value.sync.StringSyncValue;
25+
import com.cleanroommc.modularui.widget.Widget;
26+
import com.cleanroommc.modularui.widgets.CycleButtonWidget;
27+
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
28+
import com.cleanroommc.modularui.widgets.layout.Flow;
3529
import org.jetbrains.annotations.NotNull;
3630

3731
import java.util.ArrayList;
3832
import java.util.List;
3933

4034
public class OreDictFilterUIManager extends BaseFilterUIManager {
4135

42-
// @Override
43-
// public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
44-
// var filter = BaseFilter.getFilterFromStack(stack);
45-
// return createBasePanel(filter.getContainerStack()).height(160)
46-
// .child(filter.createWidgets(guiSyncManager).top(22).margin(7, 0))
47-
// .child(SlotGroupWidget.playerInventory(true));
48-
// }
49-
5036
@Override
5137
protected ModularPanel createBasePanel(ItemStack stack) {
5238
return super.createBasePanel(stack)
@@ -57,11 +43,7 @@ protected ModularPanel createBasePanel(ItemStack stack) {
5743
public @NotNull ModularPanel createPopupPanel(ItemStack stack, PanelSyncManager syncManager, String panelName) {
5844
return super.createPopupPanel(stack, syncManager, panelName)
5945
.size(188, 76)
60-
// return GTGuis.createPopupPanel(panelName, 188, 76, false)
61-
.padding(7)
62-
// .child(CoverWithUI.createTitleRow(stack))
63-
// .child(createWidgets(stack, syncManager).top(22))
64-
;
46+
.padding(7);
6547
}
6648

6749
@Override
@@ -118,7 +100,8 @@ protected ModularPanel createBasePanel(ItemStack stack) {
118100
.child(new Widget<>()
119101
.size(8).bottom(0)
120102
.onUpdateListener(widget -> getStatusIcon(filterReader.getResult(), widget))
121-
.tooltipBuilder(richTooltip -> createStatusTooltip(filterReader.getResult(), richTooltip))
103+
.tooltipBuilder(richTooltip -> createStatusTooltip(filterReader.getResult(),
104+
richTooltip))
122105
.tooltip(tooltip -> tooltip.setAutoUpdate(true))))
123106
.child(SlotGroupWidget.builder()
124107
.row("XXXXX")

‎src/main/java/gregtech/common/items/behaviors/filter/SimpleFluidFilterUIManager.java‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,24 @@
11
package gregtech.common.items.behaviors.filter;
22

3-
import com.cleanroommc.modularui.widget.Widget;
4-
import com.cleanroommc.modularui.widgets.layout.Flow;
5-
6-
import gregtech.api.cover.CoverWithUI;
73
import gregtech.api.mui.GTGuis;
8-
import gregtech.common.covers.filter.BaseFilter;
9-
10-
import com.cleanroommc.modularui.factory.HandGuiData;
11-
import com.cleanroommc.modularui.screen.ModularPanel;
12-
import com.cleanroommc.modularui.screen.UISettings;
13-
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
14-
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
15-
164
import gregtech.common.covers.filter.readers.SimpleFluidFilterReader;
175
import gregtech.common.mui.widget.GTFluidSlot;
186

197
import net.minecraft.item.ItemStack;
208

9+
import com.cleanroommc.modularui.screen.ModularPanel;
10+
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
11+
import com.cleanroommc.modularui.widget.Widget;
12+
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
13+
import com.cleanroommc.modularui.widgets.layout.Flow;
2114
import org.jetbrains.annotations.NotNull;
2215

2316
public class SimpleFluidFilterUIManager extends BaseFilterUIManager {
2417

25-
// @Override
26-
// public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
27-
// var filter = BaseFilter.getFilterFromStack(guiData.getUsedItemStack());
28-
// return createBasePanel(filter.getContainerStack())
29-
// .height(166)
30-
// .child(filter.createWidgets(guiSyncManager)
31-
// .top(22)
32-
// .left(7))
33-
// .child(SlotGroupWidget.playerInventory(true));
34-
// }
35-
3618
@Override
3719
public @NotNull ModularPanel createPopupPanel(ItemStack stack, PanelSyncManager syncManager, String panelName) {
3820
return super.createPopupPanel(stack, syncManager, panelName)
39-
// return GTGuis.createPopupPanel(panelName, 98, 81, false)
40-
.padding(4)
41-
// .child(CoverWithUI.createTitleRow(stack))
42-
// .child(createWidgets(stack, syncManager).top(22))
43-
;
21+
.padding(4);
4422
}
4523

4624
@Override

‎src/main/java/gregtech/common/items/behaviors/filter/SimpleItemFilterUIManager.java‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,34 @@
11
package gregtech.common.items.behaviors.filter;
22

3+
import gregtech.api.mui.GTGuiTextures;
4+
import gregtech.api.mui.GTGuis;
5+
import gregtech.api.util.TextFormattingUtil;
6+
import gregtech.common.covers.filter.BaseFilter;
7+
import gregtech.common.covers.filter.readers.SimpleItemFilterReader;
8+
9+
import net.minecraft.item.ItemStack;
10+
311
import com.cleanroommc.modularui.api.drawable.IKey;
12+
import com.cleanroommc.modularui.screen.ModularPanel;
413
import com.cleanroommc.modularui.utils.Color;
514
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
15+
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
616
import com.cleanroommc.modularui.value.sync.SyncHandlers;
717
import com.cleanroommc.modularui.widget.Widget;
818
import com.cleanroommc.modularui.widgets.CycleButtonWidget;
19+
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
920
import com.cleanroommc.modularui.widgets.layout.Flow;
1021
import com.cleanroommc.modularui.widgets.slot.PhantomItemSlot;
1122
import com.cleanroommc.modularui.widgets.slot.SlotGroup;
12-
13-
import gregtech.api.cover.CoverWithUI;
14-
import gregtech.api.mui.GTGuiTextures;
15-
import gregtech.api.mui.GTGuis;
16-
import gregtech.api.util.TextFormattingUtil;
17-
import gregtech.common.covers.filter.BaseFilter;
18-
19-
import com.cleanroommc.modularui.factory.HandGuiData;
20-
import com.cleanroommc.modularui.screen.ModularPanel;
21-
import com.cleanroommc.modularui.screen.UISettings;
22-
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
23-
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
24-
25-
import gregtech.common.covers.filter.readers.SimpleItemFilterReader;
26-
27-
import net.minecraft.item.ItemStack;
28-
2923
import org.jetbrains.annotations.NotNull;
3024

3125
public class SimpleItemFilterUIManager extends BaseFilterUIManager {
3226

33-
// @Override
34-
// public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
35-
// return createPanel(guiData.getUsedItemStack(), guiSyncManager);
36-
// }
37-
38-
// @Override
39-
// public @NotNull ModularPanel createPopupPanel(ItemStack stack, PanelSyncManager syncManager, String panelName) {
40-
// return super.createPopupPanel(stack, syncManager, panelName)
41-
// return GTGuis.createPopupPanel(panelName, 98, 81, false)
42-
// .child(CoverWithUI.createTitleRow(stack))
43-
// .child(createWidgets(stack, syncManager).top(22).left(4))
44-
;
45-
// }
27+
@Override
28+
public @NotNull ModularPanel createPopupPanel(ItemStack stack, PanelSyncManager syncManager, String panelName) {
29+
return super.createPopupPanel(stack, syncManager, panelName)
30+
.padding(4);
31+
}
4632

4733
@Override
4834
public @NotNull ModularPanel createPanel(ItemStack stack, PanelSyncManager syncManager) {
@@ -52,7 +38,8 @@ public class SimpleItemFilterUIManager extends BaseFilterUIManager {
5238
@SuppressWarnings("UnstableApiUsage")
5339
@Override
5440
public @NotNull Widget<?> createWidgets(ItemStack stack, PanelSyncManager syncManager) {
55-
SimpleItemFilterReader filterReader = (SimpleItemFilterReader) BaseFilter.getFilterFromStack(stack).getFilterReader();
41+
SimpleItemFilterReader filterReader = (SimpleItemFilterReader) BaseFilter.getFilterFromStack(stack)
42+
.getFilterReader();
5643
SlotGroup filterInventory = new SlotGroup("filter_inv", 3, 1000, true);
5744
var ignoreDamage = new BooleanSyncValue(filterReader::isIgnoreDamage, filterReader::setIgnoreDamage);
5845
var ignoreNBT = new BooleanSyncValue(filterReader::isIgnoreNBT, filterReader::setIgnoreNBT);

0 commit comments

Comments
 (0)