Skip to content

Commit 7d8be21

Browse files
Chikorita-LoverChikorita-Lover
committed
Add civet scat and related behavior
Civet scat is a new block that can be smelted into coffee beans or composted Mushrooms can be placed and grown on civet scat Civets eat coffee plants passively and drop civet scat some time after doing so Increased coffee bean smelting experience from 0.3 to 0.35 Texture is placeholder Civet behavior is not final
1 parent 1b5d786 commit 7d8be21

33 files changed

+387
-79
lines changed

‎src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// 1.21.1 2024-12-01T20:24:16.0014858 Caffeinated/Block Loot Tables
1+
// 1.21.1 2025-09-02T22:50:55.9370669 Caffeinated/Block Loot Tables
22
548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json
3+
049fb79e0b69606ea9e244ab47ba18c95c60a8a0 data\caffeinated\loot_table\blocks\civet_scat.json
34
8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json
45
d481f7802dfc0e83cd271518b47e73b256a24d2f data\caffeinated\loot_table\blocks\flowering_coffee_shrub.json
56
548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\coffee_cauldron.json

‎src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2024-12-01T20:24:16.0004753 Caffeinated/Advancements
1+
// 1.21.1 2025-09-02T22:50:55.9360627 Caffeinated/Advancements
22
bcaa279e3e0ad8280ebfe57370201ce6290340a1 data\caffeinated\advancement\husbandry\brew_coffee.json
33
3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json
44
fd764b415f61cad9c185cf3c952535113b90044f data\caffeinated\advancement\husbandry\brew_all_coffee.json

‎src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// 1.21.1 2024-12-01T20:24:16.0024858 Caffeinated/Recipes
1+
// 1.21.1 2025-09-02T22:50:55.938192 Caffeinated/Recipes
22
c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json
33
c9b5cb066d0fab702915da1774fdd48fcbc57229 data\caffeinated\advancement\recipes\misc\coffee_beans_from_smoking.json
4+
fc02282e1585581cdd7b7c61a868bceed7db5d1b data\caffeinated\advancement\recipes\misc\coffee_beans_from_civet_scat.json
45
6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json
56
9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancement\recipes\misc\ground_coffee_from_coffee_beans.json
7+
cffafb17fcb8dfbab6d4ea283a6ed1e9910cc606 data\caffeinated\recipe\coffee_beans_from_civet_scat.json
68
b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancement\recipes\building_blocks\coffee_bean_block.json
79
861e142a5a287eba94cf46a7d37342304f9ad285 data\caffeinated\recipe\ground_coffee_block.json
8-
f0185fd7adf812d29e6e5a362c792d604a300a06 data\caffeinated\recipe\coffee_beans_from_smoking.json
10+
68db7e4254464704bcbef0333ad25a66e6ff28e5 data\caffeinated\recipe\coffee_beans_from_smoking.json
911
c0c226ce1854c1aa133ac5392a6a40d18419bc37 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_carpet_from_white_carpet.json
1012
dc7a575ad5eb72be9b3ec137cbb83358fc420f10 data\caffeinated\recipe\coffee_stained_carpet.json
1113
51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancement\recipes\building_blocks\ground_coffee_block.json
@@ -16,7 +18,7 @@ dc7a575ad5eb72be9b3ec137cbb83358fc420f10 data\caffeinated\recipe\coffee_stained_
1618
5dc445d11ac1091b47d0393e020f2644f701cd29 data\caffeinated\recipe\coffee_berry_crate.json
1719
ba81552d4ee1d9d568b84f786de61e415fdb157e data\caffeinated\recipe\latte_coffee_bottle.json
1820
b3d10b49b978d96c244fb776e1292f0b3f9c272b data\caffeinated\recipe\brown_dye_from_ground_coffee.json
19-
920e03fa0683e9b42e081c15bd1af0c69feb51eb data\caffeinated\recipe\coffee_beans.json
21+
940b79ac38bb029284ab840c935d72cd9b2a93d7 data\caffeinated\recipe\coffee_beans.json
2022
0ce1e6e9d0c954f2ea67d39a1a43bf358a1a8991 data\caffeinated\advancement\recipes\misc\brown_dye_from_ground_coffee.json
2123
05ce2e487120bb80ae830054a41d88227ff06701 data\caffeinated\advancement\recipes\misc\coffee_beans_from_campfire_cooking.json
2224
400dd2329e8ff95d83dae40af8db1c9fc5296ce4 data\caffeinated\recipe\coffee_bean_block.json
@@ -27,7 +29,7 @@ a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\fo
2729
72418a991f973fb5cf728affdcbfde7d5818b251 data\caffeinated\advancement\recipes\food\coffee_bottle.json
2830
1410b08380530f562102b9d54fde26a7163b2256 data\caffeinated\advancement\recipes\food\latte_coffee_bottle.json
2931
145d4111298037135c323e1347f67b3871daaa3e data\caffeinated\recipe\java_banner_pattern.json
30-
3fbc068c16e4d63163f1d495c7a7c8cbefdf9ad0 data\caffeinated\recipe\coffee_beans_from_campfire_cooking.json
32+
b87c145bc168d5c9de9f572d8df7c9905b65ec6b data\caffeinated\recipe\coffee_beans_from_campfire_cooking.json
3133
cf353bc3103b1834f861ecb7a2da0ae56550bb65 data\caffeinated\recipe\cafe_miel_coffee_bottle.json
3234
1c90d5214cc2f466be11d17a52cde3d40f7d15d5 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_wool.json
3335
514280f7d04586c23693c1dae8cf30241a810a24 data\caffeinated\advancement\recipes\building_blocks\coffee_berry_crate.json

