diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 871ce7722b..447f7ef6a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,9 +115,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/iron-age-furniture-0.4.1.2603001.jar - build/libs/iron-age-furniture-0.4.1.2603001-sources.jar - build/libs/iron-age-furniture-0.4.1.2603001-javadoc.jar + build/libs/iron-age-furniture-0.4.2.2603001.jar + build/libs/iron-age-furniture-0.4.2.2603001-sources.jar + build/libs/iron-age-furniture-0.4.2.2603001-javadoc.jar build/release/SHA256SUMS CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e942131824..441eaa10b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# IronAgeFurniture 0.4.2.2603001 + +- Remove the old tallow recipes so raw meat cooks normally again. +- Update the BOP add-on to `0.4.2.2603001` or later if you use it. + # Iron Age Furniture 0.4.1.2603001 - Adds translated names for every registered block and item in all seventeen language files, including filled sconces, lamp brightness states and hidden furniture parts shown by HUD mods. diff --git a/README.md b/README.md index cccd0684e8..79f2cebd76 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ Iron Age Furniture adds wooden chairs, stools, benches, beds and lighting with a simple, old-fashioned style. -This branch provides Phase 4, version **0.4.1.2603001**, for Minecraft **26.3**, Forge **66** (minimum `66.0.2`), and Java **25**. Install the Forge build of each optional mod; NeoForge jars are not interchangeable. +This branch provides Phase 4, version **0.4.2.2603001**, for Minecraft **26.3**, Forge **66** (minimum `66.0.2`), and Java **25**. Install the Forge build of each optional mod; NeoForge jars are not interchangeable. + +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.2.2603001` or later on this branch as well. ## Furniture and lighting @@ -71,4 +75,4 @@ The profiles keep separate worlds and settings and never load development probes Close the previous client and refresh the Gradle project before retesting a new build. Run `prepareEclipse` to synchronise the production classes and resources used by Eclipse. -The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.1.2603001`. The Java API lives under `zone.moddev.mc.ironagefurniture`; persistent mod, registry, resource and save identities remain under `ironagefurniture`. Building locally does not publish or tag a release. +The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.2.2603001`. The Java API lives under `zone.moddev.mc.ironagefurniture`; persistent mod, registry, resource and save identities remain under `ironagefurniture`. Building locally does not publish or tag a release. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index c604f6dc22..45b1fa6f44 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.3 Forge, the target is `2603001`. Phase 4 began at `0.4.0.2603001`; the translated HUD-name update is `0.4.1.2603001`. Release tags use the complete version. +For Minecraft 26.3 Forge, the target is `2603001`. Phase 4 began at `0.4.0.2603001`; the translated HUD-name update is `0.4.2.2603001`. Release tags use the complete version. Equivalent ports retain the functional version and change only the target. A player-visible feature or fix changes Major, Minor, or Bug independently of the target. diff --git a/gradle.properties b/gradle.properties index f0d8f36b84..547a3501bf 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.2603001 +mod_version=0.4.2.2603001 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 c4dc7cd88e..043cd0b177 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], '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/gradle/manual-client-runs.gradle b/gradle/manual-client-runs.gradle index d670ad373e..f922f74634 100644 --- a/gradle/manual-client-runs.gradle +++ b/gradle/manual-client-runs.gradle @@ -27,11 +27,11 @@ def bopPreparation = tasks.register('prepareBopClientMods') { doLast { String source = providers.gradleProperty('bopRuntimeDirectory').getOrElse(settings.getProperty('bopRuntimeDirectory', 'libs/bop-runtime')) String addonHash = providers.gradleProperty('bopAddonSha256').getOrElse(settings.getProperty('bopAddonSha256', '')).toUpperCase() - // The add-on pins this core's hash. Keep its reciprocal staging hash in - // ignored local settings so neither release embeds a circular checksum. + // Keep the add-on staging checksum in ignored local settings. + // Its published compile dependency keeps its own checksum pin. if (!(addonHash ==~ /[A-F0-9]{64}/)) throw new GradleException('Set bopAddonSha256 to the tested add-on checksum in local.properties') Map expected = [ - 'iron-age-furniture-biomes-o-plenty-addon-0.4.1.2603001.jar': addonHash, + 'iron-age-furniture-biomes-o-plenty-addon-0.4.2.2603001.jar': addonHash, 'BiomesOPlenty-forge-26.3-26.3.0.0.7.jar': '21FD459CF3A0A9A2AF392729FE1AE6941EEA988FADC0EBC265621E0FA16F8E76', 'GlitchCore-forge-26.3-26.3.0.0.5.jar': 'A62915B9D333039D0CC0C520CF999F71CFD5E5AA8BF7406A60F959CC167BDD2A', 'TerraBlender-forge-26.3-26.3.0.0.9.jar': 'BFE24B485D0657AC9A398B784242449D7F209CB7A3A8793781D673C73537DAB6' diff --git a/gradle/verification.gradle b/gradle/verification.gradle index e58a165c62..d220a83521 100644 --- a/gradle/verification.gradle +++ b/gradle/verification.gradle @@ -67,7 +67,7 @@ tasks.register('verifyReleaseConfiguration') { dependsOn tasks.named('verifyMavenizerCompatibilityFixture') doLast { Map expected = [ - mod_version : '0.4.1.2603001', + mod_version : '0.4.2.2603001', mod_group : 'zone.moddev.mc', mod_archive_name : 'iron-age-furniture', mod_id : 'ironagefurniture', @@ -146,8 +146,8 @@ tasks.register('verifyResourceJson') { include '**/*.json' include 'pack.mcmeta' }.files.sort { it.path } - if (jsonFiles.size() != 16229) { - throw new GradleException("Expected 16229 Phase 4 runtime JSON documents, found ${jsonFiles.size()}") + if (jsonFiles.size() != 16217) { + 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 362858de2a..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_beef.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_beef" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_beef" - ] - }, - "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 f74563e7ff..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_chicken.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_chicken" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_chicken" - ] - }, - "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 25110ba116..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_mutton.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_mutton" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_mutton" - ] - }, - "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 b9fca4b405..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_porkchop.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_porkchop" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_porkchop" - ] - }, - "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 9c20d21563..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rabbit.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_rabbit" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_rabbit" - ] - }, - "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 1f0bce9675..0000000000 --- a/src/main/resources/data/ironagefurniture/advancement/recipes/phase_four/tallow_from_rotten_flesh.json +++ /dev/null @@ -1,36 +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": { - "recipes": "ironagefurniture:tallow_from_rotten_flesh" - } - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "ironagefurniture:tallow_from_rotten_flesh" - ] - }, - "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" - } -}