Only create and register sync handlers if the rows are enabled

Author: Zorbatron

src/main/java/gregtech/common/covers/CoverConveyor.java

@@ -499,24 +499,14 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
 
     protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
         // noinspection DuplicatedCode
-        EnumSyncValue<ManualImportExportMode> manualIOModeSync = new EnumSyncValue<>(ManualImportExportMode.class,
-                this::getManualImportExportMode, this::setManualImportExportMode);
-        EnumSyncValue<IOMode> conveyorModeSync = new EnumSyncValue<>(IOMode.class, this::getIOMode, this::setIOMode);
-        EnumSyncValue<DistributionMode> distributionModeSync = new EnumSyncValue<>(DistributionMode.class,
-                this::getDistributionMode, this::setDistributionMode);
-        IntSyncValue throughputSync = new IntSyncValue(this::getTransferRate, this::setTransferRate);
-
-        guiSyncManager.syncValue("manual_io", manualIOModeSync);
-        guiSyncManager.syncValue("conveyor_mode", conveyorModeSync);
-        guiSyncManager.syncValue("distribution_mode", distributionModeSync);
-
         Flow column = Flow.column()
                 .top(24)
                 .widthRel(1f)
                 .margin(7, 0)
                 .coverChildrenHeight();
 
         if (createThroughputRow()) {
+            IntSyncValue throughputSync = new IntSyncValue(this::getTransferRate, this::setTransferRate);
             column.child(Flow.row()
                     .widthRel(1f)
                     .coverChildrenHeight()
@@ -553,7 +543,14 @@ protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
             column.child(getItemFilterContainer().initUI(data, guiSyncManager));
         }
 
+        EnumSyncValue<IOMode> conveyorModeSync = new EnumSyncValue<>(IOMode.class, this::getIOMode, this::setIOMode);
+        guiSyncManager.syncValue("conveyor_mode", conveyorModeSync);
+
         if (createManualIOModeRow()) {
+            EnumSyncValue<ManualImportExportMode> manualIOModeSync = new EnumSyncValue<>(ManualImportExportMode.class,
+                    this::getManualImportExportMode, this::setManualImportExportMode);
+            guiSyncManager.syncValue("manual_io", manualIOModeSync);
+
             // noinspection DuplicatedCode
             column.child(new EnumRowBuilder<>(ManualImportExportMode.class)
                     .value(manualIOModeSync)
@@ -581,6 +578,10 @@ protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
         }
 
         if (createDistributionModeRow()) {
+            EnumSyncValue<DistributionMode> distributionModeSync = new EnumSyncValue<>(DistributionMode.class,
+                    this::getDistributionMode, this::setDistributionMode);
+            guiSyncManager.syncValue("distribution_mode", distributionModeSync);
+
             column.child(new EnumRowBuilder<>(DistributionMode.class)
                     .value(distributionModeSync)
                     .rowDescription(IKey.lang("cover.conveyor.distribution.name"))

src/main/java/gregtech/common/covers/CoverPump.java

@@ -187,21 +187,14 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
 
     protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
         // noinspection DuplicatedCode
-        EnumSyncValue<ManualImportExportMode> manualIOModeSync = new EnumSyncValue<>(ManualImportExportMode.class,
-                this::getManualImportExportMode, this::setManualImportExportMode);
-        EnumSyncValue<IOMode> pumpModeSync = new EnumSyncValue<>(IOMode.class, this::getIoMode, this::setIoMode);
-        IntSyncValue throughputSync = new IntSyncValue(this::getTransferRate, this::setTransferRate);
-
-        syncManager.syncValue("manual_io", manualIOModeSync);
-        syncManager.syncValue("pump_mode", pumpModeSync);
-
         Flow column = Flow.column()
                 .top(24)
                 .margin(7, 0)
                 .widthRel(1f)
                 .coverChildrenHeight();
 
-        if (createThroughputRow())
+        if (createThroughputRow()) {
+            IntSyncValue throughputSync = new IntSyncValue(this::getTransferRate, this::setTransferRate);
             column.child(Flow.row()
                     .widthRel(1f)
                     .marginBottom(2)
@@ -230,12 +223,20 @@ protected Flow createUI(GuiData data, PanelSyncManager syncManager) {
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(true)))));
+        }
 
         if (createFilterRow()) {
             column.child(getFluidFilterContainer().initUI(data, syncManager));
         }
 
+        EnumSyncValue<IOMode> pumpModeSync = new EnumSyncValue<>(IOMode.class, this::getIoMode, this::setIoMode);
+        syncManager.syncValue("pump_mode", pumpModeSync);
+
         if (createManualIOModeRow()) {
+            EnumSyncValue<ManualImportExportMode> manualIOModeSync = new EnumSyncValue<>(ManualImportExportMode.class,
+                    this::getManualImportExportMode, this::setManualImportExportMode);
+            syncManager.syncValue("manual_io", manualIOModeSync);
+
             // noinspection DuplicatedCode
             column.child(new EnumRowBuilder<>(ManualImportExportMode.class)
                     .value(manualIOModeSync)