diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index f99f8a6a22..76b8b3eed1 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -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Ɔ", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index c090d96fcc..261e6ea302 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -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", diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index 3c03b7b1a9..a5dcda0db8 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -5,6 +5,7 @@ "create:andesite_alloy_block", "create:brass_block", "create:cardboard_block", + "create:bound_cardboard_block", "create:experience_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/cardboard.json b/src/generated/resources/data/c/tags/block/storage_blocks/cardboard.json index 10452a5013..9eca0a214a 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks/cardboard.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks/cardboard.json @@ -1,5 +1,6 @@ { "values": [ - "create:cardboard_block" + "create:cardboard_block", + "create:bound_cardboard_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/aluminum.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/aluminum.json new file mode 100644 index 0000000000..25af0cfdde --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/aluminum.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_aluminum" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/copper.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/copper.json new file mode 100644 index 0000000000..32145342cc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/gold.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/gold.json new file mode 100644 index 0000000000..0b0bbe839d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/iron.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/iron.json new file mode 100644 index 0000000000..f0ba7ca54d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/lead.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/lead.json new file mode 100644 index 0000000000..fc341bcfa4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/lead.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_lead" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/nickel.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/nickel.json new file mode 100644 index 0000000000..a7ad5b7b90 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/nickel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_nickel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/osmium.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/osmium.json new file mode 100644 index 0000000000..6c910cb3a6 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/osmium.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_osmium" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/platinum.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/platinum.json new file mode 100644 index 0000000000..cb0822f90b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/platinum.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_platinum" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/quicksilver.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/quicksilver.json new file mode 100644 index 0000000000..78c9ada2de --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/quicksilver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_quicksilver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/silver.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/silver.json new file mode 100644 index 0000000000..7fe0c08e58 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/silver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_silver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/tin.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/tin.json new file mode 100644 index 0000000000..edace25411 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/tin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_tin" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/uranium.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/uranium.json new file mode 100644 index 0000000000..a364d94c9e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/uranium.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_uranium" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials/zinc.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials/zinc.json new file mode 100644 index 0000000000..6acae1716d --- /dev/null +++ b/src/generated/resources/data/c/tags/item/crushed_raw_materials/zinc.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:crushed_raw_zinc" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/andesite_alloy.json b/src/generated/resources/data/c/tags/item/ingots/andesite_alloy.json new file mode 100644 index 0000000000..fb51705a08 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/andesite_alloy.json @@ -0,0 +1,5 @@ +{ + "values": [ + "create:andesite_alloy" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index 3c03b7b1a9..a5dcda0db8 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -5,6 +5,7 @@ "create:andesite_alloy_block", "create:brass_block", "create:cardboard_block", + "create:bound_cardboard_block", "create:experience_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/cardboard.json b/src/generated/resources/data/c/tags/item/storage_blocks/cardboard.json index 10452a5013..9eca0a214a 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks/cardboard.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks/cardboard.json @@ -1,5 +1,6 @@ { "values": [ - "create:cardboard_block" + "create:cardboard_block", + "create:bound_cardboard_block" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 4335fb2c74..9b7102c582 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -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)) @@ -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(); diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 61d0b34b28..fcdaf46579 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -190,7 +190,7 @@ public class AllItems { public static final ItemEntry RAW_ZINC = taggedIngredient("raw_zinc", CommonMetal.ZINC.rawOres, Items.RAW_MATERIALS); - public static final ItemEntry ANDESITE_ALLOY = taggedIngredient("andesite_alloy", CREATE_INGOTS.tag), + public static final ItemEntry 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); @@ -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 CRUSHED_OSMIUM = compatCrushedOre(OSMIUM), CRUSHED_PLATINUM = compatCrushedOre(PLATINUM), CRUSHED_SILVER = compatCrushedOre(SILVER), @@ -526,7 +526,7 @@ private static ItemEntry 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(); } diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index ec1d81eaa5..e38ae8fd56 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -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"), diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CommonMetal.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CommonMetal.java index 4081255525..ea61275904 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CommonMetal.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CommonMetal.java @@ -82,6 +82,7 @@ public enum CommonMetal { public final ItemLikeTag ores; public final TagKey rawOres; + public final TagKey crushedOres; public final ItemLikeTag rawStorageBlocks; public final TagKey ingots; public final ItemLikeTag storageBlocks; @@ -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); diff --git a/src/main/java/com/simibubi/create/infrastructure/data/TagLangGenerator.java b/src/main/java/com/simibubi/create/infrastructure/data/TagLangGenerator.java index f77b366969..54d1ff0b93 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/TagLangGenerator.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/TagLangGenerator.java @@ -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) {