From b89d04a8fdd449a976bf348f6d54b811b08be17b Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 10 Jul 2023 22:00:24 -0400 Subject: [PATCH 1/6] lang, market --- kubejs/assets/kubejs/lang/en_us.json | 11 ++++++-- .../expert/recipes/enigmatica/remove.js | 2 ++ .../expert/recipes/occultism/ritual.js | 25 +++++++++++++++++++ kubejs/startup_scripts/item_registry.js | 3 ++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index 080f7c226..f6d0058a4 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -219,8 +219,8 @@ "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.interrupted": "Ritual of Calling interrupted.", "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.conditions": "Not all requirements for this ritual are met.", - "item.kubejs.ritual_summon_firenando_from_shards": "Ritual: Summon Firenando", - "item.kubejs.ritual_summon_firenando_from_shards.tooltip": "Summon a Firenando", + "item.kubejs.ritual_summon_firenando_from_shards": "Ritual: Summon Flarecannon", + "item.kubejs.ritual_summon_firenando_from_shards.tooltip": "Summon a Flarecannon", "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.started": "Ritual of Calling started.", "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.finished": "Ritual of Calling completed.", "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.interrupted": "Ritual of Calling interrupted.", @@ -254,6 +254,13 @@ "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.interrupted": "Ritual of Binding interrupted.", "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.conditions": "Not all requirements for this ritual are met.", + "item.kubejs.ritual_craft_market": "Ritual: Craft Market Stand", + "item.kubejs.ritual_craft_market.tooltip": "Bind a fae to a Market Stand to obtain rare plants.", + "ritual.enigmatica.occultism/ritual/ritual_craft_market.started": "Ritual of Binding started.", + "ritual.enigmatica.occultism/ritual/ritual_craft_market.finished": "Ritual of Binding completed.", + "ritual.enigmatica.occultism/ritual/ritual_craft_market.interrupted": "Ritual of Binding interrupted.", + "ritual.enigmatica.occultism/ritual/ritual_craft_market.conditions": "Not all requirements for this ritual are met.", + "item.kubejs.ritual_craft_module_expansion_card": "Ritual: Craft Module Expansion Card", "item.kubejs.ritual_craft_module_expansion_card.tooltip": "Bind an Air Elemental to control Tube Modules.", "ritual.enigmatica.occultism/ritual/ritual_craft_module_expansion_card.started": "Ritual of Binding started.", diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js index 65dc97551..9ca058145 100644 --- a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js @@ -130,6 +130,8 @@ ServerEvents.recipes((event) => { { id: 'farmersdelight:integration/immersiveengineering/metalpress/pumpkin' }, + { id: 'farmingforblockheads:market' }, + { id: 'functionalstorage:diamond_upgrade' }, { id: /hexerei:.*_broom_from_mixing_cauldron/ }, diff --git a/kubejs/server_scripts/expert/recipes/occultism/ritual.js b/kubejs/server_scripts/expert/recipes/occultism/ritual.js index 5c6f64731..c89e8e1f6 100644 --- a/kubejs/server_scripts/expert/recipes/occultism/ritual.js +++ b/kubejs/server_scripts/expert/recipes/occultism/ritual.js @@ -1377,6 +1377,31 @@ ServerEvents.recipes((event) => { duration: 60, id: `${id_prefix}ritual_craft_tree_of_life_trophy` }, + { + output: 'farmingforblockheads:market', + activation_item: '#forge:essences/conjuration', + inputs: [ + 'hexerei:mindful_trance_blend', + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf', + 'naturesaura:gold_leaf', + + 'ars_elemental:yellow_archwood', + 'ars_nouveau:green_archwood_wood', + 'ars_nouveau:blue_archwood_wood', + 'ars_nouveau:red_archwood_wood', + + 'ars_elemental:yellow_archwood', + 'ars_nouveau:green_archwood_wood', + 'ars_nouveau:blue_archwood_wood', + 'ars_nouveau:red_archwood_wood' + ], + ritual_dummy: 'kubejs:ritual_craft_market', + ritual_type: 'occultism:craft', + pentacle_id: 'occultism:summon_familiar', + duration: 10, + id: `${id_prefix}ritual_craft_market` + }, /* Custom Summons diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js index 8f6852555..02b9f4696 100644 --- a/kubejs/startup_scripts/item_registry.js +++ b/kubejs/startup_scripts/item_registry.js @@ -89,7 +89,8 @@ StartupEvents.registry('item', (event) => { 'ritual_of_enduring_flight', 'ritual_craft_sps_port', 'ritual_craft_energizing_orb', - 'ritual_craft_tree_of_life_trophy' + 'ritual_craft_tree_of_life_trophy', + 'ritual_craft_market' ]; const reusableItemTextures = [ From 74102c700f54214ce50c28838b6dd462e1e114cf Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 10 Jul 2023 22:25:08 -0400 Subject: [PATCH 2/6] It's raw! --- changelogs/CHANGELOG.md | 2 ++ .../base/recipes/emendatusenigmatica/shapeless.js | 10 ++++++++++ .../base/recipes/minecraft/stonecutting.js | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 9360c9914..b6cada601 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -7,11 +7,13 @@ ### 🌟 Improvements - Fiery Metal and Liquid Blaze Burners may now be used for PNC heat [\#467](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/467) ([MuteTiefling](https://github.com/MuteTiefling)) +- Added Conversion between Limestone from Quark and Create [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) ### 🐛 Fixed Bugs - Fix Some Assembly Required sawing recipes [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) - Reduce spawn range for Spirit spawners [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) +- Osmium and Tin Raw Ore Blocks now craft down into Raw Ore properly [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) --- diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/shapeless.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/shapeless.js index e54efab97..439d57950 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/shapeless.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/shapeless.js @@ -16,6 +16,16 @@ ServerEvents.recipes((event) => { inputs: 'emendatusenigmatica:sulfur_cluster_shard_block', output: '4x emendatusenigmatica:sulfur_cluster', id: `${id_prefix}from_block/sulfur` + }, + { + inputs: 'emendatusenigmatica:raw_osmium_block', + output: '9x emendatusenigmatica:raw_osmium', + id: `${id_prefix}from_block/osmium` + }, + { + inputs: 'emendatusenigmatica:raw_tin_block', + output: '9x emendatusenigmatica:raw_tin', + id: `${id_prefix}from_block/tin` } ]; diff --git a/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js b/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js index 35a029413..40a561ac9 100644 --- a/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js +++ b/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js @@ -6,6 +6,16 @@ ServerEvents.recipes((event) => { output: '4x minecraft:cut_copper', input: 'minecraft:copper_block', id: `minecraft:cut_copper_from_copper_block_stonecutting` + }, + { + output: 'create:limestone', + input: 'quark:limestone', + id: `${id_prefix}quark_to_create_limestone` + }, + { + output: 'quark:limestone', + input: 'create:limestone', + id: `${id_prefix}create_to_quark_limestone` } ]; From 2cd52d8602ac0846d95ca7f913ada89ea7d04ff9 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 10 Jul 2023 22:31:39 -0400 Subject: [PATCH 3/6] Update chapter_two.snbt --- config/ftbquests/quests/chapters/chapter_two.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/chapter_two.snbt b/config/ftbquests/quests/chapters/chapter_two.snbt index f30020fca..07eae66da 100644 --- a/config/ftbquests/quests/chapters/chapter_two.snbt +++ b/config/ftbquests/quests/chapters/chapter_two.snbt @@ -361,7 +361,7 @@ "" "Earn the boon of the Queen by completing the tasks they require, or by returning to them that which is rightfully theirs." "" - "=================================" + "==================================" "" "Essence of the Bees is a very rare reward, indeed, so do not squander it!" "Use it to first craft the Gloaming Catalyst before consuming it to receive the rest of the permanent rewards it grants. " From 06c2cc9d48ee9417682fecf428143f3bfa42a666 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 11 Jul 2023 10:45:11 -0400 Subject: [PATCH 4/6] quest updates --- .../quests/chapters/ars_nouveau.snbt | 36 +++++++++++++++++-- .../quests/chapters/ars_nouveau_expert.snbt | 36 +++++++++++++++++-- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 61c9d48ba..9bacbe47c 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -230,7 +230,7 @@ type: "item" } ] - x: 1.5d + x: 2.5d y: -6.0d } { @@ -902,6 +902,8 @@ "A Warp Scroll may be bound to a location via Right-Click and then used again later to return the player to that exact spot. The Scroll is consumed on use, however." "" "Alternatively, a portal may be built using any type of Sourcestone in a rectangular shape. Place a filled Source Jar nearby and toss a bound Warp Scroll through the frame to ignite it, linking it to the coordinates from the scroll. Items, mobs, even spells may pass through these portals, though they are incapable of crossing between dimensions. " + "" + "Ghostweave, Mirrorweave, and Falseweave may all be used for portal frames as well, allowing for endless customization!" ] id: "19C9AC76B4E2B19D" rewards: [{ @@ -1015,7 +1017,7 @@ type: "item" }] title: "Warp Portals" - x: 2.5d + x: 1.5d y: -6.0d } { @@ -2315,6 +2317,36 @@ x: -2.0d y: -1.0d } + { + dependencies: ["19C9AC76B4E2B19D"] + description: [ + "Much like standard Warp Scrolls, Stabilized Warp Scrolls may be used to great portals. They offer two advantages, however. " + "" + "First, the scroll may be used to bind to coordinates in other dimensions, allowing cross-dimensional transportation." + "" + "Second, it may be used on a block at any time to generate a temporary portal to the bound coordinates. This does not consume the scroll." + ] + id: "506FD0059E6BA5F2" + rewards: [{ + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/ars_nouveau/rare" + icon: "kubejs:rare_lootbox" + id: "65B241E708BDD124" + player_command: false + title: "Rare Ars Nouveau Loot Box" + type: "command" + }] + tasks: [{ + id: "6AB01F1B52E5A89C" + item: { + Count: 1b + id: "ars_nouveau:stable_warp_scroll" + tag: { } + } + type: "item" + }] + x: 0.5d + y: -5.0d + } ] title: "Ars Nouveau" } diff --git a/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt b/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt index 58bbc445c..fe7b5b3c5 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt @@ -255,7 +255,7 @@ type: "item" } ] - x: 1.5d + x: 2.5d y: -6.0d } { @@ -919,6 +919,8 @@ "A Warp Scroll may be bound to a location via Right-Click and then used again later to return the player to that exact spot. The Scroll is consumed on use, however." "" "Alternatively, a portal may be built using any type of Sourcestone in a rectangular shape. Place a filled Source Jar nearby and toss a bound Warp Scroll through the frame to ignite it, linking it to the coordinates from the scroll. Items, mobs, even spells may pass through these portals, though they are incapable of crossing between dimensions. " + "" + "Ghostweave, Mirrorweave, and Falseweave may all be used for portal frames as well, allowing for endless customization!" ] hide_dependency_lines: true id: "524A6B28242AA5B8" @@ -1033,7 +1035,7 @@ type: "item" }] title: "Warp Portals" - x: 2.5d + x: 1.5d y: -6.0d } { @@ -2311,6 +2313,36 @@ x: -2.0d y: -1.0d } + { + dependencies: ["524A6B28242AA5B8"] + description: [ + "Much like standard Warp Scrolls, Stabilized Warp Scrolls may be used to great portals. They offer two advantages, however. " + "" + "First, the scroll may be used to bind to coordinates in other dimensions, allowing cross-dimensional transportation." + "" + "Second, it may be used on a block at any time to generate a temporary portal to the bound coordinates. This does not consume the scroll." + ] + id: "613C01C04BF4A979" + rewards: [{ + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/ars_nouveau/rare" + icon: "kubejs:rare_lootbox" + id: "1F5953E382A8C9C2" + player_command: false + title: "Rare Ars Nouveau Loot Box" + type: "command" + }] + tasks: [{ + id: "5633FB2A086B9E68" + item: { + Count: 1b + id: "ars_nouveau:stable_warp_scroll" + tag: { } + } + type: "item" + }] + x: 0.5d + y: -5.0d + } ] title: "Ars Nouveau" } From d55f3582f5a93803e342a848b01579098bd246fc Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 11 Jul 2023 17:55:10 -0400 Subject: [PATCH 5/6] emeraldite fix --- changelogs/CHANGELOG.md | 1 + kubejs/assets/byg/lang/en_us.json | 3 ++ .../constants/jei_hidden_disabled.js | 3 +- .../loot_tables/blocks/byg/emeraldite_ore.js | 37 +++++++++++++++++++ .../base/tags/blocks/forge/ores.js | 3 +- .../base/tags/items/forge/ores.js | 2 + .../base/worldgen/byg/remove.js | 1 - 7 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/byg/lang/en_us.json create mode 100644 kubejs/server_scripts/base/loot_tables/blocks/byg/emeraldite_ore.js diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index b6cada601..d36e97594 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -14,6 +14,7 @@ - Fix Some Assembly Required sawing recipes [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) - Reduce spawn range for Spirit spawners [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) - Osmium and Tin Raw Ore Blocks now craft down into Raw Ore properly [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) +- Emeraldite Ore renamed to Emerald Ore and drops adjusted. [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) --- diff --git a/kubejs/assets/byg/lang/en_us.json b/kubejs/assets/byg/lang/en_us.json new file mode 100644 index 000000000..ec4aa8eec --- /dev/null +++ b/kubejs/assets/byg/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "block.byg.emeraldite_ore": "Emerald Ore" +} diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index 1cecad7c8..8157db3f2 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -40,13 +40,14 @@ jei.base.items.disabled = [ /emendatusenigmatica:.*_cluster_shard\b/, /pendorite/, - /emeraldite/, /ametrine/, /theoneprobe/, /create:crushed_raw_.*/, + 'byg:emeraldite_shards', + 'createaddition:copper_spool', 'createaddition:spool', 'createaddition:festive_spool', diff --git a/kubejs/server_scripts/base/loot_tables/blocks/byg/emeraldite_ore.js b/kubejs/server_scripts/base/loot_tables/blocks/byg/emeraldite_ore.js new file mode 100644 index 000000000..d015f511e --- /dev/null +++ b/kubejs/server_scripts/base/loot_tables/blocks/byg/emeraldite_ore.js @@ -0,0 +1,37 @@ +ServerEvents.blockLootTables((event) => { + event.addBlock(`byg:emeraldite_ore`, (table) => { + table.addPool((pool) => { + pool.rolls = 1.0; + pool.bonusRolls = 0.0; + pool.addEntry({ + type: 'minecraft:alternatives', + children: [ + { + type: 'minecraft:item', + conditions: [ + { + condition: 'minecraft:match_tool', + predicate: { + enchantments: [{ enchantment: 'minecraft:silk_touch', levels: { min: 1 } }] + } + } + ], + name: 'byg:emeraldite_ore' + }, + { + type: 'minecraft:item', + functions: [ + { + enchantment: 'minecraft:fortune', + formula: 'minecraft:ore_drops', + function: 'minecraft:apply_bonus' + }, + { function: 'minecraft:explosion_decay' } + ], + name: 'minecraft:emerald' + } + ] + }); + }); + }); +}); diff --git a/kubejs/server_scripts/base/tags/blocks/forge/ores.js b/kubejs/server_scripts/base/tags/blocks/forge/ores.js index 615146f6d..e1024431b 100644 --- a/kubejs/server_scripts/base/tags/blocks/forge/ores.js +++ b/kubejs/server_scripts/base/tags/blocks/forge/ores.js @@ -1,7 +1,8 @@ ServerEvents.tags('block', (event) => { event.add('forge:ores', ['minecraft:ancient_debris']); - event.get('forge:ores/nether/gold').add('minecraft:nether_gold_ore'); event.get('forge:ores/netherite_scrap').remove('minecraft:ancient_debris'); event.get('forge:ores/netherite').add('minecraft:ancient_debris'); + event.get('forge:ores/emerald').add('byg:emeraldite_ore'); + event.get('forge:ores/emeraldite').remove('byg:emeraldite_ore'); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/ores.js b/kubejs/server_scripts/base/tags/items/forge/ores.js index 128b98270..263a973ae 100644 --- a/kubejs/server_scripts/base/tags/items/forge/ores.js +++ b/kubejs/server_scripts/base/tags/items/forge/ores.js @@ -2,4 +2,6 @@ ServerEvents.tags('item', (event) => { event.add('forge:ores', ['minecraft:ancient_debris']); event.add('forge:ores/nether/gold', ['minecraft:nether_gold_ore']); event.add('forge:ores/netherite', 'minecraft:ancient_debris'); + event.get('forge:ores/emerald').add('byg:emeraldite_ore'); + event.get('forge:ores/emeraldite').remove('byg:emeraldite_ore'); }); diff --git a/kubejs/startup_scripts/base/worldgen/byg/remove.js b/kubejs/startup_scripts/base/worldgen/byg/remove.js index cd4b2d20a..b3fb5921b 100644 --- a/kubejs/startup_scripts/base/worldgen/byg/remove.js +++ b/kubejs/startup_scripts/base/worldgen/byg/remove.js @@ -22,7 +22,6 @@ WorldgenEvents.remove((event) => { 'byg:ore_quartz_blue_netherrack', 'byg:ore_anthracite', 'byg:ore_pendorite', - 'byg:ore_emeraldite', 'byg:cryptic_redstone', 'byg:island_ametrine_clusters', 'byg:quartz_spike' From d7eeb2ff9f5a4de40bf44b943f6cbe1417a01762 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 11 Jul 2023 22:02:18 -0400 Subject: [PATCH 6/6] replace ametrine with dimensional --- changelogs/CHANGELOG.md | 1 + .../configured_feature/floating_island1.json | 73 +++++++++++++++++++ .../configured_feature/floating_island2.json | 73 +++++++++++++++++++ .../configured_feature/floating_island3.json | 73 +++++++++++++++++++ .../configured_feature/floating_island4.json | 73 +++++++++++++++++++ .../configured_feature/floating_island5.json | 73 +++++++++++++++++++ .../island_ametrine_clusters.json | 36 +++++++++ .../base/worldgen/byg/remove.js | 1 - 8 files changed, 402 insertions(+), 1 deletion(-) create mode 100644 kubejs/data/byg/worldgen/configured_feature/floating_island1.json create mode 100644 kubejs/data/byg/worldgen/configured_feature/floating_island2.json create mode 100644 kubejs/data/byg/worldgen/configured_feature/floating_island3.json create mode 100644 kubejs/data/byg/worldgen/configured_feature/floating_island4.json create mode 100644 kubejs/data/byg/worldgen/configured_feature/floating_island5.json create mode 100644 kubejs/data/byg/worldgen/configured_feature/island_ametrine_clusters.json diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index d36e97594..da88cbd03 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -15,6 +15,7 @@ - Reduce spawn range for Spirit spawners [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling)) - Osmium and Tin Raw Ore Blocks now craft down into Raw Ore properly [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) - Emeraldite Ore renamed to Emerald Ore and drops adjusted. [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) +- Budding Dimensional Crystals now spawn in place of Ametrine in Viscal Isles [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling)) --- diff --git a/kubejs/data/byg/worldgen/configured_feature/floating_island1.json b/kubejs/data/byg/worldgen/configured_feature/floating_island1.json new file mode 100644 index 000000000..e71101ad0 --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/floating_island1.json @@ -0,0 +1,73 @@ +{ + "config": { + "block_provider": { + "entries": [ + { + "data": { + "Name": "byg:ether_stone" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + }, + "island_features": [ + { + "feature": "byg:island_ametrine_clusters", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + }, + { + "feature": "byg:island_sculk_plants", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + } + ], + "max_radius": 13, + "min_radius": 11, + "top_block_provider": { + "entries": [ + { + "data": { + "Name": "byg:vermilion_sculk" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + } + }, + "type": "byg:floating_island1" +} diff --git a/kubejs/data/byg/worldgen/configured_feature/floating_island2.json b/kubejs/data/byg/worldgen/configured_feature/floating_island2.json new file mode 100644 index 000000000..99a3c36a7 --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/floating_island2.json @@ -0,0 +1,73 @@ +{ + "config": { + "block_provider": { + "entries": [ + { + "data": { + "Name": "byg:ether_stone" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + }, + "island_features": [ + { + "feature": "byg:island_ametrine_clusters", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + }, + { + "feature": "byg:island_sculk_plants", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + } + ], + "max_radius": 13, + "min_radius": 11, + "top_block_provider": { + "entries": [ + { + "data": { + "Name": "byg:vermilion_sculk" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + } + }, + "type": "byg:floating_island2" +} diff --git a/kubejs/data/byg/worldgen/configured_feature/floating_island3.json b/kubejs/data/byg/worldgen/configured_feature/floating_island3.json new file mode 100644 index 000000000..c3e273f0f --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/floating_island3.json @@ -0,0 +1,73 @@ +{ + "config": { + "block_provider": { + "entries": [ + { + "data": { + "Name": "byg:ether_stone" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + }, + "island_features": [ + { + "feature": "byg:island_ametrine_clusters", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + }, + { + "feature": "byg:island_sculk_plants", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + } + ], + "max_radius": 13, + "min_radius": 11, + "top_block_provider": { + "entries": [ + { + "data": { + "Name": "byg:vermilion_sculk" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + } + }, + "type": "byg:floating_island3" +} diff --git a/kubejs/data/byg/worldgen/configured_feature/floating_island4.json b/kubejs/data/byg/worldgen/configured_feature/floating_island4.json new file mode 100644 index 000000000..0e82ec370 --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/floating_island4.json @@ -0,0 +1,73 @@ +{ + "config": { + "block_provider": { + "entries": [ + { + "data": { + "Name": "byg:ether_stone" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + }, + "island_features": [ + { + "feature": "byg:island_ametrine_clusters", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + }, + { + "feature": "byg:island_sculk_plants", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + } + ], + "max_radius": 17, + "min_radius": 13, + "top_block_provider": { + "entries": [ + { + "data": { + "Name": "byg:vermilion_sculk" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + } + }, + "type": "byg:hollow_floating_island" +} diff --git a/kubejs/data/byg/worldgen/configured_feature/floating_island5.json b/kubejs/data/byg/worldgen/configured_feature/floating_island5.json new file mode 100644 index 000000000..774d2eea4 --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/floating_island5.json @@ -0,0 +1,73 @@ +{ + "config": { + "block_provider": { + "entries": [ + { + "data": { + "Name": "byg:ether_stone" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + }, + "island_features": [ + { + "feature": "byg:island_ametrine_clusters", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + }, + { + "feature": "byg:island_sculk_plants", + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + } + ] + } + ], + "max_radius": 17, + "min_radius": 13, + "top_block_provider": { + "entries": [ + { + "data": { + "Name": "byg:vermilion_sculk" + }, + "weight": 25 + }, + { + "data": { + "Name": "emendatusenigmatica:budding_dimensional" + }, + "weight": 1 + }, + { + "data": { + "Name": "emendatusenigmatica:dimensional_cluster_shard_block" + }, + "weight": 4 + } + ], + "type": "minecraft:weighted_state_provider" + } + }, + "type": "byg:floating_island5" +} diff --git a/kubejs/data/byg/worldgen/configured_feature/island_ametrine_clusters.json b/kubejs/data/byg/worldgen/configured_feature/island_ametrine_clusters.json new file mode 100644 index 000000000..9de60e7a2 --- /dev/null +++ b/kubejs/data/byg/worldgen/configured_feature/island_ametrine_clusters.json @@ -0,0 +1,36 @@ +{ + "config": { + "feature": { + "feature": { + "config": { + "to_place": { + "state": { + "Name": "emendatusenigmatica:dimensional_cluster", + "Properties": { "facing": "up", "waterlogged": "false" } + }, + "type": "minecraft:simple_state_provider" + } + }, + "type": "minecraft:simple_block" + }, + "placement": [ + { + "heightmap": "MOTION_BLOCKING", + "type": "minecraft:heightmap" + }, + { + "predicate": { + "blocks": "emendatusenigmatica:budding_dimensional", + "offset": [0, -1, 0], + "type": "minecraft:matching_blocks" + }, + "type": "minecraft:block_predicate_filter" + } + ] + }, + "tries": 64, + "xz_spread": 16, + "y_spread": 4 + }, + "type": "minecraft:random_patch" +} diff --git a/kubejs/startup_scripts/base/worldgen/byg/remove.js b/kubejs/startup_scripts/base/worldgen/byg/remove.js index b3fb5921b..f4bc98e5c 100644 --- a/kubejs/startup_scripts/base/worldgen/byg/remove.js +++ b/kubejs/startup_scripts/base/worldgen/byg/remove.js @@ -23,7 +23,6 @@ WorldgenEvents.remove((event) => { 'byg:ore_anthracite', 'byg:ore_pendorite', 'byg:cryptic_redstone', - 'byg:island_ametrine_clusters', 'byg:quartz_spike' ];