Fix raw meat turning into tallow on NeoForge 1.21.11

.github/workflows/ci.yml

@@ -89,9 +89,9 @@ jobs:
           if-no-files-found: error
           retention-days: 30
           path: |
-            build/libs/iron-age-furniture-0.4.0.121112.jar
-            build/libs/iron-age-furniture-0.4.0.121112-sources.jar
-            build/libs/iron-age-furniture-0.4.0.121112-javadoc.jar
+            build/libs/iron-age-furniture-0.4.1.121112.jar
+            build/libs/iron-age-furniture-0.4.1.121112-sources.jar
+            build/libs/iron-age-furniture-0.4.1.121112-javadoc.jar
             build/release/SHA256SUMS
             CHANGELOG.md
       - name: Upload diagnostics on failure

CHANGELOG.md

@@ -1,3 +1,7 @@
+# IronAgeFurniture 0.4.1.121112
+
+- Remove the old tallow recipes so raw meat cooks normally again.
+
 # IronAgeFurniture 0.4.0.121112
 
 - Added wooden beds, double beds, canopy beds, wingbacks and thrones to NeoForge 1.21.11, with sixteen upholstery colours and matching wood recipes.

README.md

@@ -2,7 +2,9 @@
 
 IronAgeFurniture adds chairs, stools, benches, lighting, and other ye olde-style furniture to Minecraft.
 
-This branch is for Minecraft 1.21.11 with NeoForge 21.11.45 and Java 21. This release is `0.4.0.121112`. The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.0.121112`.
+This branch is for Minecraft 1.21.11 with NeoForge 21.11.45 and Java 21. This release is `0.4.1.121112`. The Maven coordinate is `zone.moddev.mc:iron-age-furniture:0.4.1.121112`.
+
+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
 

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 NeoForge, the target is `121112`, so the current functionally equivalent `0.4.0` version is `0.4.0.121112`. A release tag uses exactly that complete version.
+For Minecraft 1.21.11 NeoForge, the target is `121112`, so the current version is `0.4.1.121112`. A release tag uses exactly that complete version.
 
-Equivalent 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 complete version must agree with `minecraft_version`, `loader_name`, and `loader_code` in `gradle.properties`. CI build numbers are never appended.

gradle.properties

@@ -11,7 +11,7 @@ neogradle.subsystems.decompiler.maxMemory=8g
 neogradle.subsystems.decompiler.maxThreads=1
 
 # Project and release identity.
-mod_version=0.4.0.121112
+mod_version=0.4.1.121112
 mod_group=zone.moddev.mc
 mod_archive_name=iron-age-furniture
 mod_id=ironagefurniture

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
 }

gradle/verification.gradle

@@ -23,7 +23,7 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Verifies the exact IronAgeFurniture 1.21.11 NeoForge release identity.'
     doLast {
         Map<String, String> expected = [
-                mod_version            : '0.4.0.121112',
+                mod_version            : '0.4.1.121112',
                 mod_group              : 'zone.moddev.mc',
                 mod_archive_name       : 'iron-age-furniture',
                 mod_id                 : 'ironagefurniture',
@@ -104,11 +104,11 @@ tasks.register('verifyResourceJson') {
             include '**/*.json'
             include 'pack.mcmeta'
         }.files.sort { it.path }
-        // 16,229 core documents plus 1,195 documents for each of the retained
+        // 16,217 core documents plus 1,195 documents for each of the retained
         // 14 BOP and 25 BWG wood families (46 states, 609 block models, and
         // 135 each of item models, item definitions, recipes and advancements).
-        if (jsonFiles.size() != 16229 + (14 + 25) * 1195) {
-            throw new GradleException("Expected 62834 integrated Phase 4 runtime JSON documents, found ${jsonFiles.size()}")
+        if (jsonFiles.size() != 16217 + (14 + 25) * 1195) {
+            throw new GradleException("Expected 62822 integrated Phase 4 runtime JSON documents, found ${jsonFiles.size()}")
         }
         jsonFiles.each { candidate ->
             try {