Skip to content

Commit

Permalink
Fix #837: Add a few missing grouping tags (#864)
Browse files Browse the repository at this point in the history
  • Loading branch information
Technici4n authored Sep 4, 2024
1 parent 71c3234 commit 43f0425
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,7 @@
"tag.c.raw_materials.titanium": "Titanium Raw Materials",
"tag.c.raw_materials.tungsten": "Tungsten Raw Materials",
"tag.c.raw_materials.uranium": "Uranium Raw Materials",
"tag.c.rods": "Rods",
"tag.c.rods.aluminum": "Aluminum Rods",
"tag.c.rods.bronze": "Bronze Rods",
"tag.c.rods.cadmium": "Cadmium Rods",
Expand All @@ -1336,6 +1337,7 @@
"tag.c.rods.tin": "Tin Rods",
"tag.c.rods.titanium": "Titanium Rods",
"tag.c.rods.uranium": "Uranium Rods",
"tag.c.storage_blocks": "Storage Blocks",
"tag.c.storage_blocks.aluminum": "Aluminum Storage Blocks",
"tag.c.storage_blocks.annealed_copper": "Annealed Copper Storage Blocks",
"tag.c.storage_blocks.antimony": "Antimony Storage Blocks",
Expand Down
54 changes: 54 additions & 0 deletions src/generated/resources/data/c/tags/block/storage_blocks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"values": [
"#c:storage_blocks/aluminum",
"#c:storage_blocks/annealed_copper",
"#c:storage_blocks/antimony",
"#c:storage_blocks/battery_alloy",
"#c:storage_blocks/bauxite",
"#c:storage_blocks/beryllium",
"#c:storage_blocks/bronze",
"#c:storage_blocks/chromium",
"#c:storage_blocks/coke",
"#c:storage_blocks/cupronickel",
"#c:storage_blocks/electrum",
"#c:storage_blocks/he_mox",
"#c:storage_blocks/he_uranium",
"#c:storage_blocks/invar",
"#c:storage_blocks/iridium",
"#c:storage_blocks/kanthal",
"#c:storage_blocks/le_mox",
"#c:storage_blocks/le_uranium",
"#c:storage_blocks/lead",
"#c:storage_blocks/lignite_coal",
"#c:storage_blocks/monazite",
"#c:storage_blocks/neodymium",
"#c:storage_blocks/nickel",
"#c:storage_blocks/platinum",
"#c:storage_blocks/plutonium",
"#c:storage_blocks/raw_antimony",
"#c:storage_blocks/raw_iridium",
"#c:storage_blocks/raw_lead",
"#c:storage_blocks/raw_nickel",
"#c:storage_blocks/raw_platinum",
"#c:storage_blocks/raw_silver",
"#c:storage_blocks/raw_tin",
"#c:storage_blocks/raw_titanium",
"#c:storage_blocks/raw_tungsten",
"#c:storage_blocks/raw_uranium",
"#c:storage_blocks/salt",
"#c:storage_blocks/silicon",
"#c:storage_blocks/silver",
"#c:storage_blocks/sodium",
"#c:storage_blocks/soldering_alloy",
"#c:storage_blocks/stainless_steel",
"#c:storage_blocks/steel",
"#c:storage_blocks/sulfur",
"#c:storage_blocks/tin",
"#c:storage_blocks/titanium",
"#c:storage_blocks/tungsten",
"#c:storage_blocks/uranium",
"#c:storage_blocks/uranium_235",
"#c:storage_blocks/uranium_238",
"#c:storage_blocks/yttrium"
]
}
20 changes: 20 additions & 0 deletions src/generated/resources/data/c/tags/item/rods.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"values": [
"#c:rods/aluminum",
"#c:rods/bronze",
"#c:rods/cadmium",
"#c:rods/copper",
"#c:rods/gold",
"#c:rods/he_mox",
"#c:rods/he_uranium",
"#c:rods/invar",
"#c:rods/iron",
"#c:rods/le_mox",
"#c:rods/le_uranium",
"#c:rods/stainless_steel",
"#c:rods/steel",
"#c:rods/tin",
"#c:rods/titanium",
"#c:rods/uranium"
]
}
54 changes: 54 additions & 0 deletions src/generated/resources/data/c/tags/item/storage_blocks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"values": [
"#c:storage_blocks/aluminum",
"#c:storage_blocks/annealed_copper",
"#c:storage_blocks/antimony",
"#c:storage_blocks/battery_alloy",
"#c:storage_blocks/bauxite",
"#c:storage_blocks/beryllium",
"#c:storage_blocks/bronze",
"#c:storage_blocks/chromium",
"#c:storage_blocks/coke",
"#c:storage_blocks/cupronickel",
"#c:storage_blocks/electrum",
"#c:storage_blocks/he_mox",
"#c:storage_blocks/he_uranium",
"#c:storage_blocks/invar",
"#c:storage_blocks/iridium",
"#c:storage_blocks/kanthal",
"#c:storage_blocks/le_mox",
"#c:storage_blocks/le_uranium",
"#c:storage_blocks/lead",
"#c:storage_blocks/lignite_coal",
"#c:storage_blocks/monazite",
"#c:storage_blocks/neodymium",
"#c:storage_blocks/nickel",
"#c:storage_blocks/platinum",
"#c:storage_blocks/plutonium",
"#c:storage_blocks/raw_antimony",
"#c:storage_blocks/raw_iridium",
"#c:storage_blocks/raw_lead",
"#c:storage_blocks/raw_nickel",
"#c:storage_blocks/raw_platinum",
"#c:storage_blocks/raw_silver",
"#c:storage_blocks/raw_tin",
"#c:storage_blocks/raw_titanium",
"#c:storage_blocks/raw_tungsten",
"#c:storage_blocks/raw_uranium",
"#c:storage_blocks/salt",
"#c:storage_blocks/silicon",
"#c:storage_blocks/silver",
"#c:storage_blocks/sodium",
"#c:storage_blocks/soldering_alloy",
"#c:storage_blocks/stainless_steel",
"#c:storage_blocks/steel",
"#c:storage_blocks/sulfur",
"#c:storage_blocks/tin",
"#c:storage_blocks/titanium",
"#c:storage_blocks/tungsten",
"#c:storage_blocks/uranium",
"#c:storage_blocks/uranium_235",
"#c:storage_blocks/uranium_238",
"#c:storage_blocks/yttrium"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,16 @@ public class MIParts {
public static final Set<PartKey> TAGGED_PARTS = new HashSet<>(TAGGED_PARTS_LIST);

public static final Map<PartKey, CategoryTag> CATEGORY_TAGS = Map.of(
BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks"),
DUST.key(), new CategoryTag(Tags.Items.DUSTS, "Dusts"),
GEAR.key(), new CategoryTag("c:gears", "Gears"),
INGOT.key(), new CategoryTag(Tags.Items.INGOTS, "Ingots"),
NUGGET.key(), new CategoryTag(Tags.Items.NUGGETS, "Nuggets"),
PLATE.key(), new CategoryTag("c:plates", "Plates"),
ROD.key(), new CategoryTag(Tags.Items.RODS, "Rods"),
RAW_METAL.key(), new CategoryTag(Tags.Items.RAW_MATERIALS, "Raw Ores"),
TINY_DUST.key(), new CategoryTag("c:tiny_dusts", "Tiny Dusts"));
TINY_DUST.key(), new CategoryTag("c:tiny_dusts", "Tiny Dusts"),
RAW_METAL_BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks"));

public record CategoryTag(String tag, String englishName) {
public CategoryTag(TagKey<Item> tag, String englishName) {
Expand Down

0 comments on commit 43f0425

Please sign in to comment.