Port Mineralogy 6.1.2 to Minecraft 1.21.1 NeoForge

.github/workflows/ci.yml

@@ -1,19 +1,19 @@
-name: Mineralogy 1.20.6 NeoForge CI
+name: Mineralogy 1.21.1 NeoForge CI
 
 on:
   push:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
       - 'feature/**'
   pull_request:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
 
 permissions:
   contents: read
 
 concurrency:
-  group: mineralogy-1.20.6-neo-${{ github.workflow }}-${{ github.ref }}
+  group: mineralogy-1.21.1-neo-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -91,20 +91,20 @@ jobs:
       - name: Upload audited release candidate
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: Mineralogy-1.20.6-neoforge-${{ github.sha }}
+          name: Mineralogy-1.21.1-neoforge-${{ github.sha }}
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/Mineralogy-6.1.2.120062.jar
-            build/libs/Mineralogy-6.1.2.120062-sources.jar
-            build/libs/Mineralogy-6.1.2.120062-javadoc.jar
+            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/release/SHA256SUMS
             CHANGELOG.txt
       - name: Upload diagnostics on failure
         if: failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: Mineralogy-1.20.6-neoforge-diagnostics-${{ github.sha }}
+          name: Mineralogy-1.21.1-neoforge-diagnostics-${{ github.sha }}
           if-no-files-found: ignore
           retention-days: 14
           path: |

.github/workflows/codeql-analysis.yml

@@ -3,11 +3,11 @@ name: CodeQL
 on:
   push:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
       - 'feature/**'
   pull_request:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
   schedule:
     - cron: '43 7 * * 4'
 

.github/workflows/validate-gradle-build.yml

@@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
 on:
   push:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
       - 'feature/**'
   pull_request:
     branches:
-      - master-1.20.6-neo
+      - master-1.21.1-neo
 
 permissions:
   contents: read

CHANGELOG.txt

@@ -1,3 +1,28 @@
+Mineralogy 6.1.2.121012 for Minecraft 1.21.1 NeoForge
+
+- Ported the accepted NeoForge feature and compatibility contract to Minecraft
+  1.21.1 and NeoForge 21.1.247 while preserving every registry, NBT, provider,
+  configuration, migration, crude-oil, recipe, locale, guide, relief, mining,
+  furnace, and legacy-world identity.
+- Converted server data to Minecraft 1.21.1's singular recipe, advancement,
+  loot-table, and tag directories, retaining NeoForge conditions and dynamic
+  cobblestone-tag rebinding without any Forge condition serializer.
+- Reconciled Minecraft 1.21.1's complete native tuff family. Mineralogy's
+  upright-capable slabs win three crafting and six stonecutting routes; six
+  new exact bridge recipes preserve access to native raw, polished, and brick
+  tuff slabs; native stairs, walls, bricks, polished, and chiseled forms remain
+  available through their non-conflicting vanilla recipes.
+- Increased the generated contract to 1,433 Mineralogy recipe/advancement
+  pairs, 18 slab bridges, 48 Minecraft recipe overrides, and 21 Minecraft
+  advancement overrides. Tuff plus sand produces vanilla polished tuff while
+  2x2 raw tuff remains Mineralogy's brick route.
+- Updated the build, metadata, CI, documentation, and exact OreSpawn pin for
+  Minecraft 1.21.1, NeoForge 21.1.247, OreSpawn 4.0.16.121012, Java 21, and
+  pack format 34. Mineralogy still registers no world generator.
+- Prefer the exact OreSpawn release from MMD Maven, with the matching
+  CurseForge file retained as a narrowly scoped fallback and SHA-256-verified
+  release provenance. This avoids CurseMaven rate limits breaking IDE sync.
+
 Mineralogy 6.1.2.120062 for Minecraft 1.20.6 NeoForge
 
 - Added the first NeoForge Mineralogy baseline while retaining gameplay,

README.md

@@ -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.20.6-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.20.6-neo)
+[![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)
 
-# Mineralogy 6 for Minecraft 1.20.6
+# Mineralogy 6 for Minecraft 1.21.1
 
 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.120062` for NeoForge `20.6.139` and is built
-and tested against OreSpawn `4.0.16.120062`. Its declared compatibility range is
+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
 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.20.6 branch; use the jar that matches the loader in your modpack.
+Forge 1.21.1 branch; use the jar that matches the loader in your modpack.
 
 ## Configuration and help