From 3ccc7006768ac4cb40b1e4e6d2190d9ac33d4629 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 16:57:39 +0100 Subject: [PATCH] ore vein updates --- kubejs/server_scripts/gregtech/loot.js | 13 ++++++++++++- kubejs/server_scripts/tfg/tags.veins.js | 9 ++------- kubejs/startup_scripts/ae2/tag_prefixes.js | 3 ++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index eb9e18e91..849a6430e 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -169,9 +169,20 @@ const registerGTCEULoots = (event) => { // I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`; if (material == GTMaterials.Copper || material == GTMaterials.Gold || material == GTMaterials.Iron) + { rawOreBlock = "minecraft" + rawOreBlock; + } + else if (material == TFGHelpers.getMaterial('desh') + || material == TFGHelpers.getMaterial('ostrum') + || material == TFGHelpers.getMaterial('calorite') + || material == TFGHelpers.getMaterial('etrium')) + { + rawOreBlock = "ad_astra" + rawOreBlock; + } else + { rawOreBlock = "gtceu" + rawOreBlock; + } event.addBlockLootModifier(rawOreBlock) .removeLoot(ItemFilter.ALWAYS_TRUE) @@ -197,7 +208,7 @@ const registerGTCEULoots = (event) => { let stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1) - // break with pickaxe + // break with pickaxe/mining hammer/drill/mining machine event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`) .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([ diff --git a/kubejs/server_scripts/tfg/tags.veins.js b/kubejs/server_scripts/tfg/tags.veins.js index 611f42523..4c37bfd66 100644 --- a/kubejs/server_scripts/tfg/tags.veins.js +++ b/kubejs/server_scripts/tfg/tags.veins.js @@ -20,7 +20,6 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:earth/vein/deep_topaz') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_apatite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_basaltic_sands') - event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_bauxite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_beryllium') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_bismuthinite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_cassiterite') @@ -64,16 +63,12 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:moon_veins', 'tfg:moon/vein/moon_bauxite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_beryllium') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_desh') - event.add('tfg:moon_veins', 'tfg:moon/vein/moon_diopside') - event.add('tfg:moon_veins', 'tfg:moon/vein/moon_enstatite') - event.add('tfg:moon_veins', 'tfg:moon/vein/moon_fayalite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_garnierite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_magnetite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_mica') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_molybdenum') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_monazite') - event.add('tfg:moon_veins', 'tfg:moon/vein/moon_olivine') - event.add('tfg:moon_veins', 'tfg:moon/vein/moon_plutonium') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_pyrolusite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_quartz') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_redstone') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_saltpeter') @@ -81,6 +76,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:moon_veins', 'tfg:moon/vein/moon_scheelite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_sheldonite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_silver') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_topaz') // #endregion @@ -90,7 +86,6 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:nether_veins', 'tfg:nether/vein/nether_anthracite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_apatite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_basaltic_sands') - event.add('tfg:nether_veins', 'tfg:nether/vein/nether_bauxite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_beryllium') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_cassiterite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_copper') diff --git a/kubejs/startup_scripts/ae2/tag_prefixes.js b/kubejs/startup_scripts/ae2/tag_prefixes.js index 2c03f700b..81d2d39ea 100644 --- a/kubejs/startup_scripts/ae2/tag_prefixes.js +++ b/kubejs/startup_scripts/ae2/tag_prefixes.js @@ -9,9 +9,10 @@ const registerAE2TagPrefixes = (event) => { TagPrefix.block.setIgnored(Fluix, $AE_BLOCKS.FLUIX_BLOCK); TagPrefix.dust.setIgnored(Fluix, $AE_ITEMS.FLUIX_DUST); TagPrefix.gem.setIgnored(Fluix, $AE_ITEMS.FLUIX_CRYSTAL); -; + TagPrefix.dust.setIgnored(GTMaterials.CertusQuartz, $AE_ITEMS.CERTUS_QUARTZ_DUST); TagPrefix.gem.setIgnored(GTMaterials.CertusQuartz, $AE_ITEMS.CERTUS_QUARTZ_CRYSTAL); + TagPrefix.rawOreBlock.setIgnored(GTMaterials.CertusQuartz, $AE_BLOCKS.QUARTZ_BLOCK); TagPrefix.dust.setIgnored(GTMaterials.EnderPearl, $AE_ITEMS.ENDER_DUST); } \ No newline at end of file