Port OreSpawn to NeoForge 1.21.1

Author: SkyBlade1978

README.md

@@ -1,6 +1,6 @@
 # MMD OreSpawn
 
-OreSpawn 4 is a provider-driven world-generation engine for Minecraft 1.20.6.
+OreSpawn 4 is a provider-driven world-generation engine for Minecraft 1.21.1.
 It gives mods and modpacks one place to configure ores, deposit shapes, optional
 rock strata and geomes, provider-owned underground fluid deposits, biome
 palettes and world materials, flat bedrock, and bounded ore retrogen.

docs/API.md

@@ -21,7 +21,7 @@ Submit declarations during `InterModEnqueueEvent`:
 
 ```java
 WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
-    .rock(new ResourceLocation("examplemod", "slate"), GeologyFamily.METAMORPHIC, rock -> rock
+    .rock(ResourceLocation.fromNamespaceAndPath("examplemod", "slate"), GeologyFamily.METAMORPHIC, rock -> rock
         .depth(12, 36)
         .weight(1.2)
         .oreReplaceable(true))
@@ -56,17 +56,17 @@ FormationDefinition formations = FormationDefinition.builder()
     .waviness(FormationPreset.LARGE)
     .build();
 FluidDepositDefinition brine = FluidDepositDefinition.builder(
-        new ResourceLocation("examplemod", "fluid_deposit/brine"),
-        new ResourceLocation("examplemod", "brine"))
-    .dimension(new ResourceLocation("minecraft", "overworld"), placement -> placement
+        ResourceLocation.fromNamespaceAndPath("examplemod", "fluid_deposit/brine"),
+        ResourceLocation.fromNamespaceAndPath("examplemod", "brine"))
+    .dimension(ResourceLocation.fromNamespaceAndPath("minecraft", "overworld"), placement -> placement
         .yRange(-48, 32)
         .attempts(0.05)
         .radius(4, 10)
         .verticalRadius(2, 4)
         .maxLobes(3)
         .minSolidCover(2)
         .minSolidShell(1)
-        .hostTag(new ResourceLocation("minecraft", "stone_ore_replaceables")))
+        .hostTag(ResourceLocation.fromNamespaceAndPath("minecraft", "stone_ore_replaceables")))
     .build();
 
 WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
@@ -77,14 +77,14 @@ WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
 `OilDefinition` and template `.oil(...)` remain deprecated migration adapters
 for one legacy oil rule. New integrations should use `FluidDepositDefinition`.
 
-NeoForge 20.6 biomes are data-driven registry entries. Package biome JSON under
+NeoForge 21.1 biomes are data-driven registry entries. Package biome JSON under
 `data/<modid>/worldgen/biome/`, or generate it with a
 `DatapackBuiltinEntriesProvider`. `OreSpawnBiomes.copyAndRegister` is an
 optional bootstrap/datagen convenience for cloning a known biome:
 
 ```java
 public static final ResourceKey<Biome> CANDY_PLAINS = ResourceKey.create(
-    Registries.BIOME, new ResourceLocation("examplemod", "candy_plains"));
+    Registries.BIOME, ResourceLocation.fromNamespaceAndPath("examplemod", "candy_plains"));
 
 public static final RegistrySetBuilder BIOME_BUILDER = new RegistrySetBuilder()
     .add(Registries.BIOME, context -> {
@@ -99,21 +99,21 @@ materials through the same OreSpawn provider:
 
 ```java
 WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
-    .biomePalette(new ResourceLocation("examplemod", "overworld"),
-        new ResourceLocation("minecraft", "overworld"), palette -> palette
+    .biomePalette(ResourceLocation.fromNamespaceAndPath("examplemod", "overworld"),
+        ResourceLocation.fromNamespaceAndPath("minecraft", "overworld"), palette -> palette
             .mode(BiomePlacementMode.REPLACE)
             .scope(BiomeReplacementScope.MINECRAFT_ONLY)
             .regionSize(BiomeRegionSize.LARGE)
             .coverage(1.0)
             .fallbackWeight(0.0)
-            .biome(new ResourceLocation("examplemod", "candy_plains"), biome -> biome
+            .biome(ResourceLocation.fromNamespaceAndPath("examplemod", "candy_plains"), biome -> biome
                 .weight(3.0)
-                .similarBiome(new ResourceLocation("minecraft", "plains"))))
-    .dimensionMaterials(new ResourceLocation("examplemod", "overworld_materials"),
-        new ResourceLocation("minecraft", "overworld"), materials -> materials
-            .defaultFluid(new ResourceLocation("examplemod", "lemonade"))
-            .snowBlock(new ResourceLocation("examplemod", "icing"))
-            .iceBlock(new ResourceLocation("examplemod", "frozen_lemonade")))
+                .similarBiome(ResourceLocation.fromNamespaceAndPath("minecraft", "plains"))))
+    .dimensionMaterials(ResourceLocation.fromNamespaceAndPath("examplemod", "overworld_materials"),
+        ResourceLocation.fromNamespaceAndPath("minecraft", "overworld"), materials -> materials
+            .defaultFluid(ResourceLocation.fromNamespaceAndPath("examplemod", "lemonade"))
+            .snowBlock(ResourceLocation.fromNamespaceAndPath("examplemod", "icing"))
+            .iceBlock(ResourceLocation.fromNamespaceAndPath("examplemod", "frozen_lemonade")))
     .build();
 ```
 

docs/BIOMES.md

@@ -100,7 +100,7 @@ known biome's complete builder inside a `RegistrySetBuilder` bootstrap:
 
 ```java
 public static final ResourceKey<Biome> CANDY_PLAINS = ResourceKey.create(
-    Registries.BIOME, new ResourceLocation("examplemod", "candy_plains"));
+    Registries.BIOME, ResourceLocation.fromNamespaceAndPath("examplemod", "candy_plains"));
 
 public static final RegistrySetBuilder BIOME_BUILDER = new RegistrySetBuilder()
     .add(Registries.BIOME, context -> {
@@ -114,7 +114,7 @@ public static final RegistrySetBuilder BIOME_BUILDER = new RegistrySetBuilder()
 datagen that deliberately supplies every required climate, effects, spawn, and
 generation field. Both helpers create datapack content; live placement belongs
 in the provider declaration. Do not use a static `DeferredRegister<Biome>`:
-NeoForge 20.6 biomes belong to the dynamic world registry.
+NeoForge 21.1 biomes belong to the dynamic world registry.
 
 ## Surfaces And Materials
 

docs/DEVELOPER_GUIDE.md

@@ -89,7 +89,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
 
 private void enqueueWorldgen(InterModEnqueueEvent event) {
-    ResourceLocation tin = new ResourceLocation("examplemod", "tin_ore");
+    ResourceLocation tin = ResourceLocation.fromNamespaceAndPath("examplemod", "tin_ore");
     WorldgenProvider provider = WorldgenProvider.builder("examplemod", 1)
         .ore(tin, ore -> ore
             .retrogen(false)
@@ -100,7 +100,7 @@ private void enqueueWorldgen(InterModEnqueueEvent event) {
 					.quantityRange(4, 11)
                 .pattern(OrePattern.VEIN)
                 .heightDistribution(OreHeightDistribution.TRIANGLE)
-					.hostTag(new ResourceLocation("minecraft", "stone_ore_replaceables"))))
+					.hostTag(ResourceLocation.fromNamespaceAndPath("minecraft", "stone_ore_replaceables"))))
         .build();
 
     OreSpawnApi.enqueue(provider);

gradle.properties

@@ -10,16 +10,16 @@ org.gradle.configuration-cache=false
 ## Environment Properties
 
 # The Minecraft version must agree with the NeoForge version to get a valid artifact
-minecraft_version=1.20.6
+minecraft_version=1.21.1
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.6,1.21)
-# NeoForge 20.6 targets Minecraft 1.20.6.
-neo_version=20.6.139
-neo_version_range=[20.6.139,20.7)
-# NeoForge 20.6 uses FML loader major 2.
-loader_version_range=[2,)
+minecraft_version_range=[1.21.1,1.22)
+# NeoForge 21.1 targets Minecraft 1.21.1.
+neo_version=21.1.247
+neo_version_range=[21.1.247,21.2)
+# NeoForge 21.1.247 declares JavaFML loader major 3.
+loader_version_range=[3,)
 
 
 ## Mod Properties

src/main/java/zone/moddev/mc/orespawn/api/GeologyProfileView.java

@@ -31,7 +31,7 @@ public Optional<ResourceLocation> selectedTemplate() {
 			return Optional.empty();
 		}
 		try {
-			return Optional.of(new ResourceLocation(root.get("selected_template").getAsString()));
+			return Optional.of(ResourceLocation.parse(root.get("selected_template").getAsString()));
 		} catch (RuntimeException ignored) {
 			return Optional.empty();
 		}
@@ -77,7 +77,7 @@ private Set<ResourceLocation> keys(String section) {
 		Set<ResourceLocation> values = new LinkedHashSet<>();
 		for (String value : root.getAsJsonObject(section).keySet()) {
 			try {
-				values.add(new ResourceLocation(value));
+				values.add(ResourceLocation.parse(value));
 			} catch (RuntimeException ignored) {
 				// Invalid user data is omitted from the typed view.
 			}

src/main/java/zone/moddev/mc/orespawn/api/OreDimensionSelector.java

@@ -11,7 +11,7 @@ public enum OreDimensionSelector {
 	private final ResourceLocation id;
 
 	OreDimensionSelector(String path) {
-		this.id = new ResourceLocation("orespawn", path);
+		this.id = ResourceLocation.fromNamespaceAndPath("orespawn", path);
 	}
 
 	public ResourceLocation id() {
@@ -27,8 +27,8 @@ public static OreDimensionSelector fromId(ResourceLocation id) {
 
 	public static OreDimensionSelector fromName(String value) {
 		ResourceLocation id = value.indexOf(':') >= 0
-				? new ResourceLocation(value)
-				: new ResourceLocation("orespawn", value.toLowerCase(Locale.ROOT));
+				? ResourceLocation.parse(value)
+				: ResourceLocation.fromNamespaceAndPath("orespawn", value.toLowerCase(Locale.ROOT));
 		return fromId(id);
 	}
 }

src/main/java/zone/moddev/mc/orespawn/api/OreSpawnBiomes.java

@@ -13,7 +13,7 @@
  * Small bootstrap helpers for provider mods which define data-driven biomes
  * without taking a compile-time dependency on a separate biome framework.
  *
- * <p>Biomes are dynamic registry entries in NeoForge 20.6. A provider should
+ * <p>Biomes are dynamic registry entries in NeoForge 21.1. A provider should
  * package biome JSON or use these methods from a
  * {@link net.minecraft.core.RegistrySetBuilder} bootstrap used by datagen.
  */

src/main/java/zone/moddev/mc/orespawn/api/OreSpawnGeologySampler.java

@@ -22,7 +22,7 @@
 import net.minecraft.server.level.ServerLevel;
 
 final class OreSpawnGeologySampler implements GeologySampler {
-	private static final ResourceLocation CYANO_GEOME = new ResourceLocation("orespawn", "cyano");
+	private static final ResourceLocation CYANO_GEOME = ResourceLocation.fromNamespaceAndPath("orespawn", "cyano");
 
 	private final ServerLevel level;
 	private final ResourceLocation dimension;
@@ -59,7 +59,7 @@ public GeologyColumn sampleColumn(int blockX, int blockZ, int surfaceY) {
 		BlockPos position = new BlockPos(blockX, surfaceY, blockZ);
 		Holder<Biome> holder = level.getBiome(position);
 		ResourceLocation biomeId = holder.unwrapKey().map(ResourceKey::location)
-				.orElse(new ResourceLocation("orespawn", "unregistered_biome"));
+				.orElse(ResourceLocation.fromNamespaceAndPath("orespawn", "unregistered_biome"));
 		if (mode == GeologyMode.LEGACY) {
 			return new CyanoColumn(biomeId, blockX, blockZ, surfaceY);
 		}
@@ -127,10 +127,10 @@ private static Optional<GeologyFamily> family(RockFamily family) {
 
 	private static ResourceLocation geomeId(String name) {
 		try {
-			return name.indexOf(':') >= 0 ? new ResourceLocation(name)
-					: new ResourceLocation("orespawn", name.toLowerCase(Locale.ROOT));
+			return name.indexOf(':') >= 0 ? ResourceLocation.parse(name)
+					: ResourceLocation.fromNamespaceAndPath("orespawn", name.toLowerCase(Locale.ROOT));
 		} catch (RuntimeException ignored) {
-			return new ResourceLocation("orespawn", "unknown");
+			return ResourceLocation.fromNamespaceAndPath("orespawn", "unknown");
 		}
 	}
 }

src/main/java/zone/moddev/mc/orespawn/api/OreSpawnPatternRegistry.java

@@ -10,7 +10,7 @@
 /** Stable entry point for mods that register codec-backed ore patterns. */
 public final class OreSpawnPatternRegistry {
 	public static final ResourceLocation REGISTRY_NAME =
-			new ResourceLocation(OreSpawn.MODID, "ore_pattern_types");
+			ResourceLocation.fromNamespaceAndPath(OreSpawn.MODID, "ore_pattern_types");
 
 	private OreSpawnPatternRegistry() {
 	}