merge cleanup

DM-Fabric-Ports · Dec 15, 2022 · fbb1bc3 · fbb1bc3
1 parent e09ff2b
commit fbb1bc3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/plus/dragons/createdragonlib/DragonLib.java b/src/main/java/plus/dragons/createdragonlib/DragonLib.java
@@ -5,9 +5,11 @@
 import plus.dragons.createdragonlib.tag.TagGen;
 
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.loader.api.FabricLoader;
 
-public class DragonLib implements ModInitializer {
+public class DragonLib implements ModInitializer, DataGeneratorEntrypoint {
     public static final String ID = "create_dragon_lib";
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -19,4 +21,9 @@ public void onInitialize() {
 
     }
 
+    @Override
+    public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
+        TagGen.genAll();
+    }
+
 }
diff --git a/src/main/java/plus/dragons/createdragonlib/lang/LangPartial.java b/src/main/java/plus/dragons/createdragonlib/lang/LangPartial.java
@@ -6,8 +6,6 @@
 import com.google.gson.JsonObject;
 import com.simibubi.create.foundation.utility.FilesHelper;
 
-import java.util.function.Supplier;
-
 abstract class LangPartial {
     protected final String modid;
     protected final String display;
@@ -30,7 +28,7 @@ static class Merge extends LangPartial {
             super(modid, display);
             this.filename = filename;
         }
-    
+
         @Override
         public JsonObject provide() {
             String filepath = "assets/" + modid + "/lang/default/" + filename + ".json";
@@ -39,7 +37,7 @@ public JsonObject provide() {
                 throw new IllegalStateException(String.format("Could not find default lang file: %s", filepath));
             return element.getAsJsonObject();
         }
-        
+
     }
 
     static class Gen extends LangPartial {
@@ -57,7 +55,7 @@ public JsonObject provide() {
             preTask.run();
             return provider.get();
         }
-        
+
     }
-    
+
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -8,7 +8,8 @@
   "license": "MIT",
   "environment": "*",
   "entrypoints": {
-    "main": ["plus.dragons.createdragonlib.DragonLib"]
+    "main": ["plus.dragons.createdragonlib.DragonLib"],
+    "fabric-datagen": ["plus.dragons.createdragonlib.DragonLib"]
   },
   "mixins": ["create_dragon_lib.mixins.json"],
   "depends": {