Skip to content

Commit

Permalink
Merge pull request #695 from MuteTiefling/astral-config-update
Browse files Browse the repository at this point in the history
updates to ore related configs
  • Loading branch information
NielsPilgaard committed Dec 30, 2020
2 parents f1453a0 + 6b59f05 commit 8eb2e27
Show file tree
Hide file tree
Showing 11 changed files with 105 additions and 10 deletions.
4 changes: 2 additions & 2 deletions config/naturesaura-common.toml
Expand Up @@ -7,9 +7,9 @@
#The Aura to RF ratio used by the RF converter, read as aura*ratio = rf
auraToRFRatio = 0.05
#Blocks that are exempt from being recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as modid:block[prop1=value1,...] where block state properties are optional
oreExceptions = ["thermal:ruby_ore", "thermal:sapphire_ore", "tmechworks:copper_ore", "mekanism:copper_ore", "mekanism:tin_ore", "tmechworks:aluminum_ore", "mekanism:lead_ore", "mekanism:osmium_ore", "mekanism:uranium_ore", "mekanism:fluorite_ore", "immersiveengineering:ore_silver", "immersiveengineering:ore_copper", "immersiveengineering:ore_aluminum", "immersiveengineering:ore_nickel", "immersiveengineering:ore_uranium", "immersiveengineering:ore_lead", "mapperbase:bitumen_ore"]
oreExceptions = ["thermal:ruby_ore", "thermal:sapphire_ore", "tmechworks:copper_ore", "mekanism:copper_ore", "mekanism:tin_ore", "tmechworks:aluminum_ore", "mekanism:lead_ore", "mekanism:osmium_ore", "mekanism:uranium_ore", "mekanism:fluorite_ore", "immersiveengineering:ore_silver", "immersiveengineering:ore_copper", "immersiveengineering:ore_aluminum", "immersiveengineering:ore_nickel", "immersiveengineering:ore_uranium", "immersiveengineering:ore_lead", "mapperbase:bitumen_ore", "undergarden:coal_ore", "undergarden:iron_ore", "undergarden:gold_ore", "undergarden:diamond_ore"]
#Additional blocks that are recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as tag_name->oreWeight->dimension where a higher weight makes the ore more likely to spawn with 5000 being the weight of coal, the default ore with the highest weight, and dimension being any of overworld and nether
additionalOres = ["forge:ores/nether/gold->1000->nether", "forge:ores/netherite_scrap->1->nether", "forge:ores/bitumen->1000->overworld", "forge:ores/fluorite->50->overworld", "forge:ores/potassium_nitrate->500->overworld", "forge:ores/arcane->500->overworld"]
additionalOres = ["forge:ores/nether/gold->1000->nether", "forge:ores/netherite_scrap->1->nether", "forge:ores/bitumen->1000->overworld", "forge:ores/fluorite->50->overworld", "forge:ores/potassium_nitrate->500->overworld", "forge:ores/mana->500->overworld"]
#Additional dimensions that map to Aura types that should be present in them. This is useful if you have a modpack with custom dimensions that should have Aura act similarly to an existing dimension in them. Each entry needs to be formatted as dimension_name->aura_type, where aura_type can be any of naturesaura:overworld, naturesaura:nether and naturesaura:end.
auraTypeOverrides = []
#The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together
Expand Down
10 changes: 5 additions & 5 deletions defaultconfigs/astralsorcery.toml
Expand Up @@ -8,7 +8,7 @@
#If set to 'true' anything that prevents mobspawning !by this mod!, will also prevent EVERY natural mobspawning of any mobtype. When set to 'false' it'll only stop monsters of type 'MONSTER' from spawning.
mobSpawningDenyAllTypes = false
#Features generating random ores in AstralSorcery will not spawn ores from mods listed here.
modidOreBlacklist = ["techreborn", "gregtech"]
modidOreBlacklist = ["techreborn", "gregtech","mekanism","thermal","undergarden","immersiveengineering","tmechworks","mapperbase","minecraft"]
#Set this to false to prevent players from being affected by entity-related colored lens effects.
doColoredLensesAffectPlayers = true

Expand Down Expand Up @@ -687,23 +687,23 @@

