Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IF Mob Duplicator blacklist #121

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions config/ftbquests/quests/chapters/0E9796448AFA83CD.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
}
id: "0E9796448AFA83CD"
order_index: 3
progression_mode: "flexible"
quest_links: [ ]
quests: [
{
Expand Down Expand Up @@ -136,6 +137,14 @@
id: "minecraft:barrel"
}
id: "5047A6F1EF472407"
tasks: [{
dimension: "minecraft:overworld"
icon: {
id: "minecraft:chest"
}
id: "4B71487A3383C439"
type: "dimension"
}]
x: -1.5d
y: 2.0d
}
Expand All @@ -145,6 +154,14 @@
id: "minecraft:hopper"
}
id: "0B04BC5F88746182"
tasks: [{
dimension: "minecraft:overworld"
icon: {
id: "minecraft:hopper"
}
id: "36D658D637E5D847"
type: "dimension"
}]
x: -1.5d
y: 1.0d
}
Expand All @@ -154,6 +171,14 @@
id: "minecraft:bucket"
}
id: "0FCC51B49080984E"
tasks: [{
dimension: "minecraft:overworld"
icon: {
id: "minecraft:bucket"
}
id: "4AC93DA4181794FF"
type: "dimension"
}]
x: -1.5d
y: 0.0d
}
Expand Down Expand Up @@ -339,6 +364,14 @@
id: "minecraft:redstone_block"
}
id: "2F898C0C2DF380AE"
tasks: [{
dimension: "minecraft:overworld"
icon: {
id: "minecraft:redstone_block"
}
id: "3ABA48B70D4EF83A"
type: "dimension"
}]
x: -1.5d
y: 3.0d
}
Expand Down Expand Up @@ -399,6 +432,14 @@
id: "minecraft:comparator"
}
id: "0230942DF53BB9E5"
tasks: [{
dimension: "minecraft:overworld"
icon: {
id: "minecraft:comparator"
}
id: "5726FC2C852F6F2B"
type: "dimension"
}]
x: -1.5d
y: 4.0d
}
Expand Down
1 change: 1 addition & 0 deletions config/ftbquests/quests/chapters/ars_nouveau.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
{
id: "3ADF4803B5DF4AF9"
item: { count: 1, id: "ars_nouveau:glyph_sensitive" }
optional_task: true
type: "item"
}
]
Expand Down
9 changes: 7 additions & 2 deletions config/ftbquests/quests/lang/en_us.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
""
"The guidebook also has a section that explains the rules, such as placing &5Form&r before &aEffect&r or where &6Augments&r are allowed. "
""
"[\"Lastly, the community driven \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://wiki.aidancbrady.com\"},\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"Ars.Guide\",\"underlined\":true},\" has a repository of useful spells. Feel free to explore them and submit your own creations!\"]"
"[\"Lastly, the community driven \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://ars.guide/spells/introduction/compendium/\"},\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"Ars.Guide\",\"underlined\":true},\" has a repository of useful spells. Feel free to explore them and submit your own creations!\"]"
""
"&6&nExample Spells&r"
""
Expand Down Expand Up @@ -3550,7 +3550,7 @@
task.10E9A412419B679A.title: "Disabled"
task.116CBCF6CA77E71A.title: "Syringe"
task.12BDDFD0C2267B6C.title: "Pressure Mechanic"
task.14C031FA14C3CD89.title: "Environmentla Accumulator"
task.14C031FA14C3CD89.title: "Environmental Accumulator"
task.15BDBEA7237CBB17.title: "Summon: Possessed Endermite"
task.1B81285E0D45A226.title: "Any Tool"
task.1B9EA0EB538823C6.title: "Observe a Chocobo!"
Expand All @@ -3572,9 +3572,11 @@
task.34E6ED3A221ADB0E.title: "Just Dire Tools"
task.35B971D8A6CCBC94.title: "EU Cables"
task.35F8589774CE48D9.title: "Arcane Pedestals"
task.36D658D637E5D847.title: "Storage Systems"
task.3745AFEF378D7217.title: "Steel or Energized Steel"
task.37CDC8E9B9004A0D.title: "Crafting Storage"
task.3898E7E189555B8C.title: "Arcane Platforms"
task.3ABA48B70D4EF83A.title: "Bulk Energy Storage"
task.3C9F8F7D407AC253.title: "Sender Modules"
task.3D1A362E43EE4BED.title: "Other Compressors"
task.3DED6DAEE4419675.title: "Any Chipped Workbench"
Expand All @@ -3597,6 +3599,8 @@
task.49C1EEBEED453B1C.title: "Mechanical Pipes"
task.4A93D708610D3523.title: "Kaleidite Tools"
task.4AAAB62A26960EFE.title: "Fluid Pipes"
task.4AC93DA4181794FF.title: "Bulk Fluid Storage"
task.4B71487A3383C439.title: "Bulk Item Storage"
task.4D3445BCDA8E459B.title: "BumbleZone"
task.4D45C5166D0700F8.title: "Item Pipes"
task.4D5563ABAA54713A.title: "Beacon Equipment"
Expand All @@ -3606,6 +3610,7 @@
task.5314260DF92C1856.title: "Observe a Wixie's Cauldron"
task.53537003380689AB.title: "Universal Cables"
task.53EE7D896F7103FA.title: "Any Candle"
task.5726FC2C852F6F2B.title: "Energy Chargers"
task.576CB5FB3B8A46A6.title: "Smart Cables"
task.57BE29AB834A63FE.title: "Just Dire Armor"
task.5AB2F86A6AC8271E.title: "Any &3Vanilla Plus&r Tool"
Expand Down
5 changes: 1 addition & 4 deletions config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@
{
count: 8
item: {
components: {
"ftbquests:missing_item": "occultism:candle_white"
}
count: 1
id: "ftbquests:missing_item"
id: "occultism:large_candle"
}
random_bonus: 8
}
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
random_bonus: 8
weight: 0.25f
}
{ item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } }
{ item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } }
{ item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } }
{ item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } }
]
use_title: true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:industrialforegoing/laser_drill_fluid/';

