Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21.1] Sync remaining c tags from Fabric side #1593

Open
wants to merge 21 commits into
base: 1.21.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/generated/resources/assets/c/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@
"tag.item.c.ores_in_ground.stone": "Stone Ores In Ground",
"tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
"tag.item.c.player_workstations.furnaces": "Furnaces",
"tag.item.c.potions": "Potions",
"tag.item.c.potions.bottle": "Bottle Potions",
"tag.item.c.raw_materials": "Raw Materials",
"tag.item.c.raw_materials.copper": "Copper Raw Materials",
"tag.item.c.raw_materials.gold": "Gold Raw Materials",
Expand All @@ -327,6 +329,7 @@
"tag.item.c.seeds.beetroot": "Beetroot Seeds",
"tag.item.c.seeds.melon": "Melon Seeds",
"tag.item.c.seeds.pumpkin": "Pumpkin Seeds",
"tag.item.c.seeds.torchflower": "Torchflower Seeds",
"tag.item.c.seeds.wheat": "Wheat Seeds",
"tag.item.c.shulker_boxes": "Shulker Boxes",
"tag.item.c.slime_balls": "Slimeballs",
Expand Down Expand Up @@ -430,6 +433,10 @@
"tag.worldgen.biome.c.is_stony_shores": "Stony Shores",
"tag.worldgen.biome.c.is_swamp": "Swamps",
"tag.worldgen.biome.c.is_taiga": "Taiga",
"tag.worldgen.biome.c.is_temperate": "Temperate",
"tag.worldgen.biome.c.is_temperate.end": "Temperate End",
"tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether",
"tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld",
"tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Trees",
"tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Trees",
"tag.worldgen.biome.c.is_tree.jungle": "Jungle Trees",
Expand Down
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/potions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#c:potions/bottle"
]
}
7 changes: 7 additions & 0 deletions src/generated/resources/data/c/tags/item/potions/bottle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"minecraft:potion",
"minecraft:splash_potion",
"minecraft:lingering_potion"
]
}
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/seeds.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"#c:seeds/beetroot",
"#c:seeds/melon",
"#c:seeds/pumpkin",
"#c:seeds/torchflower",
"#c:seeds/wheat",
{
"id": "#forge:seeds",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:torchflower_seeds"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"values": [
"#c:is_cold/overworld",
{
"id": "#c:is_cold/nether",
"required": false
},
"#c:is_cold/nether",
"#c:is_cold/end",
{
"id": "#forge:is_cold",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_dense_vegetation/overworld",
{
"id": "#c:is_dense_vegetation/nether",
"required": false
},
{
"id": "#c:is_dense_vegetation/end",
"required": false
},
"#c:is_dense_vegetation/nether",
"#c:is_dense_vegetation/end",
{
"id": "#forge:is_dense",
"required": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"values": [
"#c:is_hot/overworld",
"#c:is_hot/nether",
{
"id": "#c:is_hot/end",
"required": false
},
"#c:is_hot/end",
{
"id": "#forge:is_hot",
"required": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"values": [
"minecraft:swamp",
"minecraft:mangrove_swamp",
"minecraft:jungle",
"minecraft:bamboo_jungle",
"minecraft:sparse_jungle",
Expand All @@ -13,6 +11,7 @@
"minecraft:savanna_plateau",
"minecraft:windswept_savanna",
"minecraft:stony_peaks",
"minecraft:mushroom_fields",
"minecraft:warm_ocean",
{
"id": "#forge:is_hot/overworld",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_sparse_vegetation/overworld",
{
"id": "#c:is_sparse_vegetation/nether",
"required": false
},
{
"id": "#c:is_sparse_vegetation/end",
"required": false
},
"#c:is_sparse_vegetation/nether",
"#c:is_sparse_vegetation/end",
{
"id": "#forge:is_sparse_vegetation",
"required": false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"#c:is_temperate/overworld",
"#c:is_temperate/nether",
"#c:is_temperate/end"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"values": [
"minecraft:plains",
"minecraft:sunflower_plains",
"minecraft:forest",
"minecraft:flower_forest",
"minecraft:birch_forest",
"minecraft:old_growth_birch_forest",
"minecraft:dark_forest",
"minecraft:cherry_grove",
"minecraft:meadow",
"minecraft:swamp",
"minecraft:mangrove_swamp",
"minecraft:beach",
"minecraft:ocean",
"minecraft:deep_ocean"
]
}
10 changes: 2 additions & 8 deletions src/generated/resources/data/c/tags/worldgen/biome/is_wet.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_wet/overworld",
{
"id": "#c:is_wet/nether",
"required": false
},
{
"id": "#c:is_wet/end",
"required": false
},
"#c:is_wet/nether",
"#c:is_wet/end",
{
"id": "#forge:is_wet",
"required": false
Expand Down
81 changes: 74 additions & 7 deletions src/main/java/net/neoforged/neoforge/common/Tags.java
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,18 @@ public static class Blocks {
*/
public static final TagKey<Block> ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone");
/**
* Ores which on average result in more than one resource worth of materials
* Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers.
* (example, Copper Ore)
*/
public static final TagKey<Block> ORE_RATES_DENSE = tag("ore_rates/dense");
/**
* Ores which on average result in one resource worth of materials
* Ores which on average result in one resource worth of materials ignoring fortune and other modifiers.
* (Example, Iron Ore)
*/
public static final TagKey<Block> ORE_RATES_SINGULAR = tag("ore_rates/singular");
/**
* Ores which on average result in less than one resource worth of materials
* Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers.
* (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop)
*/
public static final TagKey<Block> ORE_RATES_SPARSE = tag("ore_rates/sparse");
public static final TagKey<Block> ORES = tag("ores");
Expand Down Expand Up @@ -485,6 +488,9 @@ public static class Items {
public static final TagKey<Item> INGOTS_IRON = tag("ingots/iron");
public static final TagKey<Item> INGOTS_NETHERITE = tag("ingots/netherite");
public static final TagKey<Item> LEATHERS = tag("leathers");
/**
* Small mushroom items. Not the full block forms.
*/
public static final TagKey<Item> MUSHROOMS = tag("mushrooms");
/**
* For music disc-like materials to be used in recipes.
Expand Down Expand Up @@ -516,15 +522,18 @@ public static class Items {
*/
public static final TagKey<Item> ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone");
/**
* Ores which on average result in more than one resource worth of materials
* Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers.
* (example, Copper Ore)
*/
public static final TagKey<Item> ORE_RATES_DENSE = tag("ore_rates/dense");
/**
* Ores which on average result in one resource worth of materials
* Ores which on average result in one resource worth of materials ignoring fortune and other modifiers.
* (Example, Iron Ore)
*/
public static final TagKey<Item> ORE_RATES_SINGULAR = tag("ore_rates/singular");
/**
* Ores which on average result in less than one resource worth of materials
* Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers.
* (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop)
*/
public static final TagKey<Item> ORE_RATES_SPARSE = tag("ore_rates/sparse");
public static final TagKey<Item> ORES = tag("ores");
Expand Down Expand Up @@ -552,6 +561,18 @@ public static class Items {
public static final TagKey<Item> ORES_IN_GROUND_STONE = tag("ores_in_ground/stone");
public static final TagKey<Item> PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables");
public static final TagKey<Item> PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces");
/**
* Items that can hold various potion effects by making use of {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}.
* Contents of this tag may not always be a kind of bottle. Buckets of potions could go here.
* The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples.
*/
public static final TagKey<Item> POTIONS = tag("potions");
TelepathicGrunt marked this conversation as resolved.
Show resolved Hide resolved
/**
* Variations of the potion bottle that can hold various effects by using {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}.
* Examples are splash and lingering potions from vanilla.
* If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag.
*/
public static final TagKey<Item> POTION_BOTTLE = tag("potions/bottle");
public static final TagKey<Item> RAW_MATERIALS = tag("raw_materials");
public static final TagKey<Item> RAW_MATERIALS_COPPER = tag("raw_materials/copper");
public static final TagKey<Item> RAW_MATERIALS_GOLD = tag("raw_materials/gold");
Expand Down Expand Up @@ -583,10 +604,14 @@ public static class Items {
public static final TagKey<Item> SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs");
public static final TagKey<Item> SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs");

/**
* For items that are explicitly seeds for use cases such as refilling a bird feeder block or certain seed-based recipes.
*/
public static final TagKey<Item> SEEDS = tag("seeds");
public static final TagKey<Item> SEEDS_BEETROOT = tag("seeds/beetroot");
public static final TagKey<Item> SEEDS_MELON = tag("seeds/melon");
public static final TagKey<Item> SEEDS_PUMPKIN = tag("seeds/pumpkin");
public static final TagKey<Item> SEEDS_TORCHFLOWER = tag("seeds/torchflower");
public static final TagKey<Item> SEEDS_WHEAT = tag("seeds/wheat");
/**
* Block tag equivalent is {@link BlockTags#SHULKER_BOXES}
Expand Down Expand Up @@ -893,20 +918,41 @@ public static class Biomes {

public static final TagKey<Biome> IS_VOID = tag("is_void");

/**
* Biomes that are above 0.8 temperature. (Excluding 0.8)
*/
public static final TagKey<Biome> IS_HOT = tag("is_hot");
public static final TagKey<Biome> IS_HOT_OVERWORLD = tag("is_hot/overworld");
public static final TagKey<Biome> IS_HOT_NETHER = tag("is_hot/nether");
public static final TagKey<Biome> IS_HOT_END = tag("is_hot/end");

/**
* Biomes that are between 0.5 and 0.8 temperature range. (Including 0.5 and 0.8)
*/
public static final TagKey<Biome> IS_TEMPERATE = tag("is_temperate");
public static final TagKey<Biome> IS_TEMPERATE_OVERWORLD = tag("is_temperate/overworld");
public static final TagKey<Biome> IS_TEMPERATE_NETHER = tag("is_temperate/nether");
public static final TagKey<Biome> IS_TEMPERATE_END = tag("is_temperate/end");
TelepathicGrunt marked this conversation as resolved.
Show resolved Hide resolved

/**
* Biomes that are below 0.5 temperature. (Excluding 0.5)
*/
public static final TagKey<Biome> IS_COLD = tag("is_cold");
public static final TagKey<Biome> IS_COLD_OVERWORLD = tag("is_cold/overworld");
public static final TagKey<Biome> IS_COLD_NETHER = tag("is_cold/nether");
public static final TagKey<Biome> IS_COLD_END = tag("is_cold/end");

/**
* If a biome has trees but spawn infrequently like a Savanna or Sparse Jungle, then the biome is considered having sparse vegetation. It does NOT mean no trees.
*/
public static final TagKey<Biome> IS_SPARSE_VEGETATION = tag("is_sparse_vegetation");
public static final TagKey<Biome> IS_SPARSE_VEGETATION_OVERWORLD = tag("is_sparse_vegetation/overworld");
public static final TagKey<Biome> IS_SPARSE_VEGETATION_NETHER = tag("is_sparse_vegetation/nether");
public static final TagKey<Biome> IS_SPARSE_VEGETATION_END = tag("is_sparse_vegetation/end");
/**
* If a biome has more vegetation than a regular Forest biome, then it is considered having dense vegetation.
* This is more subjective so simply do your best with classifying your biomes.
*/
public static final TagKey<Biome> IS_DENSE_VEGETATION = tag("is_dense_vegetation");
public static final TagKey<Biome> IS_DENSE_VEGETATION_OVERWORLD = tag("is_dense_vegetation/overworld");
public static final TagKey<Biome> IS_DENSE_VEGETATION_NETHER = tag("is_dense_vegetation/nether");
Expand Down Expand Up @@ -1029,11 +1075,25 @@ public static class Biomes {
public static final TagKey<Biome> IS_UNDERGROUND = tag("is_underground");
public static final TagKey<Biome> IS_CAVE = tag("is_cave");

/**
* Biomes whose flora primarily consists of vibrant thick vegetation and pools of water. Think of Lush Caves as an example.
*/
public static final TagKey<Biome> IS_LUSH = tag("is_lush");
/**
* Biomes whose theme revolves around magic. Like a forest full of fairies or plants of magical abilities.
*/
public static final TagKey<Biome> IS_MAGICAL = tag("is_magical");
/**
* Intended for biomes that spawns infrequently and can be difficult to find.
*/
public static final TagKey<Biome> IS_RARE = tag("is_rare");
/**
* Biomes that spawn as a flat-topped hill often.
*/
public static final TagKey<Biome> IS_PLATEAU = tag("is_plateau");
public static final TagKey<Biome> IS_MODIFIED = tag("is_modified");
/**
* For biomes that are intended to be creepy or scary. For example, see Deep Dark biome or Dark Forest biome.
*/
public static final TagKey<Biome> IS_SPOOKY = tag("is_spooky");
/**
* Biomes that lack any natural life or vegetation.
Expand Down Expand Up @@ -1092,6 +1152,13 @@ public static class Biomes {
*/
public static final TagKey<Biome> IS_OUTER_END_ISLAND = tag("is_outer_end_island");

/**
* Old legacy tag that lost it's intended use case and is too unclear with regard to the current worldgen biome system today.
* TODO: remove in 1.22
*/
@Deprecated(forRemoval = true, since = "21.1")
public static final TagKey<Biome> IS_MODIFIED = tag("is_modified");

private static TagKey<Biome> tag(String name) {
return TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("c", name));
}
Expand Down
Loading