Make ComponentStorage iterable

Author: Swedz

src/client/java/aztech/modern_industrialization/machines/gui/MachineScreen.java

@@ -64,7 +64,9 @@ public class MachineScreen extends MIHandledScreen<MachineMenuClient> implements
     public MachineScreen(MachineMenuClient handler, Inventory inventory, Component title) {
         super(handler, inventory, title);
 
-        handler.components.forEach(component -> renderers.add(component.createRenderer(this)));
+        for (GuiComponentClient component : handler.components) {
+            renderers.add(component.createRenderer(this));
+        }
 
         this.imageHeight = handler.guiParams.backgroundHeight;
         this.imageWidth = handler.guiParams.backgroundWidth;

src/main/java/aztech/modern_industrialization/machines/ComponentStorage.java

@@ -26,16 +26,24 @@
 import aztech.modern_industrialization.machines.gui.GuiComponent;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
 
-public sealed class ComponentStorage<C> permits ComponentStorage.GuiServer, ComponentStorage.Server {
+public sealed class ComponentStorage<C> implements Iterable<C> permits ComponentStorage.GuiServer, ComponentStorage.Server {
     protected final List<C> components = new ArrayList<>();
 
+    @NotNull
+    @Override
+    public Iterator<C> iterator() {
+        return components.iterator();
+    }
+
     @SafeVarargs
     public final void register(C... components) {
         Collections.addAll(this.components, components);
@@ -56,10 +64,6 @@ public final C get(int index) {
         return components.get(index);
     }
 
-    public final void forEach(Consumer<C> action) {
-        components.forEach(action);
-    }
-
     public final void forEachIndexed(BiConsumer<Integer, C> action) {
         for (int i = 0; i < components.size(); i++) {
             action.accept(i, components.get(i));

src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java

@@ -139,10 +139,10 @@ public final void writeScreenOpeningData(RegistryFriendlyByteBuf buf) {
         inv.fluidPositions.write(buf);
         buf.writeInt(guiComponents.size());
         // Write components
-        guiComponents.forEach(component -> {
+        for (GuiComponent.Server component : guiComponents) {
             buf.writeResourceLocation(component.getId());
             component.writeInitialData(buf);
-        });
+        }
         // Write GUI params
         guiParams.write(buf);
     }
@@ -201,13 +201,17 @@ public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
         CompoundTag tag = new CompoundTag();
         tag.putBoolean("remesh", syncCausesRemesh);
         syncCausesRemesh = false;
-        icomponents.forEach(component -> component.writeClientNbt(tag, registries));
+        for (IComponent component : icomponents) {
+            component.writeClientNbt(tag, registries);
+        }
         return tag;
     }
 
     @Override
     public final void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
-        icomponents.forEach(component -> component.writeNbt(tag, registries));
+        for (IComponent component : icomponents) {
+            component.writeNbt(tag, registries);
+        }
     }
 
     @Override
@@ -217,10 +221,14 @@ public final void loadAdditional(CompoundTag tag, HolderLookup.Provider registri
 
     public final void load(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) {
         if (!tag.contains("remesh")) {
-            icomponents.forEach(component -> component.readNbt(tag, registries, isUpgradingMachine));
+            for (IComponent component : icomponents) {
+                component.readNbt(tag, registries, isUpgradingMachine);
+            }
         } else {
             boolean forceChunkRemesh = tag.getBoolean("remesh");
-            icomponents.forEach(component -> component.readClientNbt(tag, registries));
+            for (IComponent component : icomponents) {
+                component.readClientNbt(tag, registries);
+            }
             if (forceChunkRemesh) {
                 WorldHelper.forceChunkRemesh(level, worldPosition);
                 requestModelDataUpdate();

src/main/java/aztech/modern_industrialization/machines/gui/MachineMenuCommon.java

@@ -53,7 +53,9 @@ public abstract class MachineMenuCommon extends ConfigurableScreenHandler implem
         }
 
         // Gui components first (we want to prioritize them with shift click)
-        guiComponents.forEach(component -> component.setupMenu(this));
+        for (GuiComponent.Common component : guiComponents) {
+            component.setupMenu(this);
+        }
 
         // Configurable slots
         for (int i = 0; i < inventory.getItemStacks().size(); ++i) {

src/main/java/aztech/modern_industrialization/machines/gui/MachineMenuServer.java

@@ -42,7 +42,9 @@ public MachineMenuServer(int syncId, Inventory playerInventory, MachineBlockEnti
         super(syncId, playerInventory, blockEntity.getInventory(), guiParams, blockEntity.getGuiComponents());
         this.blockEntity = blockEntity;
         trackedData = new ArrayList<>();
-        blockEntity.getGuiComponents().forEach(component -> trackedData.add(component.copyData()));
+        for (GuiComponent.Server component : blockEntity.getGuiComponents()) {
+            trackedData.add(component.copyData());
+        }
     }
 
     @Override