From d55f3582f5a93803e342a848b01579098bd246fc Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Tue, 11 Jul 2023 17:55:10 -0400 Subject: [PATCH] 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'