diff --git a/config/oreveins/ore_veins.json b/config/oreveins/ore_veins.json index 9b7159b..b09b871 100644 --- a/config/oreveins/ore_veins.json +++ b/config/oreveins/ore_veins.json @@ -69,12 +69,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/silver", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 240, @@ -93,12 +90,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 6 - }, + "blocks": "contenttweaker:juice/internal/indicator/platinium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -117,12 +111,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "mekanism:oreblock", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/tin", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 180, @@ -142,12 +133,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 4 - }, + "blocks": "contenttweaker:juice/internal/indicator/aluminium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 190, @@ -166,12 +154,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/nickel", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 210, @@ -190,12 +175,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "minecraft:redstone_ore", - "meta": 0 - }, + "blocks": "contenttweaker:juice/internal/indicator/redstone", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 170, @@ -213,9 +195,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "mekanism:oreblock", + "blocks": "contenttweaker:juice/internal/indicator/osmium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 190, @@ -234,12 +216,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/magnesium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 255, @@ -258,12 +237,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/boron", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 280, @@ -282,10 +258,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "nuclearcraft:ore", - "meta": 6, + "blocks": "contenttweaker:juice/internal/indicator/lithium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 255, @@ -304,12 +279,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 4 - }, + "blocks": "contenttweaker:juice/internal/indicator/uranium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 260, @@ -327,9 +299,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:coal_ore", + "blocks": "contenttweaker:juice/internal/indicator/coal", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 90, @@ -348,9 +320,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:iron_ore", + "blocks": "contenttweaker:juice/internal/indicator/iron", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 160, @@ -368,9 +340,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:diamond_ore", + "blocks": "contenttweaker:juice/internal/indicator/diamond", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -388,9 +360,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:lapis_ore", + "blocks": "contenttweaker:juice/internal/indicator/lapis", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 150, @@ -409,12 +381,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "galacticraftcore:basic_block_core", - "meta": 8 - }, + "blocks": "contenttweaker:juice/internal/indicator/silicon", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 210, @@ -432,12 +401,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/lead", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 185, @@ -455,12 +421,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/iridium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 360, @@ -479,12 +442,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "actuallyadditions:block_misc", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/blackquartz", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 265, @@ -503,12 +463,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 1 - }, + "blocks": "contenttweaker:juice/internal/indicator/ruby", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 310, @@ -526,12 +483,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/amber", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 275, @@ -549,12 +503,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 6 - }, + "blocks": "contenttweaker:juice/internal/indicator/sapphire", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 310, @@ -572,12 +523,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/peridot", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -595,12 +543,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/malachite", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 270, @@ -618,12 +563,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/tanzite", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 295, @@ -647,12 +589,9 @@ ], "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/certus_quartz", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 330, diff --git a/index.toml b/index.toml index b997bbe..c3de786 100644 --- a/index.toml +++ b/index.toml @@ -1146,7 +1146,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187" [[files]] file = "config/oreveins/ore_veins.json" -hash = "6aef59bcddb88b84152ccb47e6ebcb1933782a4dbfb498e7a8fb7c13cf3f77a2" +hash = "e1b2b9e15458917be388f68454e78dec70d299e82525f35233d817ea9e2b03cf" [[files]] file = "config/sereneseasons/biome_info.json" @@ -2396,7 +2396,7 @@ hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee" [[files]] file = "scripts/ore_veins/indicators.1.zs" -hash = "eee1737869c3a9a2d2261894b32f09d8dee48df55f07393eec54ba8748a13d79" +hash = "e1c7d1f08c0c54de9b6f9be8c29b3fe4c6f35bc3c8e917d06aaf7bf4fd182a2a" [[files]] file = "scripts/ore_veins/indicators.2.zs" diff --git a/pack.toml b/pack.toml index 33bbaba..4659ff7 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "69b89b211686f3c98af33f370e9224b6a33e0c55d930d9efbe8884d8eddad297" +hash = "d16c25fabb4e0584e25d5d3196037dcfd66ecf74bb6b569e9e8a4bec59e90d11" [versions] forge = "14.23.5.2860" diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs index f0cee4f..5a2b4d8 100644 --- a/scripts/ore_veins/indicators.1.zs +++ b/scripts/ore_veins/indicators.1.zs @@ -7,9 +7,35 @@ import mods.contenttweaker.VanillaFactory; var nugget_table as string[][] = [ # [name, id, meta] - ["copper", "thermalfoundation:ore", "0"], + ["copper", "ic2:resource", "1"], ["apatite", "forestry:resources", "0"], - ["gold", "minecraft:gold_ore", "0"] + ["gold", "minecraft:gold_ore", "0"], + ["silver", "thermalfoundation:ore", "2"], + ["platinium", "thermalfoundation:ore", "6"], + ["tin", "mekanism:oreblock", "2"], + ["aliminium", "thermalfoundation:ore", "4"], + ["nickel", "thermalfoundation:ore", "5"], + ["redstone", "minecraft:redstone_ore", "0"], + ["osmium", "mekanism:oreblock", "0"], + ["magnesium", "nuclearcraft:ore", "7"], + ["boron", "nuclearcraft:ore", "5"], + ["lithium", "nuclearcraft:ore", "6"], + ["uranium", "nuclearcraft:ore", "4"], + ["coal", "minecarft:coal_ore", "0"], + ["iron", "minecraft:iron_ore", "0"], + ["diamond", "minecraft:diamond_ore", "0"], + ["lapis", "minecraft:lapis_ore", "0"], + ["silicon", "galacticraftcore:basic_block_core", "8"], + ["lead", "thermalfoundation:ore", "3"], + ["iridium", "thermalfoundation:ore", "7"], + ["blackquartz", "actuallyadditions:block_misc", "3"], + ["ruby", "biomesofplenty:gem_ore", "1"], + ["amber", "biomesofplenty:gem_ore", "7"], + ["sapphire", "biomesofplenty:gem_ore", "6"], + ["peridot", "biomesofplenty:gem_ore", "2"], + ["malachite", "biomesofplenty:gem_ore", "5"], + ["tanzite", "biomesofplenty:gem_ore", "4"], + ["certus_quartz", "appliedenegistics2:material", "0"] ]; function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string {