From c058bf894ec01570fd367b06bb1f36ac955bcf23 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Wed, 11 Nov 2026 12:02:37 +0000 Subject: [PATCH] Fix raw meat turning into tallow on Forge 1.18.2 --- .github/workflows/ci.yml | 6 +-- CHANGELOG.md | 4 ++ README.md | 6 ++- build.gradle | 6 +-- docs/VERSIONS.md | 4 +- gradle.properties | 2 +- gradle/lighting-catalog.gradle | 4 -- .../recipes/phase_four/tallow_from_beef.json | 46 ------------------- .../phase_four/tallow_from_chicken.json | 46 ------------------- .../phase_four/tallow_from_mutton.json | 46 ------------------- .../phase_four/tallow_from_porkchop.json | 46 ------------------- .../phase_four/tallow_from_rabbit.json | 46 ------------------- .../phase_four/tallow_from_rotten_flesh.json | 46 ------------------- .../recipes/tallow_from_beef.json | 19 -------- .../recipes/tallow_from_chicken.json | 19 -------- .../recipes/tallow_from_mutton.json | 19 -------- .../recipes/tallow_from_porkchop.json | 19 -------- .../recipes/tallow_from_rabbit.json | 19 -------- .../recipes/tallow_from_rotten_flesh.json | 19 -------- 19 files changed, 17 insertions(+), 405 deletions(-) delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_beef.json delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_chicken.json delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_mutton.json delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_porkchop.json delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rabbit.json delete mode 100644 src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rotten_flesh.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_beef.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_chicken.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_mutton.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_porkchop.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_rabbit.json delete mode 100644 src/main/resources/data/ironagefurniture/recipes/tallow_from_rotten_flesh.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76d599ab9c..8730ae4bef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,9 +137,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/iron-age-furniture-0.4.2.118021.jar - build/libs/iron-age-furniture-0.4.2.118021-sources.jar - build/libs/iron-age-furniture-0.4.2.118021-javadoc.jar + build/libs/iron-age-furniture-0.4.3.118021.jar + build/libs/iron-age-furniture-0.4.3.118021-sources.jar + build/libs/iron-age-furniture-0.4.3.118021-javadoc.jar build/release/SHA256SUMS CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index c99829d5ef..976f0eef61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# IronAgeFurniture 0.4.3.118021 + +- Remove the old tallow recipes so raw meat cooks normally again. + # IronAgeFurniture 0.4.2.118021 - Fix players floating above chairs, benches and stools when sitting down. diff --git a/README.md b/README.md index d7143bf97c..dd5179592f 100644 --- a/README.md +++ b/README.md @@ -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.18.2 with Forge 40.3.0 and Java 17. The version is `0.4.2.118021`. +This version brings Phase 4 to Minecraft 1.18.2 with Forge 40.3.0 and Java 17. The version is `0.4.3.118021`. + +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 @@ -52,4 +54,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.2.118021`. Local builds do not publish or tag releases. +The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.3.118021`. Local builds do not publish or tag releases. diff --git a/build.gradle b/build.gradle index 0ad0bad040..612abd64f2 100644 --- a/build.gradle +++ b/build.gradle @@ -735,7 +735,7 @@ tasks.register('verifyReleaseConfiguration') { dependsOn tasks.named('verifyMavenizerCompatibilityFixture') doLast { Map expected = [ - mod_version : '0.4.2.118021', + mod_version : '0.4.3.118021', mod_group : 'zone.moddev.mc', mod_archive_name : 'iron-age-furniture', mod_id : 'ironagefurniture', @@ -815,8 +815,8 @@ tasks.register('verifyResourceJson') { include 'pack.mcmeta' }.files.sort { it.path } // The native catalog has eight vanilla wood families, one fewer than 1.19. - if (jsonFiles.size() != 51620) { - throw new GradleException("Expected 51620 runtime JSON documents, found ${jsonFiles.size()}") + if (jsonFiles.size() != 51608) { + throw new GradleException("Expected 51608 runtime JSON documents, found ${jsonFiles.size()}") } jsonFiles.each { candidate -> try { diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index b452777c2b..aa4c4dd74f 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -4,9 +4,9 @@ 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.18.2 Forge, the target is `118021`, so this Phase 4 release is `0.4.2.118021`. The release tag is exactly that complete version. +For Minecraft 1.18.2 Forge, the target is `118021`, so this Phase 4 release is `0.4.3.118021`. The release tag is exactly that complete version. -Equivalent forward 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 1.18.2 release contains the upgrade bridge for supported furniture and lighting saved by the 1.10.2 and 1.12.2 core releases. It also recognises the diff --git a/gradle.properties b/gradle.properties index ae2b1a9c28..11dbb10fcb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=false net.minecraftforge.gradle.merge-source-sets=false # Project and release identity. -mod_version=0.4.2.118021 +mod_version=0.4.3.118021 mod_group=zone.moddev.mc mod_archive_name=iron-age-furniture mod_id=ironagefurniture diff --git a/gradle/lighting-catalog.gradle b/gradle/lighting-catalog.gradle index 9a3212ef56..72908967dd 100644 --- a/gradle/lighting-catalog.gradle +++ b/gradle/lighting-catalog.gradle @@ -136,9 +136,5 @@ ext.renderLightingCatalog = { File outputRoot, Map language -> write("${assets}/models/item/tallow.json", [parent: 'minecraft:item/generated', textures: [layer0: 'ironagefurniture:item/tallow']]) write("${data}/recipes/candles_from_tallow.json", [type: 'minecraft:crafting_shapeless', ingredients: [[item: 'ironagefurniture:tallow'], [item: '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}/recipes/tallow_from_${meat}.json", [type: 'minecraft:smelting', category: 'food', ingredient: [item: "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 } diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_beef.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_beef.json deleted file mode 100644 index eefb155401..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_beef.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:beef" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_beef" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_beef" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_chicken.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_chicken.json deleted file mode 100644 index 430a441ff4..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_chicken.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:chicken" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_chicken" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_chicken" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_mutton.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_mutton.json deleted file mode 100644 index f0599c3b7c..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_mutton.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:mutton" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_mutton" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_mutton" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_porkchop.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_porkchop.json deleted file mode 100644 index 7942e47b9b..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_porkchop.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:porkchop" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_porkchop" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_porkchop" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rabbit.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rabbit.json deleted file mode 100644 index 9b49b93553..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rabbit.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:rabbit" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_rabbit" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_rabbit" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rotten_flesh.json b/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rotten_flesh.json deleted file mode 100644 index f21437f5c7..0000000000 --- a/src/main/resources/data/ironagefurniture/advancements/recipes/phase_four/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:rotten_flesh" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "ironagefurniture:tallow_from_rotten_flesh" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_rotten_flesh" - ] - } - } - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_beef.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_beef.json deleted file mode 100644 index 8d30148994..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_beef.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:beef" - }, - "result": { - "count": 2, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_chicken.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_chicken.json deleted file mode 100644 index 07bb2eadc7..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_chicken.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:chicken" - }, - "result": { - "count": 1, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_mutton.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_mutton.json deleted file mode 100644 index 4c38d803b6..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_mutton.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:mutton" - }, - "result": { - "count": 2, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_porkchop.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_porkchop.json deleted file mode 100644 index 77af427fc1..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_porkchop.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:porkchop" - }, - "result": { - "count": 3, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_rabbit.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_rabbit.json deleted file mode 100644 index 08fa4c9dbe..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_rabbit.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:rabbit" - }, - "result": { - "count": 1, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipes/tallow_from_rotten_flesh.json b/src/main/resources/data/ironagefurniture/recipes/tallow_from_rotten_flesh.json deleted file mode 100644 index 3514d5cdf8..0000000000 --- a/src/main/resources/data/ironagefurniture/recipes/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": { - "item": "minecraft:rotten_flesh" - }, - "result": { - "count": 1, - "item": "ironagefurniture:tallow" - }, - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -}