small fixes

Author: ghzdude

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

@@ -58,8 +58,7 @@ public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManag
         return createBasePanel(stack)
                 .child(CoverWithUI.createTitleRow(stack))
                 .child(createWidgets(stack, syncManager)
-                        .marginTop(22)
-                        .marginLeft(7))
+                        .marginTop(18))
                 .bindPlayerInventory();
     }
 
@@ -72,8 +71,7 @@ public ModularPanel buildUI(ItemStack stack, HandGuiData guiData, PanelSyncManag
     // panel when opening ui in hand
     protected ModularPanel createBasePanel(ItemStack stack) {
         return GTGuis.createPanel(stack, 176, 166)
-        // .child(CoverWithUI.createTitleRow(stack))
-        ;
+                .padding(7);
     }
 
     @Override
@@ -93,7 +91,8 @@ public IPanelHandler createPanelHandler(ItemStack stack, PanelSyncManager syncMa
             return (PanelSyncHandler) syncManager.panel(key,
                     (psm, $) -> createPopupPanel(stack, psm, key)
                             .child(CoverWithUI.createTitleRow(stack))
-                            .child(createWidgets(stack, syncManager)),
+                            .child(createWidgets(stack, syncManager)
+                                    .marginTop(18)),
                     true);
         });
     }
