diff --git a/src/generated/resources/.cache/0fb4267a548bf299f2049691b441496991c595d5 b/src/generated/resources/.cache/0fb4267a548bf299f2049691b441496991c595d5 index ea8d4d6..b483b45 100644 --- a/src/generated/resources/.cache/0fb4267a548bf299f2049691b441496991c595d5 +++ b/src/generated/resources/.cache/0fb4267a548bf299f2049691b441496991c595d5 @@ -1,3 +1,3 @@ -// 1.20.1 2024-12-22T18:27:55.7442986 The Art of Bartending/Tags for minecraft:item -07b3b30b9447dedb83e48c06c2d87636a8dfd85b data\pdapi\tags\items\workstation_drinks.json -1b91d13f1597c12a21e037fe86666bf67ae14ed3 data\create\tags\items\upright_on_belt.json +// 1.20.1 2024-12-22T20:44:56.0029834 The Art of Bartending/Tags for minecraft:item +ff71af72a55c1d427e6351b9caaad7b4c1fd194b data\pdapi\tags\items\workstation_drinks.json +30d7d1be7936d424057332ee3f7325c10f711093 data\create\tags\items\upright_on_belt.json diff --git a/src/generated/resources/.cache/303798fc3112696d9b9c5034862c28f03bd26b05 b/src/generated/resources/.cache/303798fc3112696d9b9c5034862c28f03bd26b05 index 01e3518..673edf6 100644 --- a/src/generated/resources/.cache/303798fc3112696d9b9c5034862c28f03bd26b05 +++ b/src/generated/resources/.cache/303798fc3112696d9b9c5034862c28f03bd26b05 @@ -1,4 +1,4 @@ -// 1.20.1 2024-12-22T18:27:55.752882 The Art of Bartending/Drink Additions +// 1.20.1 2024-12-22T20:44:56.0090249 The Art of Bartending/Drink Additions 35826db48991864ac4ca7c6e18a42e27b165d318 data\bartending\drink_additions\shot_of_tequila.json 913b6b6075bb70e9b98ccd53b17c010b051f351c data\bartending\drink_additions\shot_of_gin.json 2fff062ff78a016322c996002f39cc82894f3d52 data\bartending\drink_additions\shot_of_whiskey.json diff --git a/src/generated/resources/.cache/6d2d3b838d7bc2f2d8b13b5a7fe429750978b7b0 b/src/generated/resources/.cache/6d2d3b838d7bc2f2d8b13b5a7fe429750978b7b0 index 8d4aa18..47915cb 100644 --- a/src/generated/resources/.cache/6d2d3b838d7bc2f2d8b13b5a7fe429750978b7b0 +++ b/src/generated/resources/.cache/6d2d3b838d7bc2f2d8b13b5a7fe429750978b7b0 @@ -1,2 +1,2 @@ -// 1.20.1 2024-12-22T18:27:55.7513063 The Art of Bartending/Tags for minecraft:fluid -cda3562c52a339c1794c4d4093e069fca3223a08 data\minecraft\tags\fluids\water.json +// 1.20.1 2024-12-22T20:44:56.0066705 The Art of Bartending/Tags for minecraft:fluid +d0f1d100420d2bc3bd7cf1ae2055f65645292b75 data\minecraft\tags\fluids\water.json diff --git a/src/generated/resources/.cache/77c9761cc5b7e448457b1e1632815e0dda23046e b/src/generated/resources/.cache/77c9761cc5b7e448457b1e1632815e0dda23046e index 3b23b9d..1872a81 100644 --- a/src/generated/resources/.cache/77c9761cc5b7e448457b1e1632815e0dda23046e +++ b/src/generated/resources/.cache/77c9761cc5b7e448457b1e1632815e0dda23046e @@ -1,4 +1,4 @@ -// 1.20.1 2024-12-22T18:27:55.7453049 The Art of Bartending/Recipes +// 1.20.1 2024-12-22T20:44:56.0029834 The Art of Bartending/Recipes e2293821af84fc766e5a19d55fd398253a92c615 data\bartending\recipes\pouring\bottle_of_wheat_beer.json dcc2a8032467251acaaf718171388b13ad79ab35 data\bartending\advancements\recipes\workstation\drink_workstation\add_vodka.json 95335881106c61212ceff96f9c741b62113ce2ac data\bartending\recipes\filling\coffee_liqueur.json @@ -77,8 +77,8 @@ d968a4b243d33a123b098a31888ce6c1ada5766e data\bartending\recipes\filling\shot_of 6a01ec510cd5afa053d83a4995bbe87e6c60bd6d data\bartending\recipes\filling\warped_wine.json b68559adfe789053e391c43b0ef7f79447d2790b data\bartending\recipes\emptying\glass_of_apple_mead.json 85cd40c51d5c8f0e818b0f53489ac88af6c6770e data\bartending\recipes\filling\absinthe.json -333cf0674a65363b75ad7803e29b62a93a62c24a data\bartending\recipes\emptying\glass_of_white_wine.json dc7961a5a7c49770f335b83d600fda50e4636266 data\bartending\recipes\filling\whiskey.json +333cf0674a65363b75ad7803e29b62a93a62c24a data\bartending\recipes\emptying\glass_of_white_wine.json 9d2bc16975e549b3e692b2b372a1b867966422c0 data\bartending\recipes\pouring\shot_of_tequila.json 0274d39cd92d6ee84e33637cd3a9468bd0c9ecc2 data\bartending\advancements\recipes\workstation\drink_workstation\add_tequila.json 852dd16017e4548119d5a2f93e280370f06cc837 data\bartending\advancements\recipes\workstation\drink_workstation\add_absinthe.json @@ -114,8 +114,8 @@ ce64683cd6f397ea2e3381a112caabf638dbb92d data\bartending\advancements\recipes\wo e0bbae411995015a69af0905957b74fe735dc6e2 data\bartending\recipes\drink_workstation\add_absinthe.json 174888fb25054b2579e278c9021a4bb2b73c2711 data\bartending\advancements\recipes\pouring\glass_of_warped_wine.json be5dcf7b5fcd10bad457077085c3acaf024e2e80 data\bartending\recipes\filling\shot_of_absinthe.json -b12f1cf72ac266421ed5e4d47e1c084b57bb62e1 data\bartending\advancements\recipes\pouring\glass_of_dark_beer.json a568cae8c49f3321b6176fe50b41f84ca147f36e data\bartending\recipes\pouring\shot_of_rum.json +b12f1cf72ac266421ed5e4d47e1c084b57bb62e1 data\bartending\advancements\recipes\pouring\glass_of_dark_beer.json fd8df6f426e4434527792f0503139ef0c873119d data\bartending\advancements\recipes\pouring\glass_of_sweet_vermouth.json 9acb0c5e746d51c11ef7c2f52b0b939fa68abb5b data\bartending\advancements\recipes\pouring\shot_of_whiskey.json 8f295daae9c78ef5a24fda73b539bddf8b829157 data\bartending\recipes\emptying\crimson_wine.json diff --git a/src/generated/resources/.cache/d94e39f854f8a90ca5a51c4a3251d850e0d17ab0 b/src/generated/resources/.cache/d94e39f854f8a90ca5a51c4a3251d850e0d17ab0 index 489f6bd..821a83c 100644 --- a/src/generated/resources/.cache/d94e39f854f8a90ca5a51c4a3251d850e0d17ab0 +++ b/src/generated/resources/.cache/d94e39f854f8a90ca5a51c4a3251d850e0d17ab0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-12-22T18:27:55.7483045 The Art of Bartending/Model Definitions +// 1.20.1 2024-12-22T20:44:56.0055218 The Art of Bartending/Model Definitions a9061f74c37f6f8d8852e661a67bfec7d33a46a9 assets\bartending\models\item\dark_beer.json 020b77856c78b4f829e3923b86b8e742e5830bbf assets\bartending\models\item\oak_fermenting_barrel.json 8fa6178c42606c8ed536845c16f2573fd66e2e62 assets\bartending\blockstates\cherry_fermenting_barrel.json @@ -48,8 +48,8 @@ d3616fa89183756bd4c104ac0468128dee096e9c assets\bartending\models\item\shot_of_a 8fa6178c42606c8ed536845c16f2573fd66e2e62 assets\bartending\blockstates\oak_fermenting_barrel.json d3616fa89183756bd4c104ac0468128dee096e9c assets\bartending\models\item\shot_of_coffee_liqueur.json adb0b9d3498a52570c9ff7718476b32ab5d4bd32 assets\bartending\models\item\glass_of_crimson_wine.json -4beceeea1adfd15a4b99358dbe9b533c0d258375 assets\bartending\models\item\vodka.json d3616fa89183756bd4c104ac0468128dee096e9c assets\bartending\models\item\shot_of_sweet_vermouth.json +4beceeea1adfd15a4b99358dbe9b533c0d258375 assets\bartending\models\item\vodka.json 020b77856c78b4f829e3923b86b8e742e5830bbf assets\bartending\models\item\birch_fermenting_barrel.json 020b77856c78b4f829e3923b86b8e742e5830bbf assets\bartending\models\item\crimson_fermenting_barrel.json d3616fa89183756bd4c104ac0468128dee096e9c assets\bartending\models\item\shot_of_rum.json diff --git a/src/generated/resources/.cache/da800d7f1088085e957978a513d4a9b721317555 b/src/generated/resources/.cache/da800d7f1088085e957978a513d4a9b721317555 index 59192b0..87707e4 100644 --- a/src/generated/resources/.cache/da800d7f1088085e957978a513d4a9b721317555 +++ b/src/generated/resources/.cache/da800d7f1088085e957978a513d4a9b721317555 @@ -1,11 +1,11 @@ -// 1.20.1 2024-12-22T18:27:55.7417886 The Art of Bartending/Block Loot Tables +// 1.20.1 2024-12-22T20:44:55.9984538 The Art of Bartending/Block Loot Tables d964fbb5244454f009d452d479a3d9fbe3a9b9cb data\bartending\loot_tables\blocks\warped_fermenting_barrel.json 7ca8056cf8deb44ed64bdf9fda10aec909e06d55 data\bartending\loot_tables\blocks\distillery.json 223677b5462035d764815e9eda222357dd04af51 data\bartending\loot_tables\blocks\bottler.json 375884d0a23474d31542aa17ee8d892d008de152 data\bartending\loot_tables\blocks\birch_fermenting_barrel.json cfab6e392b8a34f65c023369e4228535a9f3e0ee data\bartending\loot_tables\blocks\mangrove_fermenting_barrel.json -79cc49215f3832a621e944bf154a929091b791c2 data\bartending\loot_tables\blocks\boiler.json 9cb7ef908e45997749f1bb020f99255e79ba6636 data\bartending\loot_tables\blocks\cherry_fermenting_barrel.json +79cc49215f3832a621e944bf154a929091b791c2 data\bartending\loot_tables\blocks\boiler.json 88f3c35ec8a3b1b4891931d1be05518d73f62460 data\bartending\loot_tables\blocks\oak_fermenting_barrel.json f76ee32449e61ccc76c0b9c3bced3c94c0001f64 data\bartending\loot_tables\blocks\countertop.json d098badf2737219933b67bd1369e712da2832c69 data\bartending\loot_tables\blocks\dark_oak_fermenting_barrel.json diff --git a/src/generated/resources/.cache/de360b27eac0079f0377d40bcbafcf22dce11953 b/src/generated/resources/.cache/de360b27eac0079f0377d40bcbafcf22dce11953 index 53b9016..f806dfc 100644 --- a/src/generated/resources/.cache/de360b27eac0079f0377d40bcbafcf22dce11953 +++ b/src/generated/resources/.cache/de360b27eac0079f0377d40bcbafcf22dce11953 @@ -1,2 +1,2 @@ -// 1.20.1 2024-12-22T18:27:55.7548219 The Art of Bartending/Language (en_us) +// 1.20.1 2024-12-22T20:44:56.0120294 The Art of Bartending/Language (en_us) 5f924c702d016504a153c7fcb7936a3ff8effd8c assets\bartending\lang\en_us.json diff --git a/src/generated/resources/.cache/eff75a5b520af522b6d2aa9dd8600ee451dcd2d1 b/src/generated/resources/.cache/eff75a5b520af522b6d2aa9dd8600ee451dcd2d1 index bb12f4c..6262205 100644 --- a/src/generated/resources/.cache/eff75a5b520af522b6d2aa9dd8600ee451dcd2d1 +++ b/src/generated/resources/.cache/eff75a5b520af522b6d2aa9dd8600ee451dcd2d1 @@ -1,3 +1,3 @@ -// 1.20.1 2024-12-22T18:27:55.7432919 The Art of Bartending/Tags for minecraft:block +// 1.20.1 2024-12-22T20:44:56.0009732 The Art of Bartending/Tags for minecraft:block 77ee5bae9d8f1bae60e811c18089fbbc24bc48b8 data\minecraft\tags\blocks\mineable\pickaxe.json -760c2c69d3d94e5bdd67bf3df59a10022d957cc1 data\minecraft\tags\blocks\mineable\axe.json +e900f61a2c06e894dfc7970c10c05b476e45d30d data\minecraft\tags\blocks\mineable\axe.json diff --git a/src/generated/resources/data/create/tags/items/upright_on_belt.json b/src/generated/resources/data/create/tags/items/upright_on_belt.json index d974889..42663d4 100644 --- a/src/generated/resources/data/create/tags/items/upright_on_belt.json +++ b/src/generated/resources/data/create/tags/items/upright_on_belt.json @@ -9,51 +9,52 @@ "bartending:wine_bottle", "bartending:liquor_bottle", "bartending:jug", - "bartending:shot_of_sweet_vermouth", - "bartending:shot_of_dry_vermouth", - "bartending:shot_of_orange_liqueur", + "bartending:mixed_drink", "bartending:shot_of_vodka", + "bartending:shot_of_rum", "bartending:shot_of_absinthe", + "bartending:shot_of_dry_vermouth", + "bartending:shot_of_orange_liqueur", + "bartending:shot_of_sweet_vermouth", "bartending:shot_of_gin", "bartending:shot_of_coffee_liqueur", - "bartending:shot_of_apple_liqueur", - "bartending:shot_of_rum", - "bartending:shot_of_whiskey", "bartending:shot_of_tequila", + "bartending:shot_of_whiskey", + "bartending:shot_of_apple_liqueur", "bartending:dark_beer", - "bartending:dry_vermouth", + "bartending:apple_mead", "bartending:white_wine", - "bartending:warped_wine", - "bartending:vodka", + "bartending:orange_liqueur", + "bartending:sweet_vermouth", "bartending:gin", - "bartending:coffee_liqueur", - "bartending:rum", - "bartending:whiskey", - "bartending:mead", "bartending:tequila", - "bartending:sweet_vermouth", + "bartending:vodka", + "bartending:warped_wine", + "bartending:rum", "bartending:crimson_wine", - "bartending:orange_liqueur", - "bartending:apple_mead", - "bartending:beer", "bartending:absinthe", "bartending:red_wine", + "bartending:dry_vermouth", "bartending:wheat_beer", + "bartending:mead", + "bartending:beer", + "bartending:coffee_liqueur", + "bartending:whiskey", "bartending:apple_liqueur", "bartending:glass_of_dark_beer", - "bartending:glass_of_sweet_vermouth", + "bartending:glass_of_apple_mead", + "bartending:glass_of_warped_wine", "bartending:glass_of_crimson_wine", - "bartending:glass_of_dry_vermouth", "bartending:glass_of_white_wine", - "bartending:glass_of_warped_wine", - "bartending:glass_of_apple_mead", - "bartending:glass_of_beer", "bartending:glass_of_absinthe", "bartending:glass_of_red_wine", + "bartending:glass_of_dry_vermouth", "bartending:glass_of_wheat_beer", + "bartending:glass_of_sweet_vermouth", "bartending:glass_of_mead", + "bartending:glass_of_beer", "bartending:bottle_of_dark_beer", - "bartending:bottle_of_beer", - "bartending:bottle_of_wheat_beer" + "bartending:bottle_of_wheat_beer", + "bartending:bottle_of_beer" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index f786d42..0697d03 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "bartending:acacia_fermenting_barrel", - "bartending:mangrove_fermenting_barrel", - "bartending:oak_fermenting_barrel", "bartending:birch_fermenting_barrel", - "bartending:spruce_fermenting_barrel", + "bartending:oak_fermenting_barrel", + "bartending:mangrove_fermenting_barrel", + "bartending:bamboo_fermenting_barrel", + "bartending:acacia_fermenting_barrel", + "bartending:warped_fermenting_barrel", + "bartending:crimson_fermenting_barrel", + "bartending:cherry_fermenting_barrel", "bartending:jungle_fermenting_barrel", "bartending:dark_oak_fermenting_barrel", - "bartending:cherry_fermenting_barrel", - "bartending:crimson_fermenting_barrel", - "bartending:warped_fermenting_barrel", - "bartending:bamboo_fermenting_barrel" + "bartending:spruce_fermenting_barrel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/pdapi/tags/items/workstation_drinks.json b/src/generated/resources/data/pdapi/tags/items/workstation_drinks.json index 82c6eb6..72c01e3 100644 --- a/src/generated/resources/data/pdapi/tags/items/workstation_drinks.json +++ b/src/generated/resources/data/pdapi/tags/items/workstation_drinks.json @@ -1,17 +1,19 @@ { "replace": false, "values": [ + "bartending:cocktail_glass", + "bartending:mixed_drink", "bartending:glass_of_dark_beer", - "bartending:glass_of_sweet_vermouth", + "bartending:glass_of_apple_mead", + "bartending:glass_of_warped_wine", "bartending:glass_of_crimson_wine", - "bartending:glass_of_dry_vermouth", "bartending:glass_of_white_wine", - "bartending:glass_of_warped_wine", - "bartending:glass_of_apple_mead", - "bartending:glass_of_beer", "bartending:glass_of_absinthe", "bartending:glass_of_red_wine", + "bartending:glass_of_dry_vermouth", "bartending:glass_of_wheat_beer", - "bartending:glass_of_mead" + "bartending:glass_of_sweet_vermouth", + "bartending:glass_of_mead", + "bartending:glass_of_beer" ] } \ No newline at end of file diff --git a/src/main/java/ml/pluto7073/bartending/foundations/datagen/BartendingTagProviders.java b/src/main/java/ml/pluto7073/bartending/foundations/datagen/BartendingTagProviders.java index 22acae4..e548b85 100644 --- a/src/main/java/ml/pluto7073/bartending/foundations/datagen/BartendingTagProviders.java +++ b/src/main/java/ml/pluto7073/bartending/foundations/datagen/BartendingTagProviders.java @@ -56,11 +56,12 @@ public ItemTagProvider(FabricDataOutput output, CompletableFuture