Fix provider-declared natural terrain replacement on Forge 1.16.5

Author: SkyBlade1978

.github/workflows/ci.yml

@@ -56,9 +56,9 @@ jobs:
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/OreSpawn-4.0.8.116051.jar
-            build/libs/OreSpawn-4.0.8.116051-sources.jar
-            build/libs/OreSpawn-4.0.8.116051-javadoc.jar
+            build/libs/OreSpawn-4.0.9.116051.jar
+            build/libs/OreSpawn-4.0.9.116051-sources.jar
+            build/libs/OreSpawn-4.0.9.116051-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.txt
 

CHANGELOG.txt

@@ -1,3 +1,12 @@
+Version 4.0.9.116051
+
+* Replace provider-declared natural terrain hosts during the existing geology
+  scan before structure and vegetation features can author matching blocks.
+* Keep air, fluids, bedrock, and block entities protected even when their block
+  IDs are mistakenly declared as terrain hosts.
+* Apply the correction only while generating new chunks; existing chunks and
+  saved profiles remain unchanged.
+
 Version 4.0.8.116051
 
 * Preserve long host, tag, and biome-list values when OreSpawn editors load

README.md

@@ -17,7 +17,7 @@ End" policy used by mods such as Base Metals.
 This is not the unrelated mod that adds mobs and dimensions under the same
 name.
 
-This branch builds target-qualified version `4.0.8.116051`: the OreSpawn 4.0.8
+This branch builds target-qualified version `4.0.9.116051`: the OreSpawn 4.0.9
 feature set for Minecraft 1.16.5 and Forge. See the
 [versioning policy](docs/VERSIONS.md) for the encoding and release convention.
 

build.gradle

@@ -464,6 +464,7 @@ level-name=surface-integration-world
 level-seed=zsjpxah
 level-type=default
 online-mode=false
+server-port=0
 allow-nether=true
 generate-structures=false
 spawn-protection=0
@@ -732,7 +733,7 @@ def preparedReleaseDir = providers.gradleProperty('preparedReleaseDir')
 tasks.register('verifyReleaseConfiguration') {
     group = 'verification'
     doLast {
-        if (project.mod_version != '4.0.8.116051'
+        if (project.mod_version != '4.0.9.116051'
                 || project.minecraft_version != '1.16.5'
                 || project.forge_version != '36.2.34'
                 || project.mapping_channel != 'official'
@@ -745,9 +746,9 @@ tasks.register('verifyReleaseConfiguration') {
             throw new GradleException('Unexpected dispatcher or Java target metadata')
         }
         List<String> expectedPublicArtifacts = [
-                'OreSpawn-4.0.8.116051.jar',
-                'OreSpawn-4.0.8.116051-sources.jar',
-                'OreSpawn-4.0.8.116051-javadoc.jar'
+                'OreSpawn-4.0.9.116051.jar',
+                'OreSpawn-4.0.9.116051-sources.jar',
+                'OreSpawn-4.0.9.116051-javadoc.jar'
         ]
         if (base.archivesName.get() != 'OreSpawn'
                 || expectedReleaseFiles.get().collect { it.toString() } != expectedPublicArtifacts) {
@@ -764,7 +765,7 @@ tasks.register('verifyReleaseConfiguration') {
                 'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyMineralogyProfileMigration.java',
                 'README.md', 'CHANGELOG.txt'
         ].each { path ->
-            if (!file(path).getText('UTF-8').contains('4.0.8.116051')) {
+            if (!file(path).getText('UTF-8').contains('4.0.9.116051')) {
                 throw new GradleException("Release identity missing from ${path}")
             }
         }
@@ -1269,6 +1270,7 @@ level-name=surface-integration-world
 level-seed=zsjpxah
 level-type=default
 online-mode=false
+server-port=0
 allow-nether=true
 generate-structures=false
 spawn-protection=0

docs/BIOMES.md

@@ -123,6 +123,13 @@ lets OreSpawn replace the actual exposed ground while preserving later trees,
 plants, authored structures, and block entities. In ceiling dimensions,
 `ceiling_block` applies to the roof underside and does not replace the roof top.
 
+Provider-declared `terrain_dimensions.host_blocks` are resolved by one terrain
+scan at the start of `LOCAL_MODIFICATIONS`, immediately before provider
+surfaces. Matching natural blocks already present in base terrain are eligible
+for geology; matching blocks authored by later structure or vegetation stages
+are not. Air, fluids, bedrock, and block-entity states remain protected even if
+a provider mistakenly lists their block IDs as terrain hosts.
+
 Surface correction is generation-only. Installing or updating OreSpawn does
 not rewrite already generated chunks; travel into new terrain to see a changed
 provider surface definition.

docs/VERSIONS.md

@@ -54,7 +54,7 @@ Examples:
 | 1.13.2 | Forge | `113021` | `4.0.6.113021` |
 | 1.14.4 | Forge | `114041` | `4.0.8.114041` |
 | 1.15.2 | Forge | `115021` | `4.0.9.115021` |
-| 1.16.5 | Forge | `116051` | `4.0.8.116051` |
+| 1.16.5 | Forge | `116051` | `4.0.9.116051` |
 | 1.20.6 | Forge | `120061` | `4.0.6.120061` |
 | 1.21.11 | Forge | `121111` | `4.0.6.121111` |
 | 26.1.2 | Forge | `2601021` | `4.0.6.2601021` |
@@ -146,7 +146,8 @@ unaffected branches remained on their target-qualified 4.0.6 versions.
 
 If a different branch later receives a shared fix, it uses the next unused
 Bug number, such as Forge 1.14.4's `4.0.8.114041`, even though the 4.0.7 repair
-was not applicable there. A branch may therefore skip functional versions.
+was not applicable there. Forge 1.15.2 and 1.16.5 then advanced to their
+target-qualified 4.0.9 releases for the provider terrain-host ordering repair.
 A branch may therefore legitimately skip functional version numbers.
 
 This provides three useful guarantees:

gradle.properties

@@ -19,7 +19,7 @@ mcp_version=20210115.111550
 mod_id=orespawn
 mod_name=MMD OreSpawn
 mod_license=LGPL-2.1
-mod_version=4.0.8.116051
+mod_version=4.0.9.116051
 mod_group=zone.moddev.mc
 mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
 mod_description=Configurable, provider-driven terrain, ore, and deposit generation.