diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4b2eeba6a..be0efb48e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ca630632f..ccf6c7dd3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/README.md b/README.md index 7cd2e653d5..9eed06b1de 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.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 @@ -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. diff --git a/build.gradle b/build.gradle index 7ce661d05f..baa285fe8b 100644 --- a/build.gradle +++ b/build.gradle @@ -759,7 +759,7 @@ tasks.register('verifyReleaseConfiguration') { dependsOn tasks.named('verifyMavenizerCompatibilityFixture') doLast { Map 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', @@ -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 { diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 6ddc6c7bdd..2a17616d93 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -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. diff --git a/gradle.properties b/gradle.properties index e2a3213dd2..532babb065 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/lighting-catalog.gradle b/gradle/lighting-catalog.gradle index ade4cdc993..6d599f594b 100644 --- a/gradle/lighting-catalog.gradle +++ b/gradle/lighting-catalog.gradle @@ -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 } 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 f941d9a7e6..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_beef.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 9e59872d2c..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_chicken.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 29bde6a9a9..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_mutton.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 10d4927581..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_porkchop.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 4f354de103..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rabbit.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 11b3d2d763..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,37 +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" - ] - }, - "sends_telemetry_event": false, - "forge:condition": { - "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 6b7b9c64cd..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_beef.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:beef", - "result": { - "id": "ironagefurniture:tallow", - "count": 2 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 9b3b4499d6..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_chicken.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:chicken", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 05e50e5935..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_mutton.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:mutton", - "result": { - "id": "ironagefurniture:tallow", - "count": 2 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 933d7d4392..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_porkchop.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:porkchop", - "result": { - "id": "ironagefurniture:tallow", - "count": 3 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 6b59163a63..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rabbit.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:rabbit", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 8ba2ea3f90..0000000000 --- a/src/main/resources/data/ironagefurniture/recipe/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "food", - "ingredient": "minecraft:rotten_flesh", - "result": { - "id": "ironagefurniture:tallow", - "count": 1 - }, - "experience": 0.1, - "cookingtime": 200, - "forge:condition": { - "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 c318f5fe61..5664520925 100644 --- a/src/optionalIntegrationTest/resources/META-INF/mods.toml +++ b/src/optionalIntegrationTest/resources/META-INF/mods.toml @@ -24,7 +24,7 @@ side="SERVER" [[dependencies.ironagefurnitureintegrationprobe]] modId="ironagefurniture" mandatory=true -versionRange="[0.4.1.121111]" +versionRange="[0.4.2.121111]" ordering="AFTER" side="SERVER" [[dependencies.ironagefurnitureintegrationprobe]]