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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ jobs:
if-no-files-found: error
retention-days: 30
path: |
build/libs/iron-age-furniture-0.4.1.121111.jar
build/libs/iron-age-furniture-0.4.1.121111-sources.jar
build/libs/iron-age-furniture-0.4.1.121111-javadoc.jar
build/libs/iron-age-furniture-0.4.2.121111.jar
build/libs/iron-age-furniture-0.4.2.121111-sources.jar
build/libs/iron-age-furniture-0.4.2.121111-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.md

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# IronAgeFurniture 0.4.2.121111

- Remove the old tallow recipes so raw meat cooks normally again.

# Iron Age Furniture 0.4.1.121111

- Bring the Phase 4 furniture and lighting improvements to Forge 1.21.11.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

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

This version brings Phase 4 to Minecraft 1.21.11 with Forge 61.1.0 and Java 21. The version is `0.4.1.121111`.
This version brings Phase 4 to Minecraft 1.21.11 with Forge 61.1.0 and Java 21. The version is `0.4.2.121111`.

This fixes raw meat turning into tallow when cooked. Minecraft has its own candles now, so the old tallow recipes are no longer needed.

## Furniture and lighting

Expand Down Expand Up @@ -46,4 +48,4 @@ Furniture registrations and their matching blockstates, models, recipes, advance

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

The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.1.121111`. Local builds do not publish or tag releases.
The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.2.121111`. Local builds do not publish or tag releases.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ tasks.register('verifyReleaseConfiguration') {
dependsOn tasks.named('verifyMavenizerCompatibilityFixture')
doLast {
Map<String, String> expected = [
mod_version : '0.4.1.121111',
mod_version : '0.4.2.121111',
mod_group : 'zone.moddev.mc',
mod_archive_name : 'iron-age-furniture',
mod_id : 'ironagefurniture',
Expand Down Expand Up @@ -838,8 +838,8 @@ tasks.register('verifyResourceJson') {
include '**/*.json'
include 'pack.mcmeta'
}.files.sort { it.path }
if (jsonFiles.size() != 62834) {
throw new GradleException("Expected 62834 runtime JSON documents, found ${jsonFiles.size()}")
if (jsonFiles.size() != 62822) {
throw new GradleException("Expected 62822 runtime JSON documents, found ${jsonFiles.size()}")
}
jsonFiles.each { candidate ->
try {
Expand Down
4 changes: 2 additions & 2 deletions docs/VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ IronAgeFurniture releases use `Major.Minor.Bug.Target`. The first three componen

The target is calculated as `MmmppL`: Minecraft major without padding, two-digit minor, two-digit patch, and a one-digit loader code. Forge uses loader code `1`; NeoForge uses `2`.

For Minecraft 1.21.11 Forge, the target is `121111`, so the current functionally equivalent `0.4.1` release is `0.4.1.121111`. The release tag is exactly that complete version.
For Minecraft 1.21.11 Forge, the target is `121111`, so the current version is `0.4.2.121111`. The release tag is exactly that complete version.

Equivalent ports retain `0.4.1` and change only the target. A player-visible feature or fix changes Major, Minor, or Bug independently of the target.
Equivalent ports retain their functional version and change only the target. A player-visible feature or fix changes Major, Minor, or Bug independently of the target.

The complete version must agree with `minecraft_version`, `loader_name`, and `loader_code` in `gradle.properties`. CI build numbers are never appended.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ org.gradle.parallel=false
net.minecraftforge.gradle.merge-source-sets=true

# Project and release identity.
mod_version=0.4.1.121111
mod_version=0.4.2.121111
mod_group=zone.moddev.mc
mod_archive_name=iron-age-furniture
mod_id=ironagefurniture
Expand Down
4 changes: 0 additions & 4 deletions gradle/lighting-catalog.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,5 @@ ext.renderLightingCatalog = { File outputRoot, Map language ->
write("${assets}/items/tallow.json", [model: [type: 'minecraft:model', model: 'ironagefurniture:item/tallow']])
write("${data}/recipe/candles_from_tallow.json", [type: 'minecraft:crafting_shapeless', ingredients: ['ironagefurniture:tallow', 'minecraft:string'], result: [id: 'minecraft:candle', count: 8], 'forge:conditions': lightConditions])
discover('candles_from_tallow', 'ironagefurniture:tallow', lightConditions)
[porkchop: 3, beef: 2, mutton: 2, rabbit: 1, chicken: 1, rotten_flesh: 1].each { meat, count ->
write("${data}/recipe/tallow_from_${meat}.json", [type: 'minecraft:smelting', category: 'food', ingredient: "minecraft:${meat}", result: [id: 'ironagefurniture:tallow', count: count], experience: .1, cookingtime: 200, 'forge:conditions': lightConditions])
discover("tallow_from_${meat}".toString(), "minecraft:${meat}".toString(), lightConditions)
}
generated
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading