Add café miel coffee bottles

Chikorita-Lover · Sep 10, 2024 · 0572d2e · 0572d2e
1 parent 2ec6c07
commit 0572d2e
Show file tree

Hide file tree

Showing 24 changed files with 123 additions and 17 deletions.
diff --git a/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb b/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb
@@ -1,4 +1,4 @@
-// 1.21	2024-09-07T13:34:20.4716276	Caffeinated/Block Loot Tables
+// 1.21	2024-09-09T19:53:17.0429302	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

diff --git a/src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a b/src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a
@@ -1,4 +1,4 @@
-// 1.21	2024-09-07T13:34:20.4704644	Caffeinated/Advancements
+// 1.21	2024-09-09T19:53:17.0429302	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
+fd764b415f61cad9c185cf3c952535113b90044f data\caffeinated\advancement\husbandry\brew_all_coffee.json
diff --git a/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc
@@ -1,4 +1,4 @@
-// 1.21	2024-09-07T13:34:20.4716276	Caffeinated/Recipes
+// 1.21	2024-09-09T19:53:17.0439243	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
@@ -9,6 +9,7 @@ afc5ab486779e47ce326b86ef93037905639d03a data\caffeinated\recipe\coffee_beans_fr
 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
+07496d1ed8ed6ef8fda02b6606436108c59fbf43 data\caffeinated\advancement\recipes\food\cafe_miel_coffee_bottle.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
@@ -22,6 +23,7 @@ a3089cb10cc080957830e10d1b276e6fb8e2845c data\caffeinated\advancement\recipes\fo
 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
+cf353bc3103b1834f861ecb7a2da0ae56550bb65 data\caffeinated\recipe\cafe_miel_coffee_bottle.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

diff --git a/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed
@@ -1,4 +1,4 @@
-// 1.21	2024-09-07T13:34:20.4675794	Caffeinated/Model Definitions
+// 1.21	2024-09-09T19:53:17.0388447	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
@@ -15,13 +15,14 @@ cdbc1b9ed3c8b04b24b80402af15eb777423817d assets\caffeinated\models\block\ground_
 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
+63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets\caffeinated\models\item\civet_spawn_egg.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
+e097a5af6a5c1aab9668db9de97ac4825fd0c743 assets\caffeinated\models\item\cafe_miel_coffee_bottle.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
@@ -32,8 +33,8 @@ ee814f36f99a123b06cf2e7bcb08415b97595925 assets\caffeinated\models\block\potted_
 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
