Skip to content

Commit 5b95d10

Browse files
authored
Fix MoCreatures and add etfutrum (#25)
Co-authored-by: Xronin <xronin01@users.noreply.github.com>
1 parent aa8e139 commit 5b95d10

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

src/main/resources/assets/nutrition/configs/nutrients/fruit.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@
133133
"erebus:smoothie:2",
134134
"erebus:smoothie:7",
135135
"erebus:smoothie:9",
136+
"etfuturum:sweet_berries",
137+
"etfuturum:chorus_fruit",
136138
"exsartagine:pizzasweet",
137139
"exsartagine:pizzasweetraw",
138140
"extrautils2:magicapple",
@@ -514,7 +516,6 @@
514516
"midnight:unstable_fruit_green",
515517
"midnight:unstable_fruit_lime",
516518
"minecraft:apple",
517-
"minecraft:chorus_fruit",
518519
"minecraft:golden_apple:0",
519520
"minecraft:golden_apple:1",
520521
"minecraft:melon",
@@ -703,4 +704,4 @@
703704
"DraconicEvolution:dezilsMarshmallow"
704705
]
705706
}
706-
}
707+
}

src/main/resources/assets/nutrition/configs/nutrients/protein.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,11 @@
302302
"erebus:smoothie:9",
303303
"erebus:stag_heart_cooked",
304304
"erebus:stag_heart_raw",
305+
"etfuturum:mutton_cooked",
306+
"etfuturum:mutton_raw",
307+
"etfuturum:rabbit_cooked",
308+
"etfuturum:rabbit_raw",
309+
"etfuturum:rabbit_stew",
305310
"exoticbirds:birdmeat",
306311
"exoticbirds:cooked_birdmeat",
307312
"exsartagine:breadmeatraw",
@@ -881,33 +886,28 @@
881886
"minecraft:cooked_chicken",
882887
"minecraft:cooked_fished:0",
883888
"minecraft:cooked_fished:1",
884-
"minecraft:cooked_mutton",
885889
"minecraft:cooked_porkchop",
886-
"minecraft:cooked_rabbit",
887890
"minecraft:fish:0",
888891
"minecraft:fish:1",
889892
"minecraft:fish:2",
890893
"minecraft:fish:3",
891894
"minecraft:golden_apple:1",
892-
"minecraft:mutton",
893895
"minecraft:porkchop",
894896
"minecraft:pumpkin_pie",
895-
"minecraft:rabbit",
896-
"minecraft:rabbit_stew",
897897
"mob_mash:cooked_crocoduck",
898898
"mob_mash:raw_crocoduck",
899-
"mocreatures:crabcooked",
900-
"mocreatures:crabraw",
901-
"mocreatures:omelet",
902-
"mocreatures:ostrichcooked",
903-
"mocreatures:ostrichraw",
904-
"mocreatures:ratburger",
905-
"mocreatures:ratcooked",
906-
"mocreatures:ratraw",
907-
"mocreatures:turkeycooked",
908-
"mocreatures:turkeyraw",
909-
"mocreatures:turtleraw",
910-
"mocreatures:turtlesoup",
899+
"MoCreatures:crabcooked",
900+
"MoCreatures:crabraw",
901+
"MoCreatures:omelet",
902+
"MoCreatures:ostrichcooked",
903+
"MoCreatures:ostrichraw",
904+
"MoCreatures:ratburger",
905+
"MoCreatures:ratcooked",
906+
"MoCreatures:ratraw",
907+
"MoCreatures:turkeycooked",
908+
"MoCreatures:turkeyraw",
909+
"MoCreatures:turtleraw",
910+
"MoCreatures:turtlesoup",
911911
"mountainmobs:peakskebab",
912912
"mountainmobs:yalemeatcooked",
913913
"mountainmobs:yalemeatraw",
@@ -1254,4 +1254,4 @@
12541254
"DraconicEvolution:dezilsMarshmallow"
12551255
]
12561256
}
1257-
}
1257+
}

src/main/resources/assets/nutrition/configs/nutrients/vegetable.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@
145145
"erebus:smoothie:7",
146146
"erebus:smoothie:9",
147147
"erebus:turnip",
148+
"etfuturum:beetroot",
149+
"etfuturum:beetroot_soup",
150+
"etfuturum:rabbit_stew",
151+
"etfuturum:suspicious_stew",
148152
"exsagitarne:beans.boiled",
149153
"exsartagine:beans.boiled",
150154
"exsartagine:breadveggie",
@@ -625,15 +629,12 @@
625629
"lycanitesmobs:tropical_curry",
626630
"midnight:bulb_fungus_hand",
627631
"minecraft:baked_potato",
628-
"minecraft:beetroot",
629-
"minecraft:beetroot_soup",
630632
"minecraft:carrot",
631633
"minecraft:golden_apple:1",
632634
"minecraft:golden_carrot",
633635
"minecraft:mushroom_stew",
634636
"minecraft:poisonous_potato",
635637
"minecraft:potato",
636-
"minecraft:rabbit_stew",
637638
"mountainmobs:peakskebab",
638639
"mysticalworld:aubergine",
639640
"mysticalworld:aubergine_salad",
@@ -980,4 +981,4 @@
980981
"DraconicEvolution:dezilsMarshmallow"
981982
]
982983
}
983-
}
984+
}

0 commit comments

Comments
 (0)