Separate datagen code out of main mod source

Author: robotgryphon

build.gradle

@@ -40,6 +40,18 @@ sourceSets {
         compileClasspath += configurations.getByName("minecraft")
     }
 
+    datagen {
+        java {
+            srcDir "src/datagen/java"
+        }
+
+        compileClasspath += configurations.getByName("minecraft")
+        compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
+
     main {
         java {
             srcDir "src/main/java"
@@ -106,13 +118,16 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
+            property 'forge.enabledGameTestNamespaces', mod_id
+
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
             mods {
                 compactmachines {
                     source sourceSets.main
                     source sourceSets.api
+                    source sourceSets.test
                 }
             }
         }
@@ -136,13 +151,12 @@ minecraft {
 
             mods {
                 compactmachines {
-                    source sourceSets.main
-                    source sourceSets.api
+                    source sourceSets.datagen
                 }
             }
         }
 
-        gametestserver {
+        gameTestServer {
             workingDirectory project.file('run/gametest')
 
             // Recommended logging data for a userdev environment
@@ -160,9 +174,6 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
-            // Only runs gametests which use "examplemod" as the namespace
-            args '--enableNamespace', mod_id
-
             mods {
                 compactmachines {
                     source sourceSets.api

…chines/datagen/AdvancementGenerator.java …chines/datagen/AdvancementGenerator.javasrc/main/java/dev/compactmods/machines/datagen/AdvancementGenerator.java renamed to src/datagen/java/dev/compactmods/machines/datagen/AdvancementGenerator.java src/main/java/dev/compactmods/machines/datagen/AdvancementGenerator.java renamed to src/datagen/java/dev/compactmods/machines/datagen/AdvancementGenerator.java

@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
 import dev.compactmods.machines.core.Registration;
-import dev.compactmods.machines.reference.Reference;
+import dev.compactmods.machines.data.NbtConstants;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.loot.BlockLoot;
 import net.minecraft.data.loot.LootTableProvider;
@@ -66,8 +66,8 @@ protected void addTables() {
         }
 
         private final LootItemFunction.Builder CopyOwnerAndReferenceFunction = CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-                .copy(Reference.CompactMachines.OWNER_NBT, Reference.CompactMachines.OWNER_NBT)
-                .copy(Reference.CompactMachines.NBT_MACHINE_ID, Reference.CompactMachines.NBT_MACHINE_ID);
+                .copy(NbtConstants.ROOM_OWNER, NbtConstants.ROOM_OWNER)
+                .copy(NbtConstants.MACHINE_ID, NbtConstants.MACHINE_ID);
 
         private void registerCompactMachineBlockDrops(RegistryObject<Block> block, RegistryObject<Item> item) {
             LootPool.Builder builder = LootPool.lootPool()

…machines/datagen/BlockLootGenerator.java …machines/datagen/BlockLootGenerator.javasrc/main/java/dev/compactmods/machines/datagen/BlockLootGenerator.java renamed to src/datagen/java/dev/compactmods/machines/datagen/BlockLootGenerator.java src/main/java/dev/compactmods/machines/datagen/BlockLootGenerator.java renamed to src/datagen/java/dev/compactmods/machines/datagen/BlockLootGenerator.java

@@ -1,7 +1,7 @@
 package dev.compactmods.machines.datagen;
 
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.reference.EnumMachineSize;
+import dev.compactmods.machines.rooms.RoomSize;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;
@@ -14,7 +14,7 @@ public ItemModelGenerator(DataGenerator generator, ExistingFileHelper existingFi
 
     @Override
     protected void registerModels() {
-        for (var size : EnumMachineSize.values())
+        for (var size : RoomSize.values())
             machine(size.getSerializedName());
 
         withExistingParent("solid_wall", modLoc("block/wall"));

…ctmods/machines/datagen/DataGenUtil.java …ctmods/machines/datagen/DataGenUtil.javasrc/main/java/dev/compactmods/machines/datagen/DataGenUtil.java renamed to src/datagen/java/dev/compactmods/machines/datagen/DataGenUtil.java src/main/java/dev/compactmods/machines/datagen/DataGenUtil.java renamed to src/datagen/java/dev/compactmods/machines/datagen/DataGenUtil.java

@@ -28,7 +28,7 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
                 .pattern(" I ")
                 .define('R', Tags.Items.DUSTS_REDSTONE)
                 .define('I', Tags.Items.STORAGE_BLOCKS_IRON)
-                .unlockedBy("picked_up_iron", has(Tags.Items.STORAGE_BLOCKS_IRON))
+                .unlockedBy("picked_up_iron", RecipeProvider.has(Tags.Items.STORAGE_BLOCKS_IRON))
                 .save(consumer);
 
         ShapedRecipeBuilder.shaped(Registration.PERSONAL_SHRINKING_DEVICE.get())
@@ -39,7 +39,7 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
                 .define('E', Items.ENDER_EYE)
                 .define('B', Items.BOOK)
                 .define('I', Tags.Items.INGOTS_IRON)
-                .unlockedBy("picked_up_ender_eye", has(Items.ENDER_EYE))
+                .unlockedBy("picked_up_ender_eye", RecipeProvider.has(Items.ENDER_EYE))
                 .save(consumer);
 
         addMachineRecipes(consumer);
@@ -69,7 +69,7 @@ protected void registerMachineRecipe(Consumer<FinishedRecipe> consumer, ItemLike
             recipe.define('C', center);
 
         recipe
-                .unlockedBy("has_recipe", has(wall));
+                .unlockedBy("has_recipe", RecipeProvider.has(wall));
 
         ConditionalRecipe.builder()
                 .addCondition(new EnableVanillaRecipesConfigCondition())

…ods/machines/datagen/DataGeneration.java …ods/machines/datagen/DataGeneration.javasrc/main/java/dev/compactmods/machines/datagen/DataGeneration.java renamed to src/datagen/java/dev/compactmods/machines/datagen/DataGeneration.java src/main/java/dev/compactmods/machines/datagen/DataGeneration.java renamed to src/datagen/java/dev/compactmods/machines/datagen/DataGeneration.java

@@ -1,9 +1,9 @@
 package dev.compactmods.machines.datagen;
 
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.block.BlockCompactMachine;
+import dev.compactmods.machines.machine.CompactMachineBlock;
 import dev.compactmods.machines.core.Registration;
-import dev.compactmods.machines.reference.EnumMachineSize;
+import dev.compactmods.machines.rooms.RoomSize;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.client.model.generators.ConfiguredModel;
@@ -22,13 +22,13 @@ protected void registerStatesAndModels() {
         simpleBlock(Registration.BLOCK_BREAKABLE_WALL.get(), wall);
 
         // Machine models
-        for(EnumMachineSize size : EnumMachineSize.values()) {
+        for(RoomSize size : RoomSize.values()) {
             String sizeName = size.getName();
 
             var mod = models()
                     .cubeAll("block/machine/machine_" + sizeName, modLoc("block/machine/machine_" + sizeName));
 
-            simpleBlock(BlockCompactMachine.getBySize(size), ConfiguredModel.builder()
+            simpleBlock(CompactMachineBlock.getBySize(size), ConfiguredModel.builder()
                     .modelFile(mod)
                     .build());
         }