Skip to content

Commit 0198db8

Browse files
Remove coffee berry smoking and campfire recipes
1 parent 7d8be21 commit 0198db8

14 files changed

+5
-195
lines changed

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-02T22:50:55.9370669 Caffeinated/Block Loot Tables
1+
// 1.21.1 2025-09-03T16:09:22.2837138 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-02T22:50:55.9360627 Caffeinated/Advancements
1+
// 1.21.1 2025-09-03T16:09:22.2823129 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: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
// 1.21.1 2025-09-02T22:50:55.938192 Caffeinated/Recipes
1+
// 1.21.1 2025-09-03T16:09:22.2851688 Caffeinated/Recipes
22
c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json
3-
c9b5cb066d0fab702915da1774fdd48fcbc57229 data\caffeinated\advancement\recipes\misc\coffee_beans_from_smoking.json
43
fc02282e1585581cdd7b7c61a868bceed7db5d1b data\caffeinated\advancement\recipes\misc\coffee_beans_from_civet_scat.json
54
6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json
65
9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancement\recipes\misc\ground_coffee_from_coffee_beans.json
76
cffafb17fcb8dfbab6d4ea283a6ed1e9910cc606 data\caffeinated\recipe\coffee_beans_from_civet_scat.json
87
b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancement\recipes\building_blocks\coffee_bean_block.json
98
861e142a5a287eba94cf46a7d37342304f9ad285 data\caffeinated\recipe\ground_coffee_block.json
10-
68db7e4254464704bcbef0333ad25a66e6ff28e5 data\caffeinated\recipe\coffee_beans_from_smoking.json
119
c0c226ce1854c1aa133ac5392a6a40d18419bc37 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_carpet_from_white_carpet.json
1210
dc7a575ad5eb72be9b3ec137cbb83358fc420f10 data\caffeinated\recipe\coffee_stained_carpet.json
1311
51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancement\recipes\building_blocks\ground_coffee_block.json
@@ -20,7 +18,6 @@ ba81552d4ee1d9d568b84f786de61e415fdb157e data\caffeinated\recipe\latte_coffee_bo
2018
b3d10b49b978d96c244fb776e1292f0b3f9c272b data\caffeinated\recipe\brown_dye_from_ground_coffee.json
2119
940b79ac38bb029284ab840c935d72cd9b2a93d7 data\caffeinated\recipe\coffee_beans.json
2220
0ce1e6e9d0c954f2ea67d39a1a43bf358a1a8991 data\caffeinated\advancement\recipes\misc\brown_dye_from_ground_coffee.json
23-
05ce2e487120bb80ae830054a41d88227ff06701 data\caffeinated\advancement\recipes\misc\coffee_beans_from_campfire_cooking.json
2421
400dd2329e8ff95d83dae40af8db1c9fc5296ce4 data\caffeinated\recipe\coffee_bean_block.json
2522
a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\food\tiramisu_from_slices.json
2623
42e097d611b5534f387afce66da821f0349faf9f data\caffeinated\recipe\coffee_bottle.json
@@ -29,7 +26,6 @@ a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\fo
2926
72418a991f973fb5cf728affdcbfde7d5818b251 data\caffeinated\advancement\recipes\food\coffee_bottle.json
3027
1410b08380530f562102b9d54fde26a7163b2256 data\caffeinated\advancement\recipes\food\latte_coffee_bottle.json
3128
145d4111298037135c323e1347f67b3871daaa3e data\caffeinated\recipe\java_banner_pattern.json
32-
b87c145bc168d5c9de9f572d8df7c9905b65ec6b data\caffeinated\recipe\coffee_beans_from_campfire_cooking.json
3329
cf353bc3103b1834f861ecb7a2da0ae56550bb65 data\caffeinated\recipe\cafe_miel_coffee_bottle.json
3430
1c90d5214cc2f466be11d17a52cde3d40f7d15d5 data\caffeinated\advancement\recipes\building_blocks\coffee_stained_wool.json
3531
514280f7d04586c23693c1dae8cf30241a810a24 data\caffeinated\advancement\recipes\building_blocks\coffee_berry_crate.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-02T22:50:55.9319317 Caffeinated/Model Definitions
1+
// 1.21.1 2025-09-03T16:09:22.2784111 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/recipes/misc/coffee_beans_from_campfire_cooking.json

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

