feat: Add structs, protocols, macros, and library blocks to SFML

src/datagen/java/ca/teamdman/sfm/datagen/SFMBlockStatesAndModelsDatagen.java

@@ -53,6 +53,7 @@ protected void registerStatesAndModels() {
         registerWaterTank();
         registerTestBarrel();
         registerBuffer();
+        registerLibrary();
     }
 
     private void registerTestBarrel() {
@@ -283,4 +284,36 @@ private void registerBuffer() {
                 });
 
     }
+
+    private void registerLibrary() {
+        if (SFMBlocks.LIBRARY_BLOCK == null) return;
+
+        // Create a model with different textures for front, back, and sides
+        ModelFile libraryModel = models().cube(
+                SFMBlocks.LIBRARY_BLOCK.getPath(),
+                modLoc("block/library_bot"),    // down
+                modLoc("block/library_top"),    // up
+                modLoc("block/library_front"),  // north (front)
+                modLoc("block/library_back"),   // south (back)
+                modLoc("block/library_side"),   // west
+                modLoc("block/library_side")    // east
+        ).texture("particle", modLoc("block/library_top"));
+
+        // Create variants for each horizontal facing direction
+        getVariantBuilder(SFMBlocks.LIBRARY_BLOCK.get())
+                .forAllStates(state -> {
+                    Direction facing = state.getValue(ca.teamdman.sfm.common.block.LibraryBlock.FACING);
+                    int yRot = switch (facing) {
+                        case NORTH -> 0;
+                        case EAST -> 90;
+                        case SOUTH -> 180;
+                        case WEST -> 270;
+                        default -> 0;
+                    };
+                    return ConfiguredModel.builder()
+                            .modelFile(libraryModel)
+                            .rotationY(yRot)
+                            .build();
+                });
+    }
 }

src/datagen/java/ca/teamdman/sfm/datagen/SFMItemModelsDatagen.java

