Restore vanilla stone behaviour in Mineralogy 6.1.4 for Forge 26.2

.github/workflows/ci.yml

@@ -124,9 +124,9 @@ jobs:
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/Mineralogy-6.1.2.2602001.jar
-            build/libs/Mineralogy-6.1.2.2602001-sources.jar
-            build/libs/Mineralogy-6.1.2.2602001-javadoc.jar
+            build/libs/Mineralogy-6.1.4.2602001.jar
+            build/libs/Mineralogy-6.1.4.2602001-sources.jar
+            build/libs/Mineralogy-6.1.4.2602001-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.txt
 

CHANGELOG.txt

@@ -1,3 +1,31 @@
+Mineralogy 6.1.4.2602001 for Minecraft 26.2
+
+- Restored natural bat spawning on Mineralogy terrain through the additive
+  vanilla bats_spawnable_on block tag. Applies to existing worlds, preserves
+  normal light/height restrictions, and excludes crafted construction blocks.
+  Eligibility is independent of cobblestone equivalence.
+- Restored vanilla sculk catalyst conversion and dripstone/moss replacement on
+  37 natural terrain identities, including native aliases and special rocks.
+- Sulfur cubes now accept only the 31 raw Mineralogy rocks as Slow Bouncy
+  stones. Polished blocks, bricks and all other Mineralogy items are excluded;
+  Minecraft's own vanilla consumption rules are unchanged.
+- Goats can spawn on natural terrain and break horns against harder raw rocks.
+  Soft rocks and crafted blocks are excluded from horn breaking.
+- Fixed dripstone water-pocket and column checks rejecting natural rocks.
+  Roots and forest rocks recognise natural substrates without making bare
+  rock suitable for growing azalea trees.
+- Added slab, stair, furnace, ore, storage and dyed-block classifications.
+  Double slabs remain full blocks. Disabled construction references are
+  configuration-safe, and normal cobblestone follows the existing option.
+- Rock-salt lamps retain the centre post on straight walls.
+- Disabled construction loot tables no longer refer to missing items. Their
+  normal drops remain unchanged when construction is enabled.
+- Sculk and sulfur cubes work in existing worlds after updating. Natural cave
+  decoration improves in newly generated chunks.
+- Added deterministic tag, real-loader/reload, vanilla consumer, cave sample
+  and packaged-runtime validation. No recipes, IDs, configurations, provider,
+  OreSpawn engine, translations, or existing textures changed.
+
 Mineralogy 6.1.2.2602001 for Minecraft 26.2
 
 - Ported the accepted Mineralogy 6.1.2 Forge contract to Minecraft 26.2 while

README.md

@@ -10,11 +10,29 @@ mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer,
 and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine;
 Mineralogy no longer installs a parallel world generator.
 
-This branch builds Mineralogy `6.1.2.2602001` for Forge `65.1.0`, with an
+This branch builds Mineralogy `6.1.4.2602001` for Forge `65.1.0`, with an
 additional compatibility smoke on Forge `65.1.3`, and is built and tested
 against OreSpawn `4.0.16.2602001`. Its declared compatibility range is
 OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers.
 
+Mineralogy 6.1.4 fixes places where Minecraft wasn't recognising natural
+Mineralogy stone. Sculk and moss can spread across it, dripstone and roots
+recognise their natural substrates, and bats and goats keep their normal
+spawning rules. Goats can break horns against harder raw rocks, not soft rocks
+or crafted blocks.
+
+Sulfur cubes can absorb the 31 raw Mineralogy rocks as Slow Bouncy stones.
+Polished blocks, bricks and every other Mineralogy item are excluded. This
+doesn't change Minecraft's existing rules for vanilla blocks.
+
+Slabs, stairs, walls, furnaces, ores, storage blocks and coloured drywall now
+have the appropriate classifications. Rock-salt lamps keep the post on straight
+walls. Construction references stay loadable when their blocks are disabled.
+
+These fixes work with cobblestone equivalence on or off. Existing worlds gain
+the behaviour fixes after updating; improved cave decoration applies to newly
+generated chunks and won't redecorate explored caves.
+
 ## Configuration and help
 
 Mineralogy's content and recipe switches remain in

