diff --git a/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb b/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb new file mode 100644 index 0000000..11873ca --- /dev/null +++ b/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb @@ -0,0 +1,8 @@ +// 1.21 2024-09-07T13:34:20.4716276 Caffeinated/Block Loot Tables +548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json +8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json +d481f7802dfc0e83cd271518b47e73b256a24d2f data\caffeinated\loot_table\blocks\flowering_coffee_shrub.json +548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\coffee_cauldron.json +2181144c1ab146492f9cae41e26a4ad585b0c46b data\caffeinated\loot_table\blocks\ground_coffee_block.json +55664479b7d3ad31e070226a65db432f03d97236 data\caffeinated\loot_table\blocks\potted_coffee_shrub.json +3bec24cd54986eea9c228540df648ca7b01c86fc data\caffeinated\loot_table\blocks\coffee_bean_block.json diff --git a/src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a b/src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a new file mode 100644 index 0000000..9277145 --- /dev/null +++ b/src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a @@ -0,0 +1,4 @@ +// 1.21 2024-09-07T13:34:20.4704644 Caffeinated/Advancements +bcaa279e3e0ad8280ebfe57370201ce6290340a1 data\caffeinated\advancement\husbandry\brew_coffee.json +3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json +a13c94beba4187f9b1b7021707a912e58beac70d data\caffeinated\advancement\husbandry\brew_all_coffee.json diff --git a/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc new file mode 100644 index 0000000..e1ce807 --- /dev/null +++ b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc @@ -0,0 +1,29 @@ +// 1.21 2024-09-07T13:34:20.4716276 Caffeinated/Recipes +c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json +c9b5cb066d0fab702915da1774fdd48fcbc57229 data\caffeinated\advancement\recipes\misc\coffee_beans_from_smoking.json +6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json +9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancement\recipes\misc\ground_coffee_from_coffee_beans.json +b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancement\recipes\building_blocks\coffee_bean_block.json +861e142a5a287eba94cf46a7d37342304f9ad285 data\caffeinated\recipe\ground_coffee_block.json +afc5ab486779e47ce326b86ef93037905639d03a data\caffeinated\recipe\coffee_beans_from_smoking.json +51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancement\recipes\building_blocks\ground_coffee_block.json +31f69cf23ef6a168c6d98a8fef731d470bcbb187 data\caffeinated\recipe\coffee_berries.json +081e951942029c81b7edec2c02074e4b47d00d3d data\caffeinated\recipe\ground_coffee_from_coffee_beans.json +5dc445d11ac1091b47d0393e020f2644f701cd29 data\caffeinated\recipe\coffee_berry_crate.json +ba81552d4ee1d9d568b84f786de61e415fdb157e data\caffeinated\recipe\latte_coffee_bottle.json +b3d10b49b978d96c244fb776e1292f0b3f9c272b data\caffeinated\recipe\brown_dye_from_ground_coffee.json +920e03fa0683e9b42e081c15bd1af0c69feb51eb data\caffeinated\recipe\coffee_beans.json +0ce1e6e9d0c954f2ea67d39a1a43bf358a1a8991 data\caffeinated\advancement\recipes\misc\brown_dye_from_ground_coffee.json +05ce2e487120bb80ae830054a41d88227ff06701 data\caffeinated\advancement\recipes\misc\coffee_beans_from_campfire_cooking.json +400dd2329e8ff95d83dae40af8db1c9fc5296ce4 data\caffeinated\recipe\coffee_bean_block.json +a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\food\tiramisu_from_slices.json +42e097d611b5534f387afce66da821f0349faf9f data\caffeinated\recipe\coffee_bottle.json +72418a991f973fb5cf728affdcbfde7d5818b251 data\caffeinated\advancement\recipes\food\coffee_bottle.json +1410b08380530f562102b9d54fde26a7163b2256 data\caffeinated\advancement\recipes\food\latte_coffee_bottle.json +145d4111298037135c323e1347f67b3871daaa3e data\caffeinated\recipe\java_banner_pattern.json +fd6bc1e87eab4e2bccc5d198e5bca2730df804db data\caffeinated\recipe\coffee_beans_from_campfire_cooking.json +514280f7d04586c23693c1dae8cf30241a810a24 data\caffeinated\advancement\recipes\building_blocks\coffee_berry_crate.json +e1d9fbf68af558ba9d59fc35535075266be4d5fe data\caffeinated\recipe\tiramisu.json +d4cb036e5e2675e9ddf086c9a38c979f07b2648e data\caffeinated\advancement\recipes\food\tiramisu.json +c2ed0c8fa9984d704ee6bba4d60cf985da40fee8 data\caffeinated\advancement\recipes\food\coffee_berries.json +a9a4364e33318712c4a3e4ef39fa828117e28314 data\caffeinated\advancement\recipes\misc\java_banner_pattern.json diff --git a/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed new file mode 100644 index 0000000..f3b5290 --- /dev/null +++ b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed @@ -0,0 +1,39 @@ +// 1.21 2024-09-07T13:34:20.4675794 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 +e8f1792493d7219e1da4ac39e45bf903a349e3f5 assets\caffeinated\models\block\ground_coffee_cauldron_full.json +cd360bb185f465f81672c32ac31312f77270e5f4 assets\caffeinated\models\block\coffee_cauldron_level2.json +5f0ad0fc380a095ead21e3a00bdbbdcd648548e3 assets\caffeinated\models\item\latte_coffee_bottle.json +57311e73aae426dff5d3b58c69ec071360f952d3 assets\caffeinated\models\block\ground_coffee_cauldron_level1.json +13297d4a51cb3b1369630338ba5f7b439b4af3fc assets\caffeinated\models\block\cauldron_campfire_filled.json +cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json +ace2f8060adedf59471fa9728ad427b7c2abb51e assets\caffeinated\blockstates\soul_cauldron_campfire.json +cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_coffee_cauldron_level2.json +1297909cbb77803c3f1a796d29fa088c9aeae546 assets\caffeinated\blockstates\coffee_shrub.json +34202786f9a57de99cd6cc7be5013c91a1b9690a assets\caffeinated\models\item\tiramisu_slice.json +86a7f801b70c8f877d0e3d52a8bce349a9232c4f assets\caffeinated\models\block\ground_coffee_block.json +37d547b30cad973f0223896df68f15c5eea49d4b assets\caffeinated\models\item\ground_coffee_block.json +2e82d1add55c94e56c5b85172449dc9ff539882d assets\caffeinated\models\block\coffee_cauldron_full.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets\caffeinated\models\item\civet_spawn_egg.json +fe9155058173a06c1325878e72a8f42b0acfb9d7 assets\caffeinated\models\block\coffee_shrub_stage1.json +2078aae9dd460adbf0bf14e46615e32012f351e8 assets\caffeinated\blockstates\ground_coffee_cauldron.json +865a21f6601205d70079dbcc9d2bc9d375fbbc73 assets\caffeinated\models\block\coffee_bean_block.json +16db00fbb67b98528c1a99e61640adc411cc4cff assets\caffeinated\models\item\tiramisu.json +8ba76990b97aa664bf34e5e2b94761ebdc7a8c04 assets\caffeinated\models\block\coffee_cauldron_level1.json +3ef771d34d7bc76165d6a5f7053ea5ff27bc44dd assets\caffeinated\blockstates\coffee_bean_block.json +821f41182077e0ce6bc7918aee907e45a9dd7d73 assets\caffeinated\models\block\soul_cauldron_campfire.json +2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json +358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json +196754b26a9f9cac1bf6b81563cef5344f998868 assets\caffeinated\blockstates\tiramisu.json +ee814f36f99a123b06cf2e7bcb08415b97595925 assets\caffeinated\models\block\potted_coffee_shrub.json +50804beb94c1a58c883df514333ff7d2c2807a42 assets\caffeinated\models\item\coffee_bean_block.json +6bc7bd9e663e1a1e43a79ef46957b15c4682a3a6 assets\caffeinated\models\block\coffee_shrub_stage0.json +0dab1d0bc7608970cc968c8f8569497fae0b2295 assets\caffeinated\models\item\ground_coffee.json +ffcb5afccb3a6b30399f263654799949096594da assets\caffeinated\blockstates\cauldron_campfire.json +58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json +e4c8f2b75d3ecafc48e0a48ec6940b6dac0eb258 assets\caffeinated\models\item\coffee_beans.json +6568f0e38ffcef7753bd7c0ae1bfdd66fafc6795 assets\caffeinated\models\block\cauldron_campfire.json +66ab3c0788a1452c84c9c06f8ffe0bf7828a9620 assets\caffeinated\models\item\java_banner_pattern.json +1564a118add7b691cd3d6b1b6d06641507f0a7e2 assets\caffeinated\models\item\coffee_berries.json +f231ba05786d3928e6a0fce4139f5e1c5b106036 assets\caffeinated\models\block\soul_cauldron_campfire_filled.json diff --git a/src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries_from_crate.json b/src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries.json similarity index 86% rename from src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries_from_crate.json rename to src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries.json index c23ec84..15f1321 100644 --- a/src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries_from_crate.json +++ b/src/main/generated/data/caffeinated/advancement/recipes/food/coffee_berries.json @@ -21,7 +21,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "caffeinated:coffee_berries_from_crate" + "recipe": "caffeinated:coffee_berries" }, "trigger": "minecraft:recipe_unlocked" } @@ -34,7 +34,7 @@ ], "rewards": { "recipes": [ - "caffeinated:coffee_berries_from_crate" + "caffeinated:coffee_berries" ] } } \ No newline at end of file diff --git a/src/main/generated/data/caffeinated/recipe/coffee_berries_from_crate.json b/src/main/generated/data/caffeinated/recipe/coffee_berries.json similarity index 100% rename from src/main/generated/data/caffeinated/recipe/coffee_berries_from_crate.json rename to src/main/generated/data/caffeinated/recipe/coffee_berries.json diff --git a/src/main/java/net/chikorita_lover/caffeinated/block/CauldronCampfireBlock.java b/src/main/java/net/chikorita_lover/caffeinated/block/CauldronCampfireBlock.java index e0ebfc0..fec8fbe 100644 --- a/src/main/java/net/chikorita_lover/caffeinated/block/CauldronCampfireBlock.java +++ b/src/main/java/net/chikorita_lover/caffeinated/block/CauldronCampfireBlock.java @@ -125,10 +125,10 @@ public ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World w BlockEntity blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof CauldronCampfireBlockEntity cauldronCampfire) { Item item = stack.getItem(); - Item item2 = cauldronCampfire.getStack(0).getItem(); + Item ingredient = cauldronCampfire.getStack(0).getItem(); boolean bl = !state.get(FILLED) && cauldronCampfire.isBaseIngredient(stack); boolean bl2 = !cauldronCampfire.hasReagent() && cauldronCampfire.canBrewTogether(cauldronCampfire.getStack(0), stack); - boolean bl3 = state.get(FILLED) && (!item2.hasRecipeRemainder() || stack.isOf(item2.getRecipeRemainder())); + boolean bl3 = state.get(FILLED) && (!ingredient.hasRecipeRemainder() || stack.isOf(ingredient.getRecipeRemainder())); if (!bl && !bl2 && !bl3) { return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } @@ -144,11 +144,11 @@ public ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World w player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, item.getRecipeRemainder(stack))); world.emitGameEvent(null, GameEvent.BLOCK_CHANGE, pos); } else { - ItemStack stack2 = item2.getDefaultStack(); - if (stack2.isOf(item2.getRecipeRemainder())) { - player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, stack2)); + ItemStack ingredientStack = ingredient.getDefaultStack(); + if (stack.isOf(ingredient.getRecipeRemainder())) { + player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, ingredientStack)); } else { - player.giveItemStack(stack2); + player.giveItemStack(ingredientStack); } cauldronCampfire.clear(); cauldronCampfire.dropExperienceForRecipesUsed((ServerPlayerEntity) player); diff --git a/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java b/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java index 65293e5..036788b 100644 --- a/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java +++ b/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java @@ -4,9 +4,11 @@ import net.chikorita_lover.caffeinated.recipe.CoffeeBrewingRecipeJsonBuilder; import net.chikorita_lover.caffeinated.registry.CaffeinatedBlocks; import net.chikorita_lover.caffeinated.registry.CaffeinatedItems; +import net.chikorita_lover.caffeinated.registry.tag.CaffeinatedItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditions; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; import net.minecraft.data.server.recipe.CookingRecipeJsonBuilder; import net.minecraft.data.server.recipe.RecipeExporter; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; @@ -33,7 +35,8 @@ public void generate(RecipeExporter exporter) { offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedItems.COFFEE_BEANS); offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.GROUND_COFFEE_BLOCK, CaffeinatedItems.GROUND_COFFEE); - offerReversibleCompactingRecipes(farmersDelightExporter, RecipeCategory.FOOD, CaffeinatedItems.COFFEE_BERRIES, RecipeCategory.DECORATIONS, CaffeinatedBlocks.COFFEE_BERRY_CRATE); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, CaffeinatedItems.COFFEE_BERRIES, 9).input(CaffeinatedBlocks.COFFEE_BERRY_CRATE).criterion(hasItem(CaffeinatedBlocks.COFFEE_BERRY_CRATE), conditionsFromItem(CaffeinatedBlocks.COFFEE_BERRY_CRATE)).offerTo(farmersDelightExporter, Caffeinated.of(getItemPath(CaffeinatedItems.COFFEE_BERRIES))); + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CaffeinatedBlocks.COFFEE_BERRY_CRATE).input('#', CaffeinatedItems.COFFEE_BERRIES).pattern("###").pattern("###").pattern("###").criterion(hasItem(CaffeinatedItems.COFFEE_BERRIES), conditionsFromItem(CaffeinatedItems.COFFEE_BERRIES)).offerTo(farmersDelightExporter, Caffeinated.of(getItemPath(CaffeinatedBlocks.COFFEE_BERRY_CRATE))); ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, CaffeinatedItems.GROUND_COFFEE).input('#', CaffeinatedItems.COFFEE_BEANS).pattern("###").group("ground_coffee").criterion(hasItem(CaffeinatedItems.COFFEE_BEANS), conditionsFromItem(CaffeinatedItems.COFFEE_BEANS)).offerTo(exporter, Caffeinated.of("ground_coffee_from_coffee_beans")); ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, Items.BROWN_DYE).input(CaffeinatedItems.GROUND_COFFEE).group("brown_dye").criterion("has_ground_coffee", conditionsFromItem(CaffeinatedItems.GROUND_COFFEE)).offerTo(exporter, Caffeinated.of("brown_dye_from_ground_coffee")); diff --git a/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java b/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java index 74769f4..1e1eabe 100644 --- a/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java +++ b/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java @@ -13,6 +13,7 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import java.util.Set; @@ -23,36 +24,51 @@ public static void register() { Registry.register(Registries.ITEM_GROUP, CAFFEINATED, FabricItemGroup.builder().displayName(Text.translatable("itemGroup.caffeinated.caffeinated")).icon(CaffeinatedItems.BLACK_COFFEE_BOTTLE::getDefaultStack).build()); ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(entries -> { - entries.addBefore(Items.NETHER_WART, CaffeinatedItems.COFFEE_BERRIES); + entries.addBefore(Items.GLOW_BERRIES, CaffeinatedItems.COFFEE_BERRIES); entries.addBefore(Blocks.BEE_NEST, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedBlocks.GROUND_COFFEE_BLOCK); }); ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register(entries -> { - entries.addBefore(Items.CHORUS_FRUIT, CaffeinatedItems.COFFEE_BERRIES); - entries.addBefore(Items.ROTTEN_FLESH, CaffeinatedItems.BLACK_COFFEE_BOTTLE, CaffeinatedItems.LATTE_COFFEE_BOTTLE, CaffeinatedBlocks.TIRAMISU, CaffeinatedItems.TIRAMISU_SLICE); + entries.addBefore(Items.SWEET_BERRIES, CaffeinatedItems.COFFEE_BERRIES); + entries.addBefore(Items.ROTTEN_FLESH, CaffeinatedBlocks.TIRAMISU); + entries.addBefore(Items.OMINOUS_BOTTLE, CaffeinatedItems.BLACK_COFFEE_BOTTLE, CaffeinatedItems.LATTE_COFFEE_BOTTLE); }); ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> { - entries.addAfter(Items.WHEAT, CaffeinatedItems.COFFEE_BEANS); - entries.addBefore(Items.NETHER_WART, CaffeinatedItems.GROUND_COFFEE); - entries.addAfter(Items.PIGLIN_BANNER_PATTERN, CaffeinatedItems.JAVA_BANNER_PATTERN); + entries.addAfter(Items.WHEAT, CaffeinatedItems.COFFEE_BEANS, CaffeinatedItems.GROUND_COFFEE); + entries.addBefore(Items.PIGLIN_BANNER_PATTERN, CaffeinatedItems.JAVA_BANNER_PATTERN); }); ItemGroupEvents.modifyEntriesEvent(ItemGroups.SPAWN_EGGS).register(entries -> { entries.addAfter(Items.CHICKEN_SPAWN_EGG, CaffeinatedItems.CIVET_SPAWN_EGG); }); ItemGroupEvents.modifyEntriesEvent(CAFFEINATED).register(entries -> { - ItemGroup.StackVisibility visibility = ItemGroup.StackVisibility.PARENT_TAB_ONLY; - entries.add(CaffeinatedItems.COFFEE_BERRIES, visibility); - entries.add(CaffeinatedItems.COFFEE_BEANS, visibility); - entries.add(CaffeinatedItems.GROUND_COFFEE, visibility); - entries.add(CaffeinatedBlocks.COFFEE_BEAN_BLOCK, visibility); - entries.add(CaffeinatedBlocks.GROUND_COFFEE_BLOCK, visibility); - registerCampfiresCauldron(entries, visibility); - entries.add(Items.GLASS_BOTTLE, visibility); - entries.add(CaffeinatedItems.BLACK_COFFEE_BOTTLE, visibility); - entries.add(CaffeinatedItems.LATTE_COFFEE_BOTTLE, visibility); - entries.add(CaffeinatedBlocks.TIRAMISU, visibility); - entries.add(CaffeinatedItems.TIRAMISU_SLICE, visibility); - entries.add(CaffeinatedItems.JAVA_BANNER_PATTERN, visibility); - entries.add(CaffeinatedItems.CIVET_SPAWN_EGG, visibility); + ItemGroup.StackVisibility parentTabOnly = ItemGroup.StackVisibility.PARENT_TAB_ONLY; + entries.add(CaffeinatedItems.COFFEE_BERRIES, parentTabOnly); + entries.add(CaffeinatedItems.COFFEE_BEANS, parentTabOnly); + entries.add(CaffeinatedItems.GROUND_COFFEE, parentTabOnly); + entries.add(CaffeinatedBlocks.COFFEE_BEAN_BLOCK, parentTabOnly); + entries.add(CaffeinatedBlocks.GROUND_COFFEE_BLOCK, parentTabOnly); + registerCampfiresCauldron(entries, parentTabOnly); + entries.add(Items.GLASS_BOTTLE, parentTabOnly); + entries.add(CaffeinatedItems.BLACK_COFFEE_BOTTLE, parentTabOnly); + entries.add(CaffeinatedItems.LATTE_COFFEE_BOTTLE, parentTabOnly); + entries.add(CaffeinatedBlocks.TIRAMISU, parentTabOnly); + entries.add(CaffeinatedItems.JAVA_BANNER_PATTERN, parentTabOnly); + entries.add(CaffeinatedItems.CIVET_SPAWN_EGG, parentTabOnly); + }); + ItemGroupEvents.MODIFY_ENTRIES_ALL.register((group, entries) -> { + final String farmersDelight = "farmersdelight"; + if (Registries.ITEM_GROUP.getId(group).equals(Identifier.of(farmersDelight, farmersDelight))) { + for (int i = 0; i < entries.getDisplayStacks().size(); ++i) { + ItemStack displayStack = entries.getDisplayStacks().get(i); + Identifier id = Registries.ITEM.getId(displayStack.getItem()); + if (id.equals(Identifier.of(farmersDelight, "carrot_crate"))) { + entries.addBefore(displayStack, CaffeinatedBlocks.COFFEE_BERRY_CRATE); + ++i; + } else if (id.equals(Identifier.of(farmersDelight, "cake_slice"))) { + entries.addAfter(displayStack, CaffeinatedItems.TIRAMISU_SLICE); + ++i; + } + } + } }); } diff --git a/src/main/resources/assets/caffeinated/lang/en_us.json b/src/main/resources/assets/caffeinated/lang/en_us.json index 65806ba..5446777 100644 --- a/src/main/resources/assets/caffeinated/lang/en_us.json +++ b/src/main/resources/assets/caffeinated/lang/en_us.json @@ -7,7 +7,7 @@ "advancements.husbandry.brew_coffee.title": "Stop and Smell the Coffee", "block.caffeinated.cauldron_campfire": "Campfire with Cauldron", "block.caffeinated.coffee_bean_block": "Coffee Bean Block", - "block.caffeinated.coffee_berry_crate": "Coffee Berry Crate", + "block.caffeinated.coffee_berry_crate": "Coffee Cherry Crate", "block.caffeinated.coffee_cauldron": "Coffee Cauldron", "block.caffeinated.coffee_shrub": "Coffee Shrub", "block.caffeinated.flowering_coffee_shrub": "Flowering Coffee Shrub", @@ -16,36 +16,38 @@ "block.caffeinated.potted_coffee_shrub": "Potted Coffee Shrub", "block.caffeinated.soul_cauldron_campfire": "Soul Campfire with Cauldron", "block.caffeinated.tiramisu": "Tiramisu", - "block.minecraft.banner.caffeinated.java.black": "Black Java Emblem", - "block.minecraft.banner.caffeinated.java.blue": "Blue Java Emblem", - "block.minecraft.banner.caffeinated.java.brown": "Brown Java Emblem", - "block.minecraft.banner.caffeinated.java.cyan": "Cyan Java Emblem", - "block.minecraft.banner.caffeinated.java.gray": "Gray Java Emblem", - "block.minecraft.banner.caffeinated.java.green": "Green Java Emblem", - "block.minecraft.banner.caffeinated.java.light_blue": "Light Blue Java Emblem", - "block.minecraft.banner.caffeinated.java.light_gray": "Light Gray Java Emblem", - "block.minecraft.banner.caffeinated.java.lime": "Lime Java Emblem", - "block.minecraft.banner.caffeinated.java.magenta": "Magenta Java Emblem", - "block.minecraft.banner.caffeinated.java.orange": "Orange Java Emblem", - "block.minecraft.banner.caffeinated.java.pink": "Pink Java Emblem", - "block.minecraft.banner.caffeinated.java.purple": "Purple Java Emblem", - "block.minecraft.banner.caffeinated.java.red": "Red Java Emblem", - "block.minecraft.banner.caffeinated.java.white": "White Java Emblem", - "block.minecraft.banner.caffeinated.java.yellow": "Yellow Java Emblem", + "block.minecraft.banner.caffeinated.java.black": "Black Java", + "block.minecraft.banner.caffeinated.java.blue": "Blue Java", + "block.minecraft.banner.caffeinated.java.brown": "Brown Java", + "block.minecraft.banner.caffeinated.java.cyan": "Cyan Java", + "block.minecraft.banner.caffeinated.java.gray": "Gray Java", + "block.minecraft.banner.caffeinated.java.green": "Green Java", + "block.minecraft.banner.caffeinated.java.light_blue": "Light Blue Java", + "block.minecraft.banner.caffeinated.java.light_gray": "Light Gray Java", + "block.minecraft.banner.caffeinated.java.lime": "Lime Java", + "block.minecraft.banner.caffeinated.java.magenta": "Magenta Java", + "block.minecraft.banner.caffeinated.java.orange": "Orange Java", + "block.minecraft.banner.caffeinated.java.pink": "Pink Java", + "block.minecraft.banner.caffeinated.java.purple": "Purple Java", + "block.minecraft.banner.caffeinated.java.red": "Red Java", + "block.minecraft.banner.caffeinated.java.white": "White Java", + "block.minecraft.banner.caffeinated.java.yellow": "Yellow Java", "effect.caffeinated.caffeine": "Caffeine", "entity.caffeinated.civet": "Civet", "item.caffeinated.civet_spawn_egg": "Civet Spawn Egg", "item.caffeinated.coffee_beans": "Coffee Beans", - "item.caffeinated.coffee_berries": "Coffee Berries", + "item.caffeinated.coffee_berries": "Coffee Cherries", "item.caffeinated.coffee_bottle": "Coffee Bottle", "item.caffeinated.coffee_bottle.desc": "Black Coffee", "item.caffeinated.ground_coffee": "Ground Coffee", "item.caffeinated.java_banner_pattern": "Banner Pattern", - "item.caffeinated.java_banner_pattern.desc": "Java Emblem", + "item.caffeinated.java_banner_pattern.desc": "Java", "item.caffeinated.latte_coffee_bottle.desc": "Latte", "item.caffeinated.tiramisu_slice": "Tiramisu Slice", - "item.modifiers.exhaustion": "Exhaustion", "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Coffee Taken from Cauldron", + "stat.caffeinated.eat_tiramisu_slice": "Tiramisu Slices Eaten", + "stat.caffeinated.interact_with_cauldron_campfire": "Interactions with Campfire with Cauldron", "subtitles.block.cauldron_campfire.brew": "Cauldron brews", "subtitles.block.cauldron_campfire.bubble": "Cauldron bubbles", "subtitles.entity.civet.death": "Civet dies", @@ -53,8 +55,5 @@ "subtitles.entity.civet.hurt": "Civet hurts", "subtitles.entity.civet.idle": "Civet growls", "subtitles.item.coffee_bottle.drink": "Slurping", - "subtitles.item.ground_coffee.splash": "Ground Coffee splashes", - "stat.caffeinated.coffee_taken": "Coffee Taken from Cauldron", - "stat.caffeinated.eat_tiramisu_slice": "Tiramisu Slices Eaten", - "stat.caffeinated.interact_with_cauldron_campfire": "Interactions with Campfire with Cauldron" + "subtitles.item.ground_coffee.splash": "Ground Coffee splashes" } \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/es_ar.json b/src/main/resources/assets/caffeinated/lang/es_ar.json index 08c28a4..5cc3ef5 100644 --- a/src/main/resources/assets/caffeinated/lang/es_ar.json +++ b/src/main/resources/assets/caffeinated/lang/es_ar.json @@ -1,41 +1,59 @@ { + "advancements.husbandry.bake_tiramisu.description": "Prepara un plato de tiramisú.", + "advancements.husbandry.bake_tiramisu.title": "Recógeme", + "advancements.husbandry.brew_all_coffee.description": "Prepara a todos los tipos de botella de café.", + "advancements.husbandry.brew_all_coffee.title": "Cafeinado", + "advancements.husbandry.brew_coffee.description": "Agregue café molido al agua en una fogata con caldero para preparar café negro.", "advancements.husbandry.brew_coffee.title": "Despierta y huele el café", - "advancements.husbandry.brew_coffee.description": "Prepara una botella de café en un caldero sobre una fogata.", + "block.caffeinated.cauldron_campfire": "Fogata con caldero", "block.caffeinated.coffee_bean_block": "Bloque de granos de café", - "block.caffeinated.coffee_berry_crate": "Cajón de bayas de café", + "block.caffeinated.coffee_berry_crate": "Cajón de cerezas de café", "block.caffeinated.coffee_cauldron": "Caldero con café", "block.caffeinated.coffee_shrub": "Cafeto", "block.caffeinated.flowering_coffee_shrub": "Cafeto florido", "block.caffeinated.ground_coffee_block": "Bloque de café molido", "block.caffeinated.ground_coffee_cauldron": "Caldero con café molido", "block.caffeinated.potted_coffee_shrub": "Maceta con cafeto", - "block.minecraft.banner.caffeinated.java.black": "Figura de Java negra", - "block.minecraft.banner.caffeinated.java.blue": "Figura de Java azul", - "block.minecraft.banner.caffeinated.java.brown": "Figura de Java marrón", - "block.minecraft.banner.caffeinated.java.cyan": "Figura de Java cian", - "block.minecraft.banner.caffeinated.java.gray": "Figura de Java gris", - "block.minecraft.banner.caffeinated.java.green": "Figura de Java verde", - "block.minecraft.banner.caffeinated.java.light_blue": "Figura de Java celeste", - "block.minecraft.banner.caffeinated.java.light_gray": "Figura de Java gris claro", - "block.minecraft.banner.caffeinated.java.lime": "Figura de Java verde lima", - "block.minecraft.banner.caffeinated.java.magenta": "Figura de Java magenta", - "block.minecraft.banner.caffeinated.java.orange": "Figura de Java naranja", - "block.minecraft.banner.caffeinated.java.pink": "Figura de Java rosa", - "block.minecraft.banner.caffeinated.java.purple": "Figura de Java violeta", - "block.minecraft.banner.caffeinated.java.red": "Figura de Java roja", - "block.minecraft.banner.caffeinated.java.white": "Figura de Java blanca", - "block.minecraft.banner.caffeinated.java.yellow": "Figura de Java amarilla", + "block.caffeinated.soul_cauldron_campfire": "Fogata de almas con caldero", + "block.caffeinated.tiramisu": "Tiramisú", + "block.minecraft.banner.caffeinated.java.black": "Figura de café negra", + "block.minecraft.banner.caffeinated.java.blue": "Figura de café azul", + "block.minecraft.banner.caffeinated.java.brown": "Figura de café marrón", + "block.minecraft.banner.caffeinated.java.cyan": "Figura de café cian", + "block.minecraft.banner.caffeinated.java.gray": "Figura de café gris", + "block.minecraft.banner.caffeinated.java.green": "Figura de café verde", + "block.minecraft.banner.caffeinated.java.light_blue": "Figura de café celeste", + "block.minecraft.banner.caffeinated.java.light_gray": "Figura de café gris claro", + "block.minecraft.banner.caffeinated.java.lime": "Figura de café verde lima", + "block.minecraft.banner.caffeinated.java.magenta": "Figura de café magenta", + "block.minecraft.banner.caffeinated.java.orange": "Figura de café naranja", + "block.minecraft.banner.caffeinated.java.pink": "Figura de café rosa", + "block.minecraft.banner.caffeinated.java.purple": "Figura de café violeta", + "block.minecraft.banner.caffeinated.java.red": "Figura de café roja", + "block.minecraft.banner.caffeinated.java.white": "Figura de café blanca", + "block.minecraft.banner.caffeinated.java.yellow": "Figura de café amarilla", "effect.caffeinated.caffeine": "Cafeína", + "entity.caffeinated.civet": "Civeta", + "item.caffeinated.civet_spawn_egg": "Generar civeta", "item.caffeinated.coffee_beans": "Granos de café", - "item.caffeinated.coffee_berries": "Bayas de café", + "item.caffeinated.coffee_berries": "Cerezas de café", "item.caffeinated.coffee_bottle": "Botella de café", + "item.caffeinated.coffee_bottle.desc": "Café negro", "item.caffeinated.ground_coffee": "Café molido", "item.caffeinated.java_banner_pattern": "Diseño de estandarte", - "item.caffeinated.java_banner_pattern.desc": "Java", - "item.caffeinated.tiramisu": "Tiramisu", - "subtitles.block.cauldron.brew": "Caldero prepara", - "subtitles.block.cauldron.bubble": "Caldero burbujea", + "item.caffeinated.java_banner_pattern.desc": "Café", + "item.caffeinated.latte_coffee_bottle.desc": "Latte", + "item.caffeinated.tiramisu_slice": "Pedazo de tiramisú", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Café tomada de calderos", + "stat.caffeinated.eat_tiramisu_slice": "Pedazos de tiramisú comidos", + "stat.caffeinated.interact_with_cauldron_campfire": "Usos de fogatas con calderos", + "subtitles.block.cauldron_campfire.brew": "Caldero prepara", + "subtitles.block.cauldron_campfire.bubble": "Caldero burbujea", + "subtitles.entity.civet.death": "Civeta muere", + "subtitles.entity.civet.eat": "Civeta come", + "subtitles.entity.civet.hurt": "Civeta herido", + "subtitles.entity.civet.idle": "Gruñido de civeta", "subtitles.item.coffee_bottle.drink": "Sorbiendo", - "subtitles.item.ground_coffee.splash": "Café molido salpica", - "stat.caffeinated.coffee_taken": "Café tomada de calderos" + "subtitles.item.ground_coffee.splash": "Café molido salpica" } \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/es_es.json b/src/main/resources/assets/caffeinated/lang/es_es.json index a8d3e63..975562a 100644 --- a/src/main/resources/assets/caffeinated/lang/es_es.json +++ b/src/main/resources/assets/caffeinated/lang/es_es.json @@ -1,41 +1,59 @@ { + "advancements.husbandry.bake_tiramisu.description": "Prepara un plato de tiramisú.", + "advancements.husbandry.bake_tiramisu.title": "Recógeme", + "advancements.husbandry.brew_all_coffee.description": "Prepara a todos los tipos de frasco con café.", + "advancements.husbandry.brew_all_coffee.title": "Cafeinado", + "advancements.husbandry.brew_coffee.description": "Agregue café molido al agua en una hoguera con caldero para preparar café solo.", "advancements.husbandry.brew_coffee.title": "Despierta y huele el café", - "advancements.husbandry.brew_coffee.description": "Prepara un frasco de café en un caldero sobre una fogata.", + "block.caffeinated.cauldron_campfire": "Hoguera con caldero", "block.caffeinated.coffee_bean_block": "Bloque de granos de café", - "block.caffeinated.coffee_berry_crate": "Cajón de bayas de café", + "block.caffeinated.coffee_berry_crate": "Cajón de cerezas de café", "block.caffeinated.coffee_cauldron": "Caldero con café", "block.caffeinated.coffee_shrub": "Cafeto", "block.caffeinated.flowering_coffee_shrub": "Cafeto florecido", "block.caffeinated.ground_coffee_block": "Bloque de café molido", "block.caffeinated.ground_coffee_cauldron": "Caldero con café molido", "block.caffeinated.potted_coffee_shrub": "Maceta con cafeto", - "block.minecraft.banner.caffeinated.java.black": "Estampado negro de Java", - "block.minecraft.banner.caffeinated.java.blue": "Estampado azul de Java", - "block.minecraft.banner.caffeinated.java.brown": "Estampado marrón de Java", - "block.minecraft.banner.caffeinated.java.cyan": "Estampado cian de Java", - "block.minecraft.banner.caffeinated.java.gray": "Estampado gris de Java", - "block.minecraft.banner.caffeinated.java.green": "Estampado verde de Java", - "block.minecraft.banner.caffeinated.java.light_blue": "Estampado azul claro de Java", - "block.minecraft.banner.caffeinated.java.light_gray": "Estampado gris claro de Java", - "block.minecraft.banner.caffeinated.java.lime": "Estampado verde lima de Java", - "block.minecraft.banner.caffeinated.java.magenta": "Estampado magenta de Java", - "block.minecraft.banner.caffeinated.java.orange": "Estampado naranja de Java", - "block.minecraft.banner.caffeinated.java.pink": "Estampado rosa de Java", - "block.minecraft.banner.caffeinated.java.purple": "Estampado morado de Java", - "block.minecraft.banner.caffeinated.java.red": "Estampado rojo de Java", - "block.minecraft.banner.caffeinated.java.white": "Estampado blanco de Java", - "block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de Java", + "block.caffeinated.soul_cauldron_campfire": "Hoguera de almas con caldero", + "block.caffeinated.tiramisu": "Tiramisú", + "block.minecraft.banner.caffeinated.java.black": "Estampado negro de café", + "block.minecraft.banner.caffeinated.java.blue": "Estampado azul de café", + "block.minecraft.banner.caffeinated.java.brown": "Estampado marrón de café", + "block.minecraft.banner.caffeinated.java.cyan": "Estampado cian de café", + "block.minecraft.banner.caffeinated.java.gray": "Estampado gris de café", + "block.minecraft.banner.caffeinated.java.green": "Estampado verde de café", + "block.minecraft.banner.caffeinated.java.light_blue": "Estampado azul claro de café", + "block.minecraft.banner.caffeinated.java.light_gray": "Estampado gris claro de café", + "block.minecraft.banner.caffeinated.java.lime": "Estampado verde lima de café", + "block.minecraft.banner.caffeinated.java.magenta": "Estampado magenta de café", + "block.minecraft.banner.caffeinated.java.orange": "Estampado naranja de café", + "block.minecraft.banner.caffeinated.java.pink": "Estampado rosa de café", + "block.minecraft.banner.caffeinated.java.purple": "Estampado morado de café", + "block.minecraft.banner.caffeinated.java.red": "Estampado rojo de café", + "block.minecraft.banner.caffeinated.java.white": "Estampado blanco de café", + "block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de café", "effect.caffeinated.caffeine": "Cafeína", + "entity.caffeinated.civet": "Civeta", + "item.caffeinated.civet_spawn_egg": "Generar civeta", "item.caffeinated.coffee_beans": "Granos de café", - "item.caffeinated.coffee_berries": "Bayas de café", + "item.caffeinated.coffee_berries": "Cerezas de café", "item.caffeinated.coffee_bottle": "Frasco con café", + "item.caffeinated.coffee_bottle.desc": "Café solo", "item.caffeinated.ground_coffee": "Café molido", "item.caffeinated.java_banner_pattern": "Diseño de estandarte", - "item.caffeinated.java_banner_pattern.desc": "Estampado de Java", - "item.caffeinated.tiramisu": "Tiramisu", - "subtitles.block.cauldron.brew": "Caldero prepara", - "subtitles.block.cauldron.bubble": "Caldero burbujea", + "item.caffeinated.java_banner_pattern.desc": "Estampado de café", + "item.caffeinated.latte_coffee_bottle.desc": "Latte", + "item.caffeinated.tiramisu_slice": "Trozo de tiramisú", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Café tomada de calderos", + "stat.caffeinated.eat_tiramisu_slice": "Trozos de tiramisú comidos", + "stat.caffeinated.interact_with_cauldron_campfire": "Usos de hoguera con caldero", + "subtitles.block.cauldron_campfire.brew": "Caldero prepara", + "subtitles.block.cauldron_campfire.bubble": "Caldero burbujea", + "subtitles.entity.civet.death": "Civeta muere", + "subtitles.entity.civet.eat": "Civeta come", + "subtitles.entity.civet.hurt": "Civeta herido", + "subtitles.entity.civet.idle": "Civeta gruñe", "subtitles.item.coffee_bottle.drink": "Sorbiendo", - "subtitles.item.ground_coffee.splash": "Café molido salpica", - "stat.caffeinated.coffee_taken": "Café tomada de calderos" + "subtitles.item.ground_coffee.splash": "Café molido salpica" } \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/es_mx.json b/src/main/resources/assets/caffeinated/lang/es_mx.json index 9127649..bd4ef45 100644 --- a/src/main/resources/assets/caffeinated/lang/es_mx.json +++ b/src/main/resources/assets/caffeinated/lang/es_mx.json @@ -1,41 +1,59 @@ { + "advancements.husbandry.bake_tiramisu.description": "Prepara un plato de tiramisú", + "advancements.husbandry.bake_tiramisu.title": "Recógeme", + "advancements.husbandry.brew_all_coffee.description": "Prepara a todos los tipos de botella de café", + "advancements.husbandry.brew_all_coffee.title": "Cafeinado", + "advancements.husbandry.brew_coffee.description": "Agregue café molido al agua en una fogata con caldero para preparar café negro", "advancements.husbandry.brew_coffee.title": "Despierta y huele el café", - "advancements.husbandry.brew_coffee.description": "Prepara una botella de café en un caldero sobre un hoguero", + "block.caffeinated.cauldron_campfire": "Fogata con caldero", "block.caffeinated.coffee_bean_block": "Bloque de granos de café", - "block.caffeinated.coffee_berry_crate": "Caja de bayas de café", + "block.caffeinated.coffee_berry_crate": "Caja de cerezas de café", "block.caffeinated.coffee_cauldron": "Caldero con café", "block.caffeinated.coffee_shrub": "Cafeto", "block.caffeinated.flowering_coffee_shrub": "Cafeto florecido", "block.caffeinated.ground_coffee_block": "Bloque de café molido", "block.caffeinated.ground_coffee_cauldron": "Caldero con café molido", "block.caffeinated.potted_coffee_shrub": "Maceta con cafeto", - "block.minecraft.banner.caffeinated.java.black": "Estampado negro de Java", - "block.minecraft.banner.caffeinated.java.blue": "Estampado azul de Java", - "block.minecraft.banner.caffeinated.java.brown": "Estampado café de Java", - "block.minecraft.banner.caffeinated.java.cyan": "Estampado cian de Java", - "block.minecraft.banner.caffeinated.java.gray": "Estampado gris de Java", - "block.minecraft.banner.caffeinated.java.green": "Estampado verde de Java", - "block.minecraft.banner.caffeinated.java.light_blue": "Estampado azul claro de Java", - "block.minecraft.banner.caffeinated.java.light_gray": "Estampado gris claro de Java", - "block.minecraft.banner.caffeinated.java.lime": "Estampado verde lima de Java", - "block.minecraft.banner.caffeinated.java.magenta": "Estampado magenta de Java", - "block.minecraft.banner.caffeinated.java.orange": "Estampado naranja de Java", - "block.minecraft.banner.caffeinated.java.pink": "Estampado rosa de Java", - "block.minecraft.banner.caffeinated.java.purple": "Estampado morado de Java", - "block.minecraft.banner.caffeinated.java.red": "Estampado rojo de Java", - "block.minecraft.banner.caffeinated.java.white": "Estampado blanco de Java", - "block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de Java", + "block.caffeinated.soul_cauldron_campfire": "Fogata de almas con caldero", + "block.caffeinated.tiramisu": "Tiramisú", + "block.minecraft.banner.caffeinated.java.black": "Estampado negro de café", + "block.minecraft.banner.caffeinated.java.blue": "Estampado azul de café", + "block.minecraft.banner.caffeinated.java.brown": "Estampado café de café", + "block.minecraft.banner.caffeinated.java.cyan": "Estampado cian de café", + "block.minecraft.banner.caffeinated.java.gray": "Estampado gris de café", + "block.minecraft.banner.caffeinated.java.green": "Estampado verde de café", + "block.minecraft.banner.caffeinated.java.light_blue": "Estampado azul claro de café", + "block.minecraft.banner.caffeinated.java.light_gray": "Estampado gris claro de café", + "block.minecraft.banner.caffeinated.java.lime": "Estampado verde lima de café", + "block.minecraft.banner.caffeinated.java.magenta": "Estampado magenta de café", + "block.minecraft.banner.caffeinated.java.orange": "Estampado naranja de café", + "block.minecraft.banner.caffeinated.java.pink": "Estampado rosa de café", + "block.minecraft.banner.caffeinated.java.purple": "Estampado morado de café", + "block.minecraft.banner.caffeinated.java.red": "Estampado rojo de café", + "block.minecraft.banner.caffeinated.java.white": "Estampado blanco de café", + "block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de café", "effect.caffeinated.caffeine": "Cafeína", + "entity.caffeinated.civet": "Civeta", + "item.caffeinated.civet_spawn_egg": "Generar civeta", "item.caffeinated.coffee_beans": "Granos de café", - "item.caffeinated.coffee_berries": "Bayas de café", + "item.caffeinated.coffee_berries": "Cerezas de café", "item.caffeinated.coffee_bottle": "Botella de café", + "item.caffeinated.coffee_bottle.desc": "Café negro", "item.caffeinated.ground_coffee": "Café molido", "item.caffeinated.java_banner_pattern": "Diseño de estandarte", - "item.caffeinated.java_banner_pattern.desc": "Java", - "item.caffeinated.tiramisu": "Tiramisu", - "subtitles.block.cauldron.brew": "Caldero preparando", - "subtitles.block.cauldron.bubble": "Caldero burbujeante", + "item.caffeinated.java_banner_pattern.desc": "Café", + "item.caffeinated.latte_coffee_bottle.desc": "Latte", + "item.caffeinated.tiramisu_slice": "Trozo de tiramisú", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Café tomada de calderos", + "stat.caffeinated.eat_tiramisu_slice": "Trozos de tiramisú comidos", + "stat.caffeinated.interact_with_cauldron_campfire": "Usos de fogatas con calderos", + "subtitles.block.cauldron_campfire.brew": "Caldero preparando", + "subtitles.block.cauldron_campfire.bubble": "Caldero burbujeante", + "subtitles.entity.civet.death": "Civeta muerto", + "subtitles.entity.civet.eat": "Civeta comiendo", + "subtitles.entity.civet.hurt": "Civeta herido", + "subtitles.entity.civet.idle": "Gruñido de civeta", "subtitles.item.coffee_bottle.drink": "Sorbiendo", - "subtitles.item.ground_coffee.splash": "Café molido salpicando", - "stat.caffeinated.coffee_taken": "Café tomada de calderos" -} + "subtitles.item.ground_coffee.splash": "Café molido salpicando" +} \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/ru_ru.json b/src/main/resources/assets/caffeinated/lang/ru_ru.json index 842433a..37eb901 100644 --- a/src/main/resources/assets/caffeinated/lang/ru_ru.json +++ b/src/main/resources/assets/caffeinated/lang/ru_ru.json @@ -1,47 +1,59 @@ { - "advancements.husbandry.brew_coffee.title": "Бодренько!", - "advancements.husbandry.brew_coffee.description": "Заварите Бутылочку кофе в котле над костром", - - "block.caffeinated.coffee_bean_block": "Блок кофейных зёрен", - "block.caffeinated.coffee_berry_crate": "Ящик кофейных ягод", - "block.caffeinated.coffee_cauldron": "Котёл с кофе", - "block.caffeinated.coffee_shrub": "Кофейный куст", - "block.caffeinated.flowering_coffee_shrub": "Цветущий кофейный куст", - "block.caffeinated.ground_coffee_block": "Блок молотого кофе", - "block.caffeinated.ground_coffee_cauldron": "Котёл с молотого кофе", - "block.caffeinated.potted_coffee_shrub": "Кофейный куст в горшке", - - "block.minecraft.banner.caffeinated.java.black": "Чёрный Java", - "block.minecraft.banner.caffeinated.java.blue": "Синий Java", - "block.minecraft.banner.caffeinated.java.brown": "Коричневый Java", - "block.minecraft.banner.caffeinated.java.cyan": "Бирюзовый Java", - "block.minecraft.banner.caffeinated.java.gray": "Серый Java", - "block.minecraft.banner.caffeinated.java.green": "Зелёный Java", - "block.minecraft.banner.caffeinated.java.light_blue": "Голубой Java", - "block.minecraft.banner.caffeinated.java.light_gray": "Светло-серый Java", - "block.minecraft.banner.caffeinated.java.lime": "Лаймовый Java", - "block.minecraft.banner.caffeinated.java.magenta": "Пурпурный Java", - "block.minecraft.banner.caffeinated.java.orange": "Оранжевый Java", - "block.minecraft.banner.caffeinated.java.pink": "Розовый Java", - "block.minecraft.banner.caffeinated.java.purple": "Фиолетовый Java", - "block.minecraft.banner.caffeinated.java.red": "Красный Java", - "block.minecraft.banner.caffeinated.java.white": "Белый Java", - "block.minecraft.banner.caffeinated.java.yellow": "Жёлтый Java", - - "effect.caffeinated.caffeine": "Кофеин", - - "item.caffeinated.coffee_beans": "Кофейные зерна", - "item.caffeinated.coffee_berries": "Кофейные ягоды", - "item.caffeinated.coffee_bottle": "Бутылочка кофе", - "item.caffeinated.ground_coffee": "Молотый кофе", - "item.caffeinated.java_banner_pattern": "Узор флага", - "item.caffeinated.java_banner_pattern.desc": "Java", - "item.caffeinated.tiramisu": "Тирамису", - - "subtitles.block.cauldron.brew": "Котёл варит", - "subtitles.block.cauldron.bubble": "Котёл кипит", - "subtitles.item.coffee_bottle.drink": "Прихлёбывание", - "subtitles.item.ground_coffee.splash": "Молотый кофе брызжет", - - "stat.caffeinated.coffee_taken": "Взято кофе из котла" -} + "advancements.husbandry.bake_tiramisu.description": "Prepare a dish of Tiramisu", + "advancements.husbandry.bake_tiramisu.title": "Pick Me Up Buttercup", + "advancements.husbandry.brew_all_coffee.description": "Brew every type of Coffee Bottle", + "advancements.husbandry.brew_all_coffee.title": "Caffeinated", + "advancements.husbandry.brew_coffee.description": "Add Ground Coffee to Water in a Campfire with Cauldron to brew Black Coffee", + "advancements.husbandry.brew_coffee.title": "Бодренько!", + "block.caffeinated.cauldron_campfire": "Campfire with Cauldron", + "block.caffeinated.coffee_bean_block": "Блок кофейных зёрен", + "block.caffeinated.coffee_berry_crate": "Ящик кофейных ягод", + "block.caffeinated.coffee_cauldron": "Котёл с кофе", + "block.caffeinated.coffee_shrub": "Кофейный куст", + "block.caffeinated.flowering_coffee_shrub": "Цветущий кофейный куст", + "block.caffeinated.ground_coffee_block": "Блок молотого кофе", + "block.caffeinated.ground_coffee_cauldron": "Котёл с молотого кофе", + "block.caffeinated.potted_coffee_shrub": "Кофейный куст в горшке", + "block.caffeinated.soul_cauldron_campfire": "Soul Campfire with Cauldron", + "block.caffeinated.tiramisu": "Тирамису", + "block.minecraft.banner.caffeinated.java.black": "Чёрный кофе", + "block.minecraft.banner.caffeinated.java.blue": "Синий кофе", + "block.minecraft.banner.caffeinated.java.brown": "Коричневый кофе", + "block.minecraft.banner.caffeinated.java.cyan": "Бирюзовый кофе", + "block.minecraft.banner.caffeinated.java.gray": "Серый кофе", + "block.minecraft.banner.caffeinated.java.green": "Зелёный кофе", + "block.minecraft.banner.caffeinated.java.light_blue": "Голубой кофе", + "block.minecraft.banner.caffeinated.java.light_gray": "Светло-серый кофе", + "block.minecraft.banner.caffeinated.java.lime": "Лаймовый кофе", + "block.minecraft.banner.caffeinated.java.magenta": "Пурпурный кофе", + "block.minecraft.banner.caffeinated.java.orange": "Оранжевый кофе", + "block.minecraft.banner.caffeinated.java.pink": "Розовый кофе", + "block.minecraft.banner.caffeinated.java.purple": "Фиолетовый кофе", + "block.minecraft.banner.caffeinated.java.red": "Красный кофе", + "block.minecraft.banner.caffeinated.java.white": "Белый кофе", + "block.minecraft.banner.caffeinated.java.yellow": "Жёлтый кофе", + "effect.caffeinated.caffeine": "Кофеин", + "entity.caffeinated.civet": "Виве́рра", + "item.caffeinated.civet_spawn_egg": "Яйцо призыва виве́рра", + "item.caffeinated.coffee_beans": "Кофейные зерна", + "item.caffeinated.coffee_berries": "Кофейные ягоды", + "item.caffeinated.coffee_bottle": "Бутылочка кофе", + "item.caffeinated.coffee_bottle.desc": "Чёрный кофе", + "item.caffeinated.ground_coffee": "Молотый кофе", + "item.caffeinated.java_banner_pattern": "Узор флага", + "item.caffeinated.java_banner_pattern.desc": "Кофе", + "item.caffeinated.latte_coffee_bottle.desc": "Ла́тте", + "item.caffeinated.tiramisu_slice": "Tiramisu Slice", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Взято кофе из котла", + "stat.caffeinated.eat_tiramisu_slice": "Tiramisu Slices Eaten", + "stat.caffeinated.interact_with_cauldron_campfire": "Interactions with Campfire with Cauldron", + "subtitles.block.cauldron_campfire.brew": "Котёл варит", + "subtitles.block.cauldron_campfire.bubble": "Котёл кипит", + "subtitles.entity.civet.death": "Виве́рра погибает", + "subtitles.entity.civet.eat": "Виве́рра ест", + "subtitles.entity.civet.hurt": "Виве́рра ранена", + "subtitles.entity.civet.idle": "Виве́рра ревёт", + "subtitles.item.coffee_bottle.drink": "Прихлёбывание", + "subtitles.item.ground_coffee.splash": "Молотый кофе брызжет" +} \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/uk_ua.json b/src/main/resources/assets/caffeinated/lang/uk_ua.json index 26867fe..471c8cd 100644 --- a/src/main/resources/assets/caffeinated/lang/uk_ua.json +++ b/src/main/resources/assets/caffeinated/lang/uk_ua.json @@ -1,47 +1,59 @@ { - "advancements.husbandry.brew_coffee.title": "Прокинься й нюхни каву", - "advancements.husbandry.brew_coffee.description": "Зваріть пляшку кави в казані над багаттям", - - "block.caffeinated.coffee_bean_block": "Блок кавових зерен", - "block.caffeinated.coffee_berry_crate": "Ящик кавових ягід", - "block.caffeinated.coffee_cauldron": "Казан кави", - "block.caffeinated.coffee_shrub": "Кавовий кущ", - "block.caffeinated.flowering_coffee_shrub": "Квітучий кавовий кущ", - "block.caffeinated.ground_coffee_block": "Блок меленої кави", - "block.caffeinated.ground_coffee_cauldron": "Казан меленої кави", - "block.caffeinated.potted_coffee_shrub": "Кавовий кущ у горщику", - - "block.minecraft.banner.caffeinated.java.black": "Чорна емблема Джава", - "block.minecraft.banner.caffeinated.java.blue": "Синя емблема Джава", - "block.minecraft.banner.caffeinated.java.brown": "Коричнева емблема Джава", - "block.minecraft.banner.caffeinated.java.cyan": "Бірюзова емблема Джава", - "block.minecraft.banner.caffeinated.java.gray": "Сіра емблема Джава", - "block.minecraft.banner.caffeinated.java.green": "Зелена емблема Джава", - "block.minecraft.banner.caffeinated.java.light_blue": "Блакитна емблема Джава", - "block.minecraft.banner.caffeinated.java.light_gray": "Світло-сіра емблема Джава", - "block.minecraft.banner.caffeinated.java.lime": "Лаймова емблема Джава", - "block.minecraft.banner.caffeinated.java.magenta": "Пурпурова емблема Джава", - "block.minecraft.banner.caffeinated.java.orange": "Помаранчева емблема Джава", - "block.minecraft.banner.caffeinated.java.pink": "Рожева емблема Джава", - "block.minecraft.banner.caffeinated.java.purple": "Фіолетова емблема Джава", - "block.minecraft.banner.caffeinated.java.red": "Червона емблема Джава", - "block.minecraft.banner.caffeinated.java.white": "Біла емблема Джава", - "block.minecraft.banner.caffeinated.java.yellow": "Жовта емблема Джава", - - "effect.caffeinated.caffeine": "Кофеїн", - - "item.caffeinated.coffee_beans": "Кавові зерна", - "item.caffeinated.coffee_berries": "Кавові ягоди", - "item.caffeinated.coffee_bottle": "Пляшка кави", - "item.caffeinated.ground_coffee": "Мелена кава", - "item.caffeinated.java_banner_pattern": "Шаблон стяга", - "item.caffeinated.java_banner_pattern.desc": "Емблема Джава", - "item.caffeinated.tiramisu": "Тирамісу", - - "subtitles.block.cauldron.brew": "Казан варить", - "subtitles.block.cauldron.bubble": "Казан булькає", - "subtitles.item.coffee_bottle.drink": "Сьорбання", - "subtitles.item.ground_coffee.splash": "Мелена кава бризкає", - - "stat.caffeinated.coffee_taken": "Кави зачерпнуто з казана" -} + "advancements.husbandry.bake_tiramisu.description": "Prepare a dish of Tiramisu", + "advancements.husbandry.bake_tiramisu.title": "Pick Me Up Buttercup", + "advancements.husbandry.brew_all_coffee.description": "Brew every type of Coffee Bottle", + "advancements.husbandry.brew_all_coffee.title": "Caffeinated", + "advancements.husbandry.brew_coffee.description": "Add Ground Coffee to Water in a Campfire with Cauldron to brew Black Coffee", + "advancements.husbandry.brew_coffee.title": "Прокинься й нюхни каву", + "block.caffeinated.cauldron_campfire": "Campfire with Cauldron", + "block.caffeinated.coffee_bean_block": "Блок кавових зерен", + "block.caffeinated.coffee_berry_crate": "Ящик кавових ягід", + "block.caffeinated.coffee_cauldron": "Казан кави", + "block.caffeinated.coffee_shrub": "Кавовий кущ", + "block.caffeinated.flowering_coffee_shrub": "Квітучий кавовий кущ", + "block.caffeinated.ground_coffee_block": "Блок меленої кави", + "block.caffeinated.ground_coffee_cauldron": "Казан меленої кави", + "block.caffeinated.potted_coffee_shrub": "Кавовий кущ у горщику", + "block.caffeinated.soul_cauldron_campfire": "Soul Campfire with Cauldron", + "block.caffeinated.tiramisu": "Тирамісу", + "block.minecraft.banner.caffeinated.java.black": "Чорна кави", + "block.minecraft.banner.caffeinated.java.blue": "Синя кави", + "block.minecraft.banner.caffeinated.java.brown": "Коричнева кави", + "block.minecraft.banner.caffeinated.java.cyan": "Бірюзова кави", + "block.minecraft.banner.caffeinated.java.gray": "Сіра кави", + "block.minecraft.banner.caffeinated.java.green": "Зелена кави", + "block.minecraft.banner.caffeinated.java.light_blue": "Блакитна кави", + "block.minecraft.banner.caffeinated.java.light_gray": "Світло-сіра кави", + "block.minecraft.banner.caffeinated.java.lime": "Лаймова кави", + "block.minecraft.banner.caffeinated.java.magenta": "Пурпурова кави", + "block.minecraft.banner.caffeinated.java.orange": "Помаранчева кави", + "block.minecraft.banner.caffeinated.java.pink": "Рожева кави", + "block.minecraft.banner.caffeinated.java.purple": "Фіолетова кави", + "block.minecraft.banner.caffeinated.java.red": "Червона кави", + "block.minecraft.banner.caffeinated.java.white": "Біла кави", + "block.minecraft.banner.caffeinated.java.yellow": "Жовта кави", + "effect.caffeinated.caffeine": "Кофеїн", + "entity.caffeinated.civet": "Civet", + "item.caffeinated.civet_spawn_egg": "Civet Spawn Egg", + "item.caffeinated.coffee_beans": "Кавові зерна", + "item.caffeinated.coffee_berries": "Кавові ягоди", + "item.caffeinated.coffee_bottle": "Пляшка кави", + "item.caffeinated.coffee_bottle.desc": "Чо́рна ка́ва", + "item.caffeinated.ground_coffee": "Мелена кава", + "item.caffeinated.java_banner_pattern": "Шаблон стяга", + "item.caffeinated.java_banner_pattern.desc": "Кави", + "item.caffeinated.latte_coffee_bottle.desc": "Latte", + "item.caffeinated.tiramisu_slice": "Tiramisu Slice", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "Кави зачерпнуто з казана", + "stat.caffeinated.eat_tiramisu_slice": "Tiramisu Slices Eaten", + "stat.caffeinated.interact_with_cauldron_campfire": "Interactions with Campfire with Cauldron", + "subtitles.block.cauldron_campfire.brew": "Казан варить", + "subtitles.block.cauldron_campfire.bubble": "Казан булькає", + "subtitles.entity.civet.death": "Civet dies", + "subtitles.entity.civet.eat": "Civet eats", + "subtitles.entity.civet.hurt": "Civet hurts", + "subtitles.entity.civet.idle": "Civet growls", + "subtitles.item.coffee_bottle.drink": "Сьорбання", + "subtitles.item.ground_coffee.splash": "Мелена кава бризкає" +} \ No newline at end of file diff --git a/src/main/resources/assets/caffeinated/lang/zh_cn.json b/src/main/resources/assets/caffeinated/lang/zh_cn.json index d004caf..1051856 100644 --- a/src/main/resources/assets/caffeinated/lang/zh_cn.json +++ b/src/main/resources/assets/caffeinated/lang/zh_cn.json @@ -1,47 +1,59 @@ { - "advancements.husbandry.brew_coffee.title": "在咖啡的味道中醒来", - "advancements.husbandry.brew_coffee.description": "在被架在营火上的炼药锅中煮瓶咖啡", - - "block.caffeinated.coffee_bean_block": "咖啡豆块", - "block.caffeinated.coffee_berry_crate": "箱装咖啡果", - "block.caffeinated.coffee_cauldron": "咖啡锅", - "block.caffeinated.coffee_shrub": "咖啡灌木", - "block.caffeinated.flowering_coffee_shrub": "盛开的咖啡灌木", - "block.caffeinated.ground_coffee_block": "磨制咖啡豆块", - "block.caffeinated.ground_coffee_cauldron": "装有磨制咖啡豆的炼药锅", - "block.caffeinated.potted_coffee_shrub": "咖啡灌木盆栽", - - "block.minecraft.banner.caffeinated.java.black": "黑色Java徽标", - "block.minecraft.banner.caffeinated.java.blue": "蓝色Java徽标", - "block.minecraft.banner.caffeinated.java.brown": "棕色Java徽标", - "block.minecraft.banner.caffeinated.java.cyan": "青色Java徽标", - "block.minecraft.banner.caffeinated.java.gray": "灰色Java徽标", - "block.minecraft.banner.caffeinated.java.green": "绿色Java徽标", - "block.minecraft.banner.caffeinated.java.light_blue": "淡蓝色Java徽标", - "block.minecraft.banner.caffeinated.java.light_gray": "淡灰色Java徽标", - "block.minecraft.banner.caffeinated.java.lime": "黄绿色Java徽标", - "block.minecraft.banner.caffeinated.java.magenta": "品红色Java徽标", - "block.minecraft.banner.caffeinated.java.orange": "橙色Java徽标", - "block.minecraft.banner.caffeinated.java.pink": "粉红色Java徽标", - "block.minecraft.banner.caffeinated.java.purple": "紫色Java徽标", - "block.minecraft.banner.caffeinated.java.red": "红色Java徽标", - "block.minecraft.banner.caffeinated.java.white": "白色Java徽标", - "block.minecraft.banner.caffeinated.java.yellow": "黄色Java徽标", - - "effect.caffeinated.caffeine": "咖啡因", - - "item.caffeinated.coffee_beans": "咖啡豆", - "item.caffeinated.coffee_berries": "咖啡果", - "item.caffeinated.coffee_bottle": "咖啡瓶", - "item.caffeinated.ground_coffee": "磨制咖啡豆", - "item.caffeinated.java_banner_pattern": "旗帜图案", - "item.caffeinated.java_banner_pattern.desc": "Java徽标", - "item.caffeinated.tiramisu": "提拉米苏", - - "subtitles.block.cauldron.brew": "炼药锅：烹煮", - "subtitles.block.cauldron.bubble": "炼药锅：冒泡", - "subtitles.item.coffee_bottle.drink": "咕噜咕噜", - "subtitles.item.ground_coffee.splash": "磨制咖啡豆：溅起水花", - - "stat.caffeinated.coffee_taken": "从炼药锅中取出咖啡" + "advancements.husbandry.bake_tiramisu.description": "Prepare a dish of Tiramisu", + "advancements.husbandry.bake_tiramisu.title": "Pick Me Up Buttercup", + "advancements.husbandry.brew_all_coffee.description": "Brew every type of Coffee Bottle", + "advancements.husbandry.brew_all_coffee.title": "Caffeinated", + "advancements.husbandry.brew_coffee.description": "Add Ground Coffee to Water in a Campfire with Cauldron to brew Black Coffee", + "advancements.husbandry.brew_coffee.title": "在咖啡的味道中醒来", + "block.caffeinated.cauldron_campfire": "Campfire with Cauldron", + "block.caffeinated.coffee_bean_block": "咖啡豆块", + "block.caffeinated.coffee_berry_crate": "箱装咖啡果", + "block.caffeinated.coffee_cauldron": "咖啡锅", + "block.caffeinated.coffee_shrub": "咖啡灌木", + "block.caffeinated.flowering_coffee_shrub": "盛开的咖啡灌木", + "block.caffeinated.ground_coffee_block": "磨制咖啡豆块", + "block.caffeinated.ground_coffee_cauldron": "装有磨制咖啡豆的炼药锅", + "block.caffeinated.potted_coffee_shrub": "咖啡灌木盆栽", + "block.caffeinated.soul_cauldron_campfire": "Soul Campfire with Cauldron", + "block.caffeinated.tiramisu": "提拉米苏", + "block.minecraft.banner.caffeinated.java.black": "黑咖啡", + "block.minecraft.banner.caffeinated.java.blue": "蓝咖啡", + "block.minecraft.banner.caffeinated.java.brown": "棕咖啡", + "block.minecraft.banner.caffeinated.java.cyan": "青咖啡", + "block.minecraft.banner.caffeinated.java.gray": "灰咖啡", + "block.minecraft.banner.caffeinated.java.green": "绿咖啡", + "block.minecraft.banner.caffeinated.java.light_blue": "淡蓝咖啡", + "block.minecraft.banner.caffeinated.java.light_gray": "淡灰咖啡", + "block.minecraft.banner.caffeinated.java.lime": "黄绿咖啡", + "block.minecraft.banner.caffeinated.java.magenta": "品红咖啡", + "block.minecraft.banner.caffeinated.java.orange": "橙咖啡", + "block.minecraft.banner.caffeinated.java.pink": "粉红咖啡", + "block.minecraft.banner.caffeinated.java.purple": "紫咖啡", + "block.minecraft.banner.caffeinated.java.red": "红咖啡", + "block.minecraft.banner.caffeinated.java.white": "白咖啡", + "block.minecraft.banner.caffeinated.java.yellow": "黄咖啡", + "effect.caffeinated.caffeine": "咖啡因", + "entity.caffeinated.civet": "麝猫", + "item.caffeinated.civet_spawn_egg": "麝猫刷怪蛋", + "item.caffeinated.coffee_beans": "咖啡豆", + "item.caffeinated.coffee_berries": "咖啡果", + "item.caffeinated.coffee_bottle": "咖啡瓶", + "item.caffeinated.coffee_bottle.desc": "黑咖啡", + "item.caffeinated.ground_coffee": "磨制咖啡豆", + "item.caffeinated.java_banner_pattern": "旗帜图案", + "item.caffeinated.java_banner_pattern.desc": "Java徽标", + "item.caffeinated.latte_coffee_bottle.desc": "拿铁", + "item.caffeinated.tiramisu_slice": "Tiramisu Slice", + "itemGroup.caffeinated.caffeinated": "Caffeinated", + "stat.caffeinated.coffee_taken": "从炼药锅中取出咖啡", + "stat.caffeinated.eat_tiramisu_slice": "Tiramisu Slices Eaten", + "stat.caffeinated.interact_with_cauldron_campfire": "Interactions with Campfire with Cauldron", + "subtitles.block.cauldron_campfire.brew": "炼药锅：烹煮", + "subtitles.block.cauldron_campfire.bubble": "炼药锅：冒泡", + "subtitles.entity.civet.death": "麝猫：死亡", + "subtitles.entity.civet.eat": "麝猫：进食", + "subtitles.entity.civet.hurt": "麝猫：受伤", + "subtitles.entity.civet.idle": "麝猫：咆哮", + "subtitles.item.coffee_bottle.drink": "咕噜咕噜", + "subtitles.item.ground_coffee.splash": "磨制咖啡豆：溅起水花" } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/storage_blocks/coffee_berries.json b/src/main/resources/data/c/tags/item/storage_blocks/coffee_berries.json index e69de29..d104aab 100644 --- a/src/main/resources/data/c/tags/item/storage_blocks/coffee_berries.json +++ b/src/main/resources/data/c/tags/item/storage_blocks/coffee_berries.json @@ -0,0 +1,5 @@ +{ + "values": [ + "caffeinated:coffee_berry_crate" + ] +} \ No newline at end of file