Redesign of coffee bottle variants

Caffe Latte and Cafe Miel have been renamed to Milk Coffee and Honey Coffee respectively
Black coffee bottles now give Caffeine I instead of level II
Further changes to come later

Author: Chikorita-Lover

src/main/generated/.cache/0de68e09d261d81ea98d47a08ed0e4f48e49e82a

@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-06T16:00:17.8663253	Caffeinated/Tags for minecraft:block
+// 1.21.1	2025-09-07T00:25:45.5305008	Caffeinated/Tags for minecraft:block
 4b5dce83143a2d7c235f74dacfe4ae117545a11d data\caffeinated\tags\block\lit_fires.json
 a51becefdb60be838a24bbccdb2d54533169edfb data\minecraft\tags\block\camel_sand_step_sound_blocks.json
 28a355c0c955d5e560fbb227b5ad92a007fc7766 data\minecraft\tags\block\bee_growables.json
@@ -9,7 +9,7 @@ a51becefdb60be838a24bbccdb2d54533169edfb data\minecraft\tags\block\camel_sand_st
 12a4c2e67cc09334065e40d26093656f649e57fe data\minecraft\tags\block\cauldrons.json
 f988b0a4c7357b96edc8a02226b10077a57f7144 data\minecraft\tags\block\mineable\axe.json
 a23520cb9a9c285863dabcd07bd11fcc3c62f6b4 data\minecraft\tags\block\mineable\hoe.json
-a23520cb9a9c285863dabcd07bd11fcc3c62f6b4 data\minecraft\tags\block\mushroom_grow_block.json
 6d60a3d6afa591133bc396d1444098095408a07b data\minecraft\tags\block\wool.json
+a23520cb9a9c285863dabcd07bd11fcc3c62f6b4 data\minecraft\tags\block\mushroom_grow_block.json
 ad643e3e41ff7904b265723c87f5098dabdf5ae0 data\caffeinated\tags\block\civets_spawnable_on.json
 a51becefdb60be838a24bbccdb2d54533169edfb data\minecraft\tags\block\mineable\shovel.json

src/main/generated/.cache/19b7f1383c3f2d6ff182dbe25f7777b152880864

@@ -1,6 +1,6 @@
-// 1.21.1	2025-09-06T16:00:17.8673246	Caffeinated/Tags for minecraft:item
+// 1.21.1	2025-09-07T00:25:45.5315008	Caffeinated/Tags for minecraft:item
 2098a8d810cf19710a03b3e702f90f1cb8cd310b data\minecraft\tags\item\wool_carpets.json
 9db38f9313dfd0f73e19f1b27b321cbba4eef68b data\caffeinated\tags\item\coffee_food.json
 b3903dd6f2911c9bfd601eeed539d4df52a7dc6f data\caffeinated\tags\item\civet_food.json
 6d60a3d6afa591133bc396d1444098095408a07b data\minecraft\tags\item\wool.json
-d8537c5f2765aab0edf652a059b544bf65a169ee data\caffeinated\tags\item\coffee_bottles.json
+64bcb5868bd34eb5058cf57274f4fec9d4da08ff data\caffeinated\tags\item\coffee_bottles.json

src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb

@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-06T16:00:17.8694737	Caffeinated/Block Loot Tables
+// 1.21.1	2025-09-07T00:25:45.5335008	Caffeinated/Block Loot Tables
 548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json
 049fb79e0b69606ea9e244ab47ba18c95c60a8a0 data\caffeinated\loot_table\blocks\civet_scat.json
 8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json

src/main/generated/.cache/9ac78b54b5833f183877ec224e276c4aea5aac3a

@@ -1,5 +1,5 @@
-// 1.21.1	2025-09-06T16:00:17.8694737	Caffeinated/Advancements
+// 1.21.1	2025-09-07T00:25:45.5335008	Caffeinated/Advancements
 7baed290ce452ee5b57e2b0a312b099b6f48ccac data\caffeinated\advancement\husbandry\brew_coffee.json
 3a0446170026d8aa5bbef46b956c9373eb0a91c8 data\caffeinated\advancement\husbandry\bake_tiramisu.json
 fca907503b74a6549897a7d0437d8cb17ce88b5c data\caffeinated\advancement\husbandry\smelt_civet_scat.json
-b095a9864646e1db28494ab996535b504cb9d714 data\caffeinated\advancement\husbandry\drink_all_coffee.json
+6d98cd83df89fa2e58940fb4e84b25a93e779abf data\caffeinated\advancement\husbandry\drink_all_coffee.json

src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc

@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-06T16:00:17.8704738	Caffeinated/Recipes
+// 1.21.1	2025-09-07T00:25:45.5345011	Caffeinated/Recipes
 c773cd5c995b67602b5f054f551a8f5d6f33d139 data\caffeinated\advancement\recipes\misc\coffee_beans.json
 fc02282e1585581cdd7b7c61a868bceed7db5d1b data\caffeinated\advancement\recipes\misc\coffee_beans_from_civet_scat.json
 6061a7a2ef7b2febcca08d801ffce55d131fda2b data\caffeinated\recipe\tiramisu_from_slices.json

src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed

@@ -1,12 +1,12 @@
-// 1.21.1	2025-09-06T16:00:17.8683245	Caffeinated/Model Definitions
+// 1.21.1	2025-09-07T00:25:45.5325028	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
 e3caf06551dc333a7a34110027829436a48a7f55 assets\caffeinated\blockstates\civet_scat.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
