Skip to content

Some small tag fixes #10135

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.

Sign up for GitHub

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

Open
JensenJ wants to merge 3 commits into
base: mc1.21.1/dev
Choose a base branch
from
Open

Some small tag fixes #10135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be6b558
Bound cardboard block tags
JensenJ Apr 7, 2026
f455112
Add andesite alloy to ingot tag
JensenJ Apr 8, 2026
9b991e3
Crushed raw materials tags
JensenJ Apr 8, 2026
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
1 change: 1 addition & 0 deletions src/generated/resources/assets/create/lang/en_ud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,6 +3477,7 @@
"tag.item.c.foods.dough.wheat": "sɥbnoᗡ ʇɐǝɥM",
"tag.item.c.gems.certus_quartz": "zʇɹɐnὉ snʇɹǝƆ",
"tag.item.c.ingots.aluminum": "sʇobuI ɯnuıɯnןⱯ",
"tag.item.c.ingots.andesite_alloy": "sʇobuI ʎoןןⱯ ǝʇısǝpuⱯ",
"tag.item.c.ingots.brass": "sʇobuI ssɐɹᗺ",
"tag.item.c.ingots.constantan": "sʇobuI uɐʇuɐʇsuoƆ",
"tag.item.c.ingots.copper": "sʇobuI ɹǝddoƆ",
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/assets/create/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,6 +3477,7 @@
"tag.item.c.foods.dough.wheat": "Wheat Doughs",
"tag.item.c.gems.certus_quartz": "Certus Quartz",
"tag.item.c.ingots.aluminum": "Aluminum Ingots",
"tag.item.c.ingots.andesite_alloy": "Andesite Alloy Ingots",
"tag.item.c.ingots.brass": "Brass Ingots",
"tag.item.c.ingots.constantan": "Constantan Ingots",
"tag.item.c.ingots.copper": "Copper Ingots",
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/block/storage_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"create:andesite_alloy_block",
"create:brass_block",
"create:cardboard_block",
"create:bound_cardboard_block",
"create:experience_block"
]
}
3 changes: 2 additions & 1 deletion src/generated/resources/data/c/tags/block/storage_blocks/cardboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"create:cardboard_block"
"create:cardboard_block",
"create:bound_cardboard_block"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/aluminum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_aluminum"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/copper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_copper"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/gold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_gold"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/iron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_iron"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/lead.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_lead"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/nickel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_nickel"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/osmium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_osmium"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/platinum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_platinum"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/quicksilver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_quicksilver"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/silver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_silver"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/tin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_tin"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/uranium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_uranium"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/crushed_raw_materials/zinc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:crushed_raw_zinc"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/ingots/andesite_alloy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"create:andesite_alloy"
]
}
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/storage_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"create:andesite_alloy_block",
"create:brass_block",
"create:cardboard_block",
"create:bound_cardboard_block",
"create:experience_block"
]
}
3 changes: 2 additions & 1 deletion src/generated/resources/data/c/tags/item/storage_blocks/cardboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"create:cardboard_block"
"create:cardboard_block",
"create:bound_cardboard_block"
]
}
4 changes: 4 additions & 0 deletions src/main/java/com/simibubi/create/AllBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2615,6 +2615,8 @@ public class AllBlocks {
.ignitedByLava())
.transform(axeOnly())
.blockstate(BlockStateGen.horizontalAxisBlockProvider(false))
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(AllBlockTags.CARDBOARD_STORAGE_BLOCKS.tag)
.loot((r, b) -> r.add(b, LootTable.lootTable()
.withPool(LootPool.lootPool()
.setRolls(ConstantValue.exactly(1.0F))
Expand All @@ -2627,6 +2629,8 @@ public class AllBlocks {
.when(((BlockLootSubProviderAccessor) r).create$hasSilkTouch().invert())))))
.item()
.burnTime(4000)
.tag(AllItemTags.CARDBOARD_STORAGE_BLOCKS.tag)
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Bound Block of Cardboard")
.register();
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/simibubi/create/AllItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public class AllItems {
public static final ItemEntry<Item> RAW_ZINC =
taggedIngredient("raw_zinc", CommonMetal.ZINC.rawOres, Items.RAW_MATERIALS);

public static final ItemEntry<Item> ANDESITE_ALLOY = taggedIngredient("andesite_alloy", CREATE_INGOTS.tag),
public static final ItemEntry<Item> ANDESITE_ALLOY = taggedIngredient("andesite_alloy", AllItemTags.ANDESITE_ALLOY_INGOTS.tag, CREATE_INGOTS.tag),
ZINC_INGOT = taggedIngredient("zinc_ingot", CommonMetal.ZINC.ingots, CREATE_INGOTS.tag),
BRASS_INGOT = taggedIngredient("brass_ingot", CommonMetal.BRASS.ingots, CREATE_INGOTS.tag);

Expand Down Expand Up @@ -228,10 +228,10 @@ public class AllItems {
IRON_SHEET = taggedIngredient("iron_sheet", CommonMetal.IRON.plates, PLATES.tag),
GOLDEN_SHEET = taggedIngredient("golden_sheet", CommonMetal.GOLD.plates, PLATES.tag, ItemTags.PIGLIN_LOVED),

CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag),
CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED),
CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CRUSHED_RAW_MATERIALS.tag),
CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CRUSHED_RAW_MATERIALS.tag);
CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CommonMetal.IRON.crushedOres, CRUSHED_RAW_MATERIALS.tag),
CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CommonMetal.GOLD.crushedOres, CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED),
CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CommonMetal.COPPER.crushedOres, CRUSHED_RAW_MATERIALS.tag),
CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CommonMetal.ZINC.crushedOres, CRUSHED_RAW_MATERIALS.tag);

