Skip to content

Commit c8b7575

Browse files
Chikorita-LoverChikorita-Lover
committed
Remove cauldron campfires and adapt other content
Cauldron campfires have been removed in favor of the original cauldron brewing system Alternate coffee drinks are currently unobtainable in Survival Caffeinated advancement has been updated to requiring drinking all coffee instead of brewing all coffee
1 parent c481470 commit c8b7575

File tree

63 files changed

+76
-1852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+76
-1852
lines changed

‎build.gradle‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,7 @@ dependencies {
3333
minecraft "com.mojang:minecraft:${project.minecraft_version}"
3434
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
3535
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
36-
modImplementation "com.github.Chocohead:Fabric-ASM:${fabric_asm_version}"
37-
include "com.github.Chocohead:Fabric-ASM:${fabric_asm_version}"
38-
39-
// Fabric API. This is technically optional, but you probably want it anyway.
4036
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
41-
42-
// Uncomment the following line to enable the deprecated Fabric API modules.
43-
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
44-
// modRuntimeOnly("curse.maven:farmersdelight-482834:${project.farmersdelight_version}")
45-
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
4637
}
4738

4839
processResources {

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ archives_base_name=caffeinated
1616
# Dependencies
1717
fabric_version=0.116.6+1.21.1
1818
farmersdelight_version=4640640
19-
fabric_asm_version=v2.3

‎src/main/generated/.cache/0de68e09d261d81ea98d47a08ed0e4f48e49e82a‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
// 1.21.1 2025-09-04T13:27:07.4712676 Caffeinated/Tags for minecraft:block
1+
// 1.21.1 2025-09-05T15:35:17.173422 Caffeinated/Tags for minecraft:block
22
4b5dce83143a2d7c235f74dacfe4ae117545a11d data\caffeinated\tags\block\lit_fires.json
33
a51becefdb60be838a24bbccdb2d54533169edfb data\minecraft\tags\block\camel_sand_step_sound_blocks.json
44
28a355c0c955d5e560fbb227b5ad92a007fc7766 data\minecraft\tags\block\bee_growables.json
55
80790e06c4671eba1ca38fd150dac9b6f886e283 data\minecraft\tags\block\flower_pots.json
66
2098a8d810cf19710a03b3e702f90f1cb8cd310b data\minecraft\tags\block\wool_carpets.json
7-
6a874f1ee238599ebdfae791b8e6edb96aff4df8 data\caffeinated\tags\block\cauldron_campfires.json
87
5a578d94fd7129349f9597f0fec1931e2b8a1551 data\minecraft\tags\block\tall_flowers.json
98
12a4c2e67cc09334065e40d26093656f649e57fe data\minecraft\tags\block\cauldrons.json
10-
3eceb5fd32ee615167a7a5a00e5d610436d4e957 data\minecraft\tags\block\mineable\axe.json
9+
f988b0a4c7357b96edc8a02226b10077a57f7144 data\minecraft\tags\block\mineable\axe.json
1110
a23520cb9a9c285863dabcd07bd11fcc3c62f6b4 data\minecraft\tags\block\mineable\hoe.json
1211
a23520cb9a9c285863dabcd07bd11fcc3c62f6b4 data\minecraft\tags\block\mushroom_grow_block.json
1312
6d60a3d6afa591133bc396d1444098095408a07b data\minecraft\tags\block\wool.json

‎src/main/generated/.cache/19b7f1383c3f2d6ff182dbe25f7777b152880864‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-04T13:27:07.4722709 Caffeinated/Tags for minecraft:item
1+
// 1.21.1 2025-09-05T15:35:17.1759226 Caffeinated/Tags for minecraft:item
22
2098a8d810cf19710a03b3e702f90f1cb8cd310b data\minecraft\tags\item\wool_carpets.json
33
9db38f9313dfd0f73e19f1b27b321cbba4eef68b data\caffeinated\tags\item\coffee_food.json
44
b3903dd6f2911c9bfd601eeed539d4df52a7dc6f data\caffeinated\tags\item\civet_food.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-04T13:27:07.4749205 Caffeinated/Block Loot Tables
1+
// 1.21.1 2025-09-05T15:35:17.1789402 Caffeinated/Block Loot Tables
22
548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json
33
049fb79e0b69606ea9e244ab47ba18c95c60a8a0 data\caffeinated\loot_table\blocks\civet_scat.json
44
8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-04T13:27:07.4732675 Caffeinated/Advancements
1+
// 1.21.1 2025-09-05T15:35:17.1789402 Caffeinated/Advancements
22
7baed290ce452ee5b57e2b0a312b099b6f48ccac data\caffeinated\advancement\husbandry\brew_coffee.json
33
3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json
4-
203ed7e92ddcc329ceb74c5885e4ebaedf3352f2 data\caffeinated\advancement\husbandry\brew_all_coffee.json
4+
b095a9864646e1db28494ab996535b504cb9d714 data\caffeinated\advancement\husbandry\drink_all_coffee.json

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-04T13:27:07.4759255 Caffeinated/Recipes
1+
// 1.21.1 2025-09-05T15:35:17.1799413 Caffeinated/Recipes
22
c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json
33
fc02282e1585581cdd7b7c61a868bceed7db5d1b data\caffeinated\advancement\recipes\misc\coffee_beans_from_civet_scat.json
44
6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json
@@ -12,21 +12,15 @@ dc7a575ad5eb72be9b3ec137cbb83358fc420f10 data\caffeinated\recipe\coffee_stained_
1212
31f69cf23ef6a168c6d98a8fef731d470bcbb187 data\caffeinated\recipe\coffee_berries.json
1313
081e951942029c81b7edec2c02074e4b47d00d3d data\caffeinated\recipe\ground_coffee_from_coffee_beans.json
1414
19760d1f68d759f157db95e3e85d1aaacaa8ab64 data\caffeinated\recipe\coffee_stained_wool.json
15-
07496d1ed8ed6ef8fda02b6606436108c59fbf43 data\caffeinated\advancement\recipes\food\cafe_miel_coffee_bottle.json
1615
5dc445d11ac1091b47d0393e020f2644f701cd29 data\caffeinated\recipe\coffee_berry_crate.json
17-
5dd21b7962f2efe4affbdc8ffc223534c73ed393 data\caffeinated\recipe\latte_coffee_bottle.json
1816
b3d10b49b978d96c244fb776e1292f0b3f9c272b data\caffeinated\recipe\brown_dye_from_ground_coffee.json
1917
940b79ac38bb029284ab840c935d72cd9b2a93d7 data\caffeinated\recipe\coffee_beans.json
2018
0ce1e6e9d0c954f2ea67d39a1a43bf358a1a8991 data\caffeinated\advancement\recipes\misc\brown_dye_from_ground_coffee.json
2119
400dd2329e8ff95d83dae40af8db1c9fc5296ce4 data\caffeinated\recipe\coffee_bean_block.json
2220
a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\food\tiramisu_from_slices.json
23-
42e097d611b5534f387afce66da821f0349faf9f data\caffeinated\recipe\coffee_bottle.json
2421
6079d9b72396de3a7ea6b8a181a581d701cd02d3 data\caffeinated\advancement\recipes\decorations\coffee_stained_carpet.json
2522
5be6907919970b6cffc809b428d4e467a1db9d8a data\caffeinated\recipe\coffee_stained_carpet_from_white_carpet.json
26-
72418a991f973fb5cf728affdcbfde7d5818b251 data\caffeinated\advancement\recipes\food\coffee_bottle.json
27-
1410b08380530f562102b9d54fde26a7163b2256 data\caffeinated\advancement\recipes\food\latte_coffee_bottle.json
2823
e6061a3a68f93067a4057874be4ca45d0c759b01 data\caffeinated\recipe\java_banner_pattern.json
29-
da96c881a5a8ec864ef847a3c1532b4704b6707d data\caffeinated\recipe\cafe_miel_coffee_bottle.json
3024
1c90d5214cc2f466be11d17a52cde3d40f7d15d5 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_wool.json
3125
514280f7d04586c23693c1dae8cf30241a810a24 data\caffeinated\advancement\recipes\building_blocks\coffee_berry_crate.json
3226
37dcb51343202c8b1a7ea94e22cdcf6c99a462ad data\caffeinated\recipe\tiramisu.json

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

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,43 @@
1-
// 1.21.1 2025-09-04T13:27:07.4732675 Caffeinated/Model Definitions
1+
// 1.21.1 2025-09-05T15:35:17.1769328 Caffeinated/Model Definitions
2+
da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json
23
26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json
34
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
235
e8f1792493d7219e1da4ac39e45bf903a349e3f5 assets\caffeinated\models\block\ground_coffee_cauldron_full.json
246
e3caf06551dc333a7a34110027829436a48a7f55 assets\caffeinated\blockstates\civet_scat.json
257
cd360bb185f465f81672c32ac31312f77270e5f4 assets\caffeinated\models\block\coffee_cauldron_level2.json
268
5f0ad0fc380a095ead21e3a00bdbbdcd648548e3 assets\caffeinated\models\item\latte_coffee_bottle.json
279
57311e73aae426dff5d3b58c69ec071360f952d3 assets\caffeinated\models\block\ground_coffee_cauldron_level1.json
10+
7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json
2811
7df4c655acfe3de7441205e28103e69b22a346ca assets\caffeinated\models\item\civet_scat.json
29-
ace2f8060adedf59471fa9728ad427b7c2abb51e assets\caffeinated\blockstates\soul_cauldron_campfire.json
12+
cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
3013
cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_coffee_cauldron_level2.json
3114
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
3217
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
3320
fe9155058173a06c1325878e72a8f42b0acfb9d7 assets\caffeinated\models\block\coffee_shrub_stage1.json
21+
2078aae9dd460adbf0bf14e46615e32012f351e8 assets\caffeinated\blockstates\ground_coffee_cauldron.json
3422
2054aec4b6a37f589b32f18f2faf6366bb4a4056 assets\caffeinated\blockstates\coffee_stained_carpet.json
3523
865a21f6601205d70079dbcc9d2bc9d375fbbc73 assets\caffeinated\models\block\coffee_bean_block.json
24+
16db00fbb67b98528c1a99e61640adc411cc4cff assets\caffeinated\models\item\tiramisu.json
3625
8ba76990b97aa664bf34e5e2b94761ebdc7a8c04 assets\caffeinated\models\block\coffee_cauldron_level1.json
26+
3ef771d34d7bc76165d6a5f7053ea5ff27bc44dd assets\caffeinated\blockstates\coffee_bean_block.json
3727
e097a5af6a5c1aab9668db9de97ac4825fd0c743 assets\caffeinated\models\item\cafe_miel_coffee_bottle.json
3828
40fc080bf5e7fe5c74e12b3c3b2454805bb0ea3c assets\caffeinated\models\item\coffee_stained_carpet.json
39-
821f41182077e0ce6bc7918aee907e45a9dd7d73 assets\caffeinated\models\block\soul_cauldron_campfire.json
29+
2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json
30+
5873c2f6e62014035c0873f84f3b32eb1becc76f assets\caffeinated\models\block\civet_scat.json
4031
358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json
4132
196754b26a9f9cac1bf6b81563cef5344f998868 assets\caffeinated\blockstates\tiramisu.json
4233
04afd00b15d93557d58f63a6ba3b712667c225a7 assets\caffeinated\models\block\coffee_stained_wool.json
4334
ee814f36f99a123b06cf2e7bcb08415b97595925 assets\caffeinated\models\block\potted_coffee_shrub.json
35+
50804beb94c1a58c883df514333ff7d2c2807a42 assets\caffeinated\models\item\coffee_bean_block.json
4436
6bc7bd9e663e1a1e43a79ef46957b15c4682a3a6 assets\caffeinated\models\block\coffee_shrub_stage0.json
37+
0dab1d0bc7608970cc968c8f8569497fae0b2295 assets\caffeinated\models\item\ground_coffee.json
4538
c6d2e6012ee1a88b1c31a8c23652c236df0f1b7a assets\caffeinated\models\item\coffee_stained_wool.json
46-
6568f0e38ffcef7753bd7c0ae1bfdd66fafc6795 assets\caffeinated\models\block\cauldron_campfire.json
39+
58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
40+
60bef8f5239edf70b1bb8d309b7b27c58dc11cad assets\caffeinated\blockstates\coffee_stained_wool.json
4741
e4c8f2b75d3ecafc48e0a48ec6940b6dac0eb258 assets\caffeinated\models\item\coffee_beans.json
4842
66ab3c0788a1452c84c9c06f8ffe0bf7828a9620 assets\caffeinated\models\item\java_banner_pattern.json
49-
f231ba05786d3928e6a0fce4139f5e1c5b106036 assets\caffeinated\models\block\soul_cauldron_campfire_filled.json
43+
1564a118add7b691cd3d6b1b6d06641507f0a7e2 assets\caffeinated\models\item\coffee_berries.json

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)