Use "hatch_flags" to store hatch flags instead of "flags"

Author: Swedz

src/client/java/aztech/modern_industrialization/gui/structure/StructureMultiblockMemberEditScreen.java

@@ -217,7 +217,7 @@ public boolean charTyped(char codePoint, int modifiers) {
             }
         };
         flagsBox.setMaxLength(Short.MAX_VALUE);
-        flagsBox.setValue(member.getInputFlags());
+        flagsBox.setValue(member.getInputHatchFlags());
         flagsBox.setResponder(text -> this.updateFlags());
         this.addRenderableWidget(flagsBox);
 

src/main/java/aztech/modern_industrialization/blocks/structure/member/StructureMultiblockMemberBlockEntity.java

@@ -51,12 +51,12 @@ public class StructureMultiblockMemberBlockEntity extends FastBlockEntity implem
     private String inputPreview;
     private String inputMembers;
     private String inputCasing;
-    private String inputFlags;
+    private String inputHatchFlags;
 
     private BlockState preview;
     private List<StructureMemberTest> members;
     private MachineCasing casing;
-    private HatchFlags flags = HatchFlags.NO_HATCH;
+    private HatchFlags hatchFlags = HatchFlags.NO_HATCH;
 
     public StructureMultiblockMemberBlockEntity(BlockPos pos, BlockState state) {
         super(MIRegistries.STRUCTURE_MULTIBLOCK_MEMBER_BE.get(), pos, state);
@@ -122,13 +122,13 @@ public void setInputCasing(String inputCasing) {
     }
 
     @Nullable
-    public String getInputFlags() {
-        return inputFlags;
+    public String getInputHatchFlags() {
+        return inputHatchFlags;
     }
 
-    public void setInputFlags(String inputFlags) {
-        this.inputFlags = inputFlags;
-        flags = StructureMultiblockInputFormatters.hatchFlags(inputFlags);
+    public void setInputHatchFlags(String inputHatchFlags) {
+        this.inputHatchFlags = inputHatchFlags;
+        hatchFlags = StructureMultiblockInputFormatters.hatchFlags(inputHatchFlags);
     }
 
     @Nullable
@@ -137,14 +137,14 @@ public MachineCasing getCasing() {
     }
 
     @Nullable
-    public HatchFlags getFlags() {
-        return flags;
+    public HatchFlags getHatchFlags() {
+        return hatchFlags;
     }
 
     @Override
     public StructureMember getMemberOverride() {
         return switch (getMode()) {
-        case HATCH -> StructureMember.hatch(() -> preview, members, casing, flags);
+        case HATCH -> StructureMember.hatch(() -> preview, members, casing, hatchFlags);
         case SIMPLE -> StructureMember.simple(() -> preview, members);
         case VARIABLE -> StructureMember.variable(inputName);
         };
@@ -156,7 +156,7 @@ public boolean isConfigurationValid() {
             return inputName != null && !inputName.isEmpty();
         } else if (preview != null && members != null && !members.isEmpty()) {
             if (mode == StructureMemberMode.HATCH) {
-                return casing != null && flags != null && !inputFlags.isEmpty();
+                return casing != null && hatchFlags != null && !inputHatchFlags.isEmpty();
             }
             return true;
         }
@@ -191,8 +191,8 @@ protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries)
         if (inputCasing != null) {
             tag.putString("casing", inputCasing);
         }
-        if (inputFlags != null) {
-            tag.putString("flags", inputFlags);
+        if (inputHatchFlags != null) {
+            tag.putString("hatch_flags", inputHatchFlags);
         }
     }
 
@@ -204,7 +204,7 @@ protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries)
         this.setInputPreview(tag.getString("preview"));
         this.setInputMembers(tag.getString("members"));
         this.setInputCasing(tag.getString("casing"));
-        this.setInputFlags(tag.getString("flags"));
+        this.setInputHatchFlags(tag.getString("hatch_flags"));
         this.updateBlockState();
     }
 

src/main/java/aztech/modern_industrialization/machines/multiblocks/structure/member/HatchStructureMember.java

@@ -117,7 +117,7 @@ public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos
             be.setInputPreview(StructureMultiblockInputFormatters.preview(getPreviewState()));
             be.setInputMembers(StructureMultiblockInputFormatters.members(tests));
             be.setInputCasing(StructureMultiblockInputFormatters.casing(casing));
-            be.setInputFlags(StructureMultiblockInputFormatters.hatchFlags(hatchFlags));
+            be.setInputHatchFlags(StructureMultiblockInputFormatters.hatchFlags(hatchFlags));
             return Optional.of(Pair.of(state, be));
         }
 

src/main/java/aztech/modern_industrialization/network/structure/StructureUpdateMemberPacket.java

@@ -76,7 +76,7 @@ public void handle(Context ctx) {
             member.setInputPreview(inputPreview);
             member.setInputMembers(inputMembers);
             member.setInputCasing(inputCasing);
-            member.setInputFlags(inputFlags);
+            member.setInputHatchFlags(inputFlags);
 
             member.sync();
             member.setChanged();