Add support to the persisting disabled datagen providers for handling EMI across all the modules

Author: pupnewfster

src/datagen/additions/java/mekanism/additions/common/AdditionsDataGenerator.java

@@ -2,15 +2,16 @@
 
 import java.util.concurrent.CompletableFuture;
 import mekanism.additions.client.AdditionsBlockStateProvider;
-import mekanism.additions.client.integration.AdditionsEmiAliasProvider;
 import mekanism.additions.client.AdditionsItemModelProvider;
 import mekanism.additions.client.AdditionsLangProvider;
 import mekanism.additions.client.AdditionsSoundProvider;
 import mekanism.additions.client.AdditionsSpriteSourceProvider;
+import mekanism.additions.client.integration.AdditionsEmiAliasProvider;
 import mekanism.additions.common.loot.AdditionsLootProvider;
 import mekanism.additions.common.recipe.AdditionsRecipeProvider;
 import mekanism.common.BasePackMetadataGenerator;
 import mekanism.common.MekanismDataGenerator;
+import mekanism.common.PersistingDisabledProvidersProvider;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
@@ -40,13 +41,15 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new AdditionsSpriteSourceProvider(output, existingFileHelper, lookupProvider));
         gen.addProvider(event.includeClient(), new AdditionsItemModelProvider(output, existingFileHelper));
         gen.addProvider(event.includeClient(), new AdditionsBlockStateProvider(output, existingFileHelper));
-        gen.addProvider(event.includeClient(), new AdditionsEmiAliasProvider(output, lookupProvider));
         //Server side data generators
         gen.addProvider(event.includeServer(), new AdditionsTagProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new AdditionsLootProvider(output, lookupProvider));
         gen.addProvider(event.includeServer(), drProvider);
         gen.addProvider(event.includeServer(), new AdditionsDataMapsProvider(output, lookupProvider));
         gen.addProvider(event.includeServer(), new AdditionsRecipeProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new AdditionsAdvancementProvider(output, lookupProvider, existingFileHelper));
+        //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet
+        // DO NOT ADD OTHERS AFTER THIS ONE
+        PersistingDisabledProvidersProvider.addDisabledEmiProvider(event, lookupProvider, MekanismAdditions.MODID, () -> AdditionsEmiAliasProvider::new);
     }
 }

src/datagen/generated/mekanismadditions/.cache/59392c9e80d17fc8ebe1c2fa969d076d1da244de

@@ -3,12 +3,13 @@
 import java.util.concurrent.CompletableFuture;
 import mekanism.common.BasePackMetadataGenerator;
 import mekanism.common.MekanismDataGenerator;
+import mekanism.common.PersistingDisabledProvidersProvider;
 import mekanism.generators.client.GeneratorsBlockStateProvider;
-import mekanism.generators.client.integration.GeneratorsEmiAliasProvider;
 import mekanism.generators.client.GeneratorsItemModelProvider;
 import mekanism.generators.client.GeneratorsLangProvider;
 import mekanism.generators.client.GeneratorsSoundProvider;
 import mekanism.generators.client.GeneratorsSpriteSourceProvider;
+import mekanism.generators.client.integration.GeneratorsEmiAliasProvider;
 import mekanism.generators.common.loot.GeneratorsLootProvider;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
@@ -38,11 +39,13 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new GeneratorsSpriteSourceProvider(output, existingFileHelper, lookupProvider));
         gen.addProvider(event.includeClient(), new GeneratorsItemModelProvider(output, existingFileHelper));
         gen.addProvider(event.includeClient(), new GeneratorsBlockStateProvider(output, existingFileHelper));
-        gen.addProvider(event.includeClient(), new GeneratorsEmiAliasProvider(output, lookupProvider));
         //Server side data generators
         gen.addProvider(event.includeServer(), new GeneratorsTagProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new GeneratorsLootProvider(output, lookupProvider));
         gen.addProvider(event.includeServer(), new GeneratorsRecipeProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new GeneratorsAdvancementProvider(output, lookupProvider, existingFileHelper));
+        //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet
+        // DO NOT ADD OTHERS AFTER THIS ONE
+        PersistingDisabledProvidersProvider.addDisabledEmiProvider(event, lookupProvider, MekanismGenerators.MODID, () -> GeneratorsEmiAliasProvider::new);
     }
 }

src/datagen/generated/mekanismgenerators/.cache/59392c9e80d17fc8ebe1c2fa969d076d1da244de

@@ -10,7 +10,6 @@
 import java.nio.file.Path;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import mekanism.client.integration.emi.MekanismEmiAliasProvider;
 import mekanism.client.lang.MekanismLangProvider;
 import mekanism.client.model.MekanismItemModelProvider;
 import mekanism.client.sound.MekanismSoundProvider;
