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: IronAgeFurniture 1.21.1 NeoForge CI
name: IronAgeFurniture 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: iron-age-furniture-1.21.1-neoforge-${{ github.workflow }}-${{ github.ref }}
group: iron-age-furniture-1.21.11-neoforge-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -81,20 +81,20 @@ jobs:
- name: Upload audited release candidate
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: iron-age-furniture-1.21.1-neoforge-${{ github.sha }}
name: iron-age-furniture-1.21.11-neoforge-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/iron-age-furniture-0.3.0.121012.jar
build/libs/iron-age-furniture-0.3.0.121012-sources.jar
build/libs/iron-age-furniture-0.3.0.121012-javadoc.jar
build/libs/iron-age-furniture-0.3.0.121112.jar
build/libs/iron-age-furniture-0.3.0.121112-sources.jar
build/libs/iron-age-furniture-0.3.0.121112-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.md
- name: Upload diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: iron-age-furniture-1.21.1-neoforge-diagnostics-${{ github.sha }}
name: iron-age-furniture-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
15 changes: 9 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# IronAgeFurniture 0.3.0.121012
# IronAgeFurniture 0.3.0.121112

- Advance IronAgeFurniture to Minecraft 1.21.1 and NeoForge 21.1.247 on Java 21.
- Advance IronAgeFurniture to Minecraft 1.21.11 and NeoForge 21.11.45 on Java 21.
- Move recipes and recipe advancements to Minecraft 1.21's singular data directories and retain native `neoforge:conditions`.
- Retain contemporary Biomes O' Plenty furniture, add 25 Oh The Biomes We've Gone wood families, and restore Immersive Engineering treated-wood furniture.
- Retain contemporary Biomes O' Plenty furniture and add 25 Oh The Biomes We've Gone wood families, including spirit wood.
- Validate built-in texture paths and every optional wood model semantically against the exact pinned BOP and BWG jars.
- Remap IronAgeFurniture's legacy BOP cherry IDs to vanilla cherry, and defensible BYG furniture IDs to their BWG replacements.
- Expand the deterministic catalog and positive optional-integration runtime probe across BOP, BWG, and Immersive Engineering.

This is a release candidate changelog. Publication requires the protected default-branch release workflow.
- Expand the deterministic catalog and positive optional-integration runtime probe across BOP and BWG.
- Fix recipe advancements so furniture unlocks only when its actual ingredient is obtained, including conditional optional-mod recipes.
- Restore normal wooden-furniture fire behaviour while keeping Crimson and Warped furniture non-flammable.
- Restore throwable lava lamps, water shattering with the glass sound and obsidean-chunk drop, and safe creative-mode removal.
- Provide reproducible Eclipse/Buildship setup with the exact Temurin Java 21 toolchain, processed resources, and a duplicate-free NeoForge classpath.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

IronAgeFurniture adds chairs, stools, benches, lighting, and other ye olde-style furniture to Minecraft.

This branch targets Minecraft 1.21.1 with NeoForge 21.1.247. Its current complete version is `0.3.0.121012` and its Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.3.0.121012`.
This branch targets Minecraft 1.21.11 with NeoForge 21.11.45. Its current complete version is `0.3.0.121112` and its Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.3.0.121112`.

## Optional integrations

Biomes O' Plenty and Oh The Biomes We've Gone furniture is enabled only when the corresponding mod is present. Neither mod is a hard dependency. This target supports the contemporary BOP wood family, including Origin Oak, and the BWG wood family, including Spirit wood. Immersive Engineering furniture is intentionally unavailable on this target because there is no compatible integration release.

Recipes and recipe advancements for optional furniture are loaded conditionally with their integration. Existing IronAgeFurniture BOP Cherry furniture remaps to vanilla Cherry, while supported legacy BYG furniture names remap to their BWG replacements when BWG is installed.

## Build

Expand All @@ -22,4 +28,4 @@ Release publication is initiated manually from the protected default-branch disp

Furniture registrations and their matching blockstates, models, recipes, advancements, and translations are generated from `gradle/furniture-catalog.json`. Normal builds verify committed output without changing it; run `gradlew.bat updateFurnitureCatalog` only when intentionally changing the catalog.

The Java API namespace is `zone.moddev.mc.ironagefurniture`. The persistent Forge mod, registry, resource, data, configuration, and saved-world namespace remains `ironagefurniture`.
The Java API namespace is `zone.moddev.mc.ironagefurniture`. The persistent runtime mod, registry, resource, data, configuration, and saved-world namespace remains `ironagefurniture`.
Loading
Loading