@@ -39,6 +39,9 @@ protected void registerModels() {
         justParent(SFMItems.PRINTING_PRESS_ITEM, SFMBlocks.PRINTING_PRESS_BLOCK);
         justParent(SFMItems.WATER_TANK_ITEM, SFMBlocks.WATER_TANK_BLOCK, "_active");
         justParent(SFMItems.BUFFER_ITEM, SFMBlocks.BUFFER_BLOCK, "_item");
+        if (SFMItems.LIBRARY_ITEM != null) {
+            justParent(SFMItems.LIBRARY_ITEM, SFMBlocks.LIBRARY_BLOCK);
+        }
         basicItem(SFMItems.DISK_ITEM);
         basicItem(SFMItems.LABEL_GUN_ITEM);
         basicItem(SFMItems.EXPERIENCE_GOOP_ITEM);

src/datagen/java/ca/teamdman/sfm/datagen/SFMLootTablesDatagen.java

@@ -40,6 +40,9 @@ protected void populate(BlockLootWriter writer) {
         writer.dropOther(SFMBlocks.FANCY_CABLE_FACADE_BLOCK, SFMBlocks.FANCY_CABLE_BLOCK);
         writer.dropSelf(SFMBlocks.PRINTING_PRESS_BLOCK);
         writer.dropSelf(SFMBlocks.WATER_TANK_BLOCK);
+        if (SFMBlocks.LIBRARY_BLOCK != null) {
+            writer.dropSelf(SFMBlocks.LIBRARY_BLOCK);
+        }
     }
 
     @Override

src/datagen/java/ca/teamdman/sfm/datagen/SFMRecipesDatagen.java

@@ -5,6 +5,7 @@
 import ca.teamdman.sfm.common.registry.SFMBlocks;
 import ca.teamdman.sfm.common.registry.SFMItems;
 import ca.teamdman.sfm.common.registry.SFMRecipeSerializers;
+import ca.teamdman.sfm.common.util.SFMEnvironmentUtils;
 import ca.teamdman.sfm.common.util.SFMResourceLocation;
 import ca.teamdman.sfm.datagen.version_plumbing.MCVersionAgnosticRecipeDataGen;
 import net.minecraft.data.recipes.FinishedRecipe;
@@ -196,6 +197,18 @@ protected void populate(Consumer<FinishedRecipe> writer) {
                 .pattern("gxg")
                 .save(writer);
 
+        if (SFMEnvironmentUtils.isInIDE() && SFMBlocks.LIBRARY_BLOCK != null) {
+            beginShaped(SFMBlocks.LIBRARY_BLOCK.get(), 1)
+                    .define('M', SFMBlocks.MANAGER_BLOCK.get())
+                    .define('B', Blocks.BOOKSHELF)
+                    .define('L', Blocks.LECTERN)
+                    .unlockedBy("has_manager", RecipeProvider.has(SFMBlocks.MANAGER_BLOCK.get()))
+                    .pattern("MBM")
+                    .pattern("BLB")
+                    .pattern("MBM")
+                    .save(writer);
+        }
+
         addPrintingPressRecipe(
                 writer,
                 SFMResourceLocation.fromSFMPath("written_book_copy"),

src/gametest/java/ca/teamdman/sfm/gametest/SFMGameTestGenerator.java

@@ -1,15 +1,15 @@
-package ca.teamdman.sfm.gametest;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Classes annotated with this that extend {@link SFMGameTestGeneratorBase} will have their
- * {@link SFMGameTestGeneratorBase#generateTests} method invoked to produce game test definitions.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface SFMGameTestGenerator {
-}
+package ca.teamdman.sfm.gametest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Classes annotated with this that extend {@link SFMGameTestGeneratorBase} will have their
+ * {@link SFMGameTestGeneratorBase#generateTests} method invoked to produce game test definitions.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface SFMGameTestGenerator {
+}

src/gametest/java/ca/teamdman/sfm/gametest/SFMGameTestGeneratorBase.java

@@ -1,18 +1,18 @@
-package ca.teamdman.sfm.gametest;
-
-import java.util.function.Consumer;
-
-/**
- * Base class for game test generators. Subclasses annotated with
- * {@link SFMGameTestGenerator} will have their {@link #generateTests} method
- * invoked during test discovery to produce multiple game test definitions.
- */
-public abstract class SFMGameTestGeneratorBase {
-
-    /**
-     * Generates game test definitions and passes them to the provided consumer.
-     *
-     * @param testConsumer a consumer that accepts generated test definitions
-     */
-    public abstract void generateTests(Consumer<SFMGameTestDefinition> testConsumer);
-}
+package ca.teamdman.sfm.gametest;
+
+import java.util.function.Consumer;
+
+/**
+ * Base class for game test generators. Subclasses annotated with
+ * {@link SFMGameTestGenerator} will have their {@link #generateTests} method
+ * invoked during test discovery to produce multiple game test definitions.
+ */
+public abstract class SFMGameTestGeneratorBase {
+
+    /**
+     * Generates game test definitions and passes them to the provided consumer.
+     *
+     * @param testConsumer a consumer that accepts generated test definitions
+     */
+    public abstract void generateTests(Consumer<SFMGameTestDefinition> testConsumer);
+}

src/gametest/java/ca/teamdman/sfm/gametest/SFMGameTestHelper.java

@@ -178,7 +178,7 @@ public void assertExpr(
 
         BoolExpr expr = BoolExpr.from(exprString);
         ProgramContext programContext = new ProgramContext(
-                new Program(new ASTBuilder(), "temp lol", List.of(), Set.of(), Set.of()),
+                new Program(new ASTBuilder(), "temp lol", List.of(), List.of(), List.of(), Set.of(), Set.of()),
                 manager,
                 ExecuteProgramBehaviour::new
         );

src/gametest/java/ca/teamdman/sfm/gametest/declarative/SFMDeclarativeTestBuilder.java

@@ -112,7 +112,7 @@ private void runConditions(
         if (conditions.isEmpty()) return;
         List<BoolExpr> expressions = conditions.stream().map(BoolExpr::from).toList();
         ProgramContext programContext = new ProgramContext(
-                new Program(new ASTBuilder(), "temp lol", List.of(), Set.of(), Set.of()),
+                new Program(new ASTBuilder(), "temp lol", List.of(), List.of(), List.of(), Set.of(), Set.of()),
                 manager,
                 ExecuteProgramBehaviour::new
         );