Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ jobs:
if-no-files-found: error
retention-days: 30
path: |
build/libs/Mineralogy-6.1.2.120061.jar
build/libs/Mineralogy-6.1.2.120061-sources.jar
build/libs/Mineralogy-6.1.2.120061-javadoc.jar
build/libs/Mineralogy-6.1.4.120061.jar
build/libs/Mineralogy-6.1.4.120061-sources.jar
build/libs/Mineralogy-6.1.4.120061-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.txt

Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
Mineralogy 6.1.4.120061 for Minecraft 1.20.6 (Forge)

- Sculk can spread across natural Mineralogy terrain. Goats can spawn on it,
and the harder raw rocks can break their horns. These changes also work in
existing worlds; polished and crafted rocks are not natural terrain.
- Moss, dripstone, azalea roots and forest rocks recognise natural terrain in
newly generated chunks. Fixed two dripstone checks without changing general
base-stone tags or ore hosts. Bare rock is still not soil for growing trees.
- Single slabs, stairs and walls now join the matching vanilla classifications.
Raw rocks, ores and storage blocks join Forge's common tags. Normal cobblestone
follows the same option as the root tag, with chert and pumice always valid.
- Rock-salt lamps keep a wall post beneath them, like a vanilla torch.
- Optional construction references and loot pools load safely when those forms
are disabled. Recipes, IDs, configs, providers, migrations, textures and the
released OreSpawn dependency are unchanged. No sulfur cubes on this target.

Mineralogy 6.1.2.120061 for Minecraft 1.20.6

- Updated all pickaxe and harvest-tier tags to the supported optional
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@ 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.120061` for Forge `50.2.0` and is built
This branch builds Mineralogy `6.1.4.120061` for Forge `50.2.0` and is built
and tested against OreSpawn `4.0.16.120061`. Its declared compatibility range is
OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers.

Version 6.1.4 lets vanilla cave features and animals recognise natural
Mineralogy rock. Sculk can spread, goats can spawn, and harder raw rocks can
break goat horns in existing worlds. Moss, dripstone, roots and forest rocks
also recognise natural terrain when new chunks are generated. Crafted blocks
are kept separate, and none of this depends on cobblestone equivalence.
Sulfur cubes do not exist on this Minecraft version.

## Configuration and help

Mineralogy's content and recipe switches remain in
Expand Down
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ tasks.register('verifyReleaseConfiguration') {
description = 'Verifies the exact Mineralogy 1.20.6 release identity.'
dependsOn tasks.named('verifyMavenizerCompatibilityFixture')
doLast {
if (project.mod_version != '6.1.2.120061'
if (project.mod_version != '6.1.4.120061'
|| project.mod_group != expectedMavenGroup
|| project.minecraft_version != '1.20.6'
|| project.forge_version != '50.2.0'
Expand All @@ -594,7 +594,7 @@ tasks.register('verifyReleaseDependencies') {
group = 'verification'
description = 'Resolves and verifies the exact released OreSpawn dependency.'
doLast {
if (project.mod_version != '6.1.2.120061'
if (project.mod_version != '6.1.4.120061'
|| project.minecraft_version != project.mc_version
|| project.mc_version != '1.20.6'
|| project.loader_name != 'forge'
Expand Down Expand Up @@ -1282,7 +1282,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.120061"')) {
if (eclipseMetadata.contains('${') || !eclipseMetadata.contains('version="6.1.4.120061"')) {
throw new GradleException('Eclipse output contains unresolved or invalid Mineralogy version metadata')
}
}
Expand All @@ -1308,3 +1308,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'
19 changes: 19 additions & 0 deletions docs/DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Mineralogy Developer Guide

## Natural terrain interfaces

The block and item `mineralogy:terrain_rocks` tags contain the 32 provider
outputs and five retained legacy aliases. Vanilla cave and goat tags refer to
the block interface. The horn whitelist is narrower, and `mineralogy:raw_stones`
excludes sandstone. Forge's stone, ore and storage tags keep their native names
on this target; later workstation and dyed-colour interfaces are not invented.

Two exact-count JavaScript hooks redirect only the proven dripstone water-pocket
and large-column base-stone reads. Global base-stone, carver and ore-host tags
remain unchanged. Root replacement does not make bare rock tree soil.
Config-dependent construction members are optional. Forge 50 checks loading
conditions on loot pools, not whole tables, so each optional construction pool
has an item-existence guard without changing its enabled drops.

Use the isolated tag generator and focused resource contracts when changing
these interfaces. The non-shipping native probe checks recursive inheritance,
actual consumers and reloads; the full audit index stays local.

## Responsibility Split

| Mineralogy owns | OreSpawn owns |
Expand Down
15 changes: 15 additions & 0 deletions docs/PLAYER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,21 @@ Mineralogy rock furnace is an upgrade recipe: surround an existing Minecraft
furnace with eight matching Mineralogy slabs. Brick, polished, and
polished-brick furnaces use the corresponding slab finish.

## Natural Rock Compatibility

Sculk can spread onto natural Mineralogy rock, and goats can spawn on it.
Harder raw rocks can also break goat horns; rock salt, scoria, siltstone,
chalk, gypsum and pumice are excluded. Crafted and polished forms are not
treated as natural terrain.

Moss, dripstone, azalea roots and forest rocks recognise the same natural
substrates. Updating does not regenerate existing caves: explore new chunks
to see natural decoration changes. Bare rock still cannot grow an azalea tree.
Rock-salt lamps keep the post of a straight wall, just as vanilla torches do.

These rules work with cobblestone equivalence enabled or disabled. Sulfur cubes
and the newer bat substrate tag are not present in Minecraft 1.20.6.

## Configuration And Servers

`config/mineralogy-common.toml` controls Mineralogy content and recipe compatibility.
Expand Down
45 changes: 36 additions & 9 deletions docs/VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 1.20.6 Forge release is therefore:

```text
6.1.2.120061
6.1.4.120061
```

This expanded numeric form is compatible with Maven version ordering, but it
Expand All @@ -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.120061`, not `1.20.6-6.1.2.120061`. The Target already makes tags unique
`6.1.4.120061`, not `1.20.6-6.1.4.120061`. The Target already makes tags unique
across Minecraft versions and loaders.

