R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ore chunks tag + fix Thermal silver ore

Browse Source
This commit is contained in:
thedarkcolour 2024-06-08 12:28:41 -07:00
parent 9ea5529ce6
commit 0b3deeca85
No known key found for this signature in database
GPG Key ID: 6599A8E0516C8F38
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3
View File

@ -1,4 +1,4 @@
// 1.20.1 2024-04-06T19:42:13.2636741 Tags for minecraft:item mod id exdeorum
// 1.20.1 2024-06-08T12:27:56.4063662 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

22
src/generated/resources/data/exdeorum/tags/items/ore_chunks.json Normal file
View File

@ -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"
]
}

2
src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java
View File

@ -112,7 +112,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() {

1
src/main/java/thedarkcolour/exdeorum/data/ModTags.java
View File

@ -92,6 +92,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());

2
src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java
View File

@ -23,7 +23,6 @@ import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import thedarkcolour.exdeorum.ExDeorum;
import thedarkcolour.exdeorum.registry.ECompressedBlocks;
public class EItemTags {
public static final TagKey<Item> CROOKS = tag("crooks");
@ -32,6 +31,7 @@ public class EItemTags {
public static final TagKey<Item> SIEVE_MESHES = tag("sieve_meshes");
public static final TagKey<Item> PEBBLES = tag("pebbles");
public static final TagKey<Item> END_CAKE_MATERIAL = tag("end_cake_materials");
public static final TagKey<Item> ORE_CHUNKS = tag("ore_chunks");
public static final TagKey<Item> WOODEN_BARRELS = tag("wooden_barrels");
public static final TagKey<Item> STONE_BARRELS = tag("stone_barrels");