diff --git a/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc index 00f3c5d..4e94efb 100644 --- a/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc +++ b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc @@ -1,25 +1,25 @@ -// 1.20.1 2023-12-30T12:03:55.5346365 Caffeinated/Recipes -8673497eb207defcf0d042ff52b307325dcef6ee data\caffeinated\advancements\recipes\misc\coffee_beans_from_campfire_cooking.json +// 1.20.1 2023-12-30T12:13:30.3473862 Caffeinated/Recipes +a6e938fc8f033d82fb2c73674b2d38dbf58ef14d data\caffeinated\advancements\recipes\misc\coffee_beans_from_campfire_cooking.json 2b1061f72b3e9a1295c9aa4334d37c9dcb3dfc53 data\caffeinated\advancements\recipes\misc\java_banner_pattern.json -a01565ba0bf9276c839227dfab5f9fa1083cb376 data\caffeinated\recipes\ground_coffee_block.json +51838f015a3a334f4cc29bd8c59bc56464b2552d data\caffeinated\recipes\ground_coffee_block.json 1922870ee697bc6be35c4d62cbf7abcb35d46cf1 data\caffeinated\advancements\recipes\food\coffee_bottle.json -bb529f25b75b190a9da8518d7a0931d22cbaf194 data\caffeinated\advancements\recipes\decorations\coffee_bean_block.json -5dfbeda6e15d9e292a25fc4e3f33d71b2ab777cb data\caffeinated\recipes\coffee_beans_from_smoking.json -cd15441554dc9c3417486d7787d4609ccb9888b8 data\caffeinated\recipes\ground_coffee.json -0c5f3057fe5d2ccf6a5bd511a99c41f7c9270949 data\caffeinated\advancements\recipes\misc\coffee_beans_from_smoking.json -ebc2f568cdba0689d1071919c8b4a6bd23cc8df4 data\caffeinated\recipes\coffee_bean_block.json -5721d4f7e3a65f7b6f387ec00ee996f73a2f51ee data\caffeinated\advancements\recipes\misc\coffee_beans.json -55a0f263de5782dd9ec9aecd1d1ae815e3760bdb data\caffeinated\advancements\recipes\decorations\ground_coffee_block.json -b78f30260a00fcc80fd6b65b41be9adce06286c9 data\caffeinated\recipes\coffee_beans.json -c1dd44b442244812fd79333ec001551523590d59 data\caffeinated\advancements\recipes\misc\ground_coffee.json -7ac9428c1c4810e6e439997467b8c5afad1711b9 data\caffeinated\advancements\recipes\food\coffee_berries.json 06c7edbdec5cf1deb92d8e421279587f14aaab54 data\caffeinated\advancements\recipes\food\tiramisu.json +5dfbeda6e15d9e292a25fc4e3f33d71b2ab777cb data\caffeinated\recipes\coffee_beans_from_smoking.json f8bbfcc2f655643293992d2bc113858fedbcc78f data\caffeinated\recipes\tiramisu.json +cd15441554dc9c3417486d7787d4609ccb9888b8 data\caffeinated\recipes\ground_coffee.json +85ccf4fe4d91361b2eab60b79f83fa9c7f3f712f data\caffeinated\advancements\recipes\misc\coffee_beans_from_smoking.json ca718ec02747f39187e77abb367019198eac644e data\caffeinated\recipes\brown_dye_from_ground_coffee.json d34b1b5cba65cbe93df946e3a6badee9edc69dc0 data\caffeinated\recipes\coffee_berries.json 7d3019bc5b37ce3328bf16cc9b8edb2eb0839802 data\caffeinated\advancements\recipes\food\tiramisu_from_slices.json +d746ed80e2bf6726432f6ed1dd39e6851579ed47 data\caffeinated\recipes\coffee_bean_block.json 3f815caa0d14d9f4dd898dfd686a518ba07b5408 data\caffeinated\advancements\recipes\misc\brown_dye_from_ground_coffee.json f86c55d2f85321c89c00baa260f1964d8b81bdcf data\caffeinated\recipes\tiramisu_from_slices.json 21e45ee047fce833ccdc925196669db7be4d868b data\caffeinated\recipes\coffee_bottle.json +55a0f263de5782dd9ec9aecd1d1ae815e3760bdb data\caffeinated\advancements\recipes\building_blocks\ground_coffee_block.json +5721d4f7e3a65f7b6f387ec00ee996f73a2f51ee data\caffeinated\advancements\recipes\misc\coffee_beans.json 9dd043aa58724c5f9d877d84071191951a251c2b data\caffeinated\recipes\coffee_beans_from_campfire_cooking.json d466ced2e8e679a807bdbcee307e0eb5e6547942 data\caffeinated\recipes\java_banner_pattern.json +bb529f25b75b190a9da8518d7a0931d22cbaf194 data\caffeinated\advancements\recipes\building_blocks\coffee_bean_block.json +b78f30260a00fcc80fd6b65b41be9adce06286c9 data\caffeinated\recipes\coffee_beans.json +c1dd44b442244812fd79333ec001551523590d59 data\caffeinated\advancements\recipes\misc\ground_coffee.json +7ac9428c1c4810e6e439997467b8c5afad1711b9 data\caffeinated\advancements\recipes\food\coffee_berries.json diff --git a/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed index dc2097e..6030e62 100644 --- a/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed +++ b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed @@ -1,4 +1,4 @@ -// 1.20.1 2023-12-30T12:03:55.5316261 Caffeinated/Model Definitions +// 1.20.1 2023-12-30T12:13:30.3443018 Caffeinated/Model Definitions da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json 26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json b1a481861132973fe035c9b9ce7613e15938034c assets\caffeinated\models\block\coffee_berry_crate.json diff --git a/src/main/generated/data/caffeinated/advancements/recipes/decorations/coffee_bean_block.json b/src/main/generated/data/caffeinated/advancements/recipes/building_blocks/coffee_bean_block.json similarity index 100% rename from src/main/generated/data/caffeinated/advancements/recipes/decorations/coffee_bean_block.json rename to src/main/generated/data/caffeinated/advancements/recipes/building_blocks/coffee_bean_block.json diff --git a/src/main/generated/data/caffeinated/advancements/recipes/decorations/ground_coffee_block.json b/src/main/generated/data/caffeinated/advancements/recipes/building_blocks/ground_coffee_block.json similarity index 100% rename from src/main/generated/data/caffeinated/advancements/recipes/decorations/ground_coffee_block.json rename to src/main/generated/data/caffeinated/advancements/recipes/building_blocks/ground_coffee_block.json diff --git a/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_campfire_cooking.json b/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_campfire_cooking.json index f1e5c8f..37118ff 100644 --- a/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_campfire_cooking.json +++ b/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_campfire_cooking.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:coffee_beans_from_campfire_cooking" + "recipe": "caffeinated:coffee_beans_from_campfire_cooking" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:coffee_beans_from_campfire_cooking" + "caffeinated:coffee_beans_from_campfire_cooking" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_smoking.json b/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_smoking.json index 247774d..0a7a922 100644 --- a/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_smoking.json +++ b/src/main/generated/data/caffeinated/advancements/recipes/misc/coffee_beans_from_smoking.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:coffee_beans_from_smoking" + "recipe": "caffeinated:coffee_beans_from_smoking" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:coffee_beans_from_smoking" + "caffeinated:coffee_beans_from_smoking" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/caffeinated/recipes/coffee_bean_block.json b/src/main/generated/data/caffeinated/recipes/coffee_bean_block.json index 3e78bfa..6800e53 100644 --- a/src/main/generated/data/caffeinated/recipes/coffee_bean_block.json +++ b/src/main/generated/data/caffeinated/recipes/coffee_bean_block.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { "#": { "item": "caffeinated:coffee_beans" diff --git a/src/main/generated/data/caffeinated/recipes/ground_coffee_block.json b/src/main/generated/data/caffeinated/recipes/ground_coffee_block.json index db00fa4..871ab87 100644 --- a/src/main/generated/data/caffeinated/recipes/ground_coffee_block.json +++ b/src/main/generated/data/caffeinated/recipes/ground_coffee_block.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { "#": { "item": "caffeinated:ground_coffee" diff --git a/src/main/java/com/chikoritalover/caffeinated/CaffeinatedDataGenerator.java b/src/main/java/com/chikoritalover/caffeinated/CaffeinatedDataGenerator.java index 07a07d6..cb8475a 100644 --- a/src/main/java/com/chikoritalover/caffeinated/CaffeinatedDataGenerator.java +++ b/src/main/java/com/chikoritalover/caffeinated/CaffeinatedDataGenerator.java @@ -110,12 +110,12 @@ private CaffeinatedRecipeGenerator(FabricDataOutput output) { @Override public void generate(Consumer exporter) { - offer2x2CompactingRecipe(exporter, RecipeCategory.DECORATIONS, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedItems.COFFEE_BEANS); - offer2x2CompactingRecipe(exporter, RecipeCategory.DECORATIONS, CaffeinatedBlocks.GROUND_COFFEE_BLOCK, CaffeinatedItems.GROUND_COFFEE); + offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedItems.COFFEE_BEANS); + offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.GROUND_COFFEE_BLOCK, CaffeinatedItems.GROUND_COFFEE); CookingRecipeJsonBuilder.createSmelting(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.3F, 200).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter); - CookingRecipeJsonBuilder.createSmoking(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.3F, 100).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, new Identifier(getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_smoking")); - CookingRecipeJsonBuilder.createCampfireCooking(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.3F, 600).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, new Identifier(getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_campfire_cooking")); + CookingRecipeJsonBuilder.createSmoking(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.3F, 100).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, new Identifier(Caffeinated.MODID, getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_smoking")); + CookingRecipeJsonBuilder.createCampfireCooking(Ingredient.ofItems(CaffeinatedItems.COFFEE_BERRIES), RecipeCategory.MISC, CaffeinatedItems.COFFEE_BEANS, 0.3F, 600).criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(exporter, new Identifier(Caffeinated.MODID, getItemPath(CaffeinatedItems.COFFEE_BEANS) + "_from_campfire_cooking")); ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, CaffeinatedItems.GROUND_COFFEE, 3).input('#', CaffeinatedItems.COFFEE_BEANS).pattern("###").criterion(hasItem(CaffeinatedItems.COFFEE_BEANS), conditionsFromItem(CaffeinatedItems.COFFEE_BEANS)).offerTo(exporter); ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, CaffeinatedItems.JAVA_BANNER_PATTERN).input(Items.PAPER).input(CaffeinatedItems.COFFEE_BOTTLE).criterion("has_coffee_bottle", conditionsFromItem(CaffeinatedItems.COFFEE_BOTTLE)).offerTo(exporter);