add mod loading conditions to datamap (#158)

Author: PssbleTrngle

src/generated/resources/data/neoforge/data_maps/block/waxables.json

@@ -1,51 +1,147 @@
 {
   "values": {
     "dye_depot:amber_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_amber_concrete_powder"
     },
     "dye_depot:aqua_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_aqua_concrete_powder"
     },
     "dye_depot:beige_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_beige_concrete_powder"
     },
     "dye_depot:coral_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_coral_concrete_powder"
     },
     "dye_depot:forest_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_forest_concrete_powder"
     },
     "dye_depot:ginger_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_ginger_concrete_powder"
     },
     "dye_depot:indigo_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_indigo_concrete_powder"
     },
     "dye_depot:maroon_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_maroon_concrete_powder"
     },
     "dye_depot:mint_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_mint_concrete_powder"
     },
     "dye_depot:navy_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_navy_concrete_powder"
     },
     "dye_depot:olive_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_olive_concrete_powder"
     },
     "dye_depot:rose_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_rose_concrete_powder"
     },
     "dye_depot:slate_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_slate_concrete_powder"
     },
     "dye_depot:tan_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_tan_concrete_powder"
     },
     "dye_depot:teal_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_teal_concrete_powder"
     },
     "dye_depot:verdant_concrete_powder": {
+      "neoforge:conditions": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "dye_depot"
+        }
+      ],
       "waxed": "oreganized:waxed_verdant_concrete_powder"
     },
     "minecraft:black_concrete_powder": {

src/main/java/galena/oreganized/data/ODataMaps.java

@@ -2,18 +2,23 @@
 
 import galena.oreganized.compat.ColorCompat;
 import galena.oreganized.index.OBlocks;
-import java.util.concurrent.CompletableFuture;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
+import net.neoforged.neoforge.common.conditions.ICondition;
+import net.neoforged.neoforge.common.conditions.ModLoadedCondition;
 import net.neoforged.neoforge.common.data.DataMapProvider;
 import net.neoforged.neoforge.registries.DeferredBlock;
 import net.neoforged.neoforge.registries.datamaps.builtin.Compostable;
 import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
 import net.neoforged.neoforge.registries.datamaps.builtin.Waxable;
 
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
 public class ODataMaps extends DataMapProvider {
 
     public ODataMaps(PackOutput output, CompletableFuture<HolderLookup.Provider> lookup) {
@@ -37,7 +42,12 @@ protected void gather(HolderLookup.Provider provider) {
 
         OBlocks.WAXED_CONCRETE_POWDER.forEach((color, waxed) -> {
             var unwaxed = ColorCompat.createBlockKey("concrete_powder", color);
-            waxables.add(unwaxed, new Waxable(waxed.get()), false);
+            var conditions = Optional.of(unwaxed.location().getNamespace())
+                    .filter(it -> !it.equals(ResourceLocation.DEFAULT_NAMESPACE))
+                    .map(ModLoadedCondition::new)
+                    .stream()
+                    .toArray(ICondition[]::new);
+            waxables.add(unwaxed, new Waxable(waxed.get()), false, conditions);
         });
     }
 }