diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9f226a2ca..68b56b6898 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,9 +88,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/iron-age-furniture-0.4.0.2602002.jar - build/libs/iron-age-furniture-0.4.0.2602002-sources.jar - build/libs/iron-age-furniture-0.4.0.2602002-javadoc.jar + build/libs/iron-age-furniture-0.4.1.2602002.jar + build/libs/iron-age-furniture-0.4.1.2602002-sources.jar + build/libs/iron-age-furniture-0.4.1.2602002-javadoc.jar build/release/SHA256SUMS CHANGELOG.md - name: Upload diagnostics on failure diff --git a/CHANGELOG.md b/CHANGELOG.md index c0af623aae..ecef6dc3b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# IronAgeFurniture 0.4.1.2602002 + +- Remove the old tallow recipes so raw meat cooks normally again. +- Update the BOP add-on to `0.4.1.2602002` or later if you use it. + # IronAgeFurniture 0.4.0.2602002 - Bring the released NeoForge 26.3 Phase 4 furniture and lighting changes to Minecraft 26.2. diff --git a/README.md b/README.md index 0ba9852063..b731a44612 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ IronAgeFurniture adds chairs, stools, benches, lighting, and other ye olde-style furniture to Minecraft. -This branch provides Phase 4, version `0.4.0.2602002`, for Minecraft 26.2 with NeoForge 26.2.0.45-beta and Java 25. +This branch provides Phase 4, version `0.4.1.2602002`, for Minecraft 26.2 with NeoForge 26.2.0.45-beta and Java 25. + +This fixes raw meat turning into tallow when cooked. Minecraft has its own candles now, so the old tallow recipes are no longer needed. + +If you use the BOP add-on, update it to `0.4.1.2602002` or later on this branch as well. ## Furniture and lighting @@ -52,6 +56,6 @@ 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 core has no biome-mod dependency. Its Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.0.2602002`. A successful build does not by itself confirm gameplay, world migration or publication. +The core has no biome-mod dependency. Its Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.1.2602002`. A successful build does not by itself confirm gameplay, world migration or publication. The Java API namespace is `zone.moddev.mc.ironagefurniture`. The persistent runtime mod, registry, resource, data, configuration, and saved-world namespace remains `ironagefurniture`. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 3d6f3873ef..4493148e3e 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -4,7 +4,7 @@ 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 26.2 NeoForge, the target is `2602002`. Phase 4 is `0.4.0.2602002`; the earlier Phase 3 release is `0.3.0.2602002`. Release tags use the complete four-component version. Building locally does not publish or tag a release. +For Minecraft 26.2 NeoForge, the target is `2602002`. Phase 4 is `0.4.1.2602002`; the earlier Phase 3 release is `0.3.0.2602002`. Release tags use the complete four-component version. Building locally does not publish or tag a release. Equivalent ports retain the same functional version and change only the target. A player-visible feature or fix changes Major, Minor, or Bug independently of the target. A downward code port does not authorize downgrading saved Minecraft worlds. diff --git a/gradle.properties b/gradle.properties index 57355e1152..a1e037a942 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.caching=true org.gradle.parallel=false # Project and release identity. -mod_version=0.4.0.2602002 +mod_version=0.4.1.2602002 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 59e3edaa0d..27b012ae49 100644 --- a/gradle/lighting-catalog.gradle +++ b/gradle/lighting-catalog.gradle @@ -123,9 +123,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], 'neoforge: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, 'neoforge:conditions': lightConditions]) - discover("tallow_from_${meat}".toString(), "minecraft:${meat}".toString(), lightConditions) - } generated } diff --git a/gradle/manual-client-runs.gradle b/gradle/manual-client-runs.gradle index dba40c5545..fce01ec19d 100644 --- a/gradle/manual-client-runs.gradle +++ b/gradle/manual-client-runs.gradle @@ -9,8 +9,8 @@ def bopRuntimeDirectory = providers.gradleProperty('bopRuntimeDirectory').orElse // Pin the matching 26.2 add-on and actual published 26.2 dependencies. Map bopRuntimeJars = [ - 'iron-age-furniture-biomes-o-plenty-addon-0.4.0.2602002.jar': - '885986484781DED5B3E6910221872FDA28423E0D23C945411675F9B1C8D56337', + 'iron-age-furniture-biomes-o-plenty-addon-0.4.1.2602002.jar': + 'C28594ED5220338A005D77A0F2B082D07EE5C064DBB34F00E0C61F292C0B7EF1', 'BiomesOPlenty-neoforge-26.2-26.1.2.0.40.jar': 'C98208C568CC893FE32C8CD347FE3CC42A283DA137BBE5BEFF7587753443E561', 'GlitchCore-neoforge-26.2-26.2.0.0.0.jar': diff --git a/gradle/verification.gradle b/gradle/verification.gradle index 7dca30a925..a9cd3b7aa8 100644 --- a/gradle/verification.gradle +++ b/gradle/verification.gradle @@ -23,7 +23,7 @@ tasks.register('verifyReleaseConfiguration') { description = 'Verifies the exact IronAgeFurniture 26.2 NeoForge release identity.' doLast { Map expected = [ - mod_version : '0.4.0.2602002', + mod_version : '0.4.1.2602002', mod_group : 'zone.moddev.mc', mod_archive_name : 'iron-age-furniture', mod_id : 'ironagefurniture', @@ -103,8 +103,8 @@ tasks.register('verifyResourceJson') { include 'pack.mcmeta' }.files.sort { it.path } // Fixed-metal states share eight additional floor/wall candle-dish models. - if (jsonFiles.size() != 14989 + 56 * 22 + 8) { - throw new GradleException("Expected 16229 Phase 4 runtime JSON documents, found ${jsonFiles.size()}") + if (jsonFiles.size() != 14977 + 56 * 22 + 8) { + throw new GradleException("Expected 16217 Phase 4 runtime JSON documents, found ${jsonFiles.size()}") } jsonFiles.each { candidate -> try { diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_beef.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_beef.json deleted file mode 100644 index 8c043f7d37..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_beef.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_chicken.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_chicken.json deleted file mode 100644 index b03150230a..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_chicken.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_mutton.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_mutton.json deleted file mode 100644 index 411e39233b..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_mutton.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_porkchop.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_porkchop.json deleted file mode 100644 index af83b89eee..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_porkchop.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rabbit.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rabbit.json deleted file mode 100644 index 646d002650..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rabbit.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rotten_flesh.json b/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rotten_flesh.json deleted file mode 100644 index 5c8042e97c..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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" - ] - }, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_beef.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_beef.json deleted file mode 100644 index ee276eec06..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_beef.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:beef", - "result": { - "id": "ironagefurniture:tallow", - "count": 2 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_chicken.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_chicken.json deleted file mode 100644 index b5d80c5b23..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_chicken.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:chicken", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_mutton.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_mutton.json deleted file mode 100644 index 5f94f966c7..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_mutton.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:mutton", - "result": { - "id": "ironagefurniture:tallow", - "count": 2 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_porkchop.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_porkchop.json deleted file mode 100644 index 3cfb118c92..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_porkchop.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:porkchop", - "result": { - "id": "ironagefurniture:tallow", - "count": 3 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rabbit.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_rabbit.json deleted file mode 100644 index e88f7634bb..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rabbit.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:rabbit", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -} diff --git a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rotten_flesh.json b/src/main/resources/data/ironagefurniture/recipe/tallow_from_rotten_flesh.json deleted file mode 100644 index 1f8f4194a6..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:rotten_flesh", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "neoforge:conditions": [ - { - "type": "ironagefurniture:feature_enabled", - "feature": "lights" - } - ] -}