Try to guard against StructureTemplate loading mixins early

RE: #653

Author: robotgryphon

.github/workflows/ci-builds.yml

@@ -6,8 +6,6 @@ env:
 on:
   workflow_dispatch:
   push:
-    tags-ignore:
-      - "v**"
     paths:
       - "gradle/*.versions.toml"
       - "core-api/**/*"
@@ -33,7 +31,7 @@ jobs:
 
       - name: Version
         id: version
-        uses: paulhatch/semantic-version@v5.4.0
+        uses: paulhatch/semantic-version@v6.0.1
         with:
           version_format: "${major}.${minor}.${patch}"
           search_commit_body: true
@@ -66,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.git.createRef({

neoforge-main/src/main/java/dev/compactmods/machines/network/machine/OpenMachinePreviewScreenPacket.java

@@ -4,31 +4,32 @@
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.client.machine.ClientMachinePacketHandler;
 import dev.compactmods.machines.util.codec.VanillaCodecs;
+import net.minecraft.Util;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.neoforged.neoforge.network.handling.IPayloadHandler;
+import org.jetbrains.annotations.NotNull;
 
 public record OpenMachinePreviewScreenPacket(GlobalPos machinePos, String roomCode, StructureTemplate internalBlocks) implements CustomPacketPayload {
 
     public static final Type<OpenMachinePreviewScreenPacket> TYPE = new Type<>(CompactMachines.modRL("open_machine_preview_screen"));
 
-    public static final StreamCodec<FriendlyByteBuf, OpenMachinePreviewScreenPacket> STREAM_CODEC = StreamCodec.composite(
+    public static final StreamCodec<FriendlyByteBuf, OpenMachinePreviewScreenPacket> STREAM_CODEC = Util.make(() -> StreamCodec.composite(
             GlobalPos.STREAM_CODEC, OpenMachinePreviewScreenPacket::machinePos,
             ByteBufCodecs.STRING_UTF8, OpenMachinePreviewScreenPacket::roomCode,
             VanillaCodecs.STRUCTURE_TEMPLATE_STREAM_CODEC, OpenMachinePreviewScreenPacket::internalBlocks,
             OpenMachinePreviewScreenPacket::new
-    );
+    ));
 
-    public static final IPayloadHandler<OpenMachinePreviewScreenPacket> HANDLER = (pkt, ctx) -> {
-        ClientMachinePacketHandler.openRoomPreviewScreen(pkt);
-    };
+    public static final IPayloadHandler<OpenMachinePreviewScreenPacket> HANDLER = (pkt, ctx)
+            -> ClientMachinePacketHandler.openRoomPreviewScreen(pkt);
 
     @Override
-    public Type<? extends CustomPacketPayload> type() {
+    public @NotNull Type<? extends CustomPacketPayload> type() {
         return TYPE;
     }
 }

neoforge-main/src/main/java/dev/compactmods/machines/network/room/InitialRoomBlockDataPacket.java

@@ -3,27 +3,28 @@
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.client.room.ClientRoomPacketHandler;
 import dev.compactmods.machines.util.codec.VanillaCodecs;
+import net.minecraft.Util;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.neoforged.neoforge.network.handling.IPayloadHandler;
+import org.jetbrains.annotations.NotNull;
 
 public record InitialRoomBlockDataPacket(StructureTemplate blocks) implements CustomPacketPayload {
 
     public static final CustomPacketPayload.Type<InitialRoomBlockDataPacket> TYPE = new CustomPacketPayload.Type<>(CompactMachines.modRL("initial_room_block_data"));
 
-    public static final StreamCodec<FriendlyByteBuf, InitialRoomBlockDataPacket> STREAM_CODEC = StreamCodec.composite(
+    public static final StreamCodec<FriendlyByteBuf, InitialRoomBlockDataPacket> STREAM_CODEC = Util.make(() -> StreamCodec.composite(
             VanillaCodecs.STRUCTURE_TEMPLATE_STREAM_CODEC, InitialRoomBlockDataPacket::blocks,
             InitialRoomBlockDataPacket::new
-    );
+    ));
 
-    public static final IPayloadHandler<InitialRoomBlockDataPacket> HANDLER = (pkt, ctx) -> {
-        ctx.enqueueWork(() -> ClientRoomPacketHandler.handleBlockData(pkt.blocks));
-    };
+    public static final IPayloadHandler<InitialRoomBlockDataPacket> HANDLER = (pkt, ctx)
+            -> ctx.enqueueWork(() -> ClientRoomPacketHandler.handleBlockData(pkt.blocks));
 
     @Override
-    public Type<? extends CustomPacketPayload> type() {
+    public @NotNull Type<? extends CustomPacketPayload> type() {
         return TYPE;
     }
 }