+e4c8f2b75d3ecafc48e0a48ec6940b6dac0eb258 assets\caffeinated\models\item\coffee_beans.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/assets/caffeinated/models/item/cafe_miel_coffee_bottle.json b/src/main/generated/assets/caffeinated/models/item/cafe_miel_coffee_bottle.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "caffeinated:item/cafe_miel_coffee_bottle"
+  }
+}
diff --git a/src/main/generated/data/caffeinated/advancement/husbandry/brew_all_coffee.json b/src/main/generated/data/caffeinated/advancement/husbandry/brew_all_coffee.json
@@ -1,6 +1,14 @@
 {
   "parent": "caffeinated:husbandry/brew_coffee",
   "criteria": {
+    "brew_cafe_miel_coffee_bottle": {
+      "conditions": {
+        "result": {
+          "items": "caffeinated:cafe_miel_coffee_bottle"
+        }
+      },
+      "trigger": "caffeinated:brew_coffee"
+    },
     "brew_coffee_bottle": {
       "conditions": {
         "result": {
@@ -37,6 +45,9 @@
     ],
     [
       "brew_latte_coffee_bottle"
+    ],
+    [
+      "brew_cafe_miel_coffee_bottle"
     ]
   ],
   "rewards": {

diff --git a/src/main/generated/data/caffeinated/advancement/recipes/food/cafe_miel_coffee_bottle.json b/src/main/generated/data/caffeinated/advancement/recipes/food/cafe_miel_coffee_bottle.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_honey_bottle": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:honey_bottle"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "caffeinated:cafe_miel_coffee_bottle"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_honey_bottle"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "caffeinated:cafe_miel_coffee_bottle"
+    ]
+  }
+}
diff --git a/src/main/generated/data/caffeinated/recipe/cafe_miel_coffee_bottle.json b/src/main/generated/data/caffeinated/recipe/cafe_miel_coffee_bottle.json
@@ -0,0 +1,14 @@
+{
+  "type": "caffeinated:coffee_brewing",
+  "brewingtime": 600,
+  "experience": 1.0,
+  "ingredient": {
+    "tag": "caffeinated:black_coffee_bottles"
+  },
+  "reagent": {
+    "item": "minecraft:honey_bottle"
+  },
+  "result": {
+    "id": "caffeinated:cafe_miel_coffee_bottle"
+  }
+}
diff --git a/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedAdvancementProvider.java b/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedAdvancementProvider.java
@@ -43,7 +43,7 @@ private static Advancement.Builder requireAllCoffeeBottlesBrewed(Advancement.Bui
     public void generateAdvancement(RegistryWrapper.WrapperLookup registryLookup, Consumer<AdvancementEntry> consumer) {
         AdvancementEntry husbandryRoot = new AdvancementEntry(Identifier.ofVanilla("husbandry/root"), null);
         AdvancementEntry brewCoffee = Advancement.Builder.create().parent(husbandryRoot).display(CaffeinatedItems.BLACK_COFFEE_BOTTLE, Text.translatable("advancements.husbandry.brew_coffee.title"), Text.translatable("advancements.husbandry.brew_coffee.description"), null, AdvancementFrame.TASK, true, true, false).criterion("brew_coffee", BrewCoffeeCriterion.Conditions.create(ItemPredicate.Builder.create().tag(CaffeinatedItemTags.BLACK_COFFEE_BOTTLES))).build(consumer, Caffeinated.NAMESPACE + ":husbandry/brew_coffee");
-        requireAllCoffeeBottlesBrewed(Advancement.Builder.create().parent(brewCoffee).display(CaffeinatedItems.LATTE_COFFEE_BOTTLE, Text.translatable("advancements.husbandry.brew_all_coffee.title"), Text.translatable("advancements.husbandry.brew_all_coffee.description"), null, AdvancementFrame.CHALLENGE, true, true, false), registryLookup, CaffeinatedItems.BLACK_COFFEE_BOTTLE, CaffeinatedItems.LATTE_COFFEE_BOTTLE).rewards(AdvancementRewards.Builder.experience(100)).build(consumer, Caffeinated.NAMESPACE + ":husbandry/brew_all_coffee");
+        requireAllCoffeeBottlesBrewed(Advancement.Builder.create().parent(brewCoffee).display(CaffeinatedItems.LATTE_COFFEE_BOTTLE, Text.translatable("advancements.husbandry.brew_all_coffee.title"), Text.translatable("advancements.husbandry.brew_all_coffee.description"), null, AdvancementFrame.CHALLENGE, true, true, false), registryLookup, CaffeinatedItems.BLACK_COFFEE_BOTTLE, CaffeinatedItems.LATTE_COFFEE_BOTTLE, CaffeinatedItems.CAFE_MIEL_COFFEE_BOTTLE).rewards(AdvancementRewards.Builder.experience(100)).build(consumer, Caffeinated.NAMESPACE + ":husbandry/brew_all_coffee");
         Advancement.Builder.create().parent(brewCoffee).display(CaffeinatedBlocks.TIRAMISU, Text.translatable("advancements.husbandry.bake_tiramisu.title"), Text.translatable("advancements.husbandry.bake_tiramisu.description"), null, AdvancementFrame.TASK, true, true, false).criterion("bake_tiramisu", InventoryChangedCriterion.Conditions.items(CaffeinatedBlocks.TIRAMISU)).build(consumer, Caffeinated.NAMESPACE + ":husbandry/bake_tiramisu");
     }
 }
diff --git a/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedModelProvider.java b/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedModelProvider.java
@@ -75,13 +75,14 @@ public void generateBlockStateModels(BlockStateModelGenerator generator) {
     }
 
     @Override
-    public void generateItemModels(ItemModelGenerator itemModelGenerator) {
-        itemModelGenerator.register(CaffeinatedItems.BLACK_COFFEE_BOTTLE, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.LATTE_COFFEE_BOTTLE, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.TIRAMISU_SLICE, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.COFFEE_BEANS, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.GROUND_COFFEE, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.JAVA_BANNER_PATTERN, Models.GENERATED);
-        itemModelGenerator.register(CaffeinatedItems.CIVET_SPAWN_EGG, Models.item("template_spawn_egg"));
+    public void generateItemModels(ItemModelGenerator generator) {
+        generator.register(CaffeinatedItems.BLACK_COFFEE_BOTTLE, Models.GENERATED);
+        generator.register(CaffeinatedItems.LATTE_COFFEE_BOTTLE, Models.GENERATED);
+        generator.register(CaffeinatedItems.CAFE_MIEL_COFFEE_BOTTLE, Models.GENERATED);
+        generator.register(CaffeinatedItems.TIRAMISU_SLICE, Models.GENERATED);
+        generator.register(CaffeinatedItems.COFFEE_BEANS, Models.GENERATED);
+        generator.register(CaffeinatedItems.GROUND_COFFEE, Models.GENERATED);
+        generator.register(CaffeinatedItems.JAVA_BANNER_PATTERN, Models.GENERATED);
+        generator.register(CaffeinatedItems.CIVET_SPAWN_EGG, Models.item("template_spawn_egg"));
     }
 }
diff --git a/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java b/src/main/java/net/chikorita_lover/caffeinated/data/CaffeinatedRecipeProvider.java
@@ -48,5 +48,6 @@ public void generate(RecipeExporter exporter) {
 
         CoffeeBrewingRecipeJsonBuilder.create(Ingredient.ofItems(Items.POTION), Ingredient.ofItems(CaffeinatedItems.GROUND_COFFEE), RecipeCategory.FOOD, CaffeinatedItems.BLACK_COFFEE_BOTTLE, 1.0F, 600).criterion(hasItem(CaffeinatedItems.GROUND_COFFEE), conditionsFromItem(CaffeinatedItems.GROUND_COFFEE)).offerTo(exporter);
         CoffeeBrewingRecipeJsonBuilder.create(Ingredient.fromTag(CaffeinatedItemTags.BLACK_COFFEE_BOTTLES), Ingredient.fromTag(ConventionalItemTags.MILK_BUCKETS), RecipeCategory.FOOD, CaffeinatedItems.LATTE_COFFEE_BOTTLE, 1.0F, 600).criterion(hasItem(Items.MILK_BUCKET), conditionsFromTag(ConventionalItemTags.MILK_BUCKETS)).offerTo(exporter);
+        CoffeeBrewingRecipeJsonBuilder.create(Ingredient.fromTag(CaffeinatedItemTags.BLACK_COFFEE_BOTTLES), Ingredient.ofItems(Items.HONEY_BOTTLE), RecipeCategory.FOOD, CaffeinatedItems.CAFE_MIEL_COFFEE_BOTTLE, 1.0F, 600).criterion(hasItem(Items.HONEY_BOTTLE), conditionsFromItem(Items.HONEY_BOTTLE)).offerTo(exporter);
     }
 }