[registries.amulet_enchantments]
#Defines a whitelist of which enchantments can be rolled and buffed by the enchantment-amulet. The higher the weight, the more likely that roll is selected.Format: <enchantment-registry-name>;<weight>
amulet_enchantments = ["minecraft:protection;10", "minecraft:fire_protection;5", "minecraft:feather_falling;5", "minecraft:blast_protection;2", "minecraft:projectile_protection;5", "minecraft:respiration;2", "minecraft:aqua_affinity;2", "minecraft:thorns;1", "minecraft:depth_strider;2", "minecraft:frost_walker;2", "minecraft:soul_speed;1", "minecraft:sharpness;10", "minecraft:smite;5", "minecraft:bane_of_arthropods;5", "minecraft:knockback;5", "minecraft:fire_aspect;2", "minecraft:looting;2", "minecraft:sweeping;2", "minecraft:efficiency;10", "minecraft:silk_touch;1", "minecraft:unbreaking;5", "minecraft:fortune;2", "minecraft:power;10", "minecraft:punch;2", "minecraft:flame;2", "minecraft:infinity;1", "minecraft:luck_of_the_sea;2", "minecraft:lure;2", "minecraft:loyalty;5", "minecraft:impaling;2", "minecraft:riptide;2", "minecraft:channeling;1", "minecraft:multishot;2", "minecraft:quick_charge;5", "minecraft:piercing;10", "minecraft:mending;2", "gunswithoutroses:impact;10", "gunswithoutroses:bullseye;10", "gunswithoutroses:sleight_of_hand;5", "gunswithoutroses:preserving;2", "naturesaura:aura_mending;2", "ensorcelled:enchantmentminer;1", "pedestals:upgradespeed;10", "pedestals:upgraderange;10", "pedestals:upgradearea;10", "pedestals:upgradecapacity;10", "pedestals:upgradeadvanced;1", "morevanillalib:repairing_luck;2", "astralsorcery:night_vision;1", "astralsorcery:scorching_heat;1", "farmersdelight:backstabbing;5", "ars_nouveau:mana_regen;5", "ars_nouveau:mana_boost;5", "ars_nouveau:reactive;1", "ensorcellation:magic_protection;5", "ensorcellation:displacement;2", "ensorcellation:fire_rebuke;1", "ensorcellation:frost_rebuke;1", "ensorcellation:air_affinity;2", "ensorcellation:exp_boost;5", "ensorcellation:gourmand;5", "ensorcellation:reach;5", "ensorcellation:vitality;1", "ensorcellation:damage_ender;5", "ensorcellation:damage_illager;5", "ensorcellation:damage_villager;5", "ensorcellation:cavalier;5", "ensorcellation:frost_aspect;2", "ensorcellation:instigating;5", "ensorcellation:leech;5", "ensorcellation:magic_edge;2", "ensorcellation:vorpal;2", "ensorcellation:excavating;2", "ensorcellation:hunter;1", "ensorcellation:quick_draw;5", "ensorcellation:trueshot;5", "ensorcellation:volley;2", "ensorcellation:angler;1", "ensorcellation:pilfering;2", "ensorcellation:furrowing;5", "ensorcellation:tilling;2", "ensorcellation:weeding;5", "ensorcellation:bulwark;5", "ensorcellation:phalanx;5", "ensorcellation:soulbound;5", "travel_anchors:teleportation;2", "travel_anchors:range;2", "apotheosis:hell_infusion;1", "apotheosis:depth_miner;2", "apotheosis:stable_footing;2", "apotheosis:scavenger;1", "apotheosis:icy_thorns;2", "apotheosis:tempting;5", "apotheosis:shield_bash;2", "apotheosis:reflective;2", "apotheosis:knowledge;2", "apotheosis:splitting;2", "apotheosis:natures_blessing;2", "apotheosis:rebounding;2", "apotheosis:magic_protection;5", "apotheosis:sea_infusion;1", "apotheosis:bane_of_illagers;5", "apotheosis:obliteration;2", "apotheosis:crescendo;2", "apotheosis:capturing;1", "apotheosis:true_infinity;1"]
amulet_enchantments = ["minecraft:protection;10", "minecraft:fire_protection;5", "minecraft:feather_falling;5", "minecraft:blast_protection;2", "minecraft:projectile_protection;5", "minecraft:respiration;2", "minecraft:aqua_affinity;2", "minecraft:thorns;1", "minecraft:depth_strider;2", "minecraft:sharpness;10", "minecraft:smite;5", "minecraft:bane_of_arthropods;5", "minecraft:knockback;5", "minecraft:fire_aspect;2", "minecraft:looting;2", "minecraft:sweeping;2", "minecraft:efficiency;10", "minecraft:unbreaking;5", "minecraft:fortune;2", "minecraft:power;10", "minecraft:punch;2", "minecraft:flame;2", "minecraft:infinity;1", "minecraft:luck_of_the_sea;2", "minecraft:lure;2", "minecraft:loyalty;5", "minecraft:impaling;2", "minecraft:riptide;2", "minecraft:channeling;1", "minecraft:multishot;2", "minecraft:quick_charge;5", "minecraft:piercing;10", "minecraft:mending;2", "gunswithoutroses:impact;10", "gunswithoutroses:bullseye;10", "gunswithoutroses:sleight_of_hand;5", "gunswithoutroses:preserving;2", "naturesaura:aura_mending;2", "ensorcelled:enchantmentminer;1", "morevanillalib:repairing_luck;2", "astralsorcery:night_vision;1", "astralsorcery:scorching_heat;1", "farmersdelight:backstabbing;5", "ars_nouveau:mana_regen;5", "ars_nouveau:mana_boost;5", "ensorcellation:magic_protection;5", "ensorcellation:displacement;2", "ensorcellation:fire_rebuke;1", "ensorcellation:frost_rebuke;1", "ensorcellation:exp_boost;5", "ensorcellation:gourmand;5", "ensorcellation:reach;5", "ensorcellation:vitality;1", "ensorcellation:damage_ender;5", "ensorcellation:damage_illager;5", "ensorcellation:damage_villager;5", "ensorcellation:cavalier;5", "ensorcellation:frost_aspect;2", "ensorcellation:instigating;5", "ensorcellation:leech;5", "ensorcellation:magic_edge;2", "ensorcellation:vorpal;2", "ensorcellation:excavating;2", "ensorcellation:hunter;1", "ensorcellation:quick_draw;5", "ensorcellation:trueshot;5", "ensorcellation:volley;2", "ensorcellation:angler;1", "ensorcellation:pilfering;2", "ensorcellation:furrowing;5", "ensorcellation:tilling;2", "ensorcellation:weeding;5", "ensorcellation:bulwark;5", "ensorcellation:phalanx;5", "ensorcellation:soulbound;5", "travel_anchors:range;2", "apotheosis:hell_infusion;1", "apotheosis:depth_miner;2", "apotheosis:scavenger;1", "apotheosis:icy_thorns;2", "apotheosis:shield_bash;2", "apotheosis:reflective;2", "apotheosis:knowledge;2", "apotheosis:natures_blessing;2", "apotheosis:rebounding;2", "apotheosis:magic_protection;5", "apotheosis:sea_infusion;1", "apotheosis:bane_of_illagers;5", "apotheosis:obliteration;2", "apotheosis:crescendo;2", "apotheosis:capturing;1"]