+9a0543b14cd1496b52cb486d1728113aecd74fc3 assets\caffeinated\models\item\milk_coffee_bottle.json
 7eea00b3f89da1c214d0719b54a196746bdaef55 assets\caffeinated\models\block\coffee_stained_carpet.json
 7df4c655acfe3de7441205e28103e69b22a346ca assets\caffeinated\models\item\civet_scat.json
 cd254ba40cfd07d6c01d66a963e5ec83ed478aef assets\caffeinated\blockstates\coffee_berry_crate.json
@@ -24,20 +24,20 @@ fe9155058173a06c1325878e72a8f42b0acfb9d7 assets\caffeinated\models\block\coffee_
 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
 40fc080bf5e7fe5c74e12b3c3b2454805bb0ea3c assets\caffeinated\models\item\coffee_stained_carpet.json
 2ee0688f44b78a48941720e3223b7bf3a9133161 assets\caffeinated\blockstates\potted_coffee_shrub.json
-358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json
 5873c2f6e62014035c0873f84f3b32eb1becc76f assets\caffeinated\models\block\civet_scat.json
+358965a77d8a9ace29f9981a460163089349eda2 assets\caffeinated\models\item\coffee_berry_crate.json
 196754b26a9f9cac1bf6b81563cef5344f998868 assets\caffeinated\blockstates\tiramisu.json
 04afd00b15d93557d58f63a6ba3b712667c225a7 assets\caffeinated\models\block\coffee_stained_wool.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
-58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
 c6d2e6012ee1a88b1c31a8c23652c236df0f1b7a assets\caffeinated\models\item\coffee_stained_wool.json
+58f78eb6198fba07304fece9e3c7bb6247a13229 assets\caffeinated\models\item\coffee_bottle.json
 60bef8f5239edf70b1bb8d309b7b27c58dc11cad assets\caffeinated\blockstates\coffee_stained_wool.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
+b68fe22ab70d6e273a6818a84df8a0677de47287 assets\caffeinated\models\item\honey_coffee_bottle.json

…ted/models/item/latte_coffee_bottle.json …ted/models/item/honey_coffee_bottle.jsonsrc/main/generated/assets/caffeinated/models/item/latte_coffee_bottle.json renamed to src/main/generated/assets/caffeinated/models/item/honey_coffee_bottle.json src/main/generated/assets/caffeinated/models/item/latte_coffee_bottle.json renamed to src/main/generated/assets/caffeinated/models/item/honey_coffee_bottle.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "caffeinated:item/latte_coffee_bottle"
+    "layer0": "caffeinated:item/honey_coffee_bottle"
   }
 }

…models/item/cafe_miel_coffee_bottle.json …ated/models/item/milk_coffee_bottle.jsonsrc/main/generated/assets/caffeinated/models/item/cafe_miel_coffee_bottle.json renamed to src/main/generated/assets/caffeinated/models/item/milk_coffee_bottle.json src/main/generated/assets/caffeinated/models/item/cafe_miel_coffee_bottle.json renamed to src/main/generated/assets/caffeinated/models/item/milk_coffee_bottle.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "caffeinated:item/cafe_miel_coffee_bottle"
+    "layer0": "caffeinated:item/milk_coffee_bottle"
   }
 }

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

@@ -1,26 +1,26 @@
 {
   "parent": "caffeinated:husbandry/brew_coffee",
   "criteria": {
-    "cafe_miel_coffee_bottle": {
+    "coffee_bottle": {
       "conditions": {
         "item": {
-          "items": "caffeinated:cafe_miel_coffee_bottle"
+          "items": "caffeinated:coffee_bottle"
         }
       },
       "trigger": "minecraft:consume_item"
     },
-    "coffee_bottle": {
+    "honey_coffee_bottle": {
       "conditions": {
         "item": {
-          "items": "caffeinated:coffee_bottle"
+          "items": "caffeinated:honey_coffee_bottle"
         }
       },
       "trigger": "minecraft:consume_item"
     },
-    "latte_coffee_bottle": {
+    "milk_coffee_bottle": {
       "conditions": {
         "item": {
-          "items": "caffeinated:latte_coffee_bottle"
+          "items": "caffeinated:milk_coffee_bottle"
         }
       },
       "trigger": "minecraft:consume_item"
@@ -33,7 +33,7 @@
     "frame": "challenge",
     "icon": {
       "count": 1,
-      "id": "caffeinated:latte_coffee_bottle"
+      "id": "caffeinated:milk_coffee_bottle"
     },
     "title": {
       "translate": "advancements.husbandry.drink_all_coffee.title"
@@ -44,10 +44,10 @@
       "coffee_bottle"
     ],
     [
-      "latte_coffee_bottle"
+      "milk_coffee_bottle"
     ],
     [
-      "cafe_miel_coffee_bottle"
+      "honey_coffee_bottle"
     ]
   ],
   "rewards": {

src/main/generated/data/caffeinated/tags/item/coffee_bottles.json

@@ -1,7 +1,7 @@
 {
   "values": [
     "caffeinated:coffee_bottle",
-    "caffeinated:latte_coffee_bottle",
-    "caffeinated:cafe_miel_coffee_bottle"
+    "caffeinated:milk_coffee_bottle",
+    "caffeinated:honey_coffee_bottle"
   ]
 }