diff --git a/src/main/java/net/chikorita_lover/caffeinated/item/CafeMielCoffeeBottleItem.java b/src/main/java/net/chikorita_lover/caffeinated/item/CafeMielCoffeeBottleItem.java
@@ -0,0 +1,25 @@
+package net.chikorita_lover.caffeinated.item;
+
+import net.chikorita_lover.caffeinated.registry.CaffeinatedStatusEffects;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import java.util.ArrayList;
+
+public class CafeMielCoffeeBottleItem extends CoffeeBottleItem {
+    public CafeMielCoffeeBottleItem(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {
+        stack = super.finishUsing(stack, world, user);
+        if (!world.isClient()) {
+            user.removeStatusEffect(StatusEffects.POISON);
+        }
+        return stack;
+    }
+}
diff --git a/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedFoodComponents.java b/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedFoodComponents.java
@@ -2,10 +2,12 @@
 
 import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
 
 public class CaffeinatedFoodComponents {
     public static final FoodComponent COFFEE_BERRIES = new FoodComponent.Builder().nutrition(2).saturationModifier(0.1F).build();
     public static final FoodComponent BLACK_COFFEE_BOTTLE = (new FoodComponent.Builder()).nutrition(2).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(CaffeinatedStatusEffects.CAFFEINE, 3600, 1), 1.0F).build();
     public static final FoodComponent LATTE_COFFEE_BOTTLE = (new FoodComponent.Builder()).nutrition(3).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(CaffeinatedStatusEffects.CAFFEINE, 2700, 0), 1.0F).build();