‎src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,49 @@
1-
// 1.21.1 2024-12-01T20:24:15.9969777 Caffeinated/Model Definitions
2-
da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json
1+
// 1.21.1 2025-09-02T22:50:55.9319317 Caffeinated/Model Definitions
32
26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json
43
b1a481861132973fe035c9b9ce7613e15938034c assets\caffeinated\models\block\coffee_berry_crate.json
4+
7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json
5+
13297d4a51cb3b1369630338ba5f7b439b4af3fc assets\caffeinated\models\block\cauldron_campfire_filled.json
6+
cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
7+
34202786f9a57de99cd6cc7be5013c91a1b9690a assets\caffeinated\models\item\tiramisu_slice.json
8+
86a7f801b70c8f877d0e3d52a8bce349a9232c4f assets\caffeinated\models\block\ground_coffee_block.json
9+
2e82d1add55c94e56c5b85172449dc9ff539882d assets\caffeinated\models\block\coffee_cauldron_full.json
10+
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets\caffeinated\models\item\civet_spawn_egg.json
11+
2078aae9dd460adbf0bf14e46615e32012f351e8 assets\caffeinated\blockstates\ground_coffee_cauldron.json
12+
16db00fbb67b98528c1a99e61640adc411cc4cff assets\caffeinated\models\item\tiramisu.json
13+
3ef771d34d7bc76165d6a5f7053ea5ff27bc44dd assets\caffeinated\blockstates\coffee_bean_block.json
14+
5873c2f6e62014035c0873f84f3b32eb1becc76f assets\caffeinated\models\block\civet_scat.json
15+
2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json
16+
50804beb94c1a58c883df514333ff7d2c2807a42 assets\caffeinated\models\item\coffee_bean_block.json
17+
0dab1d0bc7608970cc968c8f8569497fae0b2295 assets\caffeinated\models\item\ground_coffee.json
18+
ffcb5afccb3a6b30399f263654799949096594da assets\caffeinated\blockstates\cauldron_campfire.json
19+
58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
20+
60bef8f5239edf70b1bb8d309b7b27c58dc11cad assets\caffeinated\blockstates\coffee_stained_wool.json
21+
1564a118add7b691cd3d6b1b6d06641507f0a7e2 assets\caffeinated\models\item\coffee_berries.json
22+
da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json
523
e8f1792493d7219e1da4ac39e45bf903a349e3f5 assets\caffeinated\models\block\ground_coffee_cauldron_full.json
24+
e3caf06551dc333a7a34110027829436a48a7f55 assets\caffeinated\blockstates\civet_scat.json
625
cd360bb185f465f81672c32ac31312f77270e5f4 assets\caffeinated\models\block\coffee_cauldron_level2.json
726
5f0ad0fc380a095ead21e3a00bdbbdcd648548e3 assets\caffeinated\models\item\latte_coffee_bottle.json
827
57311e73aae426dff5d3b58c69ec071360f952d3 assets\caffeinated\models\block\ground_coffee_cauldron_level1.json
9-
7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json
10-
13297d4a51cb3b1369630338ba5f7b439b4af3fc assets\caffeinated\models\block\cauldron_campfire_filled.json
28+
7df4c655acfe3de7441205e28103e69b22a346ca assets\caffeinated\models\item\civet_scat.json
1129
ace2f8060adedf59471fa9728ad427b7c2abb51e assets\caffeinated\blockstates\soul_cauldron_campfire.json
12-
cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
1330
cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_coffee_cauldron_level2.json
1431
1297909cbb77803c3f1a796d29fa088c9aeae546 assets\caffeinated\blockstates\coffee_shrub.json
15-
34202786f9a57de99cd6cc7be5013c91a1b9690a assets\caffeinated\models\item\tiramisu_slice.json
16-
86a7f801b70c8f877d0e3d52a8bce349a9232c4f assets\caffeinated\models\block\ground_coffee_block.json
1732
37d547b30cad973f0223896df68f15c5eea49d4b assets\caffeinated\models\item\ground_coffee_block.json
18-
2e82d1add55c94e56c5b85172449dc9ff539882d assets\caffeinated\models\block\coffee_cauldron_full.json
19-
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets\caffeinated\models\item\civet_spawn_egg.json
2033
fe9155058173a06c1325878e72a8f42b0acfb9d7 assets\caffeinated\models\block\coffee_shrub_stage1.json
21-
2078aae9dd460adbf0bf14e46615e32012f351e8 assets\caffeinated\blockstates\ground_coffee_cauldron.json
2234
2054aec4b6a37f589b32f18f2faf6366bb4a4056 assets\caffeinated\blockstates\coffee_stained_carpet.json
2335
865a21f6601205d70079dbcc9d2bc9d375fbbc73 assets\caffeinated\models\block\coffee_bean_block.json
24-
16db00fbb67b98528c1a99e61640adc411cc4cff assets\caffeinated\models\item\tiramisu.json
2536
8ba76990b97aa664bf34e5e2b94761ebdc7a8c04 assets\caffeinated\models\block\coffee_cauldron_level1.json
26-
3ef771d34d7bc76165d6a5f7053ea5ff27bc44dd assets\caffeinated\blockstates\coffee_bean_block.json
2737
e097a5af6a5c1aab9668db9de97ac4825fd0c743 assets\caffeinated\models\item\cafe_miel_coffee_bottle.json
2838
40fc080bf5e7fe5c74e12b3c3b2454805bb0ea3c assets\caffeinated\models\item\coffee_stained_carpet.json
2939
821f41182077e0ce6bc7918aee907e45a9dd7d73 assets\caffeinated\models\block\soul_cauldron_campfire.json
30-
2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json
3140
358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json
3241
196754b26a9f9cac1bf6b81563cef5344f998868 assets\caffeinated\blockstates\tiramisu.json
3342
04afd00b15d93557d58f63a6ba3b712667c225a7 assets\caffeinated\models\block\coffee_stained_wool.json
3443
ee814f36f99a123b06cf2e7bcb08415b97595925 assets\caffeinated\models\block\potted_coffee_shrub.json
35-
50804beb94c1a58c883df514333ff7d2c2807a42 assets\caffeinated\models\item\coffee_bean_block.json
3644
6bc7bd9e663e1a1e43a79ef46957b15c4682a3a6 assets\caffeinated\models\block\coffee_shrub_stage0.json
37-
0dab1d0bc7608970cc968c8f8569497fae0b2295 assets\caffeinated\models\item\ground_coffee.json
38-
ffcb5afccb3a6b30399f263654799949096594da assets\caffeinated\blockstates\cauldron_campfire.json
39-
58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
4045
c6d2e6012ee1a88b1c31a8c23652c236df0f1b7a assets\caffeinated\models\item\coffee_stained_wool.json
41-
60bef8f5239edf70b1bb8d309b7b27c58dc11cad assets\caffeinated\blockstates\coffee_stained_wool.json
4246
6568f0e38ffcef7753bd7c0ae1bfdd66fafc6795 assets\caffeinated\models\block\cauldron_campfire.json
4347
e4c8f2b75d3ecafc48e0a48ec6940b6dac0eb258 assets\caffeinated\models\item\coffee_beans.json
4448
66ab3c0788a1452c84c9c06f8ffe0bf7828a9620 assets\caffeinated\models\item\java_banner_pattern.json
45-
1564a118add7b691cd3d6b1b6d06641507f0a7e2 assets\caffeinated\models\item\coffee_berries.json
4649
f231ba05786d3928e6a0fce4139f5e1c5b106036 assets\caffeinated\models\block\soul_cauldron_campfire_filled.json

