re-add projecte datagen and run datagen

mekanism · Nov 13, 2023 · faac6da · faac6da
1 parent 022e458
commit faac6da
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -462,8 +462,7 @@ dependencies {
     datagenMainCompileOnly fg.deobf("curse.maven:i-like-wood-biomes-o-plenty-437203:${ilikewood_bop_id}")
     //TODO - 1.20: Switch back to datagenMainImplementation
     datagenMainCompileOnly fg.deobf("curse.maven:i-like-wood-oh-the-biomes-youll-go-475110:${ilikewood_byg_id}")
-    //TODO - 1.20: Re-enable after projecte is updated
-    //datagenMainRuntimeOnly fg.deobf("curse.maven:projecte-226410:${projecte_id}")
+    datagenMainRuntimeOnly fg.deobf("curse.maven:projecte-226410:${projecte_id}")
 
     datagenNonMod "com.thiakil:yaml-ops:${yamlops_version}"
 }

diff --git a/src/datagen/generated/mekanism/.cache/ef78a28b75a57238cdbddc354771ab0fbdd2908a b/src/datagen/generated/mekanism/.cache/ef78a28b75a57238cdbddc354771ab0fbdd2908a
@@ -1,5 +1,5 @@
-// 1.20.1	2023-10-20T14:25:46.9752989	Languages: en_us: mekanism
+// 1.20.1	2023-11-13T17:34:32.8703646	Languages: en_us: mekanism
 8b96cf63810cff4efaf58324ad63b17bd30abd5d assets/mekanism/lang/en_au.json
 8b96cf63810cff4efaf58324ad63b17bd30abd5d assets/mekanism/lang/en_gb.json
-62775576bb139385632b2361922d2823fb4d507f assets/mekanism/lang/en_ud.json
-0481c9f1ce9b37c009c585776a3d8de887222aff assets/mekanism/lang/en_us.json
+b623f1814a7d0fc358762c36fa82e83263462f1c assets/mekanism/lang/en_ud.json
+4890b1920582b9419c17d9a4d4355b03336e6a82 assets/mekanism/lang/en_us.json
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json
@@ -938,7 +938,6 @@
   "generic.mekanism.transfer": "(%2$s) %1$s -",
   "generic.mekanism.with_comma": "%2$s '%1$s",
   "generic.mekanism.with_parenthesis": "(%2$s) %1$s",
-  "generic.mekanism.with_two_parenthesis": "(%3$s) (%s) %1$s",
   "gui.mekanism.back": "ʞɔɐᗺ",
   "gui.mekanism.chemical": "%s :ꞁɐɔᴉɯǝɥƆ",
   "gui.mekanism.close": "ǝsoꞁƆ",

diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json
@@ -938,7 +938,6 @@
   "generic.mekanism.transfer": "- %1$s (%2$s)",
   "generic.mekanism.with_comma": "%1$s, %2$s",
   "generic.mekanism.with_parenthesis": "%1$s (%2$s)",
-  "generic.mekanism.with_two_parenthesis": "%1$s (%2$s) (%3$s)",
   "gui.mekanism.back": "Back",
   "gui.mekanism.chemical": "Chemical: %1$s",
   "gui.mekanism.close": "Close",

diff --git a/src/datagen/main/java/mekanism/common/MekanismDataGenerator.java b/src/datagen/main/java/mekanism/common/MekanismDataGenerator.java
@@ -20,6 +20,7 @@
 import mekanism.common.advancements.MekanismCriteriaTriggers;
 import mekanism.common.integration.computer.ComputerHelpProvider;
 import mekanism.common.integration.crafttweaker.MekanismCrTExampleProvider;
+import mekanism.common.integration.projecte.MekanismCustomConversions;
 import mekanism.common.loot.MekanismLootProvider;
 import mekanism.common.recipe.impl.MekanismRecipeProvider;
 import mekanism.common.registries.MekanismDatapackRegistryProvider;
@@ -70,8 +71,7 @@ public static void gatherData(GatherDataEvent event) {
         MekanismRecipeProvider recipeProvider = new MekanismRecipeProvider(output, existingFileHelper);
         gen.addProvider(event.includeServer(), recipeProvider);
         gen.addProvider(event.includeServer(), new MekanismAdvancementProvider(output, existingFileHelper));
-        //TODO - 1.20: Re-enable after updating ProjectE
-        //addProvider(gen, event.includeServer(), MekanismCustomConversions::new);
+        gen.addProvider(event.includeServer(), new MekanismCustomConversions(output, lookupProvider));
         gen.addProvider(event.includeServer(), new MekanismCrTExampleProvider(output, existingFileHelper));
         gen.addProvider(event.includeServer(), new ComputerHelpProvider(output, Mekanism.MODID));
         //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet

diff --git a/src/datagen/main/java/mekanism/common/integration/projecte/MekanismCustomConversions.java b/src/datagen/main/java/mekanism/common/integration/projecte/MekanismCustomConversions.java
@@ -1,19 +1,22 @@
-/*package mekanism.common.integration.projecte;
+package mekanism.common.integration.projecte;
 
+import java.util.concurrent.CompletableFuture;
 import mekanism.common.Mekanism;
 import mekanism.common.registries.MekanismItems;
 import moze_intel.projecte.api.data.CustomConversionProvider;
-import net.minecraft.data.DataGenerator;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.HolderLookup.Provider;
+import net.minecraft.data.PackOutput;
 import org.jetbrains.annotations.NotNull;
 
 public class MekanismCustomConversions extends CustomConversionProvider {
 
-    public MekanismCustomConversions(DataGenerator generator) {
-        super(generator);
+    public MekanismCustomConversions(PackOutput output, CompletableFuture<Provider> lookupProvider) {
+        super(output, lookupProvider);
     }
 
     @Override
-    protected void addCustomConversions() {
+    protected void addCustomConversions(HolderLookup.Provider registries) {
         createConversionBuilder(Mekanism.rl("defaults"))
               .comment("Default values for Mekanism items.")
               .before(MekanismItems.SALT, 8)
@@ -28,4 +31,4 @@ protected void addCustomConversions() {
     public String getName() {
         return super.getName() + ": " + Mekanism.MODID;
     }
-}*/
+}