Split simple and literal member types so they are loaded differently

Author: Swedz

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

@@ -107,10 +107,10 @@ public void save(CompoundTag tag) {
     }
 
     @Override
-    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean attempt) {
+    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean required) {
         assertLoaded();
 
-        if (attempt) {
+        if (required) {
             var state = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.asBlock().defaultBlockState();
             state = state.setValue(StructureMultiblockMemberBlock.MODE, StructureMemberMode.HATCH);
             var be = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.get().newBlockEntity(pos, state);

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

@@ -0,0 +1,52 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.machines.multiblocks.structure.member;
+
+import aztech.modern_industrialization.blocks.FastBlockEntity;
+import aztech.modern_industrialization.machines.multiblocks.structure.member.test.StateStructureMemberTest;
+import com.mojang.datafixers.util.Pair;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class LiteralStructureMember extends SimpleStructureMember {
+    public LiteralStructureMember(Supplier<BlockState> blockState) {
+        super(blockState, List.of(new StateStructureMemberTest(blockState)));
+    }
+
+    public LiteralStructureMember() {
+    }
+
+    @Override
+    public String typeId() {
+        return "literal";
+    }
+
+    @Override
+    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean required) {
+        return Optional.empty();
+    }
+}

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

@@ -51,10 +51,10 @@ public class SimpleStructureMember extends StructureMember {
 
     private BlockState preview;
 
-    public SimpleStructureMember(Supplier<BlockState> previewSupplier, List<StructureMemberTest> tests) {
-        Objects.requireNonNull(previewSupplier);
+    public SimpleStructureMember(Supplier<BlockState> preview, List<StructureMemberTest> tests) {
+        Objects.requireNonNull(preview);
         Objects.requireNonNull(tests);
-        this.previewSupplier = previewSupplier;
+        this.previewSupplier = preview;
         this.tests = tests;
     }
 
@@ -120,10 +120,10 @@ public void save(CompoundTag tag) {
     }
 
     @Override
-    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean attempt) {
+    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean required) {
         assertLoaded();
 
-        if (attempt && tests.size() > 1) {
+        if (required) {
             var state = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.asBlock().defaultBlockState();
             state = state.setValue(StructureMultiblockMemberBlock.MODE, StructureMemberMode.SIMPLE);
             var be = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.get().newBlockEntity(pos, state);

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

@@ -27,7 +27,6 @@
 import aztech.modern_industrialization.machines.models.MachineCasing;
 import aztech.modern_industrialization.machines.multiblocks.HatchFlags;
 import aztech.modern_industrialization.machines.multiblocks.SimpleMember;
-import aztech.modern_industrialization.machines.multiblocks.structure.member.test.StateStructureMemberTest;
 import aztech.modern_industrialization.machines.multiblocks.structure.member.test.StructureMemberTest;
 import com.mojang.datafixers.util.Pair;
 import java.util.List;
@@ -58,14 +57,14 @@ public void save(CompoundTag tag) {
         assertLoaded();
     }
 
-    public abstract Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean attempt);
+    public abstract Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean required);
 
     public static SimpleStructureMember simple(Supplier<BlockState> preview, List<StructureMemberTest> tests) {
         return new SimpleStructureMember(preview, tests);
     }
 
-    public static SimpleStructureMember literal(Supplier<BlockState> blockState) {
-        return simple(blockState, List.of(new StateStructureMemberTest(blockState)));
+    public static LiteralStructureMember literal(Supplier<BlockState> blockState) {
+        return new LiteralStructureMember(blockState);
     }
 
     public static HatchStructureMember hatch(Supplier<BlockState> preview, List<StructureMemberTest> tests, MachineCasing casing,
@@ -85,6 +84,7 @@ public static StructureMember from(CompoundTag tag) {
         String type = tag.getString("type");
         StructureMember member = switch (type) {
         case "simple" -> new SimpleStructureMember();
+        case "literal" -> new LiteralStructureMember();
         case "hatch" -> new HatchStructureMember();
         case "variable" -> new VariableStructureMember();
         default -> throw new IllegalStateException("Unexpected type: " + type);

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

@@ -82,7 +82,7 @@ public void save(CompoundTag tag) {
     }
 
     @Override
-    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean attempt) {
+    public Optional<Pair<BlockState, FastBlockEntity>> asStructureBlock(BlockPos pos, boolean required) {
         assertLoaded();
 
         var state = MIBlock.STRUCTURE_MULTIBLOCK_MEMBER.asBlock().defaultBlockState();