From 718494a938482efa5336ea23ce6a997f885879ca Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Wed, 23 Oct 2024 15:55:32 +0200 Subject: [PATCH] Fix coffee ingredient recipe using camel case for some keys --- .../cf73036c8429237f1243c873fdd92cabc277e5ec | 20 +++++++++---------- .../coffee_ingredient/blaze_powder.json | 2 +- .../fermented_spider_eye.json | 2 +- .../recipe/coffee_ingredient/ghast_tear.json | 2 +- .../coffee_ingredient/golden_carrot.json | 2 +- .../recipe/coffee_ingredient/magma_cream.json | 2 +- .../recipe/coffee_ingredient/milk_bucket.json | 4 ++-- .../recipe/coffee_ingredient/milk_tagged.json | 4 ++-- .../recipe/coffee_ingredient/pufferfish.json | 2 +- .../recipe/coffee_ingredient/sugar.json | 2 +- .../mod/crafting/CoffeeIngredientRecipe.java | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/generated/resources/.cache/cf73036c8429237f1243c873fdd92cabc277e5ec b/src/generated/resources/.cache/cf73036c8429237f1243c873fdd92cabc277e5ec index 125a4fc57..014dbaa30 100644 --- a/src/generated/resources/.cache/cf73036c8429237f1243c873fdd92cabc277e5ec +++ b/src/generated/resources/.cache/cf73036c8429237f1243c873fdd92cabc277e5ec @@ -1,10 +1,10 @@ -// 1.21.1 2024-08-11T19:30:01.831319 Coffee Ingredient Recipes -68a4a8ca4b24d8cc042c0a384069196f708a4dd9 data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json -f18e6b3fee9f1610c0366feabc0dd3ffe2455224 data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json -5402f0078e820175f117c4c3b63907f29daa6209 data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json -58f7831e3e547732cb9b0605334d21f45730b566 data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json -708f899155df8a114e30f15e7e5940f75fb2a9e9 data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json -113a26d8cd82641cf612e39e4bf026f769e4597b data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json -2869da64a7df293242e280a3e5c61fc3070f3c37 data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json -228b27e7fb0ea183b8c34561ceb6b7b6a48fc0fe data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json -1f74a319b1677a66f1fc83ccc6c284dc51db88ef data/actuallyadditions/recipe/coffee_ingredient/sugar.json +// 1.21.1 2024-10-23T15:53:59.2712517 Coffee Ingredient Recipes +c27e4fb15f6385f5e539ae481204836fb61b315b data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json +58f717b91bb3bb0dd5cff8ebeb436062d45a2d0c data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json +4a528b8d95a7df8789f61d34f7253b71c164543b data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json +5b423115202fec7a2d68ac37cba54bfa61a94985 data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json +d30f3419c9c3bd2fc23bc0283c45c7c0106a7d3c data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json +bcc38e8cce44fabc32911122306a631602618b84 data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json +f8400141dd335ec5c9eec0015e622a33af249621 data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json +ac8015c1d6abdc0afc07332002dd56c6aee20172 data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json +7f1611c9771254b5bd1d9451c942216a605b7dc5 data/actuallyadditions/recipe/coffee_ingredient/sugar.json diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json index 2ccd99169..04b3ea81b 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:blaze_powder" }, - "maxAmplifier": 4 + "max_amplifier": 4 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json index 56392634f..3172682d9 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:fermented_spider_eye" }, - "maxAmplifier": 2 + "max_amplifier": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json index 7078b9b74..45d7e9972 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:ghast_tear" }, - "maxAmplifier": 3 + "max_amplifier": 3 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json index e1689656f..7e763a054 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:golden_carrot" }, - "maxAmplifier": 2 + "max_amplifier": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json index 3da104528..670e77ec2 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:magma_cream" }, - "maxAmplifier": 2 + "max_amplifier": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json index cd444a8f1..991c00b7c 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json @@ -1,8 +1,8 @@ { "type": "actuallyadditions:coffee_ingredient", - "extraText": "jei.actuallyadditions.coffee.extra.milk", + "extra_text": "jei.actuallyadditions.coffee.extra.milk", "ingredient": { "item": "minecraft:milk_bucket" }, - "maxAmplifier": 0 + "max_amplifier": 0 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json index 7bd799730..0329bfaab 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json @@ -9,9 +9,9 @@ } ], "type": "actuallyadditions:coffee_ingredient", - "extraText": "jei.actuallyadditions.coffee.extra.milk", + "extra_text": "jei.actuallyadditions.coffee.extra.milk", "ingredient": { "tag": "c:milk" }, - "maxAmplifier": 0 + "max_amplifier": 0 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json index 325b25f75..8405ffb2d 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:pufferfish" }, - "maxAmplifier": 2 + "max_amplifier": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/sugar.json b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/sugar.json index bf889d560..191f5884c 100644 --- a/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/sugar.json +++ b/src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/sugar.json @@ -10,5 +10,5 @@ "ingredient": { "item": "minecraft:sugar" }, - "maxAmplifier": 4 + "max_amplifier": 4 } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CoffeeIngredientRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CoffeeIngredientRecipe.java index 255c78b16..1bba8a926 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CoffeeIngredientRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CoffeeIngredientRecipe.java @@ -164,8 +164,8 @@ public class CoffeeIngredientRecipe implements Recipe { DataResult::success ) .forGetter(recipe -> recipe.instances), - Codec.INT.fieldOf("maxAmplifier").forGetter(recipe -> recipe.maxAmplifier), - Codec.STRING.optionalFieldOf("extraText", "").forGetter(recipe -> recipe.extraText) + Codec.INT.fieldOf("max_amplifier").forGetter(recipe -> recipe.maxAmplifier), + Codec.STRING.optionalFieldOf("extra_text", "").forGetter(recipe -> recipe.extraText) ) .apply(instance, CoffeeIngredientRecipe::new) );