public static final ItemEntry<TagDependentIngredientItem> CRUSHED_OSMIUM = compatCrushedOre(OSMIUM),
CRUSHED_PLATINUM = compatCrushedOre(PLATINUM), CRUSHED_SILVER = compatCrushedOre(SILVER),
Expand Down Expand Up @@ -526,7 +526,7 @@ private static ItemEntry<TagDependentIngredientItem> compatCrushedOre(CommonMeta
return REGISTRATE
.item("crushed_raw_" + metal,
props -> new TagDependentIngredientItem(props, metal.ores.items()))
.tag(CRUSHED_RAW_MATERIALS.tag)
.tag(CRUSHED_RAW_MATERIALS.tag, metal.crushedOres)
.register();
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/simibubi/create/AllTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ public enum AllItemTags {

CARDBOARD_STORAGE_BLOCKS(COMMON, "storage_blocks/cardboard"),
ANDESITE_ALLOY_STORAGE_BLOCKS(COMMON, "storage_blocks/andesite_alloy"),
ANDESITE_ALLOY_INGOTS(COMMON, "ingots/andesite_alloy"),

CHOCOLATE_BUCKETS(COMMON, "buckets/chocolate"),
HONEY_BUCKETS(COMMON, "buckets/honey"),
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/simibubi/create/foundation/data/recipe/CommonMetal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public enum CommonMetal {

public final ItemLikeTag ores;
public final TagKey<Item> rawOres;
public final TagKey<Item> crushedOres;
public final ItemLikeTag rawStorageBlocks;
public final TagKey<Item> ingots;
public final ItemLikeTag storageBlocks;
Expand All @@ -100,6 +101,7 @@ public enum CommonMetal {

this.ores = new ItemLikeTag("ores/" + this.name);
this.rawOres = itemTag("raw_materials/" + this.name);
this.crushedOres = itemTag("crushed_raw_materials/" + this.name);
this.rawStorageBlocks = new ItemLikeTag("storage_blocks/raw_" + this.name);
this.ingots = itemTag("ingots/" + this.name);
this.storageBlocks = new ItemLikeTag("storage_blocks/" + this.name);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/simibubi/create/infrastructure/data/TagLangGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ public void generate() {
translate(metal.nuggets, name + " Nuggets");
translate(metal.plates, name + " Plates");
}
translate(AllItemTags.ANDESITE_ALLOY_INGOTS, "Andesite Alloy Ingots");
}

protected static String keyFor(TagKey<?> tag) {
Expand Down
Loading