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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Mineralogy 1.21.1 NeoForge CI
name: Mineralogy 1.21.11 NeoForge CI

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

permissions:
contents: read

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

jobs:
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.1-neoforge-${{ github.sha }}
name: Mineralogy-1.21.11-neoforge-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/Mineralogy-6.1.2.121012.jar
build/libs/Mineralogy-6.1.2.121012-sources.jar
build/libs/Mineralogy-6.1.2.121012-javadoc.jar
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/release/SHA256SUMS
CHANGELOG.txt
- name: Upload diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-1.21.1-neoforge-diagnostics-${{ github.sha }}
name: Mineralogy-1.21.11-neoforge-diagnostics-${{ github.sha }}
if-no-files-found: ignore
retention-days: 14
path: |
Expand Down
4 changes: 2 additions & 2 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.1-neo
- master-1.21.11-neo
- 'feature/**'
pull_request:
branches:
- master-1.21.1-neo
- master-1.21.11-neo
schedule:
- cron: '43 7 * * 4'

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.1-neo
- master-1.21.11-neo
- 'feature/**'
pull_request:
branches:
- master-1.21.1-neo
- master-1.21.11-neo

permissions:
contents: read
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
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
NeoForge 21.11.45 while preserving registry, NBT, provider, configuration,
migration, crude-oil, recipe, locale, guide, relief, mining, furnace, and
world identities.
- Replaced NeoForge 1.21.1's JavaScript conversion coremod with required
Mixins for legacy state-table expansion, level-data capture, protected chunk
writes, and converted chunk preparation/finalization. All 18,192 legacy
mappings, selected-world restoration, sidecars, and furnace normalization
remain intact.
- Adapted registrations, fluids, block entities, fuel handling, item
definitions, identifiers, tags, and JSON recipes to Minecraft 1.21.11.
Runtime cobblestone membership is rebound in place through named holder sets
and holder invalidation callbacks; obsolete ingredient-cache access is gone.
- Retained rock-furnace block entities through 1.21.11's changed-state hook so
lit and unlit transitions preserve contents without a block-state mismatch.
Added canonical `c:paper` and `c:lamps/rock_salt` tags so every retained
Mineralogy recipe resolves under the target tag conventions.
- Restored the NeoForge mod-bus subscription for creative-tab content builds,
so the registered Mineralogy tab or five grouped tabs contain their intended
visible blocks and items.
- Matched Mineralogy's native-equivalent andesite, diorite, granite, basalt,
and tuff models to Minecraft's textures, including upright slabs, stairs,
walls, furnaces, and reliefs. Basalt preserves its separate top and side
surfaces; tuff bricks use native tuff-brick artwork. Mineralogy-only brick
finishes and custom furnace fronts remain distinct, while resource packs can
now restyle each shared family consistently.
- Retained the complete native-rock and tuff contract: 1,433 Mineralogy
recipe/advancement pairs, 18 slab bridges, 48 Minecraft recipe overrides,
21 Minecraft advancement overrides, and all 19 configurable cobblestone
routes.
- Updated metadata, CI, documentation, exact OreSpawn pin, and release audits
for Minecraft 1.21.11, NeoForge 21.11.45, OreSpawn 4.0.16.121112, Java 21,
resource format 75, and data format 94.1. Mineralogy still registers no
world generator.

Mineralogy 6.1.2.121012 for Minecraft 1.21.1 NeoForge

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

# Mineralogy 6 for Minecraft 1.21.1
# Mineralogy 6 for Minecraft 1.21.11

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.121012` for NeoForge `21.1.247` and is built
and tested against OreSpawn `4.0.16.121012`. Its declared compatibility range is
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
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.1 branch; use the jar that matches the loader in your modpack.
Forge 1.21.11 branch; use the jar that matches the loader in your modpack.

## Configuration and help

Expand Down
Loading
Loading