diff --git a/kubejs/server_scripts/gregtech/dense_ores.js b/kubejs/server_scripts/gregtech/dense_ores.js index 3b4f4e3a3..f99a0fbb4 100644 --- a/kubejs/server_scripts/gregtech/dense_ores.js +++ b/kubejs/server_scripts/gregtech/dense_ores.js @@ -3,22 +3,22 @@ */ const ores = [ - {name: 'redstone', mod: 'gtceu'}, - {name: 'diamond', mod: 'gtceu'}, - {name: 'emerald', mod: 'gtceu'}, - {name: 'lapis', mod: 'gtceu'}, - {name: 'coal', mod: 'gtceu'}, - {name: 'nether_quartz', mod: 'gtceu'}, - {name: 'iron', mod: 'minecraft'}, - {name: 'gold', mod: 'minecraft'}, - {name: 'copper', mod: 'minecraft'}, + ['redstone', 16], + ['diamond', 16], + ['emerald', 16], + ['gold', 16], + ['lapis', 16], + ['iron', 16], + ['coal', 16], + ['nether_quartz', 32], + ['copper', 16], ] ServerEvents.recipes(event => { - ores.forEach(ore => { - event.recipes.gtceu.chemical_reactor(`kubejs:undensify_${ore.name}`) - .itemInputs(`kubejs:dense_${ore.name}_ore`) - .itemOutputs(`16x ${ore.mod}:raw_${ore.name}`) + ores.forEach(([name, amount]) => { + event.recipes.gtceu.chemical_reactor(`kubejs:undensify_${name}`) + .itemInputs(`kubejs:dense_${name}_ore`) + .itemOutputs(ChemicalHelper.get("raw", name, amount)) .inputFluids(Fluid.of("gtceu:nitric_acid", 1000)) .duration(200) .EUt(500) @@ -26,7 +26,7 @@ ServerEvents.recipes(event => { event.recipes.gtceu.chemical_reactor("kubejs:undensify_oilsands") .itemInputs("kubejs:dense_oilsands_ore") - .itemOutputs('16x gtceu:raw_oilsands') + .itemOutputs('16x gtceu:endstone_oilsands_ore') .inputFluids(Fluid.of("gtceu:nitric_acid", 1000)) .duration(200) .EUt(500) @@ -38,18 +38,3 @@ ServerEvents.recipes(event => { .duration(200) .EUt(500) }) - -ServerEvents.tags('item', event => { - // dense ore mod is gone, so we tag it - ores.forEach(ore => { - event.add("forge:ores/dense", `forge:ores/dense/${ore.name}`, `kubejs:dense_${ore.name}`); - // event.add('forge:dense_ores', `kubejs:dense_${ore}`); - }) -}) - -ServerEvents.tags('block', event => { - // might as well - ores.forEach(ore => { - event.add("forge:ores/dense", `forge:ores/dense/${ore.name}`, `kubejs:dense_${ore.name}`); - }) -}) diff --git a/kubejs/startup_scripts/registry/block_registry.js b/kubejs/startup_scripts/registry/block_registry.js index ac84ebec6..026b7c932 100644 --- a/kubejs/startup_scripts/registry/block_registry.js +++ b/kubejs/startup_scripts/registry/block_registry.js @@ -148,26 +148,26 @@ StartupEvents.registry("block", event => { // Dense Ores const ores = [ - 'redstone_ore', - 'diamond_ore', - 'emerald_ore', - 'gold_ore', - 'lapis_ore', - 'iron_ore', - 'coal_ore', - 'copper_ore', - 'nether_quartz_ore', - 'oilsands_ore' + 'redstone', + 'diamond', + 'emerald', + 'gold', + 'lapis', + 'iron', + 'coal', + 'copper', + 'nether_quartz', + 'oilsands' ] ores.forEach(ore => { - event.create(`dense_${ore}`) + event.create(`dense_${ore}_ore`) .soundType('stone') .resistance(6) .hardness(5) .tagBlock('mineable/pickaxe') - .tagBlock('forge:ores/dense') - .tagBlock(`forge:ores/dense_${ore}`) + .tagBoth('forge:ores/dense') + .tagBoth(`forge:ores/dense/${ore}`) .requiresTool(true); }); @@ -176,8 +176,8 @@ StartupEvents.registry("block", event => { .resistance(6) .hardness(5) .tagBlock('mineable/pickaxe') - .tagBlock('forge:ores/dense') - .tagBlock('forge:ores/dense_magma') + .tagBoth('forge:ores/dense') + .tagBoth('forge:ores/dense/magma') .requiresTool(true) .lightLevel(1.0);