@@ -58,7 +57,6 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new MekanismSpriteSourceProvider(output, existingFileHelper, lookupProvider));
         gen.addProvider(event.includeClient(), new MekanismItemModelProvider(output, existingFileHelper));
         gen.addProvider(event.includeClient(), new MekanismBlockStateProvider(output, existingFileHelper));
-        gen.addProvider(event.includeClient(), new MekanismEmiAliasProvider(output, lookupProvider));
         //Server side data generators
         gen.addProvider(event.includeServer(), new MekanismTagProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new MekanismLootProvider(output, lookupProvider));

src/datagen/generated/mekanismtools/.cache/59392c9e80d17fc8ebe1c2fa969d076d1da244de

@@ -7,18 +7,23 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import mekanism.client.integration.emi.MekanismEmiAliasProvider;
 import mekanism.common.integration.MekanismHooks;
 import mekanism.common.integration.crafttweaker.MekanismCrTExampleProvider;
 import mekanism.common.integration.projecte.MekanismCustomConversions;
 import mekanism.common.lib.FieldReflectionHelper;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DataProvider;
@@ -49,6 +54,12 @@ public static void addDisableableProviders(GatherDataEvent event, CompletableFut
         ModList modList = ModList.get();
         Set<String> pathsToSkip = new HashSet<>();
         List<String> fakeProviders = new ArrayList<>();
+        if (modList.isLoaded(MekanismHooks.EMI_MOD_ID)) {
+            gen.addProvider(event.includeClient(), new MekanismEmiAliasProvider(output, lookupProvider));
+        } else {
+            pathsToSkip.add("emi/aliases");
+            fakeProviders.add("EMI Alias Provider: mekanism");
+        }
         if (modList.isLoaded(MekanismHooks.PROJECTE_MOD_ID)) {
             gen.addProvider(event.includeServer(), new MekanismCustomConversions(output, lookupProvider));
         } else {
@@ -67,6 +78,24 @@ public static void addDisableableProviders(GatherDataEvent event, CompletableFut
         gen.addProvider(true, new PersistingDisabledProvidersProvider(output, disabledCompats, pathsToSkip, fakeProviders));
     }
 
+    public static void addDisabledEmiProvider(GatherDataEvent event, CompletableFuture<HolderLookup.Provider> lookupProvider, String modid,
+          Supplier<BiFunction<PackOutput, CompletableFuture<Provider>, DataProvider>> providerFunction) {
+        DataGenerator gen = event.getGenerator();
+        PackOutput output = gen.getPackOutput();
+        ModList modList = ModList.get();
+        Set<String> pathsToSkip = new HashSet<>();
+        List<String> fakeProviders = new ArrayList<>();
+        if (modList.isLoaded(MekanismHooks.EMI_MOD_ID)) {
+            gen.addProvider(event.includeClient(), providerFunction.get().apply(output, lookupProvider));
+        } else {
+            pathsToSkip.add("emi/aliases");
+            fakeProviders.add("EMI Alias Provider: " + modid);
+        }
+        //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet
+        // DO NOT ADD OTHERS AFTER THIS ONE
+        gen.addProvider(true, new PersistingDisabledProvidersProvider(output, Collections.emptySet(), pathsToSkip, fakeProviders));
+    }
+
     private final Set<String> compatRecipesToSkip;
     private final Set<String> pathsToSkip;
     private final List<String> fakeProviders;

src/datagen/generators/java/mekanism/generators/common/GeneratorsDataGenerator.java

@@ -3,6 +3,7 @@
 import java.util.concurrent.CompletableFuture;
 import mekanism.common.BasePackMetadataGenerator;
 import mekanism.common.MekanismDataGenerator;
+import mekanism.common.PersistingDisabledProvidersProvider;
 import mekanism.tools.client.ToolsItemModelProvider;
 import mekanism.tools.client.ToolsLangProvider;
 import mekanism.tools.client.ToolsSpriteSourceProvider;
@@ -34,10 +35,12 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new ToolsLangProvider(output));
         gen.addProvider(event.includeClient(), new ToolsSpriteSourceProvider(output, existingFileHelper, lookupProvider));
         gen.addProvider(event.includeClient(), new ToolsItemModelProvider(output, existingFileHelper));
-        gen.addProvider(event.includeClient(), new ToolsEmiAliasProvider(output, lookupProvider));
         //Server side data generators
         gen.addProvider(event.includeServer(), new ToolsTagProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new ToolsRecipeProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new ToolsAdvancementProvider(output, lookupProvider, existingFileHelper));
+        //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet
+        // DO NOT ADD OTHERS AFTER THIS ONE
+        PersistingDisabledProvidersProvider.addDisabledEmiProvider(event, lookupProvider, MekanismTools.MODID, () -> ToolsEmiAliasProvider::new);
     }
 }