+    public static final FoodComponent CAFE_MIEL_COFFEE_BOTTLE = (new FoodComponent.Builder()).nutrition(3).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(CaffeinatedStatusEffects.CAFFEINE, 2700, 0), 1.0F).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 440, 0), 1.0F).build();
     public static final FoodComponent TIRAMISU_SLICE = (new FoodComponent.Builder()).nutrition(2).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(CaffeinatedStatusEffects.CAFFEINE, 600, 1), 1.0F).snack().build();
 }
diff --git a/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java b/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItemGroups.java
@@ -30,7 +30,7 @@ public static void register() {
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register(entries -> {
             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);
+            entries.addBefore(Items.OMINOUS_BOTTLE, CaffeinatedItems.BLACK_COFFEE_BOTTLE, CaffeinatedItems.LATTE_COFFEE_BOTTLE, CaffeinatedItems.CAFE_MIEL_COFFEE_BOTTLE);
         });
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> {
             entries.addAfter(Items.WHEAT, CaffeinatedItems.COFFEE_BEANS, CaffeinatedItems.GROUND_COFFEE);
@@ -50,6 +50,7 @@ public static void register() {
             entries.add(Items.GLASS_BOTTLE, parentTabOnly);
             entries.add(CaffeinatedItems.BLACK_COFFEE_BOTTLE, parentTabOnly);
             entries.add(CaffeinatedItems.LATTE_COFFEE_BOTTLE, parentTabOnly);
+            entries.add(CaffeinatedItems.CAFE_MIEL_COFFEE_BOTTLE, parentTabOnly);
             entries.add(CaffeinatedBlocks.TIRAMISU, parentTabOnly);
             entries.add(CaffeinatedItems.JAVA_BANNER_PATTERN, parentTabOnly);
             entries.add(CaffeinatedItems.CIVET_SPAWN_EGG, parentTabOnly);

diff --git a/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItems.java b/src/main/java/net/chikorita_lover/caffeinated/registry/CaffeinatedItems.java
@@ -1,6 +1,7 @@
 package net.chikorita_lover.caffeinated.registry;
 
 import net.chikorita_lover.caffeinated.Caffeinated;
+import net.chikorita_lover.caffeinated.item.CafeMielCoffeeBottleItem;
 import net.chikorita_lover.caffeinated.item.CoffeeBottleItem;
 import net.chikorita_lover.caffeinated.item.LatteCoffeeBottleItem;
 import net.chikorita_lover.caffeinated.registry.tag.CaffeinatedBannerPatternTags;
@@ -19,6 +20,7 @@ public class CaffeinatedItems {
 
     public static final Item BLACK_COFFEE_BOTTLE = register("coffee_bottle", createCoffeeBottle(CaffeinatedFoodComponents.BLACK_COFFEE_BOTTLE));
     public static final Item LATTE_COFFEE_BOTTLE = register("latte_coffee_bottle", new LatteCoffeeBottleItem(new Item.Settings().food(CaffeinatedFoodComponents.LATTE_COFFEE_BOTTLE).maxCount(16).recipeRemainder(Items.GLASS_BOTTLE)));
+    public static final Item CAFE_MIEL_COFFEE_BOTTLE = register("cafe_miel_coffee_bottle", new CafeMielCoffeeBottleItem(new Item.Settings().food(CaffeinatedFoodComponents.CAFE_MIEL_COFFEE_BOTTLE).maxCount(16).recipeRemainder(Items.GLASS_BOTTLE)));
 
     public static final Item JAVA_BANNER_PATTERN = register("java_banner_pattern", new BannerPatternItem(CaffeinatedBannerPatternTags.JAVA_PATTERN_ITEM, new Item.Settings().maxCount(1)));
     public static final Item TIRAMISU_SLICE = register("tiramisu_slice", new Item(new Item.Settings().food(CaffeinatedFoodComponents.TIRAMISU_SLICE)));

diff --git a/src/main/resources/assets/caffeinated/lang/en_us.json b/src/main/resources/assets/caffeinated/lang/en_us.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Yellow Java",
 	"effect.caffeinated.caffeine": "Caffeine",
 	"entity.caffeinated.civet": "Civet",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café Miel",
 	"item.caffeinated.civet_spawn_egg": "Civet Spawn Egg",
 	"item.caffeinated.coffee_beans": "Coffee Beans",
 	"item.caffeinated.coffee_berries": "Coffee Cherries",

diff --git a/src/main/resources/assets/caffeinated/lang/es_ar.json b/src/main/resources/assets/caffeinated/lang/es_ar.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Figura de café amarilla",
 	"effect.caffeinated.caffeine": "Cafeína",
 	"entity.caffeinated.civet": "Civeta",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café miel",
 	"item.caffeinated.civet_spawn_egg": "Generar civeta",
 	"item.caffeinated.coffee_beans": "Granos de café",
 	"item.caffeinated.coffee_berries": "Cerezas de café",

diff --git a/src/main/resources/assets/caffeinated/lang/es_es.json b/src/main/resources/assets/caffeinated/lang/es_es.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de café",
 	"effect.caffeinated.caffeine": "Cafeína",
 	"entity.caffeinated.civet": "Civeta",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café miel",
 	"item.caffeinated.civet_spawn_egg": "Generar civeta",
 	"item.caffeinated.coffee_beans": "Granos de café",
 	"item.caffeinated.coffee_berries": "Cerezas de café",

diff --git a/src/main/resources/assets/caffeinated/lang/es_mx.json b/src/main/resources/assets/caffeinated/lang/es_mx.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Estampado amarillo de café",
 	"effect.caffeinated.caffeine": "Cafeína",
 	"entity.caffeinated.civet": "Civeta",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café miel",
 	"item.caffeinated.civet_spawn_egg": "Generar civeta",
 	"item.caffeinated.coffee_beans": "Granos de café",
 	"item.caffeinated.coffee_berries": "Cerezas de café",

diff --git a/src/main/resources/assets/caffeinated/lang/ru_ru.json b/src/main/resources/assets/caffeinated/lang/ru_ru.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Жёлтый кофе",
 	"effect.caffeinated.caffeine": "Кофеин",
 	"entity.caffeinated.civet": "Виве́рра",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café Miel",
 	"item.caffeinated.civet_spawn_egg": "Яйцо призыва виве́рра",
 	"item.caffeinated.coffee_beans": "Кофейные зерна",
 	"item.caffeinated.coffee_berries": "Кофейные ягоды",

diff --git a/src/main/resources/assets/caffeinated/lang/uk_ua.json b/src/main/resources/assets/caffeinated/lang/uk_ua.json
@@ -34,6 +34,7 @@
 	"block.minecraft.banner.caffeinated.java.yellow": "Жовта кави",
 	"effect.caffeinated.caffeine": "Кофеїн",
 	"entity.caffeinated.civet": "Civet",
+	"item.caffeinated.cafe_miel_coffee_bottle.desc": "Café Miel",
 	"item.caffeinated.civet_spawn_egg": "Civet Spawn Egg",
 	"item.caffeinated.coffee_beans": "Кавові зерна",
 	"item.caffeinated.coffee_berries": "Кавові ягоди",