‎src/main/generated/assets/caffeinated/blockstates/civet_scat.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "caffeinated:block/civet_scat"
5+
}
6+
}
7+
}

‎src/main/generated/assets/caffeinated/models/block/civet_scat.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "caffeinated:block/civet_scat"
5+
}
6+
}

‎src/main/generated/assets/caffeinated/models/item/civet_scat.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "caffeinated:block/civet_scat"
3+
}

‎src/main/generated/data/caffeinated/advancement/recipes/misc/coffee_beans_from_civet_scat.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_civet_scat": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "caffeinated:civet_scat"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "caffeinated:coffee_beans_from_civet_scat"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_civet_scat"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"caffeinated:coffee_beans_from_civet_scat"
30+
]
31+
}
32+
}

‎src/main/generated/data/caffeinated/loot_table/blocks/civet_scat.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"bonus_rolls": 0.0,
6+
"conditions": [
7+
{
8+
"condition": "minecraft:survives_explosion"
9+
}
10+
],
11+
"entries": [
12+
{
13+
"type": "minecraft:item",
14+
"name": "caffeinated:civet_scat"
15+
}
16+
],
17+
"rolls": 1.0
18+
}
19+
]
20+
}

‎src/main/generated/data/caffeinated/recipe/coffee_beans.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"type": "minecraft:smelting",
33
"category": "misc",
44
"cookingtime": 200,
5-
"experience": 0.3,
5+
"experience": 0.35,
6+
"group": "coffee_beans",
67
"ingredient": {
78
"item": "caffeinated:coffee_berries"
89
},

0 commit comments

Comments
 (0)