Skip to content

Commit

Permalink
feat: added more cookies and improved compatibility with other mods
Browse files Browse the repository at this point in the history
      - **ADDED 12 NEW COOKIES!!!!1** ❤️
      - The infuser screen is now pretty.
      - Fixed a visual bug with the infuser model.
      - The infuser now takes longer to cook.
      - You can now bone meal Aristea.
      - You can find the cookies in village chests.
      - Increased the rarity of cotton candy seeds.
      - Added lots of tags to all items to improve compatibility with other mods.
      - Dropped support for 1.20.2.
  • Loading branch information
iamkaf committed Mar 13, 2024
1 parent 180ffd1 commit d83083d
Show file tree
Hide file tree
Showing 155 changed files with 3,292 additions and 134 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.8
loader_version=0.14.21

# Mod Properties
mod_version=1.2.2+1.20.1
mod_version=1.3.0+1.20.1
maven_group=com.codekaffe.valentine
archives_base_name=kafvalentine-fabric

Expand Down
47 changes: 43 additions & 4 deletions src/main/generated/.cache/9241bba324b1141ca1454fcedf94b8f13cdb566e
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
// 1.20.1 2024-02-28T10:01:20.3202891 Kaf's Valentine Special/Recipes
dc56546942d667e5b8b197f13136e85f87d0c28f data\kafvalentine\advancements\recipes\misc\lovey_dovey_infuser.json
// 1.20.1 2024-03-13T15:13:43.4377125 Kaf's Valentine Special/Recipes
bc076317a1c015c0f8a04b0251c4489ea3e7438f data\kafvalentine\advancements\recipes\food\fire_cookie.json
8839a7102aead55bc35c0586436302bdc0ab6a5c data\kafvalentine\recipes\special_fire_cookie_from_infusing_fire_cookie.json
4da9f258446eb8f43829e51a9f7ecefba393c497 data\kafvalentine\recipes\golden_cookie.json
8868034e398c9e15cb53d9f2c689416b287eee21 data\kafvalentine\recipes\special_aristea_cookie_from_infusing_aristea_cookie.json
093fb48462bf22fed0addbfe4ac7b2e6332fe19a data\kafvalentine\advancements\recipes\food\special_chocolate_cookie.json
1dd27bad756385cee32b94461391cda981510091 data\kafvalentine\recipes\special_caramel_cookie_from_infusing_caramel_cookie.json
0cc43a4a71086e68cf48d9374c5a91feab61fd6a data\kafvalentine\advancements\recipes\food\aristea_cookie.json
de317d520364b401681494dfa7548510c7402077 data\kafvalentine\recipes\lovey_dovey_infuser.json
9d07d698dccc09aa9a256b97b47234fa1170dc61 data\kafvalentine\recipes\special_chocolate_cookie.json
093fb48462bf22fed0addbfe4ac7b2e6332fe19a data\kafvalentine\advancements\recipes\misc\special_chocolate_cookie.json
d32b125cff92955755e57b79ee7886d42148f27d data\kafvalentine\advancements\recipes\food\evil_cookie.json
ffd570d9444fd6f2cf5a005c5de9f3b83c9523f4 data\kafvalentine\recipes\special_glow_cookie_from_infusing_glow_cookie.json
1bd58ae0d233e1074a4055fdfbee8a364ef7d4f8 data\kafvalentine\advancements\recipes\food\apple_cookie.json
301d0358add36606ba01ef3816e42b938b53eeed data\kafvalentine\recipes\aristea_cookie.json
d30bdfd34cf23202685d323e5a28555ff4914f1e data\kafvalentine\advancements\recipes\food\good_vision_cookie.json
c1cc9217ccf7676e4cbc9a449dbb8672ce34c799 data\kafvalentine\recipes\special_explosive_cookie_from_infusing_explosive_cookie.json
872378dd4d174d626a8c05b55b63aa08f92cea6f data\kafvalentine\recipes\purple_dye.json
dc56546942d667e5b8b197f13136e85f87d0c28f data\kafvalentine\advancements\recipes\misc\lovey_dovey_infuser.json
472a618e96d8344e5c01864a737bc3b608b6f503 data\kafvalentine\recipes\good_vision_cookie.json
697a5afc9dae249b9ab1645dbb3ec780eff4e910 data\kafvalentine\advancements\recipes\food\explosive_cookie.json
83d2528eabb46957bc979ee27cee6791c6d01f27 data\kafvalentine\recipes\glow_cookie.json
28781caf1899715eaaebd80f2864c97a5ec29492 data\kafvalentine\advancements\recipes\decorations\purple_dye.json
2fbd192031dede9a8795213990b871149907828e data\kafvalentine\recipes\caramel_cookie.json
4dde57908590814abd8415477119dd1c0bbdbf00 data\kafvalentine\recipes\fire_cookie.json
14dc3c0d162bb7ec88fc947b3c78761459d91f8e data\kafvalentine\recipes\explosive_cookie.json
223bda39c3de43e8ed2c65305e70fb0724c7262c data\kafvalentine\recipes\special_evil_cookie_from_infusing_evil_cookie.json
1a76c63c74131ef0489b53a328827746de1efa0b data\kafvalentine\recipes\apple_cookie.json
3309422cb37087bd272230ea7232f553505b81c7 data\kafvalentine\advancements\recipes\food\nether_wart_cookie.json
530713a02a63f913d70deb557bf610b4f37c57a8 data\kafvalentine\advancements\recipes\food\glow_cookie.json
88af99ee6baadcc922d4f96c3017268b79c16939 data\kafvalentine\advancements\recipes\food\caramel_cookie.json
d4d3b4e4089c32ad88d46273abecce37e51a3bfc data\kafvalentine\advancements\recipes\food\golden_cookie.json
c629c5f98def11417f8a0de233b73f30dbfc2f97 data\kafvalentine\recipes\special_medic_cookie_from_infusing_medic_cookie.json
9677f5d3122fdee6a5618b87a84acb48d01ed98b data\kafvalentine\recipes\melon_cookie.json
85e552b6ce3ac0a371aeedd425e060f75e431b92 data\kafvalentine\advancements\recipes\food\medic_cookie.json
1dc21c2b19fe627200e4407e60fc6da7d8599e7a data\kafvalentine\recipes\nether_wart_cookie.json
9f45e46b172a23991f86c3496d2af34264b1644c data\kafvalentine\recipes\medic_cookie.json
bf6b8d90f0fa1e8532af027cc86a0aa3e7ab4e9d data\kafvalentine\advancements\recipes\food\melon_cookie.json
f908d2ee774454b6509a69abf7c9b3bb0c0c1a48 data\kafvalentine\recipes\special_melon_cookie_from_infusing_melon_cookie.json
eae396dacf3a564c4ec5cd432c59386d5eaec8c8 data\kafvalentine\recipes\extra_special_chocolate_cookie_from_infusing_special_chocolate_cookie.json
88ebb6cd324d3705b70151e202806ad5374ccc54 data\kafvalentine\recipes\special_nether_wart_cookie_from_infusing_nether_wart_cookie.json
b566d932a10adac042ece3a35979e2ebc9c77f52 data\kafvalentine\recipes\evil_cookie.json
deac98161e3ec86f3771121966e0355c745bfba1 data\kafvalentine\recipes\special_apple_cookie_from_infusing_apple_cookie.json
e8e96f799effc86f5ef216d21de882ac2c0c075b data\kafvalentine\recipes\special_golden_cookie_from_infusing_golden_cookie.json
ec52da32adb36a1715b69d3016b9c25ac47e4d94 data\kafvalentine\recipes\special_chocolate_cookie.json
63f670085d4c6acb46082b7c0ae6b5978b490d3f data\kafvalentine\recipes\special_good_vision_cookie_from_infusing_good_vision_cookie.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
// 1.20.1 2024-02-28T10:01:20.3207882 Kaf's Valentine Special/Tags for minecraft:block
// 1.20.1 2024-03-13T15:13:43.4387166 Kaf's Valentine Special/Tags for minecraft:block
9c8348c58e3e27b69a4b16f8e20d8eaa980834bc data\minecraft\tags\blocks\flowers.json
8f07b04159f7352d1b38cb3fe7f1a64493c8ce5d data\minecraft\tags\blocks\bee_growables.json
9c8348c58e3e27b69a4b16f8e20d8eaa980834bc data\c\tags\blocks\flowers.json
a1798706c3e5fd45736c9c5576100f04b2d857ff data\minecraft\tags\blocks\mineable\pickaxe.json
a1798706c3e5fd45736c9c5576100f04b2d857ff data\minecraft\tags\blocks\needs_stone_tool.json
a1798706c3e5fd45736c9c5576100f04b2d857ff data\minecraft\tags\blocks\mineable\pickaxe.json
9c8348c58e3e27b69a4b16f8e20d8eaa980834bc data\minecraft\tags\blocks\small_flowers.json
25cc646d5e2a2f791d1e2f4e5535188a658cf758 data\c\tags\blocks\plant.json
25cc646d5e2a2f791d1e2f4e5535188a658cf758 data\minecraft\tags\blocks\crops.json
25cc646d5e2a2f791d1e2f4e5535188a658cf758 data\minecraft\tags\blocks\maintains_farmland.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-02-28T10:01:20.3197893 Kaf's Valentine Special/Block Loot Tables
// 1.20.1 2024-03-13T15:13:43.4372053 Kaf's Valentine Special/Block Loot Tables
c398222fb15587d243e94a83eda77222d434bcfe data\kafvalentine\loot_tables\blocks\cotton_candy_crop.json
1be6bea11684ce2e5253abed1df40340cac97293 data\kafvalentine\loot_tables\blocks\aristea.json
df7afe04fb92f9685a24bc3d7893986bb782e56d data\kafvalentine\loot_tables\blocks\lovey_dovey_infuser.json
Expand Down
34 changes: 29 additions & 5 deletions src/main/generated/.cache/ca415627b0b00c77cffd2be8b7474dc16c5acbac
Original file line number Diff line number Diff line change
@@ -1,19 +1,43 @@
// 1.20.1 2024-02-28T10:01:20.3177848 Kaf's Valentine Special/Model Definitions
// 1.20.1 2024-03-13T15:13:43.4346975 Kaf's Valentine Special/Model Definitions
ecfc6a0d8264149c4ed5d1dc2e09ded6805ef94a assets\kafvalentine\models\item\special_aristea_cookie.json
ce36fcf7318243a60feebd83eeeb0cac6eb4427e assets\kafvalentine\models\item\aristea_cookie.json
94fb8c93e565e2b657e2642783928b7d4368bac8 assets\kafvalentine\models\item\special_evil_cookie.json
f230362b425023b92f497863011b67a43a19d936 assets\kafvalentine\blockstates\lovey_dovey_infuser.json
d649fbc5d6042bb5c33ebb9b627cb4740aa6972d assets\kafvalentine\models\item\special_fire_cookie.json
414797217c160d5fd2cc0732c4ef39bd5bf5c6d6 assets\kafvalentine\models\item\special_nether_wart_cookie.json
6487da39ba37df24e855d370b0d1169bcb496c58 assets\kafvalentine\models\item\fire_cookie.json
7901e62003e2fd269c8014d06561bb567e10bd56 assets\kafvalentine\models\item\golden_cookie.json
c151e32ee20b197ebec296a059d38d4b9c746d42 assets\kafvalentine\models\item\explosive_cookie.json
bd02a523edc976c062d3c21025778579d94eed1a assets\kafvalentine\blockstates\aristea.json
133515bd8b713a6800512752a54d62d5eb324a14 assets\kafvalentine\models\block\cotton_candy_crop_stage4.json
213ea4688849d02cc97310ca149822f7c74255de assets\kafvalentine\models\block\cotton_candy_crop_stage1.json
4ad8c13e78f60131fde29ee9da8153c623fad124 assets\kafvalentine\models\item\glow_cookie.json
f1b9765d7a5df224428d8a4908696343dc153a2a assets\kafvalentine\models\block\potted_aristea.json
5fa629abd31587b3a3ad436c953401ea28218210 assets\kafvalentine\models\item\special_good_vision_cookie.json
9e8d717f49da5b3802411bad8724b3b24ec97ea3 assets\kafvalentine\models\item\aristea.json
a334fbe52f56e2f07530686a01db6d7152e5aaa3 assets\kafvalentine\models\item\cotton_candy_seeds.json
58a84e36ae1b004f3914d9424dbf19ae693a9e25 assets\kafvalentine\blockstates\cotton_candy_crop.json
92ff33847e2aa996ea83d7f2b3a92675203b84db assets\kafvalentine\models\block\cotton_candy_crop_stage2.json
ddd031a28e294f489937d47bacad50ea981b6630 assets\kafvalentine\models\item\lovey_dovey_infuser.json
f5790a43d9b2501597c9a595e94df8af51c61b90 assets\kafvalentine\blockstates\potted_aristea.json
d18fb7f86d8921a99665ad9decdca2df5f14f936 assets\kafvalentine\models\item\special_caramel_cookie.json
700bee53596a64c02f78d7f8d05104b0301e0888 assets\kafvalentine\models\item\nether_wart_cookie.json
fe09da65d1595bf961d0bf1d99732aaca1321245 assets\kafvalentine\models\item\caramel_cookie.json
cc3cf1fa995b9cfd3389223453f0f2f69cd6643f assets\kafvalentine\models\item\extra_special_chocolate_cookie.json
f230362b425023b92f497863011b67a43a19d936 assets\kafvalentine\blockstates\lovey_dovey_infuser.json
fa3803d91c4abddde6da8b8d59f700fb059ca069 assets\kafvalentine\models\block\cotton_candy_crop_stage5.json
90265640b6e256c374b1085ea04bbd676e29f507 assets\kafvalentine\models\item\apple_cookie.json
4df5d4fa3d3580200ba06079526eb376878df068 assets\kafvalentine\models\item\cotton_candy.json
d0576d55112119fefa385cab24b0814bc068189f assets\kafvalentine\models\item\special_explosive_cookie.json
f7eb0125a870954a0c6c0d8bb081dba8eedfb5cb assets\kafvalentine\models\block\cotton_candy_crop_stage0.json
0de04ff727d417a5bf18a1d9d85ee7e98ceed3d3 assets\kafvalentine\models\block\cotton_candy_crop_stage3.json
69c9c9e7104863d68460a35f308eca404e059733 assets\kafvalentine\models\item\special_apple_cookie.json
6f15da8a5ad511700910753f06838c3d2fa40000 assets\kafvalentine\models\item\special_melon_cookie.json
d74bd6a9bc489ba5c69ede81e5904ba1cb534826 assets\kafvalentine\models\item\evil_cookie.json
1279e9ebce1197748ceb93094610c38a6fa51323 assets\kafvalentine\models\item\special_chocolate_cookie.json
bd02a523edc976c062d3c21025778579d94eed1a assets\kafvalentine\blockstates\aristea.json
133515bd8b713a6800512752a54d62d5eb324a14 assets\kafvalentine\models\block\cotton_candy_crop_stage4.json
213ea4688849d02cc97310ca149822f7c74255de assets\kafvalentine\models\block\cotton_candy_crop_stage1.json
1c2305fb2d6e26b2bf9da1430da0fb889bd94ae1 assets\kafvalentine\models\item\special_glow_cookie.json
23dabc827366aed729440f34bac30b42c16d0001 assets\kafvalentine\models\item\special_medic_cookie.json
39314bf15cfb35e399b54a32c3ea31206ee25d2b assets\kafvalentine\models\item\medic_cookie.json
db1d32c20716aedb14b71a3fdf459267aadc7c1c assets\kafvalentine\models\item\special_golden_cookie.json
f5d20385fdc3fc956ca0b6ade4e4eda997fb34ba assets\kafvalentine\models\item\good_vision_cookie.json
86a39e2ca577fc58a94d762e4e15c3c42ad970e2 assets\kafvalentine\models\block\aristea.json
a734423a78b1e30eb0f1b664bfd7344c8d6190f4 assets\kafvalentine\models\item\melon_cookie.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
// 1.20.1 2024-02-28T10:01:20.3212859 Kaf's Valentine Special/Tags for minecraft:item
// 1.20.1 2024-03-13T15:13:43.4392171 Kaf's Valentine Special/Tags for minecraft:item
9c8348c58e3e27b69a4b16f8e20d8eaa980834bc data\c\tags\items\flowers.json
f67de4dd68af4b468ac5b5823802ead6c689cfaa data\kafvalentine\tags\items\special_cookie.json
2579c917ce22d63fca7c240c559e56d3061e91cb data\c\tags\items\cookies.json
9821ba29b28cd7ed1bbbb41aaf307e3c57b56e99 data\c\tags\items\golden_apples.json
2388a7d48daef4a569c89aab474c716a355c724d data\c\tags\items\seeds.json
2388a7d48daef4a569c89aab474c716a355c724d data\minecraft\tags\items\villager_plantable_seeds.json
9c8348c58e3e27b69a4b16f8e20d8eaa980834bc data\c\tags\items\aristeas.json
2388a7d48daef4a569c89aab474c716a355c724d data\botania\tags\items\seed_apothecary_reagent.json
2579c917ce22d63fca7c240c559e56d3061e91cb data\origins\tags\items\ignore_diet.json
2579c917ce22d63fca7c240c559e56d3061e91cb data\kafvalentine\tags\items\kaf_cookie.json
2388a7d48daef4a569c89aab474c716a355c724d data\naturalist\tags\items\bird_food_items.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.1 2024-02-28T10:01:20.3192862 Kaf's Valentine Special/World Gen
// 1.20.1 2024-03-13T15:13:43.4361997 Kaf's Valentine Special/World Gen
312eff65da6bcfab1829dcdc1e868b55ac396187 data\kafvalentine\worldgen\configured_feature\aristea.json
30a27f2e3d0058747f9ebd18abe2b3e32b5a8d98 data\kafvalentine\worldgen\placed_feature\aristea_placed.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/apple_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/aristea_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/caramel_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/evil_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/explosive_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/fire_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/glow_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/golden_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/good_vision_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/medic_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/melon_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/nether_wart_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_apple_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_aristea_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_caramel_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_evil_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_explosive_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_fire_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_glow_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_golden_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_good_vision_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_medic_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_melon_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "kafvalentine:item/special_nether_wart_cookie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"kafvalentine:cotton_candy_seeds"
]
}
6 changes: 6 additions & 0 deletions src/main/generated/data/c/tags/blocks/plant.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"kafvalentine:cotton_candy_crop"
]
}
11 changes: 11 additions & 0 deletions src/main/generated/data/c/tags/items/cookies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"kafvalentine:special_chocolate_cookie",
"kafvalentine:extra_special_chocolate_cookie",
"kafvalentine:medic_cookie",
"kafvalentine:special_medic_cookie",
"kafvalentine:good_vision_cookie",
"kafvalentine:special_good_vision_cookie"
]
}
7 changes: 7 additions & 0 deletions src/main/generated/data/c/tags/items/golden_apples.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"kafvalentine:golden_cookie",
"kafvalentine:special_golden_cookie"
]
}
6 changes: 6 additions & 0 deletions src/main/generated/data/c/tags/items/seeds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"kafvalentine:cotton_candy_seeds"
]
}
Loading

0 comments on commit d83083d

Please sign in to comment.