Skip to content

Commit c481470

Browse files
Add coffee cauldron experience
Coffee cauldron now gives 1 to 3 experience after successful brewing (independent of cauldron level) Stop and Smell the Coffee advancement has been updated to use cauldron brewing
1 parent b008f24 commit c481470

19 files changed

+122
-90
lines changed

src/main/generated/.cache/0de68e09d261d81ea98d47a08ed0e4f48e49e82a

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-03T21:00:29.287536 Caffeinated/Tags for minecraft:block
1+
// 1.21.1 2025-09-04T13:27:07.4712676 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

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-03T21:00:29.2900495 Caffeinated/Tags for minecraft:item
1+
// 1.21.1 2025-09-04T13:27:07.4722709 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-03T21:00:29.2940761 Caffeinated/Block Loot Tables
1+
// 1.21.1 2025-09-04T13:27:07.4749205 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
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-03T21:00:29.2930756 Caffeinated/Advancements
2-
b78dadfcbd89b33d75b5d4c72d632be32a721e42 data\caffeinated\advancement\husbandry\brew_coffee.json
1+
// 1.21.1 2025-09-04T13:27:07.4732675 Caffeinated/Advancements
2+
7baed290ce452ee5b57e2b0a312b099b6f48ccac data\caffeinated\advancement\husbandry\brew_coffee.json
33
3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json
4-
fd764b415f61cad9c185cf3c952535113b90044f data\caffeinated\advancement\husbandry\brew_all_coffee.json
4+
203ed7e92ddcc329ceb74c5885e4ebaedf3352f2 data\caffeinated\advancement\husbandry\brew_all_coffee.json

src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-03T21:00:29.2950763 Caffeinated/Recipes
1+
// 1.21.1 2025-09-04T13:27:07.4759255 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

src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-03T21:00:29.2910491 Caffeinated/Model Definitions
1+
// 1.21.1 2025-09-04T13:27:07.4732675 Caffeinated/Model Definitions
22
26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json
33
b1a481861132973fe035c9b9ce7613e15938034c assets\caffeinated\models\block\coffee_berry_crate.json
44
7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json

src/main/generated/data/caffeinated/advancement/husbandry/brew_all_coffee.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
{
22
"parent": "caffeinated:husbandry/brew_coffee",
33
"criteria": {
4-
"brew_cafe_miel_coffee_bottle": {
4+
"cafe_miel_coffee_bottle": {
55
"conditions": {
6-
"result": {
7-
"items": "caffeinated:cafe_miel_coffee_bottle"
8-
}
6+
"items": [
7+
{
8+
"items": "caffeinated:cafe_miel_coffee_bottle"
9+
}
10+
]
911
},
10-
"trigger": "caffeinated:brew_coffee"
12+
"trigger": "minecraft:inventory_changed"
1113
},
12-
"brew_coffee_bottle": {
13-
"conditions": {
14-
"result": {
15-
"items": "caffeinated:coffee_bottle"
16-
}
17-
},
18-
"trigger": "caffeinated:brew_coffee"
14+
"coffee_bottle": {
15+
"trigger": "caffeinated:brewed_coffee"
1916
},
20-
"brew_latte_coffee_bottle": {
17+
"latte_coffee_bottle": {
2118
"conditions": {
22-
"result": {
23-
"items": "caffeinated:latte_coffee_bottle"
24-
}
19+
"items": [
20+
{
21+
"items": "caffeinated:latte_coffee_bottle"
22+
}
23+
]
2524
},
26-
"trigger": "caffeinated:brew_coffee"
25+
"trigger": "minecraft:inventory_changed"
2726
}
2827
},
2928
"display": {
@@ -41,13 +40,13 @@
4140
},
4241
"requirements": [
4342
[
44-
"brew_coffee_bottle"
43+
"latte_coffee_bottle"
4544
],
4645
[
47-
"brew_latte_coffee_bottle"
46+
"cafe_miel_coffee_bottle"
4847
],
4948
[
50-
"brew_cafe_miel_coffee_bottle"
49+
"coffee_bottle"
5150
]
5251
],
5352
"rewards": {

src/main/generated/data/caffeinated/advancement/husbandry/brew_coffee.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
"parent": "minecraft:husbandry/root",
33
"criteria": {
44
"brew_coffee": {
5-
"conditions": {
6-
"result": {
7-
"items": "caffeinated:coffee_bottle"
8-
}
9-
},
10-
"trigger": "caffeinated:brew_coffee"
5+
"trigger": "caffeinated:brewed_coffee"
116
}
127
},
138
"display": {

src/main/java/net/chikorita_lover/caffeinated/Caffeinated.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.chikorita_lover.caffeinated;
22

3-
import net.chikorita_lover.caffeinated.advancement.BrewCoffeeCriterion;
3+
import net.chikorita_lover.caffeinated.advancement.BrewedCoffeeCriterion;
44
import net.chikorita_lover.caffeinated.block.CoffeeCauldronBlock;
55
import net.chikorita_lover.caffeinated.block.GroundCoffeeCauldronBlock;
66
import net.chikorita_lover.caffeinated.entity.CivetEntity;
@@ -11,7 +11,6 @@
1111
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
1212
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
1313
import net.fabricmc.fabric.api.loot.v3.LootTableEvents;
14-
import net.minecraft.block.entity.BlockEntityType;
1514
import net.minecraft.entity.SpawnGroup;
1615
import net.minecraft.entity.SpawnLocationTypes;
1716
import net.minecraft.entity.SpawnRestriction;
@@ -32,7 +31,7 @@
3231
public class Caffeinated implements ModInitializer {
3332
public static final Logger LOGGER = LoggerFactory.getLogger("Caffeinated");
3433
public static final String NAMESPACE = "caffeinated";
35-
public static final BrewCoffeeCriterion BREW_COFFEE_CRITERION = Registry.register(Registries.CRITERION, of("brew_coffee"), new BrewCoffeeCriterion());
34+
public static final BrewedCoffeeCriterion BREWED_COFFEE_CRITERION = Registry.register(Registries.CRITERION, of("brewed_coffee"), new BrewedCoffeeCriterion());
3635
public static final RecipeSerializer<CoffeeBrewingRecipe> COFFEE_BREWING_SERIALIZER = Registry.register(Registries.RECIPE_SERIALIZER, of("coffee_brewing"), new CoffeeBrewingRecipe.Serializer<CoffeeBrewingRecipe>(CoffeeBrewingRecipe::new, 600) {
3736
});
3837

src/main/java/net/chikorita_lover/caffeinated/advancement/BrewCoffeeCriterion.java

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

0 commit comments

Comments
 (0)