diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec21130c3c..63f595b850 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,9 +120,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/iron-age-furniture-0.4.1.117011.jar - build/libs/iron-age-furniture-0.4.1.117011-sources.jar - build/libs/iron-age-furniture-0.4.1.117011-javadoc.jar + build/libs/iron-age-furniture-0.4.2.117011.jar + build/libs/iron-age-furniture-0.4.2.117011-sources.jar + build/libs/iron-age-furniture-0.4.2.117011-javadoc.jar build/release/SHA256SUMS CHANGELOG.md - name: Upload diagnostics on failure diff --git a/CHANGELOG.md b/CHANGELOG.md index a16589eb3d..b83ccc9817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# IronAgeFurniture 0.4.2.117011 + +- Remove the old tallow recipes so raw meat cooks normally again. + # IronAgeFurniture 0.4.1.117011 Phase 4 for Minecraft 1.17.1 and Forge 37.1.1. Requires Java 16. diff --git a/README.md b/README.md index 7e3cb2febf..e5624cb7db 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,12 @@ olde-style furniture to Minecraft. Seating is functional, furniture supports the appropriate vanilla and optional-mod materials, and lighting includes falling and throwable lava lamps. -This branch provides IronAgeFurniture `0.4.1.117011` for Minecraft 1.17.1 and +This branch provides IronAgeFurniture `0.4.2.117011` for Minecraft 1.17.1 and Forge 37.1.1. It requires Java 16 and can be installed on both clients and dedicated servers. +This fixes raw meat turning into tallow when cooked. Minecraft has its own candles now, so the old tallow recipes are no longer needed. + ## Phase 4 furniture and lighting The four creative tabs are Chairs, Benches, Beds and Lights. Wooden and canopy @@ -88,7 +90,7 @@ The supported Java source namespace is now `zone.moddev.mc.ironagefurniture`. Add-ons compiled against the former `com.mcmoddev.ironagefurniture` packages must update their imports. The Maven coordinate is -`zone.moddev.mc:iron-age-furniture:0.4.1.117011`. +`zone.moddev.mc:iron-age-furniture:0.4.2.117011`. See [CHANGELOG.md](CHANGELOG.md) for the release notes and [docs/VERSIONS.md](docs/VERSIONS.md) for the versioning scheme. Bugs can be diff --git a/build.gradle b/build.gradle index 5c2ceb043d..85c1dacb1c 100644 --- a/build.gradle +++ b/build.gradle @@ -705,7 +705,7 @@ tasks.register('verifyReleaseConfiguration') { description = 'Verifies the exact IronAgeFurniture 1.17.1 release identity.' doLast { Map expected = [ - mod_version : '0.4.1.117011', + mod_version : '0.4.2.117011', mod_group : 'zone.moddev.mc', mod_archive_name : 'iron-age-furniture', mod_id : 'ironagefurniture', @@ -785,8 +785,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() != 21925) { - throw new GradleException("Expected 21925 runtime JSON documents, found ${jsonFiles.size()}") + if (jsonFiles.size() != 21913) { + throw new GradleException("Expected 21913 runtime JSON documents, found ${jsonFiles.size()}") } jsonFiles.each { candidate -> try { diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 7a41db6282..abf71c04f5 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.17.1 Forge, the target is `117011`, so Phase 4 is `0.4.1.117011`. The release tag, when published, is exactly that complete version. +For Minecraft 1.17.1 Forge, the target is `117011`, so Phase 4 is `0.4.2.117011`. The release tag, when published, is exactly that complete version. -Equivalent Phase 4 forward ports retain `0.4.0` 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.17.1 release contains the upgrade bridge for supported furniture and lighting saved by the 1.10.2 and 1.12.2 core releases. Back up a world before diff --git a/gradle.properties b/gradle.properties index 83a79a7ea1..2cae5b9b7d 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.1.117011 +mod_version=0.4.2.117011 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 c677d36681..c78a9e3dc4 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" - } - ] -} diff --git a/src/optionalIntegrationTest/resources/META-INF/mods.toml b/src/optionalIntegrationTest/resources/META-INF/mods.toml index 856a3471d9..07e1023e38 100644 --- a/src/optionalIntegrationTest/resources/META-INF/mods.toml +++ b/src/optionalIntegrationTest/resources/META-INF/mods.toml @@ -23,7 +23,7 @@ side="SERVER" [[dependencies.ironagefurnitureintegrationprobe]] modId="ironagefurniture" mandatory=true -versionRange="[0.4.1.117011]" +versionRange="[0.4.2.117011]" ordering="AFTER" side="SERVER"