@@ -113,7 +112,9 @@ public IPanelHandler createPanelHandler(ItemStack stack, PanelSyncManager syncMa
     public abstract Widget<?> createWidgets(ItemStack stack, PanelSyncManager syncManager);
 
     public BaseFilterReader getFilterReader(ItemStack stack) {
-        return BaseFilter.getFilterFromStack(stack).getFilterReader();
+        BaseFilterReader filterReader = BaseFilter.getFilterFromStack(stack).getFilterReader();
+        filterReader.readStack(stack);
+        return filterReader;
     }
 
     public IWidget createBlacklistUI(ItemStack filterStack) {

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

@@ -55,6 +55,7 @@ protected ModularPanel createBasePanel(ItemStack stack) {
     public @NotNull Widget<?> createWidgets(ItemStack stack, PanelSyncManager syncManager) {
         OreDictionaryItemFilter filter = (OreDictionaryItemFilter) BaseFilter.getFilterFromStack(stack);
         OreDictFilterReader filterReader = filter.getFilterReader();
+        filterReader.readStack(stack);
 
         List<OreFilterTestSlot> oreSlots = new ArrayList<>();
         var expression = new StringSyncValue(filterReader::getExpression, filterReader::setExpression);
@@ -79,25 +80,31 @@ protected ModularPanel createBasePanel(ItemStack stack) {
         var caseSensitive = new BooleanSyncValue(filterReader::isCaseSensitive, setCaseSensitive);
         var matchAll = new BooleanSyncValue(filterReader::shouldMatchAll, setMatchAll);
 
-        return Flow.column().widthRel(1f).coverChildrenHeight()
+        return Flow.column().coverChildren()
+                .name("root.widget.col")
                 .child(new HighlightedTextField()
                         .setHighlightRule(this::highlightRule)
                         .onUnfocus(() -> {
                             for (var slot : oreSlots) {
                                 slot.updatePreview();
                             }
                         })
+                        .name("oredict.text_field")
                         .setTextColor(Color.WHITE.darker(1))
                         .value(expression).marginBottom(4)
                         .height(18).widthRel(1f))
                 .child(Flow.row().coverChildrenHeight()
+                        .name("oredict.info.row")
                         .widthRel(1f)
                         .child(Flow.column().height(18)
+                                .name("oredict.info.status.col")
                                 .coverChildrenWidth().marginRight(2)
                                 .child(GTGuiTextures.OREDICT_INFO.asWidget()
+                                        .name("oredict.info.icon")
                                         .size(8).top(0)
                                         .addTooltipLine(IKey.lang("cover.ore_dictionary_filter.info")))
                                 .child(new Widget<>()
+                                        .name("oredict.status.icon")
                                         .size(8).bottom(0)
                                         .onUpdateListener(widget -> getStatusIcon(filterReader.getResult(), widget))
                                         .tooltipBuilder(richTooltip -> createStatusTooltip(filterReader.getResult(),
@@ -110,10 +117,11 @@ protected ModularPanel createBasePanel(ItemStack stack) {
                                             .setGlobSupplier(filterReader::getGlob);
                                     slot.setMatchAll(filterReader.shouldMatchAll());
                                     oreSlots.add(slot);
-                                    return slot;
+                                    return slot.name("oredict.test_slot." + i);
                                 })
-                                .build().marginRight(2))
+                                .build().name("oredict.test.slot_group").marginRight(2))
                         .child(new CycleButtonWidget()
+                                .name("oredict.button.case_sensitive")
                                 .size(18).value(caseSensitive)
                                 .marginRight(2)
                                 .stateBackground(0, GTGuiTextures.BUTTON_CASE_SENSITIVE[0])
@@ -123,6 +131,7 @@ protected ModularPanel createBasePanel(ItemStack stack) {
                                 .addTooltip(1,
                                         IKey.lang("cover.ore_dictionary_filter.button.case_sensitive.enabled")))
                         .child(new CycleButtonWidget()
+                                .name("oredict.button.match_all")
                                 .size(18).value(matchAll)
                                 .marginRight(2)
                                 .stateBackground(0, GTGuiTextures.BUTTON_MATCH_ALL[0])

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

@@ -29,7 +29,8 @@ public class SimpleFluidFilterUIManager extends BaseFilterUIManager {
     @Override
     public @NotNull Widget<?> createWidgets(ItemStack stack, PanelSyncManager syncManager) {
         SimpleFluidFilterReader filterReader = (SimpleFluidFilterReader) getFilterReader(stack);
-        return Flow.row().coverChildrenHeight().widthRel(1f)
+        return Flow.row().coverChildren()
+                .alignX(0f)
                 .child(SlotGroupWidget.builder()
                         .matrix("FFF",
                                 "FFF",

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

@@ -3,7 +3,6 @@
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.util.TextFormattingUtil;
-import gregtech.common.covers.filter.BaseFilter;
 import gregtech.common.covers.filter.readers.SimpleItemFilterReader;
 
 import net.minecraft.item.ItemStack;
@@ -38,15 +37,15 @@ public class SimpleItemFilterUIManager extends BaseFilterUIManager {
     @SuppressWarnings("UnstableApiUsage")
     @Override
     public @NotNull Widget<?> createWidgets(ItemStack stack, PanelSyncManager syncManager) {
-        SimpleItemFilterReader filterReader = (SimpleItemFilterReader) BaseFilter.getFilterFromStack(stack)
-                .getFilterReader();
+        SimpleItemFilterReader filterReader = (SimpleItemFilterReader) getFilterReader(stack);
         SlotGroup filterInventory = new SlotGroup("filter_inv", 3, 1000, true);
         var ignoreDamage = new BooleanSyncValue(filterReader::isIgnoreDamage, filterReader::setIgnoreDamage);
         var ignoreNBT = new BooleanSyncValue(filterReader::isIgnoreNBT, filterReader::setIgnoreNBT);
 
         syncManager.registerSlotGroup(filterInventory);
 
         return Flow.row().coverChildren()
+                .alignX(0f)
                 .child(SlotGroupWidget.builder()
                         .matrix("XXX",
                                 "XXX",

src/main/java/gregtech/common/items/behaviors/filter/SmartFilterUIManager.java

@@ -28,7 +28,8 @@ public class SmartFilterUIManager extends BaseFilterUIManager {
 
     @Override
     public @NotNull ModularPanel createPanel(ItemStack stack, PanelSyncManager syncManager) {
-        return GTGuis.createPanel("smart_item_filter", 100, 100).padding(7);
+        return GTGuis.createPanel("smart_item_filter", 100, 100)
+                .padding(7);
     }
 
     @Override
@@ -39,6 +40,7 @@ public class SmartFilterUIManager extends BaseFilterUIManager {
         syncManager.syncValue("filter_mode", filterMode);
 
         return Flow.row().coverChildren()
+                .alignX(0f)
                 .child(Flow.column().coverChildren().marginRight(4)
                         .child(createFilterModeButton(filterMode, SmartItemFilter.SmartFilteringMode.ELECTROLYZER))
                         .child(createFilterModeButton(filterMode, SmartItemFilter.SmartFilteringMode.CENTRIFUGE))