src/main/generated/data/caffeinated/advancement/recipes/misc/coffee_beans_from_smoking.json

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

src/main/generated/data/caffeinated/recipe/coffee_beans_from_campfire_cooking.json

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

src/main/generated/data/caffeinated/recipe/coffee_beans_from_smoking.json

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
import net.fabricmc.loader.api.FabricLoader;
66
import net.fabricmc.loader.api.MappingResolver;
77
import net.minecraft.item.ItemStack;
8-
import net.minecraft.item.Items;
98

109
public class CaffeinatedEarlyRiser implements Runnable {
1110
@Override
1211
public void run() {
1312
MappingResolver mappingResolver = FabricLoader.getInstance().getMappingResolver();
14-
1513
String recipeBookGroup = mappingResolver.mapClassName("intermediary", "net.minecraft.class_314");
1614
String itemStack = "[L" + mappingResolver.mapClassName("intermediary", "net.minecraft.class_1799") + ';';
17-
ClassTinkerers.enumBuilder(recipeBookGroup, itemStack).addEnum("CAFFEINATED_SMOKER_MISC", () -> new Object[]{new ItemStack[]{new ItemStack(Items.LAVA_BUCKET), new ItemStack(CaffeinatedItems.COFFEE_BERRIES)}}).build();
1815
ClassTinkerers.enumBuilder(recipeBookGroup, itemStack).addEnum("CAFFEINATED_COFFEE_BREWING", () -> new Object[]{new ItemStack[]{new ItemStack(CaffeinatedItems.COFFEE_BOTTLE)}}).build();
1916
}
2017
}

src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
1616
import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
1717
import net.minecraft.item.Items;
18-
import net.minecraft.recipe.CampfireCookingRecipe;
1918
import net.minecraft.recipe.Ingredient;
20-
import net.minecraft.recipe.RecipeSerializer;
21-
import net.minecraft.recipe.SmokingRecipe;
2219
import net.minecraft.recipe.book.RecipeCategory;
2320
import net.minecraft.registry.RegistryWrapper;
2421

@@ -34,8 +31,6 @@ public void generate(RecipeExporter exporter) {
3431
final RecipeExporter farmersDelightExporter = this.withConditions(exporter, ResourceConditions.allModsLoaded("farmersdelight"));
3532

3633
CookingRecipeJsonBuilder.createSmelting(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.35F, 200).group(getItemPath(CaffeinatedItems.COFFEE_BEANS)).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter);
37-
CookingRecipeJsonBuilder.create(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.35F, 100, RecipeSerializer.SMOKING, SmokingRecipe::new).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, Caffeinated.of(getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_smoking"));
38-
CookingRecipeJsonBuilder.create(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.35F, 600, RecipeSerializer.CAMPFIRE_COOKING, CampfireCookingRecipe::new).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, Caffeinated.of(getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_campfire_cooking"));
3934
CookingRecipeJsonBuilder.createSmelting(Ingredient.ofItems(CaffeinatedBlocks.CIVET_SCAT), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.35F, 200).criterion(hasItem(CaffeinatedBlocks.CIVET_SCAT), conditionsFromItem(CaffeinatedBlocks.CIVET_SCAT)).offerTo(exporter, Caffeinated.of(convertBetween(CaffeinatedItems.COFFEE_BEANS, CaffeinatedBlocks.CIVET_SCAT)));
4035

4136
offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedItems.COFFEE_BEANS);

0 commit comments

Comments
 (0)