Move datagen back to a sourceset, troubleshooting screen not opening

[no ci]

Author: robotgryphon

forge-datagen/build.gradle.kts

@@ -11,15 +11,21 @@
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Collections;
 import java.util.List;
 
 @Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class DataGeneration {
 
+    public static final Logger LOGGER = LogManager.getLogger();
+
     @SubscribeEvent
     public static void gatherData(GatherDataEvent event) {
+        LOGGER.debug("Starting CM datagen...");
+
         final var helper = event.getExistingFileHelper();
         final var generator = event.getGenerator();
         final var packOut = generator.getPackOutput();
@@ -45,5 +51,7 @@ public static void gatherData(GatherDataEvent event) {
 
         generator.addProvider(event.includeClient(), new EnglishLangGenerator(generator));
         generator.addProvider(event.includeClient(), new RussianLangGenerator(generator));
+
+        LOGGER.debug("Finished CM datagen");
     }
 }

forge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java

@@ -21,7 +21,6 @@
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.crafting.ConditionalRecipe;
 import net.minecraftforge.registries.ForgeRegistries;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -32,7 +31,7 @@ public RecipeGenerator(PackOutput packOut) {
     }
 
     @Override
-    protected void buildRecipes(@NotNull Consumer<FinishedRecipe> consumer) {
+    protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
         ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Walls.ITEM_BREAKABLE_WALL.get(), 8)
                 .pattern("DDD")
                 .pattern("D D")

forge-datagen/src/main/java/dev/compactmods/machines/datagen/RecipeGenerator.java

@@ -24,16 +24,27 @@ base {
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-sourceSets {
-    main {
-        resources.srcDir("src/generated/resources")
-    }
+sourceSets.main {
+    resources.srcDir("src/generated/resources")
+}
+
+val ssDatagen = sourceSets.create("datagen") {
+    java.srcDir("../forge-datagen/src/main/java")
+    resources.srcDir("src/main/resources")
+
+    compileClasspath += forgeApi.sourceSets.main.get().output
+    compileClasspath += sourceSets.main.get().output
+
+    runtimeClasspath += forgeApi.sourceSets.main.get().output
+    runtimeClasspath += sourceSets.main.get().output
 }
 
+
 neoForge {
     version = "1.20.1-47.3.0"
 
     addModdingDependenciesTo(sourceSets.test.get())
+    addModdingDependenciesTo(ssDatagen)
 
     parchment {
         enabled = true
@@ -44,6 +55,7 @@ neoForge {
     mods.create(modId) {
         modSourceSets.add(forgeApi.sourceSets.main)
         modSourceSets.add(sourceSets.main)
+        modSourceSets.add(ssDatagen)
         modSourceSets.add(sourceSets.test)
     }
 
@@ -54,9 +66,9 @@ neoForge {
             sourceSet = sourceSets.main
 
             // JetBrains Runtime Hotswap
-//            if (!System.getenv().containsKey("CI")) {
-//              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
-//            }
+            if (!System.getenv().containsKey("CI")) {
+              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
+            }
         }
 
         create("client") {
@@ -95,7 +107,17 @@ neoForge {
             sourceSet = sourceSets.test
         }
 
+        create("data") {
+            this.data()
 
+            this.gameDirectory.set(file("runs/data"))
+            this.sourceSet = ssDatagen
+
+            programArguments.addAll("--mod", modId)
+            programArguments.addAll("--all")
+            programArguments.addAll("--output", file("src/generated/resources").absolutePath)
+            programArguments.addAll("--existing", file("src/main/resources").absolutePath)
+        }
 
         create("gameTestServer") {
             type = "gameTestServer"
@@ -153,7 +175,7 @@ dependencies {
     compileOnly(forgeApi)
     testCompileOnly(forgeApi)
 
-    if(USE_JARINJAR_FOR_API) {
+    if (USE_JARINJAR_FOR_API) {
         jarJar(forgeApi)
     }
 
@@ -172,7 +194,7 @@ dependencies {
     modCompileOnly("curse.maven:jade-324717:5776962")
 }
 
-if(!USE_JARINJAR_FOR_API) {
+if (!USE_JARINJAR_FOR_API) {
     tasks.named<Jar>("jar") {
         from(forgeApi.sourceSets["main"].output)
         finalizedBy("reobfJar")

forge-main/build.gradle.kts

@@ -49,7 +49,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import net.minecraftforge.network.NetworkHooks;
 import net.minecraftforge.network.PacketDistributor;
 
 import javax.annotation.Nullable;

forge-main/src/main/java/dev/compactmods/machines/machine/CompactMachineBlock.java

@@ -1,5 +1,6 @@
 package dev.compactmods.machines.room.network;
 
+import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.room.network.client.ClientRoomNetworkHandler;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
@@ -27,8 +28,12 @@ public static OpenMachinePreviewScreenPacket fromNetwork(FriendlyByteBuf friendl
         return new OpenMachinePreviewScreenPacket(chunkPos, blocks);
     }
 
-    public void handle(Supplier<NetworkEvent.Context> context) {
-        context.get().enqueueWork(() -> ClientRoomNetworkHandler.openRoomPreviewScreen(this));
-        context.get().setPacketHandled(true);
+    public static boolean handle(OpenMachinePreviewScreenPacket pkt, Supplier<NetworkEvent.Context> context) {
+        //context.get().enqueueWork(() -> {
+        CompactMachines.LOGGER.debug("Opening machine preview screen: {}", pkt.roomChunk);
+        ClientRoomNetworkHandler.openRoomPreviewScreen(pkt);
+        // });
+
+        return true;
     }
 }

forge-main/src/main/java/dev/compactmods/machines/room/network/OpenMachinePreviewScreenPacket.java

@@ -48,4 +48,3 @@ fun addVersionCatalog(dependencyResolutionManagement: DependencyResolutionManage
         from(files("./gradle/$name.versions.toml"))
     }
 }
-include("forge-datagen")