From b8c63df11b6683f4b29bf9f3be0aac54c605e1fe Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Tue, 28 Jul 2020 23:16:08 +0200
Subject: [PATCH] Make build depend on generateData, and remove unmapped mods
 from its dependencies.

---
 build.gradle                                 |  8 +++----
 src/datagen/java/appeng/data/Entrypoint.java | 23 +++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 28be2ab89..c8426aac4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,10 +172,8 @@ publishing {
 import net.fabricmc.loom.task.RunClientTask;
 
 task generateData(type: RunClientTask, dependsOn: downloadAssets, group: "ae2") {
+    classpath = configurations.runtimeClasspath
     classpath sourceSets.datagen.runtimeClasspath
-    doFirst {
-        sourceSets.datagen.runtimeClasspath.each { println it }
-        sourceSets.main.runtimeClasspath.each { println it }
-    }
+    systemProperty "appeng.generateData", "true"
 }
-
+build.dependsOn generateData
diff --git a/src/datagen/java/appeng/data/Entrypoint.java b/src/datagen/java/appeng/data/Entrypoint.java
index 7a8e5f369..7764bc814 100644
--- a/src/datagen/java/appeng/data/Entrypoint.java
+++ b/src/datagen/java/appeng/data/Entrypoint.java
@@ -1,21 +1,19 @@
 package appeng.data;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-
-import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
-import net.minecraft.Bootstrap;
-import net.minecraft.data.DataGenerator;
-
 import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.core.CreativeTab;
 import appeng.data.providers.loot.BlockDropProvider;
 import appeng.data.providers.recipes.SlabStairRecipes;
 import appeng.data.providers.tags.ConventionTagProvider;
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+import net.minecraft.Bootstrap;
+import net.minecraft.data.DataGenerator;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
 
 public class Entrypoint implements PreLaunchEntrypoint {
 
@@ -31,6 +29,11 @@ public class Entrypoint implements PreLaunchEntrypoint {
 
     @Override
     public void onPreLaunch() {
+        if (!"true".equals(System.getProperty("appeng.generateData"))) {
+            System.out.println("Applied Energistics 2: Skipping data generation. System property not set.");
+            return;
+        }
+
         Bootstrap.initialize();
         AEConfig.load(new File("config"));
         CreativeTab.init(); // Vanilla data gens use item tab associations