## Reading the target component
Expand Down Expand Up @@ -55,7 +55,7 @@ minor digits, and all remaining digits for the Minecraft major version.
| 1.18.2 | Forge | `118021` | `6.1.2.118021` |
| 1.19.4 | Forge | `119041` | `6.1.2.119041` |
| 1.20.1 | Forge | `120011` | `6.1.2.120011` |
| 1.20.6 | Forge | `120061` | `6.1.2.120061` |
| 1.20.6 | Forge | `120061` | `6.1.4.120061` |
| 1.21.11 | Forge | `121111` | `6.1.2.121111` |
| 26.2 | Forge | `2602001` | `6.0.0.2602001` |
| 26.2 | NeoForge | `2602002` | `6.0.0.2602002` |
Expand All @@ -68,6 +68,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 target builds share the 6.1.4 terrain compatibility fixes.
This is a release-target matrix, not a claim that every release is published.
NeoForge 26.3 retains its existing 6.1.3 compatibility correction.

| Minecraft | Forge version | NeoForge version |
| --- | --- | --- |
| 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 |

The revised campaign includes Forge 1.16.5–1.18.2 where each interface exists.
Minecraft 1.17 retains its native goat-spawning rule. Sulfur cubes on 26.2 and
26.3 consume only raw Mineralogy rocks, not polished or brick forms; vanilla's
own consumption rules are unchanged. Native-texture synchronization remains
a separate campaign.

## Major version

The **Major** number changes for a fundamental or breaking new generation of
Expand All @@ -92,7 +119,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.120061 -> 6.2.0.120061
6.1.4.120061 -> 6.2.0.120061
6.2.4.120061 -> 7.0.0.120061
```

Expand Down Expand Up @@ -121,7 +148,7 @@ Minecraft 1.17.1 / Forge / Mineralogy 6.1.0.117011
Minecraft 1.18.2 / Forge / Mineralogy 6.1.2.118021
Minecraft 1.19.4 / Forge / Mineralogy 6.1.2.119041
Minecraft 1.20.1 / Forge / Mineralogy 6.1.2.120011
Minecraft 1.20.6 / Forge / Mineralogy 6.1.2.120061
Minecraft 1.20.6 / Forge / Mineralogy 6.1.4.120061
```

Minecraft and loader APIs may require different internal code without changing
Expand Down Expand Up @@ -154,7 +181,7 @@ particular jar can load on the current game.

Mineralogy 6 also requires OreSpawn `[4.0.6,5.0.0)`. OreSpawn uses the same
target calculation, so the matching Minecraft 1.20.6 Forge release used for
this candidate is `4.0.16.120061`. The dependency range deliberately describes the supported
this release is `4.0.16.120061`. The dependency range deliberately describes the supported
functional OreSpawn generation; Forge still prevents jars for another
Minecraft target from loading together.

Expand All @@ -167,7 +194,7 @@ feature generation, not the exact jar.
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.120061`.
branch, published metadata and artifacts therefore use `6.1.4.120061`.

Every release note should state:

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ org.gradle.caching=true
org.gradle.parallel=false
net.minecraftforge.gradle.merge-source-sets=false

mod_version=6.1.2.120061
mod_version=6.1.4.120061
mod_group=zone.moddev.mc.mineralogy

# Release metadata consumed by the generic dispatcher.
Expand Down
23 changes: 23 additions & 0 deletions gradle/terrain-compatibility-probe.gradle
Original file line number Diff line number Diff line change
@@ -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') }
Loading
Loading