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
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Mineralogy 1.21.11 NeoForge CI
name: Mineralogy 26.1.2 NeoForge CI

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

permissions:
contents: read

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

jobs:
Expand All @@ -24,11 +24,11 @@ jobs:
steps:
- name: Check out source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
- name: Install exact Java 21
- name: Install exact Java 25
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
with:
distribution: temurin
java-version: '21.0.7+6.0.LTS'
java-version: '25.0.3+9.0.LTS'
- name: Bootstrap an isolated empty NeoGradle cache
shell: bash
run: |
Expand All @@ -52,11 +52,11 @@ jobs:
steps:
- name: Check out source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
- name: Install exact Java 21
- name: Install exact Java 25
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
with:
distribution: temurin
java-version: '21.0.7+6.0.LTS'
java-version: '25.0.3+9.0.LTS'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
- name: Stage exact OreSpawn release dependency
Expand Down Expand Up @@ -91,20 +91,20 @@ jobs:
- name: Upload audited release candidate
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-1.21.11-neoforge-${{ github.sha }}
name: Mineralogy-26.1.2-neoforge-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/Mineralogy-6.1.2.121112.jar
build/libs/Mineralogy-6.1.2.121112-sources.jar
build/libs/Mineralogy-6.1.2.121112-javadoc.jar
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/release/SHA256SUMS
CHANGELOG.txt
- name: Upload diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-1.21.11-neoforge-diagnostics-${{ github.sha }}
name: Mineralogy-26.1.2-neoforge-diagnostics-${{ github.sha }}
if-no-files-found: ignore
retention-days: 14
path: |
Expand Down
8 changes: 4 additions & 4 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-1.21.11-neo
- master-26.1.2-neo
- 'feature/**'
pull_request:
branches:
- master-1.21.11-neo
- master-26.1.2-neo
schedule:
- cron: '43 7 * * 4'

Expand All @@ -24,11 +24,11 @@ jobs:
steps:
- name: Check out source
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
- name: Install exact Java 21
- name: Install exact Java 25
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
with:
distribution: temurin
java-version: '21.0.7+6.0.LTS'
java-version: '25.0.3+9.0.LTS'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
- name: Initialize CodeQL
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-1.21.11-neo
- master-26.1.2-neo
- 'feature/**'
pull_request:
branches:
- master-1.21.11-neo
- master-26.1.2-neo

permissions:
contents: read
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
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
NeoForge 26.1.2.94 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.
- Adapted loot tools to Minecraft 26.1's `ItemInstance`, fertilizer helper
stacks to post-registration construction, rock-furnace crafting remainders
to `ItemStackTemplate`, and furnace recipe assembly to the target signature.
Existing furnace contents, fuel, burn/cook progress, and state synchronization
remain intact.
- Registered crude-oil rendering through NeoForge 26.1's native fluid-model
event and retained the accepted native texture synchronization for andesite,
diorite, granite, basalt, and tuff.
- Retargeted the legacy conversion Mixins to the four-argument chunk upgrader,
moved tag rebinding to the target reload hook, and indexed both legacy root
region files and Minecraft 26.1's Overworld dimension-region layout. All
18,192 mappings, selected-world restoration, sidecars, protected chunks, and
legacy furnace normalization remain intact.
- Regenerated and audited the existing 1,433 recipe/advancement pairs for the
target codecs without obsolete stonecutting groups. The 18 slab bridges, 48
Minecraft recipe overrides, 21 advancement overrides, 19 configurable
cobblestone routes, tuff matrix, and stone-spear compatibility are unchanged.
- Updated metadata, CI, documentation, release checks, and the exact dependency
pin for Minecraft 26.1.2, NeoForge 26.1.2.94, OreSpawn 4.0.16.2601022,
Java 25, resource format 84, and data format 101.1. Mineralogy still
registers no world generator.

Mineralogy 6.1.2.121112 for Minecraft 1.21.11 NeoForge

- Ported the accepted NeoForge 1.21.1 product to Minecraft 1.21.11 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-1.21.11-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.21.11-neo)
[![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)

# Mineralogy 6 for Minecraft 1.21.11
# Mineralogy 6 for Minecraft 26.1.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.121112` for NeoForge `21.11.45` and is built
and tested against OreSpawn `4.0.16.121112`. Its declared compatibility range is
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
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 1.21.11 branch; use the jar that matches the loader in your modpack.
Forge 26.1.2 branch; use the jar that matches the loader in your modpack.

## Configuration and help

Expand Down
Loading
Loading