mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'campfire-book-lies' into 'main'

Browse Source 
Recipe Book Lies No More

See merge request cable-mc/cobblemon!2487
This commit is contained in:
Polymeta
2026-10-14 11:32:52 +00:00
parent 2f87d53af6 8caa82f123
commit bbc9a5e62e
8 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -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.
common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "cobblemon:cooking_pot_shapeless",
"category": "medicines",
"category": "misc",
"ingredients": [
{
"item": "cobblemon:exp_candy_m"
common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "cobblemon:cooking_pot_shapeless",
"category": "medicines",
"category": "misc",
"ingredients": [
{
"item": "cobblemon:exp_candy_s"
common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "cobblemon:cooking_pot_shapeless",
"category": "medicines",
"category": "misc",
"ingredients": [
{
"item": "cobblemon:exp_candy_xs"
common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "cobblemon:cooking_pot_shapeless",
"category": "medicines",
"category": "misc",
"ingredients": [
{
"item": "cobblemon:exp_candy_l"
common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "cobblemon:cooking_pot_shapeless",
"category": "medicines",
"category": "misc",
"ingredients": [
{
"item": "minecraft:sculk"
fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java
+1 -1
View File
@@ -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);
}
neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt
+1 -1
View File
@@ -34,5 +34,5 @@ object CobblemonEnumExtensions {
Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.APRIJUICE_RED)) as List<ItemStack> })
@JvmField
val COOKING_POT_MISC = EnumProxy(RecipeBookCategories::class.java,
Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.PROTEIN)) as List<ItemStack> })
Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.HEALTH_CANDY)) as List<ItemStack> })
}