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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Mineralogy 26.1.2 NeoForge CI
name: Mineralogy 26.2 NeoForge CI

on:
push:
branches:
- master-26.1.2-neo
- master-26.2-neo
- 'feature/**'
pull_request:
branches:
- master-26.1.2-neo
- master-26.2-neo

permissions:
contents: read

concurrency:
group: mineralogy-26.1.2-neo-${{ github.workflow }}-${{ github.ref }}
group: mineralogy-26.2-neo-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -72,12 +72,17 @@ jobs:
run: |
set -euo pipefail
chmod +x ./gradlew
./gradlew clean check build javadoc verifyReleaseConfiguration verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \
--no-daemon --stacktrace --max-workers=2 \
"-Dorg.gradle.java.installations.paths=$JAVA_HOME" \
-Dorg.gradle.java.installations.auto-detect=false \
gradle_jdk_args=(
"-Dorg.gradle.java.installations.paths=$JAVA_HOME"
-Dorg.gradle.java.installations.auto-detect=false
-Dorg.gradle.java.installations.auto-download=false
)
./gradlew clean \
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \
--no-daemon --stacktrace --max-workers=2 "${gradle_jdk_args[@]}"
./gradlew check build javadoc verifyReleaseConfiguration verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \
--no-daemon --stacktrace --max-workers=2 "${gradle_jdk_args[@]}"
- name: Generate and audit Eclipse production launches
shell: bash
run: |
Expand All @@ -91,20 +96,20 @@ jobs:
- name: Upload audited release candidate
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-26.1.2-neoforge-${{ github.sha }}
name: Mineralogy-26.2-neoforge-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/Mineralogy-6.1.2.2601022.jar
build/libs/Mineralogy-6.1.2.2601022-sources.jar
build/libs/Mineralogy-6.1.2.2601022-javadoc.jar
build/libs/Mineralogy-6.1.2.2602002.jar
build/libs/Mineralogy-6.1.2.2602002-sources.jar
build/libs/Mineralogy-6.1.2.2602002-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.txt
- name: Upload diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-26.1.2-neoforge-diagnostics-${{ github.sha }}
name: Mineralogy-26.2-neoforge-diagnostics-${{ github.sha }}
if-no-files-found: ignore
retention-days: 14
path: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: CodeQL
on:
push:
branches:
- master-26.1.2-neo
- master-26.2-neo
- 'feature/**'
pull_request:
branches:
- master-26.1.2-neo
- master-26.2-neo
schedule:
- cron: '43 7 * * 4'

Expand Down Expand Up @@ -40,14 +40,14 @@ jobs:
run: |
set -euo pipefail
chmod +x ./gradlew
gradle_args=(
clean classes --no-daemon --stacktrace --max-workers=2
gradle_jdk_args=(
"-Dorg.gradle.java.installations.paths=$JAVA_HOME"
-Dorg.gradle.java.installations.auto-detect=false
-Dorg.gradle.java.installations.auto-download=false
)
./gradlew clean --no-daemon --stacktrace --max-workers=2 "${gradle_jdk_args[@]}"
for attempt in 1 2 3; do
if ./gradlew "${gradle_args[@]}"; then
if ./gradlew classes --no-daemon --stacktrace --max-workers=2 "${gradle_jdk_args[@]}"; then
exit 0
fi
if [ "$attempt" -eq 3 ]; then
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
on:
push:
branches:
- master-26.1.2-neo
- master-26.2-neo
- 'feature/**'
pull_request:
branches:
- master-26.1.2-neo
- master-26.2-neo

permissions:
contents: read
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
Mineralogy 6.1.2.2602002 for Minecraft 26.2 NeoForge

- Ported the accepted NeoForge 26.1.2 product to Minecraft 26.2 and
NeoForge 26.2.0.45-beta while preserving every registry, block-entity, NBT,
provider, configuration, migration, recipe, locale, guide, crude-oil,
relief, mining, furnace, creative-tab, texture, and legacy-world identity.
- Retained the established NeoForge registration, capabilities, fluid models,
tag reload policy, and Java-25 Mixin conversion path. The complete 18,192
legacy mappings, dual Overworld region layouts, selected-world restoration,
sidecars, chunk protection, and furnace normalization remain intact.
- Regenerated the five changed vanilla overrides without Minecraft 26.2's
removed crafting category field. The remaining 1,433 Mineralogy recipes,
progressive advancements, tuff matrix, slab precedence, stone-spear support,
and all 19 configurable cobblestone routes are unchanged.
- Kept Minecraft's new sulfur and cinnabar families separate from Mineralogy's
sulfur ore, dust, storage block, recipes, tags, and OreSpawn provider rule.
- Removed the 26.1.2-only NeoGradle source-decompiler workaround and adopted
the validated 26.2 binary userdev path, while retaining the MMD Maven primary
and checksum-verified CurseMaven fallback for OreSpawn.
- Updated metadata, packs, CI, documentation, and release audits for Minecraft
26.2, NeoForge 26.2.0.45-beta, OreSpawn 4.0.16.2602002, Java 25,
resource format 88, and data format 107.1. Mineralogy still registers no
world generator.

Mineralogy 6.1.2.2601022 for Minecraft 26.1.2 NeoForge

- Ported the accepted NeoForge 1.21.11 product to Minecraft 26.1.2 and
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone)
[![CurseForge downloads](https://cf.way2muchnoise.eu/full_minecraft-mineralogy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy)
[![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy)
[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-26.1.2-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-26.1.2-neo)
[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-26.2-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-26.2-neo)

# Mineralogy 6 for Minecraft 26.1.2
# Mineralogy 6 for Minecraft 26.2

Mineralogy adds real-world rock families, matching construction blocks,
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.2601022` for NeoForge `26.1.2.94` and is built
and tested against OreSpawn `4.0.16.2601022`. Its declared compatibility range is
This branch builds Mineralogy `6.1.2.2602002` for NeoForge `26.2.0.45-beta` and is built
and tested against OreSpawn `4.0.16.2602002`. Its declared compatibility range is
OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers.

This is the NeoForge build. It is intentionally maintained separately from the
Forge 26.1.2 branch; use the jar that matches the loader in your modpack.
Forge 26.2 branch; use the jar that matches the loader in your modpack.

## Configuration and help

Expand Down
Loading
Loading