build.gradle

@@ -650,7 +650,7 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Verifies the exact Mineralogy 26.2 release identity.'
     dependsOn tasks.named('verifyMavenizerCompatibilityFixture')
     doLast {
-        if (project.mod_version != '6.1.2.2602001'
+        if (project.mod_version != '6.1.4.2602001'
                 || project.mod_group != expectedMavenGroup
                 || project.minecraft_version != '26.2'
                 || project.forge_version != '65.1.0'
@@ -665,7 +665,7 @@ tasks.register('verifyReleaseDependencies') {
     group = 'verification'
     description = 'Resolves and verifies the exact released OreSpawn dependency.'
     doLast {
-        if (project.mod_version != '6.1.2.2602001'
+        if (project.mod_version != '6.1.4.2602001'
                 || project.minecraft_version != project.mc_version
                 || project.mc_version != '26.2'
                 || project.loader_name != 'forge'
@@ -1453,7 +1453,7 @@ tasks.register('verifyEclipseProductionClasspath') {
             throw new GradleException('Eclipse output contains stale or unexpanded mods.toml metadata')
         }
         String eclipseMetadata = eclipseModsToml.getText('UTF-8')
-        if (eclipseMetadata.contains('${') || !eclipseMetadata.contains('version="6.1.2.2602001"')) {
+        if (eclipseMetadata.contains('${') || !eclipseMetadata.contains('version="6.1.4.2602001"')) {
             throw new GradleException('Eclipse output contains unresolved or invalid Mineralogy version metadata')
         }
     }
@@ -1476,3 +1476,6 @@ tasks.named('check') {
     dependsOn tasks.named('verifyOilCompatibilityFixtureIsolation')
     dependsOn tasks.named('compileRecipeIntegrationFixture')
 }
+
+apply from: 'gradle/verify-terrain-compatibility.gradle'
+apply from: 'gradle/terrain-compatibility-probe.gradle'

docs/DEVELOPER_GUIDE.md

@@ -1,5 +1,24 @@
 # Mineralogy Developer Guide
 
+## Stone compatibility tags
+
+`mineralogy:terrain_rocks` contains natural provider outputs and retained aliases,
+not crafted forms, machines, ores or storage conversions. `raw_stones` excludes
+sandstone for common stone consumers. The horn whitelist excludes rock salt,
+scoria, siltstone, chalk, gypsum and pumice.
+
+Sulfur cubes receive exactly 31 raw Mineralogy items, independently of the
+cobblestone option. Crafted items must remain outside the resolved swallowing
+aggregate, including through indirect common-tag references.
+
+Config-dependent construction members are optional objects inside `values`.
+Their loot tables check item existence before loading, keeping disabled
+construction free of missing-item references without changing normal drops.
+Single/upright slabs join the shape aggregates; separate double slabs do not.
+The two dripstone hooks redirect only the pool-containment and column-boundary
+checks to the dedicated base-stone/terrain union. Global base-stone, ore-host
+and carver tags remain unchanged. Review native interfaces explicitly on ports.
+
 ## Responsibility Split
 
 | Mineralogy owns | OreSpawn owns |

docs/PLAYER_GUIDE.md

@@ -1,5 +1,17 @@
 # Mineralogy Player Guide
 
+## Natural stone compatibility
+
+Natural Mineralogy rocks support sculk, moss, dripstone, bats and goat spawning.
+Harder raw rocks can break goat horns; soft rocks and crafted blocks cannot.
+Sulfur cubes accept only the 31 raw Mineralogy rocks as Slow Bouncy stones, not
+polished blocks, bricks or other crafted items. Vanilla blocks keep Minecraft's
+own consumption rules.
+
+Rock-salt lamps keep the post on a straight wall. These behaviour fixes work
+in existing worlds; cave, root and forest-rock decoration changes apply to
+newly generated chunks.
+
 ## Installing
 
 Mineralogy 6 needs Minecraft 26.2, Forge 65.1.0 or compatible Forge 65.1.x,

docs/VERSIONS.md

@@ -9,14 +9,14 @@ exact Minecraft/loader target are both visible in one number.
 Major.Minor.Bug.Target
 ```
 
-The first three components are the **functional version**. Mineralogy `6.1.2`
-means major generation 6, minor release 1, and bug revision 2.
+The first three components are the **functional version**. Mineralogy `6.1.4`
+means major generation 6, minor release 1, and bug revision 4.
 
 The fourth component identifies the target build. The complete version for
 this Minecraft 26.2 Forge release is therefore:
 
 ```text
-6.1.2.2602001
+6.1.4.2602001
 ```
 
 This expanded numeric form is compatible with Maven version ordering, but it
@@ -25,7 +25,7 @@ components.
 
 The release tag is exactly the complete four-component version, with no
 redundant Minecraft-version prefix. For this branch the tag is therefore
-`6.1.2.2602001`, not `26.2-6.1.2.2602001`. The Target already makes tags unique
+`6.1.4.2602001`, not `26.2-6.1.4.2602001`. The Target already makes tags unique
 across Minecraft versions and loaders.
 
 ## Reading the target component
@@ -59,7 +59,7 @@ minor digits, and all remaining digits for the Minecraft major version.
 | 1.21.1 | Forge | `121011` | `6.1.2.121011` |
 | 1.21.11 | Forge | `121111` | `6.1.2.121111` |
 | 26.1.2 | Forge | `2601021` | `6.1.2.2601021` |
-| 26.2 | Forge | `2602001` | `6.1.2.2602001` |
+| 26.2 | Forge | `2602001` | `6.1.4.2602001` |
 | 26.2 | NeoForge | `2602002` | `6.0.0.2602002` |
 
 The 26.2 row records this branch's current release. The other rows illustrate
@@ -70,6 +70,33 @@ Historical Mineralogy releases may also have four numeric components that used
 the last number as an ordinary build sequence. The target policy applies to
 new releases and does not reinterpret an old file's version.
 
+
+## Vanilla stone compatibility campaign
+
+The following local candidates share the 6.1.4 additive terrain compatibility
+fix. This is a candidate matrix, not a claim that every release is published.
+NeoForge 26.3 retains its existing 6.1.3 compatibility correction.
+Publication is paused while the expanded tag fixes are checked and retested.
+
+| Minecraft | Forge candidate | NeoForge candidate |
+| --- | --- | --- |
+| 1.16.5 | 6.1.4.116051 | Not in scope |
+| 1.17.1 | 6.1.4.117011 | Not in scope |
+| 1.18.2 | 6.1.4.118021 | Not in scope |
+| 1.19.4 | 6.1.4.119041 | Not in scope |
+| 1.20.1 | 6.1.4.120011 | Not in scope |
+| 1.20.6 | 6.1.4.120061 | 6.1.4.120062 |
+| 1.21.1 | 6.1.4.121011 | 6.1.4.121012 |
+| 1.21.11 | 6.1.4.121111 | 6.1.4.121112 |
+| 26.1.2 | 6.1.4.2601021 | 6.1.4.2601022 |
+| 26.2 | 6.1.4.2602001 | 6.1.4.2602002 |
+| 26.3 | 6.1.4.2603001 | 6.1.4.2603002 |
+
+Natural cave and animal interfaces apply only where Minecraft supports them.
+Sulfur cubes use raw Mineralogy items only on 26.2 and 26.3. Forge 1.17 keeps
+its native goat-spawning rule. Forge 1.13.2–1.15.2 are deferred until their
+later 6.1 ports; native-texture synchronization remains a separate campaign.
+
 ## Major version
 
 The **Major** number changes for a fundamental or breaking new generation of
@@ -94,7 +121,7 @@ When Major changes, Minor and Bug reset to zero. When Minor changes, Bug resets
 to zero. The target for the actual build is then appended:
 
 ```text
-6.1.2.2602001 -> 6.2.0.2602001
+6.1.4.2602001 -> 6.2.0.2602001
 6.2.4.2602001 -> 7.0.0.2602001
 ```
 
@@ -127,7 +154,7 @@ Minecraft 1.20.6 / Forge / Mineralogy 6.1.2.120061
 Minecraft 1.21.1 / Forge / Mineralogy 6.1.2.121011
 Minecraft 1.21.11 / Forge / Mineralogy 6.1.2.121111
 Minecraft 26.1.2 / Forge / Mineralogy 6.1.2.2601021
-Minecraft 26.2 / Forge / Mineralogy 6.1.2.2602001
+Minecraft 26.2 / Forge / Mineralogy 6.1.4.2602001
 ```
 
 Minecraft and loader APIs may require different internal code without changing
@@ -170,10 +197,16 @@ feature generation, not the exact jar.
 
 ## Builds and release notes
 
+This local 6.1.4 candidate also repairs natural bat substrate eligibility.
+Minecraft introduced the bats_spawnable_on block tag in 1.21.2; the compatibility
+interface belongs only on 1.21.2-and-later targets. Earlier Mineralogy candidates
+remain unchanged. The additive block tag reuses natural terrain membership,
+not the broad base_stone_overworld tag, and preserves vanilla spawn restrictions.
+
 The Gradle build reads the complete version from `mod_version`, verifies that
 it has four numeric components, and checks that its Target matches the declared
 Minecraft version and Forge loader. CI build numbers are not appended. For this
-branch, published metadata and artifacts therefore use `6.1.2.2602001`.
+branch, published metadata and artifacts therefore use `6.1.4.2602001`.
 
 Every release note should state:
 

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.caching=true
 org.gradle.parallel=false
 net.minecraftforge.gradle.merge-source-sets=true
 
-mod_version=6.1.2.2602001
+mod_version=6.1.4.2602001
 mod_group=zone.moddev.mc
 
 # Release metadata consumed by the generic dispatcher.

gradle/terrain-compatibility-probe.gradle

@@ -0,0 +1,23 @@
+def probeClasses = layout.buildDirectory.dir('terrain-compatibility-fixture/classes')
+tasks.register('compileTerrainCompatibilityProbe', JavaCompile) {
+    dependsOn tasks.named('classes'), tasks.named('compileRecipeIntegrationFixture')
+    source fileTree('src/terrainCompatibilityTest/java')
+    classpath = files(sourceSets.main.output, sourceSets.main.compileClasspath, layout.buildDirectory.dir('recipe-integration-fixture/classes'))
+    destinationDirectory = probeClasses
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(Integer.parseInt(project.java_version))
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+    options.encoding = 'UTF-8'
+    options.release = Integer.parseInt(project.java_version)
+}
+tasks.register('terrainCompatibilityProbeJar', Jar) {
+    dependsOn tasks.named('compileTerrainCompatibilityProbe')
+    archiveFileName = 'terraincompatibilityprobe.jar'
+    destinationDirectory = layout.buildDirectory.dir('terrain-compatibility-fixture')
+    from probeClasses
+    from 'src/terrainCompatibilityTest/resources'
+    from(layout.buildDirectory.dir('recipe-integration-fixture/classes')) { include 'zone/moddev/mc/mineralogy/fixture/RecipeIntegrationAssertions*.class' }
+    from('src/test/resources') { include 'tag-compatibility-contract.json' }
+}
+tasks.named('check') { dependsOn tasks.named('compileTerrainCompatibilityProbe') }