Rename components variable and make them public instead of using getters

Author: Swedz

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

@@ -71,8 +71,8 @@
 @SuppressWarnings("rawtypes")
 public abstract class MachineBlockEntity extends FastBlockEntity
         implements MenuProvider, WrenchableBlockEntity {
-    protected final ComponentStorage.GuiServer guiComponents = new ComponentStorage.GuiServer();
-    protected final ComponentStorage.Server icomponents = new ComponentStorage.Server();
+    public final ComponentStorage.GuiServer guiComponents = new ComponentStorage.GuiServer();
+    public final ComponentStorage.Server components = new ComponentStorage.Server();
     public final MachineGuiParameters guiParams;
     /**
      * Server-side only: true if the next call to sync() will trigger a remesh.
@@ -101,22 +101,14 @@ protected final void registerGuiComponent(GuiComponent.Server... components) {
     }
 
     protected final void registerComponents(IComponent... components) {
-        icomponents.register(components);
+        this.components.register(components);
     }
 
     /**
      * @return The inventory that will be synced with the client.
      */
     public abstract MIInventory getInventory();
 
-    public final ComponentStorage.GuiServer getGuiComponents() {
-        return guiComponents;
-    }
-
-    public final ComponentStorage.Server getComponents() {
-        return icomponents;
-    }
-
     @Override
     public final Component getDisplayName() {
         return Component.translatable(Util.makeDescriptionId("block", guiParams.blockId));
@@ -201,15 +193,15 @@ public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
         CompoundTag tag = new CompoundTag();
         tag.putBoolean("remesh", syncCausesRemesh);
         syncCausesRemesh = false;
-        for (IComponent component : icomponents) {
+        for (IComponent component : components) {
             component.writeClientNbt(tag, registries);
         }
         return tag;
     }
 
     @Override
     public final void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
-        for (IComponent component : icomponents) {
+        for (IComponent component : components) {
             component.writeNbt(tag, registries);
         }
     }
@@ -221,12 +213,12 @@ public final void loadAdditional(CompoundTag tag, HolderLookup.Provider registri
 
     public final void load(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) {
         if (!tag.contains("remesh")) {
-            for (IComponent component : icomponents) {
+            for (IComponent component : components) {
                 component.readNbt(tag, registries, isUpgradingMachine);
             }
         } else {
             boolean forceChunkRemesh = tag.getBoolean("remesh");
-            for (IComponent component : icomponents) {
+            for (IComponent component : components) {
                 component.readClientNbt(tag, registries);
             }
             if (forceChunkRemesh) {
@@ -263,7 +255,7 @@ public static void registerFluidApi(BlockEntityType<?> bet) {
 
     public List<ItemStack> dropExtra() {
         List<ItemStack> drops = new ArrayList<>();
-        icomponents.forType(DropableComponent.class, u -> drops.add(u.getDrop()));
+        components.forType(DropableComponent.class, u -> drops.add(u.getDrop()));
         return drops;
     }
 

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java

@@ -76,13 +76,13 @@ protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, D
             result = LubricantHelper.onUse(this.crafter, player, hand);
         }
         if (!result.consumesAction()) {
-            result = icomponents.mapOrDefault(UpgradeComponent.class, upgrade -> upgrade.onUse(this, player, hand), result);
+            result = components.mapOrDefault(UpgradeComponent.class, upgrade -> upgrade.onUse(this, player, hand), result);
         }
         if (!result.consumesAction()) {
             result = redstoneControl.onUse(this, player, hand);
         }
         if (!result.consumesAction()) {
-            result = icomponents.mapOrDefault(OverdriveComponent.class, overdrive -> overdrive.onUse(this, player, hand), result);
+            result = components.mapOrDefault(OverdriveComponent.class, overdrive -> overdrive.onUse(this, player, hand), result);
         }
         return result;
     }

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

@@ -39,18 +39,18 @@ public class MachineMenuServer extends MachineMenuCommon {
     protected final List trackedData;
 
     public MachineMenuServer(int syncId, Inventory playerInventory, MachineBlockEntity blockEntity, MachineGuiParameters guiParams) {
-        super(syncId, playerInventory, blockEntity.getInventory(), guiParams, blockEntity.getGuiComponents());
+        super(syncId, playerInventory, blockEntity.getInventory(), guiParams, blockEntity.guiComponents);
         this.blockEntity = blockEntity;
         trackedData = new ArrayList<>();
-        for (GuiComponent.Server component : blockEntity.getGuiComponents()) {
+        for (GuiComponent.Server component : blockEntity.guiComponents) {
             trackedData.add(component.copyData());
         }
     }
 
     @Override
     public void broadcastChanges() {
         super.broadcastChanges();
-        blockEntity.getGuiComponents().forEachIndexed((i, component) -> {
+        blockEntity.guiComponents.forEachIndexed((i, component) -> {
             if (component.needsSync(trackedData.get(i))) {
                 var buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), blockEntity.getLevel().registryAccess());
                 component.writeCurrentData(buf);

src/main/java/aztech/modern_industrialization/network/machines/ChangeShapePacket.java

@@ -50,7 +50,7 @@ public void handle(Context ctx) {
 
         AbstractContainerMenu menu = ctx.getPlayer().containerMenu;
         if (menu.containerId == syncId && menu instanceof MachineMenuServer machineMenu) {
-            ShapeSelection.Server shapeSelection = machineMenu.blockEntity.getGuiComponents().get(GuiComponents.SHAPE_SELECTION);
+            ShapeSelection.Server shapeSelection = machineMenu.blockEntity.guiComponents.get(GuiComponents.SHAPE_SELECTION);
             shapeSelection.behavior.handleClick(shapeLine, clickedLeftButton ? -1 : +1);
         }
     }

src/main/java/aztech/modern_industrialization/network/machines/ReiLockSlotsPacket.java

@@ -48,7 +48,7 @@ public void handle(Context ctx) {
         AbstractContainerMenu sh = ctx.getPlayer().containerMenu;
         if (sh.containerId == containedId && sh instanceof MachineMenuServer screenHandler) {
             // Check that locking the slots is allowed in the first place
-            ReiSlotLocking.Server slotLocking = screenHandler.blockEntity.getGuiComponents().get(GuiComponents.REI_SLOT_LOCKING);
+            ReiSlotLocking.Server slotLocking = screenHandler.blockEntity.guiComponents.get(GuiComponents.REI_SLOT_LOCKING);
             if (!slotLocking.allowLocking.get())
                 return;
 

src/main/java/aztech/modern_industrialization/network/machines/SetAutoExtractPacket.java

@@ -50,7 +50,7 @@ public void handle(Context ctx) {
 
         if (ctx.getPlayer().containerMenu.containerId == syncId) {
             var screenHandler = (MachineMenuServer) ctx.getPlayer().containerMenu;
-            AutoExtract.Server autoExtract = screenHandler.blockEntity.getGuiComponents().get(GuiComponents.AUTO_EXTRACT);
+            AutoExtract.Server autoExtract = screenHandler.blockEntity.guiComponents.get(GuiComponents.AUTO_EXTRACT);
             OrientationComponent orientation = autoExtract.getOrientation();
             if (isItem) {
                 orientation.extractItems = isExtract;