const recipes = [
{
catalyst: { item: 'industrialforegoing:red_laser_lens' },
entity: 'minecraft:villager',
output: { amount: 100, id: 'evilcraft:blood' },
rarity: [
{
dimension_filter: { blacklist: [], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 256,
depth_min: -64,
weight: 8
}
],
id: `${id_prefix}blood`
}
];

recipes.forEach((recipe) => {
recipe.type = 'industrialforegoing:laser_drill_fluid';
event.custom(recipe).id(recipe.id);
});
});
200 changes: 200 additions & 0 deletions kubejs/server_scripts/recipes/industrialforegoing/laser_drill_ore.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:industrialforegoing/laser_drill_ore/';

const recipes = [
{
catalyst: { item: 'industrialforegoing:purple_laser_lens' },
output: { item: 'evilcraft:dark_ore' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 16,
depth_min: 5,
weight: 4
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}dark_ore`
},
{
catalyst: { item: 'industrialforegoing:pink_laser_lens' },
output: { item: 'theurgy:sal_ammoniac_ore' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 132,
depth_min: 5,
weight: 10
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 4
}
],
id: `${id_prefix}sal_ammoniac_ore`
},
{
catalyst: { item: 'industrialforegoing:lime_laser_lens' },
output: { tag: 'c:raw_materials/uraninite' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 29,
depth_min: 5,
weight: 5
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}uraninite`
},
{
catalyst: { item: 'industrialforegoing:white_laser_lens' },
output: { item: 'modern_industrialization:quartz_ore' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end', 'minecraft:the_nether'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 117,
depth_min: 7,
weight: 12
},
{
dimension_filter: { blacklist: ['minecraft:the_end', 'minecraft:the_nether'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}quartz_ore`
},
{
catalyst: { item: 'industrialforegoing:cyan_laser_lens' },
output: { tag: 'c:ores/benitoite' },
rarity: [
{
dimension_filter: { blacklist: [], whitelist: ['minecraft:the_nether'] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 68,
depth_min: 16,
weight: 3
},
{
dimension_filter: { blacklist: [], whitelist: ['minecraft:the_nether'] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}benitoite`
},
{
catalyst: { item: 'industrialforegoing:orange_laser_lens' },
output: { tag: 'c:ores/anglesite' },
rarity: [
{
dimension_filter: { blacklist: [], whitelist: ['minecraft:the_end'] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 68,
depth_min: 16,
weight: 3
},
{
dimension_filter: { blacklist: [], whitelist: ['minecraft:the_end'] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}anglesite`
},
{
catalyst: { item: 'industrialforegoing:orange_laser_lens' },
output: { tag: 'c:ores/bauxite' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 84,
depth_min: 68,
weight: 5
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}bauxite`
},
{
catalyst: { item: 'industrialforegoing:magenta_laser_lens' },
output: { tag: 'c:raw_materials/titanium' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 84,
depth_min: 68,
weight: 5
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}titanium`
},
{
catalyst: { item: 'industrialforegoing:gray_laser_lens' },
output: { tag: 'c:raw_materials/antimony' },
rarity: [
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 40,
depth_min: 10,
weight: 5
},
{
dimension_filter: { blacklist: ['minecraft:the_end'], whitelist: [] },
biome_filter: { blacklist: [], whitelist: [] },
depth_max: 255,
depth_min: 0,
weight: 1
}
],
id: `${id_prefix}antimony`
}
];

recipes.forEach((recipe) => {
recipe.type = 'industrialforegoing:laser_drill_ore';
event.custom(recipe).id(recipe.id);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ServerEvents.tags('entity_type', (event) => {
event
.get('industrialforegoing:mob_crusher_blacklist')
.add([/ars_.*:.*familiar/, /occultism:.*familiar/, /occultism:demonic_/]);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ServerEvents.tags('entity_type', (event) => {
event.get('industrialforegoing:mob_duplicator_blacklist').add(['#enigmatica:mob_spawner_blacklist']);
});