mmo-ref/mc-forge
1
0
Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge synced 2026-08-22 04:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add c:drink_containing/bottle and c:drink_containing/bucket (#10812)

Browse source
This commit is contained in:
Paint_Ninja 2026-04-15 22:19:44 +01:00 • committed by GitHub
parent 7846d25606
commit 4834f16aef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -21,7 +21,7 @@ ext {
}
changelog {
from '47.999'
from '64.0'
}
tasks.register('setup') {

7
src/main/generated/data/c/tags/item/drink_containing/bottle.json Normal file
View file

@ -0,0 +1,7 @@
{
"values": [
"minecraft:potion",
"minecraft:honey_bottle",
"minecraft:ominous_bottle"
]
}

5
src/main/generated/data/c/tags/item/drink_containing/bucket.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:milk_bucket"
]
}

36
src/main/java/net/minecraftforge/common/Tags.java
View file

@ -12,11 +12,13 @@ import net.minecraft.tags.BlockTags;
import net.minecraft.tags.FluidTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemUseAnimation;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.biome.Biome;
@ -415,15 +417,49 @@ public class Tags {
public static final TagKey<Item> DUSTS_REDSTONE = cTag("dusts/redstone");
public static final TagKey<Item> DUSTS_GLOWSTONE = cTag("dusts/glowstone");
/**
* Drinks are defined as (1) consumable items that (2) use the
* {@linkplain ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless of the
* player's current hunger.
*
* <p>Drinks may provide nutrition and saturation, but are not required to do so.
*
* <p>More specific types of drinks, such as Water, Milk, or Juice should be placed in a sub-tag, such as
* {@code #c:drinks/water}, {@code #c:drinks/milk}, and {@code #c:drinks/juice}.
*/
public static final TagKey<Item> DRINKS = cTag("drinks");
public static final TagKey<Item> DRINKS_HONEY = cTag("drinks/honey");
/**
* Plant based fruit and vegetable juices belong in this tag, for example apple juice and carrot juice.
*
* <p>If tags for specific types of juices are desired, they may go in a sub-tag, using their regular name such as
* {@code #c:drinks/apple_juice}.
*/
public static final TagKey<Item> DRINKS_JUICE = cTag("drinks/juice");
public static final TagKey<Item> DRINKS_MAGIC = cTag("drinks/magic");
public static final TagKey<Item> DRINKS_MILK = cTag("drinks/milk");
/**
* For drinks that always grant the {@linkplain MobEffects#BAD_OMEN Bad Omen} effect.
*/
public static final TagKey<Item> DRINKS_OMINOUS = cTag("drinks/ominous");
/**
* For consumable drinks that contain only water.
*/
public static final TagKey<Item> DRINKS_WATER = cTag("drinks/water");
/**
* For consumable drinks that are generally watery (such as potions).
*/
public static final TagKey<Item> DRINKS_WATERY = cTag("drinks/watery");
/**
* For non-empty bottles that are {@linkplain #DRINKS drinkable}.
*/
public static final TagKey<Item> DRINK_CONTAINING_BOTTLE = cTag("drink_containing/bottle");
/**
* For non-empty buckets that are {@linkplain #DRINKS drinkable}.
*/
public static final TagKey<Item> DRINK_CONTAINING_BUCKET = cTag("drink_containing/bucket");
/**
* Tag that holds all blocks and items that can be dyed a specific color.
* (Does not include color blending items like leather armor

4
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
View file

@ -84,6 +84,10 @@ public final class ForgeItemTagsProvider extends VanillaItemTagsProvider {
tag(Tags.Items.CROPS_SUGAR_CANE).add(Items.SUGAR_CANE);
tag(Tags.Items.CROPS_WHEAT)
.add(Items.WHEAT);
tag(Tags.Items.DRINK_CONTAINING_BOTTLE)
.add(Items.POTION, Items.HONEY_BOTTLE, Items.OMINOUS_BOTTLE);
tag(Tags.Items.DRINK_CONTAINING_BUCKET)
.add(Items.MILK_BUCKET);
tag(Tags.Items.DRINKS)
.addTags(Tags.Items.DRINKS_HONEY, Tags.Items.DRINKS_JUICE, Tags.Items.DRINKS_MAGIC, Tags.Items.DRINKS_MILK,
Tags.Items.DRINKS_OMINOUS, Tags.Items.DRINKS_WATER, Tags.Items.DRINKS_WATERY);