[registries.gem_attributes]
#Format: '<attributeRegistryName>;<integerWeight>' Defines the attributes Perk Gems can roll.
gem_attributes = ["astralsorcery:maxhealth;2", "astralsorcery:movespeed;8", "astralsorcery:armor;8", "astralsorcery:reach;4", "astralsorcery:attackspeed;2", "astralsorcery:meleeattackdamage;8", "astralsorcery:projectileattackdamage;8", "astralsorcery:harvestspeed;2", "astralsorcery:critchance;4", "astralsorcery:critmulti;4", "astralsorcery:allres;2", "astralsorcery:dodge;2", "astralsorcery:liferecovery;2", "astralsorcery:chargecap;3", "astralsorcery:chargeregeneration;3", "astralsorcery:expgain;1"]

[registries.perk_void_trash_ore]
#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define item-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
perk_void_trash_ore = ["forge:ores/coal;5200", "forge:ores/iron;2500", "forge:ores/gold;550", "forge:ores/lapis;360", "forge:ores/redstone;700", "forge:ores/diamond;120", "forge:ores/emerald;100"]
perk_void_trash_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;3000","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]

[registries.perk_stone_enrichment_ore]
#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
perk_stone_enrichment_ore = ["forge:ores/coal;5200", "forge:ores/iron;2500", "forge:ores/gold;550", "forge:ores/lapis;360", "forge:ores/redstone;700", "forge:ores/diamond;120", "forge:ores/emerald;100"]
perk_stone_enrichment_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;3000","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]

[registries.mineralis_ritual_ore]
#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
mineralis_ritual_ore = ["forge:ores/coal;5200", "forge:ores/iron;2500", "forge:ores/gold;550", "forge:ores/lapis;360", "forge:ores/redstone;700", "forge:ores/diamond;120", "forge:ores/emerald;100"]
mineralis_ritual_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;3000","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]

