diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index fb529aea1..eb9e18e91 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -24,6 +24,13 @@ const STONE_TYPES_TO_COBBLE = { deepslate: 'minecraft:cobbled_deepslate', pyroxenite: 'minecraft:blackstone', dripstone: 'minecraft:dripstone_block', + moon_stone: 'ad_astra:moon_cobblestone', + moon_deepslate: 'ad_astra:moon_sand', + mars_stone: 'ad_astra:mars_cobblestone', + venus_stone: 'ad_astra:venus_cobblestone', + mercury_stone: 'ad_astra:mercury_cobblestone', + glacio_stone: 'ad_astra:glacio_cobblestone', + permafrost: 'gtceu:ice_dust' } const registerGTCEULoots = (event) => { @@ -52,7 +59,7 @@ const registerGTCEULoots = (event) => { event.addBlockLootModifier('tfg:rock/hardened_deepslate') .matchMainHand('#forge:tools/hammers') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/black') + .addLoot('minecraft:cobbled_deepslate') event.addBlockLootModifier('tfg:rock/hardened_dripstone') .matchMainHand('#forge:tools/hammers') @@ -72,8 +79,63 @@ const registerGTCEULoots = (event) => { .removeLoot(ItemFilter.ALWAYS_TRUE) .addLoot('tfc:sand/pink') + event.addBlockLootModifier('ad_astra:moon_stone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:moon_cobblestone') + + event.addBlockLootModifier('ad_astra:moon_cobblestone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:moon_sand') + + event.addBlockLootModifier('ad_astra:moon_deepslate') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:moon_sand') + + event.addBlockLootModifier('ad_astra:mars_stone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:mars_cobblestone') + + event.addBlockLootModifier('ad_astra:mars_cobblestone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:mars_sand') + + event.addBlockLootModifier('ad_astra:venus_stone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:venus_cobblestone') + + event.addBlockLootModifier('ad_astra:venus_cobblestone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:venus_sand') + + event.addBlockLootModifier('ad_astra:mercury_stone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:mercury_cobblestone') + + event.addBlockLootModifier('ad_astra:mercury_cobblestone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('tfc:sand/red') + + event.addBlockLootModifier('ad_astra:glacio_stone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('ad_astra:glacio_cobblestone') + + event.addBlockLootModifier('ad_astra:glacio_cobblestone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('tfc:sand/white') + // Crush raw rock into cobble - global.ORE_BEARING_STONES.forEach(stoneType => { + global.TFC_STONE_TYPES.forEach(stoneType => { event.addBlockLootModifier(`tfc:rock/raw/${stoneType}`) .matchMainHand('#forge:tools/hammers') .removeLoot(ItemFilter.ALWAYS_TRUE) @@ -82,7 +144,6 @@ const registerGTCEULoots = (event) => { // Go through all materials forEachMaterial(material => { - if (material.hasProperty(PropertyKey.ORE)) { // Indicator buds