Rename StructureMultiblockFormatters to StructureMultiblockInputFormatters

Author: Swedz

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

@@ -30,7 +30,7 @@
 import aztech.modern_industrialization.blocks.structure.StructureMultiblockControllerBlockEntity;
 import aztech.modern_industrialization.machines.models.MachineCasing;
 import aztech.modern_industrialization.machines.multiblocks.structure.MIStructureTemplateManager;
-import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockFormatters;
+import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockInputFormatters;
 import aztech.modern_industrialization.network.structure.StructureLoadControllerPacket;
 import aztech.modern_industrialization.network.structure.StructureSaveControllerPacket;
 import aztech.modern_industrialization.network.structure.StructureUpdateControllerPacket;
@@ -88,7 +88,7 @@ private Optional<ResourceLocation> getId() {
     }
 
     private Optional<MachineCasing> getCasing() {
-        return Optional.ofNullable(StructureMultiblockFormatters.casing(casingBox.getValue()));
+        return Optional.ofNullable(StructureMultiblockInputFormatters.casing(casingBox.getValue()));
     }
 
     private Optional<StructureControllerBounds> getBounds() {

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

@@ -28,7 +28,7 @@
 import aztech.modern_industrialization.blocks.structure.StructureMultiblockMemberBlockEntity;
 import aztech.modern_industrialization.machines.models.MachineCasing;
 import aztech.modern_industrialization.machines.multiblocks.HatchFlags;
-import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockFormatters;
+import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockInputFormatters;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.StructureMemberTest;
 import aztech.modern_industrialization.network.structure.StructureUpdateMemberPacket;
 import com.mojang.blaze3d.platform.InputConstants;
@@ -65,19 +65,19 @@ public StructureMultiblockMemberEditScreen(StructureMultiblockMemberBlockEntity
     }
 
     private Optional<BlockState> getPreview() {
-        return Optional.ofNullable(StructureMultiblockFormatters.preview(previewBox.getValue()));
+        return Optional.ofNullable(StructureMultiblockInputFormatters.preview(previewBox.getValue()));
     }
 
     private Optional<List<StructureMemberTest>> getMembers() {
-        return Optional.ofNullable(StructureMultiblockFormatters.members(membersBox.getValue()));
+        return Optional.ofNullable(StructureMultiblockInputFormatters.members(membersBox.getValue()));
     }
 
     private Optional<MachineCasing> getCasing() {
-        return Optional.ofNullable(StructureMultiblockFormatters.casing(casingBox.getValue()));
+        return Optional.ofNullable(StructureMultiblockInputFormatters.casing(casingBox.getValue()));
     }
 
     private Optional<HatchFlags> getHatchFlags() {
-        return Optional.ofNullable(StructureMultiblockFormatters.hatchFlags(flagsBox.getValue()));
+        return Optional.ofNullable(StructureMultiblockInputFormatters.hatchFlags(flagsBox.getValue()));
     }
 
     private void updatePreview() {

src/main/java/aztech/modern_industrialization/blocks/structure/StructureMultiblockControllerBlockEntity.java

@@ -26,7 +26,7 @@
 import aztech.modern_industrialization.MIRegistries;
 import aztech.modern_industrialization.blocks.FastBlockEntity;
 import aztech.modern_industrialization.machines.models.MachineCasing;
-import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockFormatters;
+import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockInputFormatters;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.StructureMember;
 import java.util.Locale;
 import java.util.Objects;
@@ -82,7 +82,7 @@ public String getInputCasing() {
 
     public void setInputCasing(String inputCasing) {
         this.inputCasing = inputCasing;
-        casing = StructureMultiblockFormatters.casing(inputCasing);
+        casing = StructureMultiblockInputFormatters.casing(inputCasing);
     }
 
     @Nullable

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

@@ -27,7 +27,7 @@
 import aztech.modern_industrialization.blocks.FastBlockEntity;
 import aztech.modern_industrialization.machines.models.MachineCasing;
 import aztech.modern_industrialization.machines.multiblocks.HatchFlags;
-import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockFormatters;
+import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockInputFormatters;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.StructureMember;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.StructureMemberTest;
 import java.util.List;
@@ -62,7 +62,7 @@ public String getInputPreview() {
 
     public void setInputPreview(String inputPreview) {
         this.inputPreview = inputPreview;
-        preview = StructureMultiblockFormatters.preview(inputPreview);
+        preview = StructureMultiblockInputFormatters.preview(inputPreview);
     }
 
     @Nullable
@@ -77,7 +77,7 @@ public String getInputMembers() {
 
     public void setInputMembers(String inputMembers) {
         this.inputMembers = inputMembers;
-        members = StructureMultiblockFormatters.members(inputMembers);
+        members = StructureMultiblockInputFormatters.members(inputMembers);
     }
 
     @Nullable
@@ -92,7 +92,7 @@ public String getInputCasing() {
 
     public void setInputCasing(String inputCasing) {
         this.inputCasing = inputCasing;
-        casing = StructureMultiblockFormatters.casing(inputCasing);
+        casing = StructureMultiblockInputFormatters.casing(inputCasing);
     }
 
     @Nullable
@@ -102,7 +102,7 @@ public String getInputFlags() {
 
     public void setInputFlags(String inputFlags) {
         this.inputFlags = inputFlags;
-        flags = StructureMultiblockFormatters.hatchFlags(inputFlags);
+        flags = StructureMultiblockInputFormatters.hatchFlags(inputFlags);
     }
 
     @Nullable

src/main/java/aztech/modern_industrialization/machines/multiblocks/ShapeMatcher.java

@@ -25,7 +25,7 @@
 
 import aztech.modern_industrialization.MIBlock;
 import aztech.modern_industrialization.blocks.structure.StructureMultiblockMemberBlockEntity;
-import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockFormatters;
+import aztech.modern_industrialization.machines.multiblocks.structure.StructureMultiblockInputFormatters;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.StructureMember;
 import aztech.modern_industrialization.machines.multiblocks.world.ChunkEventListener;
 import aztech.modern_industrialization.machines.multiblocks.world.ChunkEventListeners;
@@ -265,11 +265,11 @@ public int buildMultiblock(Level level, boolean structureBlocks) {
                             state = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.asBlock().defaultBlockState();
                             level.setBlockAndUpdate(pos, state);
                             StructureMultiblockMemberBlockEntity be = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.get().newBlockEntity(pos, state);
-                            be.setInputPreview(StructureMultiblockFormatters.preview(member.preview()));
-                            be.setInputMembers(StructureMultiblockFormatters.members(member.tests()));
+                            be.setInputPreview(StructureMultiblockInputFormatters.preview(member.preview()));
+                            be.setInputMembers(StructureMultiblockInputFormatters.members(member.tests()));
                             if (hasHatchFlags) {
-                                be.setInputCasing(StructureMultiblockFormatters.casing(member.casing()));
-                                be.setInputFlags(StructureMultiblockFormatters.hatchFlags(member.hatchFlags()));
+                                be.setInputCasing(StructureMultiblockInputFormatters.casing(member.casing()));
+                                be.setInputFlags(StructureMultiblockInputFormatters.hatchFlags(member.hatchFlags()));
                             }
                             level.setBlockEntity(be);
                             be.setChanged();

src/main/java/aztech/modern_industrialization/machines/multiblocks/structure/StructureMultiblockFormatters.java renamed to src/main/java/aztech/modern_industrialization/machines/multiblocks/structure/StructureMultiblockInputFormatters.java

@@ -43,7 +43,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
 
-public final class StructureMultiblockFormatters {
+public final class StructureMultiblockInputFormatters {
     @Nullable
     public static MachineCasing casing(String input) {
         if (input == null || input.isEmpty()) {
@@ -188,6 +188,6 @@ public static String hatchFlags(HatchFlags hatchFlags) {
         return string.toString();
     }
 
-    private StructureMultiblockFormatters() {
+    private StructureMultiblockInputFormatters() {
     }
 }