[registries.entity_transmutation]
#Defines the entity types the corrupted pelotrio ritual can transmute from and to. Format: <EntityTypeFrom>;<EntityTypeTo>
Expand Down
3 changes: 3 additions & 0 deletions kubejs/client_scripts/item_modifiers/jei_hide.js
Expand Up @@ -9,6 +9,9 @@ events.listen('jei.hide.items', (event) => {
'emendatusenigmatica:' + material + '_jasper_ore',
'emendatusenigmatica:' + material + '_marble_ore',
'emendatusenigmatica:' + material + '_slate_ore',
'emendatusenigmatica:' + material + '_netherrack_ore',
'emendatusenigmatica:' + material + '_blackstone_ore',
'emendatusenigmatica:' + material + '_end_stone_ore',
'titanium:' + material + '_gear',
'thermal:' + material,
'thermal:' + material + '_dust',
Expand Down
27 changes: 27 additions & 0 deletions kubejs/data/rftoolsbuilder/recipes/shape_card_quarry_fortune.json
@@ -0,0 +1,27 @@
{
"type": "mcjtylib:copy_nbt",
"pattern": ["sns", "eMd", "srs"],
"key": {
"n": {
"item": "minecraft:ghast_tear"
},
"M": {
"item": "rftoolsbuilder:shape_card_quarry"
},
"r": {
"item": "minecraft:redstone"
},
"s": {
"tag": "forge:gems/dimensional"
},
"d": {
"item": "minecraft:diamond"
},
"e": {
"item": "minecraft:emerald"
}
},
"result": {
"item": "rftoolsbuilder:shape_card_quarry_fortune"
}
}
21 changes: 21 additions & 0 deletions kubejs/data/rftoolsbuilder/recipes/shape_card_quarry_silk.json
@@ -0,0 +1,21 @@
{
"type": "mcjtylib:copy_nbt",
"pattern": ["sns", "dMd", "sds"],
"key": {
"n": {
"item": "minecraft:nether_star"
},
"M": {
"item": "rftoolsbuilder:shape_card_quarry"
},
"s": {
"tag": "forge:gems/dimensional"
},
"d": {
"item": "minecraft:diamond"
}
},
"result": {
"item": "rftoolsbuilder:shape_card_quarry_silk"
}
}
18 changes: 18 additions & 0 deletions kubejs/data/rftoolsbuilder/recipes/shield_block3.json
@@ -0,0 +1,18 @@
{
"type": "mcjtylib:copy_nbt",
"pattern": ["sOs", "OMO", "sOs"],
"key": {
"M": {
"item": "rftoolsbuilder:shield_block2"
},
"s": {
"tag": "forge:gems/dimensional"
},
"O": {
"item": "minecraft:obsidian"
}
},
"result": {
"item": "rftoolsbuilder:shield_block3"
}
}
21 changes: 21 additions & 0 deletions kubejs/data/rftoolsbuilder/recipes/shield_block4.json
@@ -0,0 +1,21 @@
{
"type": "mcjtylib:copy_nbt",
"pattern": ["nOs", "OMO", "sOn"],
"key": {
"M": {
"item": "rftoolsbuilder:shield_block3"
},
"n": {
"item": "minecraft:nether_star"
},
"s": {
"tag": "forge:gems/dimensional"
},
"O": {
"item": "minecraft:obsidian"
}
},
"result": {
"item": "rftoolsbuilder:shield_block4"
}
}
Expand Up @@ -62,7 +62,9 @@ events.listen('recipes', function (event) {
'mapperbase:steel_rod_from_blasting',
'mapperbase:steel_rod',

'morevanillalib:obsidian_shard'
'morevanillalib:obsidian_shard',

'jaopca:mekanism.ore_to_material.dimensional'
];

outputRemovals.forEach((removal) => {
Expand Down
Expand Up @@ -71,6 +71,8 @@ events.listen('recipes', function (event) {

event.replaceInput({}, 'mapperbase:raw_bitumen', '#forge:gems/bitumen');

event.replaceInput({}, 'rftoolsbase:dimensionalshard', '#forge:gems/dimensional');

event.replaceInput({}, '#forge:fillet_knife', '#forge:tools/knife');
event.replaceInput({}, '#farmersdelight:tools/knife', '#forge:tools/knife');

Expand Down
@@ -1,5 +1,5 @@
events.listen('recipes', function (event) {
output = 'rftoolsbase:dimensionalshard';
output = 'emendatusenigmatica:dimensional_gem';
count = 8;
event.recipes.mekanism.enriching({
input: {
Expand Down
3 changes: 2 additions & 1 deletion kubejs/server_scripts/enigmatica/kubejs/global_constants.js
Expand Up @@ -96,7 +96,8 @@ const materialsToUnify = [
'mana',
'certus_quartz',
'charged_certus_quartz',
'iesnium'
'iesnium',
'dimensional'
];

global.materialsToUnify = materialsToUnify;
Expand Down

0 comments on commit 8eb2e27

Please sign in to comment.