Merge branch 'ore_datagen_dimension' into ore_datagen_additions

# Conflicts:
#	src/client/java/aztech/modern_industrialization/textures/PartTextureGenerator.java
#	src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java
#	src/main/java/aztech/modern_industrialization/materials/part/OrePart.java

Author: fmbellomy

src/client/java/aztech/modern_industrialization/textures/PartTextureGenerator.java

@@ -157,7 +157,12 @@ private void processHotIngot() {
     private void processOre(ResourceLocation stoneType, MaterialOreSet oreSet) throws IOException {
         String template = String.format("modern_industrialization:textures/materialsets/ores/%s.png", oreSet.name);
         String stoneId = stoneType.getPath();
-        String prefix = "";
+        String prefix;
+        if (stoneId.equals("stone")) {
+            prefix = "";
+        } else {
+            prefix = stoneId + "_";
+        }
 
         String from = switch (oreSet) {
         case IRON -> "%siron_ore".formatted(prefix);

src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java

@@ -33,8 +33,12 @@
 import aztech.modern_industrialization.materials.set.MaterialRawSet;
 import aztech.modern_industrialization.nuclear.NuclearConstant;
 import com.google.gson.JsonObject;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BiomeTags;
+import net.minecraft.tags.TagKey;
 import net.minecraft.util.valueproviders.UniformInt;
+import net.minecraft.world.level.biome.Biome;
 
 public class PartJsonCreator {
 
@@ -132,10 +136,14 @@ public PartTemplate orePart(JsonObject json, ResourceLocation stoneType) {
         }
 
         if (generate) {
+            TagKey<Biome> biomeTag = BiomeTags.IS_OVERWORLD;
+            if (json.has("biome_tag")) {
+                biomeTag = TagKey.create(Registries.BIOME, ResourceLocation.parse(json.get("biome_tag").getAsString()));
+            }
             int veinSize = json.get("vein_size").getAsInt();
             int veinPerChunk = json.get("veins_per_chunk").getAsInt();
             int maxY = json.get("max_y").getAsInt();
-            return act.of(UniformInt.of(minXp, maxXp), veinSize, veinPerChunk, maxY, oreSet);
+            return act.of(UniformInt.of(minXp, maxXp), veinSize, veinPerChunk, maxY, oreSet, biomeTag);
         } else {
             return act.of(UniformInt.of(minXp, maxXp), oreSet);
         }

src/main/java/aztech/modern_industrialization/materials/part/OrePart.java

@@ -45,12 +45,16 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BiomeTags;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.TagKey;
 import net.minecraft.util.valueproviders.UniformInt;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
 import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.common.world.BiomeModifiers;
@@ -67,6 +71,10 @@ public PartKey key() {
         return key;
     }
 
+    public PartTemplate of(UniformInt xpProvider, int veinsPerChunk, int veinSize, int maxYLevel, MaterialOreSet set, TagKey<Biome> biomeTag) {
+        return of(new OrePartParams(xpProvider, set, veinsPerChunk, veinSize, maxYLevel, biomeTag));
+    }
+
     public PartTemplate of(int veinsPerChunk, int veinSize, int maxYLevel, MaterialOreSet set) {
         return of(new OrePartParams(UniformInt.of(0, 2), set, veinsPerChunk, veinSize, maxYLevel));
     }
@@ -151,13 +159,13 @@ public PartTemplate of(OrePartParams oreParams) {
                         var modifierKey = ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, oreGenId);
 
                         DynamicRegistryDatagen.addAction(() -> {
-                            TagMatchTest ruleTest;
+                            RuleTest ruleTest;
                             if (stoneId.equals("stone")) {
                                 ruleTest = new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES);
                             } else if (stoneId.equals("deepslate")) {
                                 ruleTest = new TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES);
                             } else {
-                                return;
+                                ruleTest = new BlockMatchTest(BuiltInRegistries.BLOCK.get(stoneType));
                             }
                             var target = List.of(
                                     OreConfiguration.target(ruleTest, oreBlockBlockDefinition.asBlock().defaultBlockState()));
@@ -176,7 +184,7 @@ public PartTemplate of(OrePartParams oreParams) {
 
                             DynamicRegistryDatagen.add(NeoForgeRegistries.Keys.BIOME_MODIFIERS, context -> {
                                 var modifier = new BiomeModifiers.AddFeaturesBiomeModifier(
-                                        context.lookup(Registries.BIOME).getOrThrow(BiomeTags.IS_OVERWORLD),
+                                        context.lookup(Registries.BIOME).getOrThrow(oreParams.biomeTag),
                                         HolderSet.direct(context.lookup(Registries.PLACED_FEATURE).getOrThrow(placedFeatureKey)),
                                         GenerationStep.Decoration.UNDERGROUND_ORES);
                                 context.register(modifierKey, modifier);
@@ -207,27 +215,35 @@ public static class OrePartParams {
         public final MaterialOreSet set;
         public final boolean generate;
 
+        public final TagKey<Biome> biomeTag;
         public final int veinsPerChunk;
         public final int veinSize;
         public final int maxYLevel;
 
-        private OrePartParams(UniformInt xpDropped, MaterialOreSet set, boolean generate, int veinsPerChunk, int veinSize, int maxYLevel) {
+        private OrePartParams(UniformInt xpDropped, MaterialOreSet set, boolean generate, int veinsPerChunk, int veinSize, int maxYLevel,
+                TagKey<Biome> biomeTag) {
             this.xpDropped = xpDropped;
             this.set = set;
             this.generate = generate;
 
+            this.biomeTag = biomeTag;
             this.veinsPerChunk = veinsPerChunk;
             this.veinSize = veinSize;
             this.maxYLevel = maxYLevel;
         }
 
         public OrePartParams(UniformInt xpDropped, MaterialOreSet set) {
-            this(xpDropped, set, false, 0, 0, 0);
+            this(xpDropped, set, false, 0, 0, 0, BiomeTags.IS_OVERWORLD);
         }
 
         public OrePartParams(UniformInt xpDropped, MaterialOreSet set, int veinsPerChunk, int veinSize, int maxYLevel) {
-            this(xpDropped, set, true, veinsPerChunk, veinSize, maxYLevel);
+            this(xpDropped, set, true, veinsPerChunk, veinSize, maxYLevel, BiomeTags.IS_OVERWORLD);
         }
+
+        public OrePartParams(UniformInt xpDropped, MaterialOreSet set, int veinsPerChunk, int veinSize, int maxYLevel, TagKey<Biome> biomeTag) {
+            this(xpDropped, set, true, veinsPerChunk, veinSize, maxYLevel, biomeTag);
+        }
+
     }
 
 }