diff --git a/CHANGELOG.md b/CHANGELOG.md index 671ab199ac..7504bf9b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ ### Animation updates for the following Pokémon ### Changes +- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy +- Moved EXP Candies from the Medicine recipe book category to the Misc category ### Fixes - Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load. diff --git a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json index 3082a1f910..4f2fdb8394 100644 --- a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json +++ b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json @@ -1,6 +1,6 @@ { "type": "cobblemon:cooking_pot_shapeless", - "category": "medicines", + "category": "misc", "ingredients": [ { "item": "cobblemon:exp_candy_m" diff --git a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json index 8b5166401b..aa3b96dd2b 100644 --- a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json +++ b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json @@ -1,6 +1,6 @@ { "type": "cobblemon:cooking_pot_shapeless", - "category": "medicines", + "category": "misc", "ingredients": [ { "item": "cobblemon:exp_candy_s" diff --git a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json index 807284212f..9403fa9f90 100644 --- a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json +++ b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json @@ -1,6 +1,6 @@ { "type": "cobblemon:cooking_pot_shapeless", - "category": "medicines", + "category": "misc", "ingredients": [ { "item": "cobblemon:exp_candy_xs" diff --git a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json index f833822404..9c51ddb319 100644 --- a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json +++ b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json @@ -1,6 +1,6 @@ { "type": "cobblemon:cooking_pot_shapeless", - "category": "medicines", + "category": "misc", "ingredients": [ { "item": "cobblemon:exp_candy_l" diff --git a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json index 340dc7647c..2af9fb9128 100644 --- a/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json +++ b/common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json @@ -1,6 +1,6 @@ { "type": "cobblemon:cooking_pot_shapeless", - "category": "medicines", + "category": "misc", "ingredients": [ { "item": "minecraft:sculk" diff --git a/fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java b/fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java index 8e3d21d765..6d735c67c3 100644 --- a/fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java +++ b/fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java @@ -56,7 +56,7 @@ public class RecipeBookCategoriesMixin { types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.LEEK_AND_POTATO_STEW))); types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.POTION))); types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_COMPLEX_DISHES", $VALUES.length + 3, new ItemStack(CobblemonItems.APRIJUICE_RED))); - types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.PROTEIN))); + types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.HEALTH_CANDY))); $VALUES = types.toArray(RecipeBookCategories[]::new); } diff --git a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt index cd76a0a3b7..a615c471ef 100644 --- a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt +++ b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt @@ -34,5 +34,5 @@ object CobblemonEnumExtensions { Supplier> { listOf(ItemStack(CobblemonItems.APRIJUICE_RED)) as List }) @JvmField val COOKING_POT_MISC = EnumProxy(RecipeBookCategories::class.java, - Supplier> { listOf(ItemStack(CobblemonItems.PROTEIN)) as List }) + Supplier> { listOf(ItemStack(CobblemonItems.HEALTH_CANDY)) as List }) } \ No newline at end of file