Fix ore generation and upgrades on 1.12.2

Bring the 4.1.6 ore and upgrade fixes to Forge 1.12.2.

Author: SkyBlade1978

.github/workflows/ci.yml

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

CHANGELOG.txt

@@ -1,3 +1,15 @@
+Version 4.1.6.112021
+
+* Let Java providers select an exact ore host, such as plain stone without
+  granite. Whole-block selectors still work as before.
+* Keep imported ore rules and saved choices when moving a world from 1.10.2
+  or 1.11.2. Back up the profile before removing an untouched duplicate and
+  leave edited rules for review.
+* Choose sulfur and lithium defaults after all mods have loaded so Base
+  Electric can share the same veins. Existing worlds keep their choices.
+* Use the correct Austrian German locale and give Pirate Speak its own menu
+  and guide text.
+
 Version 4.1.3.112021
 
 * Apply hybrid and replacement background limits to imported built-in ore

README.md

@@ -10,7 +10,7 @@ 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.
 
-This branch builds target-qualified version `4.1.3.112021`: the OreSpawn 4.1.3
+This branch builds target-qualified version `4.1.6.112021`: the OreSpawn 4.1.6
 feature set for Minecraft 1.12.2 and Forge. It adds stable generation identity,
 non-loading geology sampling, per-resource background control, existing-world
 provider merge policy, an Ore Sources arbiter for equivalent provider ores, a

docs/API.md

@@ -98,6 +98,12 @@ exclusions. These methods work on both explicit `.dimension(...)` rules and
 `.dimensionSelector(...)` fallbacks; built definitions and their returned
 filter sets are immutable.
 
+Use `.hostState(block, metadata)` to select one legacy ore host variant, or
+`.hostState(block, metadata, weight)` to give it a replacement weight.
+For example, `.hostState(new ResourceLocation("minecraft", "stone"), 0)`
+accepts plain stone without accepting granite or diorite. The existing
+`.hostBlock(...)` method still accepts every variant of a block.
+
 Create one `BiomeRegistrar` during normal mod construction. It attaches to the
 calling mod's event bus and defers biome factories until Forge's biome registry
 event. `OreSpawnBiomes.copyAndRegister` clones a known biome without adding a

docs/CONFIGURATION.md

@@ -44,6 +44,10 @@ world. Restart after editing JSON by hand.
 | `flat_bedrock` | object | Opt-in flat bedrock controls |
 | `worldgen_aliases` | ID-to-ID object | Replacement output aliases resolved while baking |
 
+Forge 1.12.2 applies the same gold settings to the normal and extra Mesa
+gold passes. With vanilla ore management off and suppression disabled, both
+passes keep their normal generation.
+
 ## Enumerated Values
 
 | Setting | Accepted values |

docs/MIGRATION.md

@@ -69,6 +69,16 @@ deterministic machine-readable detail.
 
 ## Provider-Aware OS3 Imports
 
+If you move a world with an OreSpawn 1 import already saved by OreSpawn 4
+on 1.10.2 or 1.11.2, its rule ID and settings are kept even without the
+converted provider file. If an older build added a
+second rule, OreSpawn removes it only when the saved rule still matches the
+provider default and no custom ore-source selection depends on it. The
+original profile is backed up before that repair. Edited or ambiguous
+overlaps are left in place and listed under `legacy_ore_review` in the
+provider's saved manifest and reported in the log. This does not change
+ore blocks in chunks already generated.
+
 When an OreSpawn 2/3 file is named for an installed provider, the migrator now
 compares each converted primary output with that provider's ore declarations.
 A unique output match is written under the provider's stable rule ID, allowing

docs/PROVIDERS.md

@@ -120,11 +120,12 @@ unambiguous. NetherMetals and EndMetals stay in their respective dimension
 domains. DenseMetals is enrichment, not an interchangeable output, and
 BaseSciences has no ordinary ore-source role.
 
-Reviewed fresh-world conflicts start Balanced with all eligible output blocks.
-Mineralogy, then BaseMinerals, then ElectricAdvantage is the initial placement
-and Single-mode priority for sulfur; BaseMinerals, then ElectricAdvantage is the
-corresponding lithium priority. No other conflict is automatically consolidated
-without an explicit catalog row. Exact Ore Dictionary `oreX` inference recognizes the curated
+Once mods have finished registering their ores, reviewed fresh-world conflicts
+start Balanced with all eligible output blocks. Sulfur prefers Mineralogy,
+then Base Minerals, then Base Electric (`baseelectric` or the older
+`electricadvantage` ID) for placement. Lithium prefers Base Minerals, then
+Base Electric. Existing choices are kept. Other conflicts need an explicit
+catalog entry for automatic consolidation. Exact Ore Dictionary `oreX` inference recognizes the curated
 sulfur/sulphur and aluminum/aluminium aliases but deliberately keeps Niter and
 Saltpeter distinct. Multiple unrelated entries are marked for review rather
 than fuzzy-matched from block names.

docs/VERSIONS.md

@@ -52,7 +52,7 @@ Examples:
 | Minecraft | Loader | Target | Example full OreSpawn version |
 | --- | --- | ---: | --- |
 | 1.10.2 | Forge | `110021` | `4.0.6.110021` |
-| 1.12.2 | Forge | `112021` | `4.1.3.112021` |
+| 1.12.2 | Forge | `112021` | `4.1.6.112021` |
 | 1.13.2 | Forge | `113021` | `4.0.6.113021` |
 | 1.20.6 | Forge | `120061` | `4.0.6.120061` |
 | 1.21.11 | Forge | `121111` | `4.0.6.121111` |

gradle.properties

@@ -30,7 +30,7 @@ mod_vendor=Minecraft Mod Development
 mod_license=LGPL-2.1
 mod_license_name=GNU Lesser General Public License, Version 2.1
 mod_license_url=https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-mod_version=4.1.3.112021
+mod_version=4.1.6.112021
 mod_group=zone.moddev.mc.orespawn
 mod_authors=SkyBlade1978, dshadowwolf, the MMD Team
 mod_description=Configurable, provider-driven terrain, ore, and deposit generation.

gradle/release/artifacts.gradle

@@ -81,7 +81,7 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Validates the target-qualified release, API, schemas, reports, and publishing identity.'
 
     doLast {
-        if (project.mod_version != '4.1.3.112021'
+        if (project.mod_version != '4.1.6.112021'
                 || project.mod_group != expectedMavenGroup) {
             throw new GradleException("Unexpected OreSpawn release version: ${project.mod_version}")
         }
@@ -108,8 +108,8 @@ tasks.register('verifyReleaseConfiguration') {
                 'src/main/java/zone/moddev/mc/orespawn/worldgen/LegacyOs3ProfileMigration.java',
                 'README.md', 'CHANGELOG.txt'
         ].each { path ->
-            if (!file(path).getText('UTF-8').contains('4.1.3.112021')) {
-                throw new GradleException("Authoritative release location does not contain 4.1.3.112021: ${path}")
+            if (!file(path).getText('UTF-8').contains('4.1.6.112021')) {
+                throw new GradleException("Authoritative release location does not contain 4.1.6.112021: ${path}")
             }
         }
         if (!file('docs/API.md').getText('UTF-8').contains('orespawn@[4.0.6,5.0.0)')) {