From 27a3c5f7d531aa1161875dc597e453433ccbc0b6 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 24 Jul 2023 21:01:29 -0400 Subject: [PATCH 1/3] remove more uranium, osmium, and lead ores --- .../deposit/geodes/dimensional_geode.json | 23 ++++++------- .../geodes/emerald_geode_dripstone_caves.json | 32 ++++++++--------- .../geodes/emerald_geode_hills_high.json | 34 +++++++++---------- .../geodes/emerald_geode_hills_low.json | 30 ++++++++-------- .../deposit/geodes/emerald_geode_swamp.json | 26 +++++++------- .../deposit/geodes/fluorite_geode.json | 23 ++++++------- .../deposit/geodes/fluorite_geode_nether.json | 25 ++++++-------- .../deposit/geodes/ocean_geode.json | 20 +++++------ .../deposit/geodes/redstone_geode.json | 26 +++++++------- .../deposit/geodes/sulfur_geode_air.json | 25 ++++++-------- .../deposit/geodes/sulfur_geode_nether.json | 25 ++++++-------- .../deposit/geodes/sulfur_geode_water.json | 25 ++++++-------- 12 files changed, 142 insertions(+), 172 deletions(-) diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json index a46e2a9a1..01edb0abc 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/dimensional_geode.json @@ -5,23 +5,20 @@ "registryName": "dimensional_geode", "config": { "outerShellBlocks": [ - {"block": "create:cut_asurine", "weight": 95}, - {"block": "create:asurine", "weight": 5} + { "block": "create:cut_asurine", "weight": 95 }, + { "block": "create:asurine", "weight": 5 } ], "innerShellBlocks": [ - {"block": "create:asurine", "weight": 65}, - {"block": "emendatusenigmatica:lapis_asurine_ore", "weight": 25}, - {"block": "emendatusenigmatica:diamond_asurine_ore", "weight": 25} + { "block": "create:asurine", "weight": 65 }, + { "block": "emendatusenigmatica:lapis_asurine_ore", "weight": 25 }, + { "block": "emendatusenigmatica:diamond_asurine_ore", "weight": 25 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:dimensional_cluster_shard_block", "weight": 60}, - {"block": "emendatusenigmatica:budding_dimensional", "weight": 40} + { "block": "emendatusenigmatica:dimensional_cluster_shard_block", "weight": 60 }, + { "block": "emendatusenigmatica:budding_dimensional", "weight": 40 } ], - "clusters": [ - "emendatusenigmatica:small_dimensional_bud", - "emendatusenigmatica:medium_dimensional_bud" - ], - "fillBlocks": [{"block": "minecraft:air", "weight": 10}], + "clusters": ["emendatusenigmatica:small_dimensional_bud", "emendatusenigmatica:medium_dimensional_bud"], + "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }], "chance": 20, "rarity": "rare", "crackChance": 0.25, @@ -49,4 +46,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json index 163d9879f..cb857f53c 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_dripstone_caves.json @@ -1,35 +1,33 @@ { "type": "emendatusenigmatica:geode_deposit", "dimension": "minecraft:overworld", - "biomes": [ - "minecraft:dripstone_caves" - ], + "biomes": ["minecraft:dripstone_caves"], "registryName": "emerald_geode_caves", "config": { "outerShellBlocks": [ - {"block": "create:cut_dripstone", "weight": 85}, - {"block": "minecraft:dripstone_block", "weight": 15}, - {"block": "minecraft:obsidian", "weight": 100} + { "block": "create:cut_dripstone", "weight": 85 }, + { "block": "minecraft:dripstone_block", "weight": 15 }, + { "block": "minecraft:obsidian", "weight": 100 } ], "innerShellBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 65}, - {"block": "create:cut_dripstone", "weight": 15}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20} + { "block": "minecraft:dripstone_block", "weight": 65 }, + { "block": "create:cut_dripstone", "weight": 15 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 } ], "innerBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "emendatusenigmatica:lapis_dripstone_ore","weight": 15}, - {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 }, + { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15 } ], "fillBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 55}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15}, - {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 30} + { "block": "minecraft:dripstone_block", "weight": 55 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15 }, + { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 30 } ], "clusters": [], "chance": 20, "rarity": "rare", - "crackChance": 0.20, + "crackChance": 0.2, "minYLevel": -60, "maxYLevel": 70, "generateSamples": false, @@ -54,4 +52,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json index dc8ba75c3..335df638a 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_high.json @@ -10,31 +10,31 @@ "minecraft:jagged_peaks", "minecraft:stony_peaks", "minecraft:snowy_slopes", - "byg:canadian_shield", - "byg:crag_gardens", - "byg:dacite_ridges", + "byg:canadian_shield", + "byg:crag_gardens", + "byg:dacite_ridges", "byg:howling_peaks" ], "registryName": "emerald_geode_hills_high", "config": { "outerShellBlocks": [ - {"block": "create:cut_dripstone", "weight": 85}, - {"block": "minecraft:dripstone_block", "weight": 15} + { "block": "create:cut_dripstone", "weight": 85 }, + { "block": "minecraft:dripstone_block", "weight": 15 } ], "innerShellBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "create:cut_dripstone", "weight": 20}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 10} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "create:cut_dripstone", "weight": 20 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 10 } ], "innerBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 60}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 25}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15} + { "block": "minecraft:dripstone_block", "weight": 60 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 25 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 15 } ], "fillBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 55}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 35}, - {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 10} + { "block": "minecraft:dripstone_block", "weight": 55 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 35 }, + { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 10 } ], "clusters": [], "chance": 20, @@ -43,9 +43,7 @@ "minYLevel": 20, "maxYLevel": 75, "generateSamples": true, - "sampleBlocks": [ - { "material": "emerald", "weight": 10, "strata": "minecraft_dripstone"} - ], + "sampleBlocks": [{ "material": "emerald", "weight": 10, "strata": "minecraft_dripstone" }], "fillerTypes": [ "minecraft_deepslate", "minecraft_tuff", @@ -66,4 +64,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json index 17188a134..d6f4871f2 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_hills_low.json @@ -10,31 +10,31 @@ "minecraft:jagged_peaks", "minecraft:stony_peaks", "minecraft:snowy_slopes", - "byg:canadian_shield", - "byg:crag_gardens", - "byg:dacite_ridges", + "byg:canadian_shield", + "byg:crag_gardens", + "byg:dacite_ridges", "byg:howling_peaks" ], "registryName": "emerald_geode_hills_low", "config": { "outerShellBlocks": [ - {"block": "create:cut_dripstone", "weight": 85}, - {"block": "minecraft:dripstone_block", "weight": 15} + { "block": "create:cut_dripstone", "weight": 85 }, + { "block": "minecraft:dripstone_block", "weight": 15 } ], "innerShellBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "create:cut_dripstone", "weight": 15}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "create:cut_dripstone", "weight": 15 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 } ], "innerBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10 } ], "fillBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 55}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25}, - {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 25} + { "block": "minecraft:dripstone_block", "weight": 55 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25 }, + { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 25 } ], "clusters": [], "chance": 20, @@ -64,4 +64,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json index 8e76ec885..0b2cc9ec2 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/emerald_geode_swamp.json @@ -11,24 +11,24 @@ "registryName": "emerald_geode_swamp", "config": { "outerShellBlocks": [ - {"block": "create:cut_dripstone", "weight": 85}, - {"block": "minecraft:dripstone_block", "weight": 15}, - {"block": "minecraft:obsidian", "weight": 100} + { "block": "create:cut_dripstone", "weight": 85 }, + { "block": "minecraft:dripstone_block", "weight": 15 }, + { "block": "minecraft:obsidian", "weight": 100 } ], "innerShellBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "create:cut_dripstone", "weight": 15}, - {"block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "create:cut_dripstone", "weight": 15 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 15 } ], "innerBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 70}, - {"block": "emendatusenigmatica:lapis_dripstone_ore","weight": 20}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10} + { "block": "minecraft:dripstone_block", "weight": 70 }, + { "block": "emendatusenigmatica:lapis_dripstone_ore", "weight": 20 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 10 } ], "fillBlocks": [ - {"block": "minecraft:dripstone_block", "weight": 60}, - {"block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25}, - {"block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15} + { "block": "minecraft:dripstone_block", "weight": 60 }, + { "block": "emendatusenigmatica:emerald_dripstone_ore", "weight": 25 }, + { "block": "emendatusenigmatica:diamond_dripstone_ore", "weight": 15 } ], "clusters": [], "chance": 20, @@ -58,4 +58,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json index 48fe26e7f..4ae8d162d 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode.json @@ -5,23 +5,20 @@ "registryName": "fluorite_geode", "config": { "outerShellBlocks": [ - {"block": "create:cut_asurine", "weight": 95}, - {"block": "create:asurine", "weight": 5} + { "block": "create:cut_asurine", "weight": 95 }, + { "block": "create:asurine", "weight": 5 } ], "innerShellBlocks": [ - {"block": "create:asurine", "weight": 45}, - {"block": "emendatusenigmatica:apatite_asurine_ore", "weight": 30}, - {"block": "emendatusenigmatica:niter_asurine_ore", "weight": 25} + { "block": "create:asurine", "weight": 45 }, + { "block": "emendatusenigmatica:apatite_asurine_ore", "weight": 30 }, + { "block": "emendatusenigmatica:niter_asurine_ore", "weight": 25 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 60}, - {"block": "emendatusenigmatica:budding_fluorite", "weight": 40} + { "block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 60 }, + { "block": "emendatusenigmatica:budding_fluorite", "weight": 40 } ], - "clusters": [ - "emendatusenigmatica:small_fluorite_bud", - "emendatusenigmatica:medium_fluorite_bud" - ], - "fillBlocks": [{"block": "minecraft:air", "weight": 10}], + "clusters": ["emendatusenigmatica:small_fluorite_bud", "emendatusenigmatica:medium_fluorite_bud"], + "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }], "chance": 30, "rarity": "rare", "crackChance": 0.15, @@ -48,4 +45,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json index 377dcd838..09e8951bd 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/fluorite_geode_nether.json @@ -4,24 +4,19 @@ "biomes": [], "registryName": "fluorite_geode_nether", "config": { - "outerShellBlocks": [ - {"block": "minecraft:blackstone", "weight": 95} - ], + "outerShellBlocks": [{ "block": "minecraft:blackstone", "weight": 95 }], "innerShellBlocks": [ - {"block": "minecraft:basalt", "weight": 40}, - {"block": "emendatusenigmatica:uranium_basalt_ore", "weight": 30}, - {"block": "emendatusenigmatica:osmium_basalt_ore", "weight": 20}, - {"block": "emendatusenigmatica:lead_basalt_ore", "weight": 10} + { "block": "minecraft:basalt", "weight": 40 }, + { "block": "emendatusenigmatica:gold_basalt_ore", "weight": 30 }, + { "block": "emendatusenigmatica:silver_basalt_ore", "weight": 20 }, + { "block": "emendatusenigmatica:tin_basalt_ore", "weight": 10 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 75}, - {"block": "emendatusenigmatica:budding_fluorite", "weight": 25} - ], - "clusters": [ - "emendatusenigmatica:small_fluorite_bud", - "emendatusenigmatica:medium_fluorite_bud" + { "block": "emendatusenigmatica:fluorite_cluster_shard_block", "weight": 75 }, + { "block": "emendatusenigmatica:budding_fluorite", "weight": 25 } ], - "fillBlocks": [{"block": "minecraft:air", "weight": 10}], + "clusters": ["emendatusenigmatica:small_fluorite_bud", "emendatusenigmatica:medium_fluorite_bud"], + "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }], "chance": 30, "rarity": "rare", "crackChance": 0.25, @@ -40,4 +35,4 @@ "minecraft_soul_soil" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json index 09e2d4a4a..275199b68 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/ocean_geode.json @@ -16,20 +16,18 @@ ], "registryName": "ocean_geode", "config": { - "outerShellBlocks": [ - {"block": "quark:shale", "weight": 100} - ], + "outerShellBlocks": [{ "block": "quark:shale", "weight": 100 }], "innerShellBlocks": [ - {"block": "quark:shale", "weight": 70}, - {"block": "minecraft:prismarine", "weight": 15}, - {"block": "emendatusenigmatica:gold_shale_ore", "weight": 15} + { "block": "quark:shale", "weight": 70 }, + { "block": "minecraft:prismarine", "weight": 15 }, + { "block": "emendatusenigmatica:gold_shale_ore", "weight": 15 } ], "innerBlocks": [ - {"block": "minecraft:prismarine", "weight": 65}, - {"block": "minecraft:prismarine_bricks", "weight": 25}, - {"block": "minecraft:sea_lantern", "weight": 10} + { "block": "minecraft:prismarine", "weight": 65 }, + { "block": "minecraft:prismarine_bricks", "weight": 25 }, + { "block": "minecraft:sea_lantern", "weight": 10 } ], - "fillBlocks": [{"block": "minecraft:water", "weight": 10}], + "fillBlocks": [{ "block": "minecraft:water", "weight": 10 }], "clusters": [], "chance": 30, "rarity": "rare", @@ -60,4 +58,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/redstone_geode.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/redstone_geode.json index 7728bbda7..ea7e70341 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/redstone_geode.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/redstone_geode.json @@ -14,22 +14,22 @@ "registryName": "redstone_geode", "config": { "outerShellBlocks": [ - {"block": "create:cut_crimsite", "weight": 95}, - {"block": "create:crimsite", "weight": 5} + { "block": "create:cut_crimsite", "weight": 95 }, + { "block": "create:crimsite", "weight": 5 } ], "innerShellBlocks": [ - {"block": "create:crimsite", "weight": 70}, - {"block": "create:cut_crimsite", "weight": 5}, - {"block": "emendatusenigmatica:copper_crimsite_ore", "weight": 25} + { "block": "create:crimsite", "weight": 70 }, + { "block": "create:cut_crimsite", "weight": 5 }, + { "block": "emendatusenigmatica:copper_crimsite_ore", "weight": 25 } ], "innerBlocks": [ - {"block": "create:crimsite", "weight": 30}, - {"block": "emendatusenigmatica:copper_crimsite_ore", "weight": 45}, - {"block": "emendatusenigmatica:redstone_crimsite_ore", "weight": 25} + { "block": "create:crimsite", "weight": 30 }, + { "block": "emendatusenigmatica:copper_crimsite_ore", "weight": 45 }, + { "block": "emendatusenigmatica:redstone_crimsite_ore", "weight": 25 } ], "fillBlocks": [ - {"block": "emendatusenigmatica:redstone_crimsite_ore", "weight": 85}, - {"block": "emendatusenigmatica:copper_crimsite_ore", "weight": 15} + { "block": "emendatusenigmatica:redstone_crimsite_ore", "weight": 85 }, + { "block": "emendatusenigmatica:copper_crimsite_ore", "weight": 15 } ], "clusters": [], "chance": 30, @@ -38,9 +38,7 @@ "minYLevel": -40, "maxYLevel": 40, "generateSamples": true, - "sampleBlocks": [ - { "material": "redstone", "weight": 10, "strata": "create_crimsite"} - ], + "sampleBlocks": [{ "material": "redstone", "weight": 10, "strata": "create_crimsite" }], "fillerTypes": [ "minecraft_deepslate", "minecraft_tuff", @@ -61,4 +59,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_air.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_air.json index 4f41b1255..cbd852ea2 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_air.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_air.json @@ -5,24 +5,21 @@ "registryName": "sulfur_geode_air", "config": { "outerShellBlocks": [ - {"block": "create:cut_ochrum", "weight": 95}, - {"block": "create:ochrum", "weight": 5} + { "block": "create:cut_ochrum", "weight": 95 }, + { "block": "create:ochrum", "weight": 5 } ], "innerShellBlocks": [ - {"block": "create:ochrum", "weight": 40}, - {"block": "emendatusenigmatica:uranium_ochrum_ore", "weight": 30}, - {"block": "emendatusenigmatica:niter_ochrum_ore", "weight": 20}, - {"block": "emendatusenigmatica:lead_ochrum_ore", "weight": 10} + { "block": "create:ochrum", "weight": 40 }, + { "block": "emendatusenigmatica:gold_ochrum_ore", "weight": 30 }, + { "block": "emendatusenigmatica:niter_ochrum_ore", "weight": 20 }, + { "block": "emendatusenigmatica:tin_ochrum_ore", "weight": 10 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75}, - {"block": "emendatusenigmatica:budding_sulfur", "weight": 25} + { "block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75 }, + { "block": "emendatusenigmatica:budding_sulfur", "weight": 25 } ], - "clusters": [ - "emendatusenigmatica:small_sulfur_bud", - "emendatusenigmatica:medium_sulfur_bud" - ], - "fillBlocks": [{"block": "minecraft:air", "weight": 10}], + "clusters": ["emendatusenigmatica:small_sulfur_bud", "emendatusenigmatica:medium_sulfur_bud"], + "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }], "chance": 30, "rarity": "rare", "crackChance": 0.15, @@ -50,4 +47,4 @@ "quark_shale" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_nether.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_nether.json index e97da3aa5..52a6b418e 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_nether.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_nether.json @@ -4,24 +4,19 @@ "biomes": [], "registryName": "sulfur_geode_nether", "config": { - "outerShellBlocks": [ - {"block": "minecraft:blackstone", "weight": 95} - ], + "outerShellBlocks": [{ "block": "minecraft:blackstone", "weight": 95 }], "innerShellBlocks": [ - {"block": "byg:brimstone", "weight": 40}, - {"block": "emendatusenigmatica:uranium_brimstone_ore", "weight": 30}, - {"block": "emendatusenigmatica:niter_brimstone_ore", "weight": 20}, - {"block": "emendatusenigmatica:lead_brimstone_ore", "weight": 10} + { "block": "byg:brimstone", "weight": 40 }, + { "block": "emendatusenigmatica:gold_brimstone_ore", "weight": 30 }, + { "block": "emendatusenigmatica:niter_brimstone_ore", "weight": 20 }, + { "block": "emendatusenigmatica:silver_brimstone_ore", "weight": 10 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75}, - {"block": "emendatusenigmatica:budding_sulfur", "weight": 25} - ], - "clusters": [ - "emendatusenigmatica:small_sulfur_bud", - "emendatusenigmatica:medium_sulfur_bud" + { "block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75 }, + { "block": "emendatusenigmatica:budding_sulfur", "weight": 25 } ], - "fillBlocks": [{"block": "minecraft:air", "weight": 10}], + "clusters": ["emendatusenigmatica:small_sulfur_bud", "emendatusenigmatica:medium_sulfur_bud"], + "fillBlocks": [{ "block": "minecraft:air", "weight": 10 }], "chance": 30, "rarity": "rare", "crackChance": 0.25, @@ -40,4 +35,4 @@ "minecraft_soul_soil" ] } -} \ No newline at end of file +} diff --git a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_water.json b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_water.json index 82433f8b6..2e76c987d 100644 --- a/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_water.json +++ b/config/configswapper/expert/config/emendatusenigmatica/deposit/geodes/sulfur_geode_water.json @@ -5,24 +5,21 @@ "registryName": "sulfur_geode_water", "config": { "outerShellBlocks": [ - {"block": "create:cut_ochrum", "weight": 95}, - {"block": "create:ochrum", "weight": 5} + { "block": "create:cut_ochrum", "weight": 95 }, + { "block": "create:ochrum", "weight": 5 } ], "innerShellBlocks": [ - {"block": "create:ochrum", "weight": 40}, - {"block": "emendatusenigmatica:uranium_ochrum_ore", "weight": 30}, - {"block": "emendatusenigmatica:niter_ochrum_ore", "weight": 20}, - {"block": "emendatusenigmatica:lead_ochrum_ore", "weight": 10} + { "block": "create:ochrum", "weight": 40 }, + { "block": "emendatusenigmatica:gold_ochrum_ore", "weight": 30 }, + { "block": "emendatusenigmatica:niter_ochrum_ore", "weight": 20 }, + { "block": "emendatusenigmatica:silver_ochrum_ore", "weight": 10 } ], "innerBlocks": [ - {"block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75}, - {"block": "emendatusenigmatica:budding_sulfur", "weight": 25} + { "block": "emendatusenigmatica:sulfur_cluster_shard_block", "weight": 75 }, + { "block": "emendatusenigmatica:budding_sulfur", "weight": 25 } ], - "clusters": [ - "emendatusenigmatica:small_sulfur_bud", - "emendatusenigmatica:medium_sulfur_bud" - ], - "fillBlocks": [{"block": "minecraft:water", "weight": 10}], + "clusters": ["emendatusenigmatica:small_sulfur_bud", "emendatusenigmatica:medium_sulfur_bud"], + "fillBlocks": [{ "block": "minecraft:water", "weight": 10 }], "chance": 10, "rarity": "rare", "crackChance": 0, @@ -50,4 +47,4 @@ "quark_shale" ] } -} \ No newline at end of file +} From 59c4e00f362a69851a21a6d5236a7746cd7e6ed5 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 24 Jul 2023 21:20:47 -0400 Subject: [PATCH 2/3] EE Crystal Cluster Transformation --- .../base/recipes/lychee/block_interacting.js | 91 ++++++++++++++----- 1 file changed, 70 insertions(+), 21 deletions(-) diff --git a/kubejs/server_scripts/base/recipes/lychee/block_interacting.js b/kubejs/server_scripts/base/recipes/lychee/block_interacting.js index c0e47e444..5ce5aad21 100644 --- a/kubejs/server_scripts/base/recipes/lychee/block_interacting.js +++ b/kubejs/server_scripts/base/recipes/lychee/block_interacting.js @@ -9,7 +9,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_cobblestone' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -25,7 +25,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'farmersdelight:rich_soil_farmland' }, { type: 'damage_item', damage: 25 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.grass.place block @p ~ ~ ~', @@ -41,7 +41,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:moss_block' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -57,7 +57,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'twilightforest:liveroot_block' }, { type: 'damage_item', damage: 125 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.grass.place block @p ~ ~ ~', @@ -73,7 +73,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_stone_bricks' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -89,7 +89,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_stone_brick_wall' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -105,7 +105,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_stone_brick_stairs' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -121,7 +121,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_cobblestone_stairs' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -137,7 +137,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_cobblestone_slab' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -153,7 +153,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:mossy_cobblestone_wall' }, { type: 'damage_item', damage: 50 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.stone.place block @p ~ ~ ~', @@ -169,7 +169,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'ae2:flawless_budding_quartz' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -185,7 +185,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'ae2:flawless_budding_quartz' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -201,7 +201,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'ae2:flawless_budding_quartz' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -217,7 +217,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'ae2:flawless_budding_quartz' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -233,7 +233,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'byg:budding_therium_crystal' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -249,7 +249,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'byg:budding_subzero_crystal' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -265,7 +265,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'minecraft:budding_amethyst' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -281,7 +281,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'emendatusenigmatica:budding_sulfur' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -290,6 +290,23 @@ ServerEvents.recipes((event) => { ], id: `${id_prefix}infused_iron_pickaxe_conversions/budding_sulfur` }, + , + { + item_in: { item: 'naturesaura:infused_iron_pickaxe' }, + block_in: 'emendatusenigmatica:sulfur_cluster_shard_block', + post: [ + { type: 'prevent_default' }, + { type: 'place', block: 'emendatusenigmatica:budding_sulfur' }, + { type: 'damage_item', damage: 100 }, + { type: 'add_item_cooldown', s: 0.5 }, + { + type: 'execute', + command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', + hide: true + } + ], + id: `${id_prefix}infused_iron_pickaxe_conversions/budding_sulfur_from_cluster` + }, { item_in: { item: 'naturesaura:infused_iron_pickaxe' }, block_in: 'emendatusenigmatica:dimensional_block', @@ -297,7 +314,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'emendatusenigmatica:budding_dimensional' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -306,6 +323,22 @@ ServerEvents.recipes((event) => { ], id: `${id_prefix}infused_iron_pickaxe_conversions/budding_dimensional` }, + { + item_in: { item: 'naturesaura:infused_iron_pickaxe' }, + block_in: 'emendatusenigmatica:dimensional_cluster_shard_block', + post: [ + { type: 'prevent_default' }, + { type: 'place', block: 'emendatusenigmatica:budding_dimensional' }, + { type: 'damage_item', damage: 100 }, + { type: 'add_item_cooldown', s: 0.5 }, + { + type: 'execute', + command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', + hide: true + } + ], + id: `${id_prefix}infused_iron_pickaxe_conversions/budding_dimensional_from_cluster` + }, { item_in: { item: 'naturesaura:infused_iron_pickaxe' }, block_in: 'emendatusenigmatica:fluorite_block', @@ -313,7 +346,7 @@ ServerEvents.recipes((event) => { { type: 'prevent_default' }, { type: 'place', block: 'emendatusenigmatica:budding_fluorite' }, { type: 'damage_item', damage: 200 }, - { type: 'add_item_cooldown', s: 2 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', @@ -322,6 +355,22 @@ ServerEvents.recipes((event) => { ], id: `${id_prefix}infused_iron_pickaxe_conversions/budding_fluorite` }, + { + item_in: { item: 'naturesaura:infused_iron_pickaxe' }, + block_in: 'emendatusenigmatica:fluorite_cluster_shard_block', + post: [ + { type: 'prevent_default' }, + { type: 'place', block: 'emendatusenigmatica:budding_fluorite' }, + { type: 'damage_item', damage: 100 }, + { type: 'add_item_cooldown', s: 0.5 }, + { + type: 'execute', + command: 'playsound minecraft:block.large_amethyst_bud.place block @p ~ ~ ~', + hide: true + } + ], + id: `${id_prefix}infused_iron_pickaxe_conversions/budding_fluorite_from_cluster` + }, { hide_in_viewer: true, item_in: { tag: 'forge:tools/knives' }, @@ -359,7 +408,7 @@ ServerEvents.recipes((event) => { contextual: { type: 'direction', direction: 'down' } }, { type: 'damage_item', damage: 1 }, - { type: 'add_item_cooldown', s: 1 }, + { type: 'add_item_cooldown', s: 0.5 }, { type: 'execute', command: 'playsound minecraft:block.pumpkin.carve block @p ~ ~ ~', From 44aeff74cc43e8f523a5b4eb64b9248e527d3507 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 24 Jul 2023 21:22:29 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- changelogs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 02d94afed..4a58239c0 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -5,6 +5,8 @@ ### 🌟 Improvements - Certus Quartz Blocks may now be converted straight to Flawless with the Nature's Aura pick. [\#531](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/531) ([MuteTiefling](https://github.com/MuteTiefling)) +- Crystal Cluster blocks may now be converted to Budding via Right Click Interaction. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling)) +- Cooldown for Right Click Interactions has been reduced. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling)) ### 🐛 Fixed Bugs