From 9a4566c5bae4614fb730b152fe9fa12b28842a63 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:09:23 -0700 Subject: [PATCH] Ore chunks tag + fix Thermal silver ore --- .../221483d9edeccdc82e726e39216c875f3fc356d3 | 3 ++- .../data/exdeorum/tags/items/ore_chunks.json | 22 +++++++++++++++++++ .../exdeorum/compat/PreferredOres.java | 2 +- .../thedarkcolour/exdeorum/data/ModTags.java | 1 + .../thedarkcolour/exdeorum/tag/EItemTags.java | 1 + 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/exdeorum/tags/items/ore_chunks.json diff --git a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 index 653a7a8a..e3745d46 100644 --- a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 +++ b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 @@ -1,4 +1,4 @@ -// 1.20.4 2024-04-08T16:37:05.5942391 Tags for minecraft:item mod id exdeorum +// 1.20.4 2024-06-12T10:02:21.4190209 Tags for minecraft:item mod id exdeorum 6c72957356b1d59a27be736fa1da54a5a9795ef7 data/exdeorum/tags/items/barrels.json 6afa16b45f76c0defa1675d07586e2c6e6b0be69 data/exdeorum/tags/items/compressed/andesite.json 31b46613766e4cdc53196850495ab1019f61cb48 data/exdeorum/tags/items/compressed/blackstone.json @@ -25,6 +25,7 @@ dad00c75d1a0b74a2f843bead336ee278e9cecba data/exdeorum/tags/items/compressed_ham 5feb54ce68fa657af5ce696f75b8c7a6d04cc7a7 data/exdeorum/tags/items/crooks.json 74eefeb986d633d26ad42202c4a6b5e71463c425 data/exdeorum/tags/items/end_cake_materials.json be46bf2abe731d5ee5bd15ce72f222b2b9a49385 data/exdeorum/tags/items/hammers.json +008b4a382f07b9c0f9a07c78bedb949b4400e011 data/exdeorum/tags/items/ore_chunks.json b90bd3c642e69b9e800c58a9f8f53e369652e6ba data/exdeorum/tags/items/pebbles.json 8e1b5ab26037123d3948e9ac9f50da1b7cd0a129 data/exdeorum/tags/items/sieve_meshes.json 0152da758e7665bf282f17f466599c7a009d9a15 data/exdeorum/tags/items/stone_barrels.json diff --git a/src/generated/resources/data/exdeorum/tags/items/ore_chunks.json b/src/generated/resources/data/exdeorum/tags/items/ore_chunks.json new file mode 100644 index 00000000..684dc894 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/ore_chunks.json @@ -0,0 +1,22 @@ +{ + "values": [ + "exdeorum:iron_ore_chunk", + "exdeorum:copper_ore_chunk", + "exdeorum:gold_ore_chunk", + "exdeorum:aluminum_ore_chunk", + "exdeorum:cobalt_ore_chunk", + "exdeorum:silver_ore_chunk", + "exdeorum:lead_ore_chunk", + "exdeorum:platinum_ore_chunk", + "exdeorum:nickel_ore_chunk", + "exdeorum:uranium_ore_chunk", + "exdeorum:osmium_ore_chunk", + "exdeorum:tin_ore_chunk", + "exdeorum:zinc_ore_chunk", + "exdeorum:iridium_ore_chunk", + "exdeorum:thorium_ore_chunk", + "exdeorum:magnesium_ore_chunk", + "exdeorum:lithium_ore_chunk", + "exdeorum:boron_ore_chunk" + ] +} \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java index abf950e3..391afdc6 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java @@ -109,7 +109,7 @@ public class PreferredOres { } public static Item getDefaultSilverOre() { - return defaultItem("silver_ore", ModIds.ALL_THE_ORES, ModIds.OCCULTISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING); + return defaultItem("silver_ore", ModIds.ALL_THE_ORES, ModIds.THERMAL, ModIds.OCCULTISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC, ModIds.IMMERSIVE_ENGINEERING); } public static Item getDefaultLeadOre() { diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java index 663a8b5a..a6a5eea7 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java @@ -91,6 +91,7 @@ class ModTags { tags.tag(EItemTags.CROOKS).add(EItems.CROOK, EItems.BONE_CROOK); tags.tag(EItemTags.SIEVE_MESHES).add(EItems.STRING_MESH, EItems.FLINT_MESH, EItems.IRON_MESH, EItems.GOLDEN_MESH, EItems.DIAMOND_MESH, EItems.NETHERITE_MESH); tags.tag(EItemTags.PEBBLES).add(EItems.STONE_PEBBLE, EItems.DIORITE_PEBBLE, EItems.GRANITE_PEBBLE, EItems.ANDESITE_PEBBLE, EItems.DEEPSLATE_PEBBLE, EItems.TUFF_PEBBLE, EItems.CALCITE_PEBBLE, EItems.BLACKSTONE_PEBBLE, EItems.BASALT_PEBBLE); + tags.tag(EItemTags.ORE_CHUNKS).add(EItems.IRON_ORE_CHUNK.get(), EItems.COPPER_ORE_CHUNK.get(), EItems.GOLD_ORE_CHUNK.get(), EItems.ALUMINUM_ORE_CHUNK.get(), EItems.COBALT_ORE_CHUNK.get(), EItems.SILVER_ORE_CHUNK.get(), EItems.LEAD_ORE_CHUNK.get(), EItems.PLATINUM_ORE_CHUNK.get(), EItems.NICKEL_ORE_CHUNK.get(), EItems.URANIUM_ORE_CHUNK.get(), EItems.OSMIUM_ORE_CHUNK.get(), EItems.TIN_ORE_CHUNK.get(), EItems.ZINC_ORE_CHUNK.get(), EItems.IRIDIUM_ORE_CHUNK.get(), EItems.THORIUM_ORE_CHUNK.get(), EItems.MAGNESIUM_ORE_CHUNK.get(), EItems.LITHIUM_ORE_CHUNK.get(), EItems.BORON_ORE_CHUNK.get()); tags.tag(EItemTags.END_CAKE_MATERIAL).add(Items.ENDER_EYE); tags.tag(EItemTags.WOODEN_BARRELS).add(WOODEN_BARRELS.stream().map(BarrelMaterial::getItem).toArray(Item[]::new)); tags.tag(EItemTags.STONE_BARRELS).add(DefaultMaterials.STONE_BARREL.getItem(), DefaultMaterials.CRYSTALLIZED_BARREL.getItem()); diff --git a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java index 1eee0caa..783e0406 100644 --- a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java +++ b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java @@ -30,6 +30,7 @@ public class EItemTags { public static final TagKey COMPRESSED_HAMMERS = tag("compressed_hammers"); public static final TagKey SIEVE_MESHES = tag("sieve_meshes"); public static final TagKey PEBBLES = tag("pebbles"); + public static final TagKey ORE_CHUNKS = tag("ore_chunks"); public static final TagKey END_CAKE_MATERIAL = tag("end_cake_materials"); public static final TagKey WOODEN_BARRELS = tag("wooden_barrels");