diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml index 95c22b2..d1a651d 100644 --- a/config/emendatusenigmatica-common.toml +++ b/config/emendatusenigmatica-common.toml @@ -666,7 +666,7 @@ baseline = 32 #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 12] #Range: 0 ~ 256 - spread = 12 + spread = 20 ["Osmium Config"."The Nether"] #Activate/Deactivate the Ore Gen in The Nether [Default: false] diff --git a/config/quark-common.toml b/config/quark-common.toml index 8fec69e..0e16fad 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -382,7 +382,7 @@ "Reacharound Placing" = true "Replace Scaffolding" = true "Sign Editing" = true - "Simple Harvest" = true + "Simple Harvest" = false "Snow Golem Player Heads" = true "Springy Slime" = true "Utility Recipes" = true diff --git a/kubejs/client_scripts/item_modifiers/jei_hide.js b/kubejs/client_scripts/item_modifiers/jei_hide.js index 1e1c1d9..b68c8f0 100644 --- a/kubejs/client_scripts/item_modifiers/jei_hide.js +++ b/kubejs/client_scripts/item_modifiers/jei_hide.js @@ -72,15 +72,15 @@ events.listen('jei.hide.items', (event) => { /create:\w+_ingot/, /create:\w+_ore/, /immersiveposts:stick_/, - /buildersaddition:\w+_rod/, - /eidolon:\w+_ingot/, - /eidolon:\w+_nugget/, - /eidolon:\w+_ore/, - /byg:pendorite/, - /byg:ametrine/, + // /buildersaddition:\w+_rod/, + // /eidolon:\w+_ingot/, + // /eidolon:\w+_nugget/, + // /eidolon:\w+_ore/, + // /byg:pendorite/, + // /byg:ametrine/, /emendatusenigmatica:\w+certus/, /emendatusenigmatica:\w+fluix/, - /mapperbase:steel/, + // /mapperbase:steel/, /rftoolsbase:dimensionalshard/ ]; regexHide.forEach((regexExpression) => { diff --git a/kubejs/data/botanypots/recipes/crops/datura.json b/kubejs/data/botanypots/recipes/crops/datura.json index 93d65fc..407bdf5 100644 --- a/kubejs/data/botanypots/recipes/crops/datura.json +++ b/kubejs/data/botanypots/recipes/crops/datura.json @@ -1,43 +1,43 @@ -{ - "type": "botanypots:crop", - "seed": { - "item": "occultism:datura_seeds" - }, - "categories": [ - "dirt", - "farmland" - ], - "growthTicks": 800, - "display": { - "block": "occultism:datura", - "properties": { - "age": 5 - } - }, - "results": [ - { - "chance": 0.75, - "output": { - "item": "occultism:datura" - }, - "minRolls": 1, - "maxRolls": 1 - }, - { - "chance": 0.05, - "output": { - "item": "occultism:datura" - }, - "minRolls": 1, - "maxRolls": 2 - }, - { - "chance": 0.05, - "output": { - "item": "occultism:datura_seeds" - }, - "minRolls": 1, - "maxRolls": 2 - } - ] -} \ No newline at end of file +// { +// "type": "botanypots:crop", +// "seed": { +// "item": "occultism:datura_seeds" +// }, +// "categories": [ +// "dirt", +// "farmland" +// ], +// "growthTicks": 800, +// "display": { +// "block": "occultism:datura", +// "properties": { +// "age": 5 +// } +// }, +// "results": [ +// { +// "chance": 0.75, +// "output": { +// "item": "occultism:datura" +// }, +// "minRolls": 1, +// "maxRolls": 1 +// }, +// { +// "chance": 0.05, +// "output": { +// "item": "occultism:datura" +// }, +// "minRolls": 1, +// "maxRolls": 2 +// }, +// { +// "chance": 0.05, +// "output": { +// "item": "occultism:datura_seeds" +// }, +// "minRolls": 1, +// "maxRolls": 2 +// } +// ] +// } \ No newline at end of file diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/occultism_saplings.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/occultism_saplings.json index a6bba29..557c81e 100644 --- a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/occultism_saplings.json +++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/occultism_saplings.json @@ -1,18 +1,18 @@ -{ - "modId": "quark", - "group": { - "name": "Occultism Saplings", - "enabledByDefault": true, - "defaultPayment": { - "item": "occultism:spirit_attuned_gem" - }, - "defaultCategory": "farmingforblockheads:saplings" - }, - "customEntries": [ - { - "output": { - "item": "occultism:otherworld_sapling_natural" - } - } - ] -} +// { +// "modId": "quark", +// "group": { +// "name": "Occultism Saplings", +// "enabledByDefault": true, +// "defaultPayment": { +// "item": "occultism:spirit_attuned_gem" +// }, +// "defaultCategory": "farmingforblockheads:saplings" +// }, +// "customEntries": [ +// { +// "output": { +// "item": "occultism:otherworld_sapling_natural" +// } +// } +// ] +// } diff --git a/kubejs/server_scripts/fellies/kubejs/base/recipes/replace_input.js b/kubejs/server_scripts/fellies/kubejs/base/recipes/replace_input.js index f5963ab..895cb64 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/recipes/replace_input.js +++ b/kubejs/server_scripts/fellies/kubejs/base/recipes/replace_input.js @@ -331,7 +331,7 @@ events.listen('recipes', function (event) { event.replaceInput({ mod: 'powah' }, '#forge:ingots/iron', '#forge:ingots/iron_copper'); event.replaceInput({ mod: 'powah' }, '#forge:nuggets/iron', '#forge:nuggets/iron_copper'); - ['quark:tallow', 'eidolon:tallow', 'occultism:tallow'].forEach((tallow) => { + ['quark:tallow'].forEach((tallow) => { event.replaceInput({}, tallow, '#forge:tallow'); }); diff --git a/kubejs/server_scripts/fellies/kubejs/base/recipes/shaped.js b/kubejs/server_scripts/fellies/kubejs/base/recipes/shaped.js index 1101616..82df118 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/recipes/shaped.js +++ b/kubejs/server_scripts/fellies/kubejs/base/recipes/shaped.js @@ -24,11 +24,11 @@ events.listen('recipes', function (event) { C: 'refinedstorage:wireless_grid', D: 'minecraft:crafting_table' }), - shapedRecipe('simplefarming:fish_and_chips', [' A ', 'BCB', ' A '], { - A: '#forge:crops/potato', - B: '#forge:grain', - C: 'aquaculture:fish_fillet_cooked' - }), + // shapedRecipe('simplefarming:fish_and_chips', [' A ', 'BCB', ' A '], { + // A: '#forge:crops/potato', + // B: '#forge:grain', + // C: 'aquaculture:fish_fillet_cooked' + // }), shapedRecipe('quantumstorage:tank', ['CBC', 'BLB', 'CCC'], { L: 'mekanism:ultimate_fluid_tank', C: '#forge:ingots/compressed_iron', @@ -75,24 +75,24 @@ events.listen('recipes', function (event) { shapedRecipe('decorative_blocks:lattice', ['A A', ' ', 'A A'], { A: '#forge:rods/wooden' }), - shapedRecipe(item.of('valhelsia_structures:oak_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:oak_log' - }), - shapedRecipe(item.of('valhelsia_structures:spruce_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:spruce_log' - }), - shapedRecipe(item.of('valhelsia_structures:birch_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:birch_log' - }), - shapedRecipe(item.of('valhelsia_structures:jungle_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:jungle_log' - }), - shapedRecipe(item.of('valhelsia_structures:dark_oak_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:dark_oak_log' - }), - shapedRecipe(item.of('valhelsia_structures:acacia_post', 6), ['A', 'A', 'A'], { - A: 'minecraft:acacia_log' - }), + // shapedRecipe(item.of('valhelsia_structures:oak_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:oak_log' + // }), + // shapedRecipe(item.of('valhelsia_structures:spruce_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:spruce_log' + // }), + // shapedRecipe(item.of('valhelsia_structures:birch_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:birch_log' + // }), + // shapedRecipe(item.of('valhelsia_structures:jungle_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:jungle_log' + // }), + // shapedRecipe(item.of('valhelsia_structures:dark_oak_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:dark_oak_log' + // }), + // shapedRecipe(item.of('valhelsia_structures:acacia_post', 6), ['A', 'A', 'A'], { + // A: 'minecraft:acacia_log' + // }), shapedRecipe(item.of('minecraft:ladder', 4), ['A A', 'ABA', 'A A'], { A: '#forge:rods/wooden', B: '#minecraft:planks' @@ -101,184 +101,184 @@ events.listen('recipes', function (event) { A: '#engineersdecor:brick_ingots', B: '#forge:slag' }), - shapedRecipe(item.of('prettypipes:wrench', 1), [' A ', 'AB ', ' B'], { - A: '#forge:nuggets/iron', - B: 'prettypipes:pipe' - }), - shapedRecipe(item.of('prettypipes:blank_module', 3), [' A ', 'BBB', 'CCC'], { - A: '#forge:dusts/redstone', - B: 'minecraft:stone_slab', - C: '#forge:nuggets/copper' - }), - shapedRecipe(item.of('prettypipes:low_extraction_module', 1), [' A ', ' B ', ' C '], { - A: '#forge:dusts/redstone', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_extraction_module', 1), [' C ', 'ABA', ' A '], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_extraction_module', - C: '#forge:ingots/invar' - }), - shapedRecipe(item.of('prettypipes:high_extraction_module', 1), [' C ', 'ABA', ' A '], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_extraction_module', - C: '#forge:ingots/electrum' - }), - shapedRecipe(item.of('prettypipes:low_filter_module', 1), [' A ', ' B ', ' C '], { - A: '#forge:paper', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_filter_module', 1), [' C ', 'ABA', ' C '], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_filter_module', - C: 'minecraft:iron_bars' - }), - shapedRecipe(item.of('prettypipes:high_filter_module', 1), [' C ', 'ABA', ' C '], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_filter_module', - C: 'minecraft:iron_bars' - }), - shapedRecipe(item.of('prettypipes:low_speed_module', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:sugar', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_speed_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_speed_module', - C: 'minecraft:sugar' - }), - shapedRecipe(item.of('prettypipes:high_speed_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_speed_module', - C: 'minecraft:sugar' - }), - shapedRecipe(item.of('prettypipes:low_low_priority_module', 1), [' A ', ' B ', ' C '], { - A: '#forge:nuggets/lead', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_low_priority_module', - C: '#forge:nuggets/lead' - }), - shapedRecipe(item.of('prettypipes:high_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_low_priority_module', - C: '#forge:nuggets/lead' - }), - shapedRecipe(item.of('prettypipes:low_high_priority_module', 1), [' A ', ' B ', ' C '], { - A: '#forge:nuggets/silver', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_high_priority_module', - C: '#forge:nuggets/silver' - }), - shapedRecipe(item.of('prettypipes:high_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_high_priority_module', - C: '#forge:nuggets/silver' - }), - shapedRecipe(item.of('prettypipes:low_retrieval_module', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:observer', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_retrieval_module', 1), [' A ', 'ABA', ' C '], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_retrieval_module', - C: '#forge:ingots/invar' - }), - shapedRecipe(item.of('prettypipes:high_retrieval_module', 1), [' A ', 'ABA', ' C '], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_retrieval_module', - C: '#forge:ingots/electrum' - }), - shapedRecipe(item.of('prettypipes:stack_size_module', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:comparator', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:damage_filter_modifier', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:stone_pickaxe', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:nbt_filter_modifier', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:book', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:tag_filter_modifier', 1), [' A ', ' B ', ' C '], { - A: '#forge:chunks', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:mod_filter_modifier', 1), [' A ', ' B ', ' C '], { - A: 'prettypipes:wrench', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:redstone_module', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:redstone_torch', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:filter_increase_modifier', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:iron_bars', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:low_crafting_module', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:crafting_table', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:medium_crafting_module', 1), [' A ', 'ABA', ' C '], { - A: '#forge:nuggets/invar', - B: 'prettypipes:low_crafting_module', - C: '#forge:ingots/invar' - }), - shapedRecipe(item.of('prettypipes:high_crafting_module', 1), [' A ', 'ABA', ' C '], { - A: '#forge:nuggets/electrum', - B: 'prettypipes:medium_crafting_module', - C: '#forge:ingots/electrum' - }), - shapedRecipe(item.of('prettypipes:pipe', 12), [' ', 'ABA', ' '], { - A: '#forge:ingots/tin', - B: '#forge:glass/colorless' - }), - shapedRecipe(item.of('prettypipes:item_terminal', 1), [' B ', 'CAD', 'EFE'], { - A: 'thermal:machine_frame', - B: 'minecraft:observer', - C: 'prettypipes:high_extraction_module', - D: 'prettypipes:high_retrieval_module', - E: '#forge:gears/invar', - F: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:pressurizer', 1), [' E ', 'BAB', 'CDC'], { - A: 'thermal:machine_frame', - B: 'prettypipes:high_speed_module', - C: '#forge:gears/invar', - D: 'thermal:rf_coil', - E: 'prettypipes:pipe' - }), - shapedRecipe(item.of('prettypipes:round_robin_sorting_modifier', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:clock', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), - shapedRecipe(item.of('prettypipes:random_sorting_modifier', 1), [' A ', ' B ', ' C '], { - A: 'minecraft:dropper', - B: 'prettypipes:blank_module', - C: 'thermal:redstone_servo' - }), + // shapedRecipe(item.of('prettypipes:wrench', 1), [' A ', 'AB ', ' B'], { + // A: '#forge:nuggets/iron', + // B: 'prettypipes:pipe' + // }), + // shapedRecipe(item.of('prettypipes:blank_module', 3), [' A ', 'BBB', 'CCC'], { + // A: '#forge:dusts/redstone', + // B: 'minecraft:stone_slab', + // C: '#forge:nuggets/copper' + // }), + // shapedRecipe(item.of('prettypipes:low_extraction_module', 1), [' A ', ' B ', ' C '], { + // A: '#forge:dusts/redstone', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_extraction_module', 1), [' C ', 'ABA', ' A '], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_extraction_module', + // C: '#forge:ingots/invar' + // }), + // shapedRecipe(item.of('prettypipes:high_extraction_module', 1), [' C ', 'ABA', ' A '], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_extraction_module', + // C: '#forge:ingots/electrum' + // }), + // shapedRecipe(item.of('prettypipes:low_filter_module', 1), [' A ', ' B ', ' C '], { + // A: '#forge:paper', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_filter_module', 1), [' C ', 'ABA', ' C '], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_filter_module', + // C: 'minecraft:iron_bars' + // }), + // shapedRecipe(item.of('prettypipes:high_filter_module', 1), [' C ', 'ABA', ' C '], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_filter_module', + // C: 'minecraft:iron_bars' + // }), + // shapedRecipe(item.of('prettypipes:low_speed_module', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:sugar', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_speed_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_speed_module', + // C: 'minecraft:sugar' + // }), + // shapedRecipe(item.of('prettypipes:high_speed_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_speed_module', + // C: 'minecraft:sugar' + // }), + // shapedRecipe(item.of('prettypipes:low_low_priority_module', 1), [' A ', ' B ', ' C '], { + // A: '#forge:nuggets/lead', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_low_priority_module', + // C: '#forge:nuggets/lead' + // }), + // shapedRecipe(item.of('prettypipes:high_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_low_priority_module', + // C: '#forge:nuggets/lead' + // }), + // shapedRecipe(item.of('prettypipes:low_high_priority_module', 1), [' A ', ' B ', ' C '], { + // A: '#forge:nuggets/silver', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_high_priority_module', + // C: '#forge:nuggets/silver' + // }), + // shapedRecipe(item.of('prettypipes:high_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_high_priority_module', + // C: '#forge:nuggets/silver' + // }), + // shapedRecipe(item.of('prettypipes:low_retrieval_module', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:observer', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_retrieval_module', 1), [' A ', 'ABA', ' C '], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_retrieval_module', + // C: '#forge:ingots/invar' + // }), + // shapedRecipe(item.of('prettypipes:high_retrieval_module', 1), [' A ', 'ABA', ' C '], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_retrieval_module', + // C: '#forge:ingots/electrum' + // }), + // shapedRecipe(item.of('prettypipes:stack_size_module', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:comparator', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:damage_filter_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:stone_pickaxe', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:nbt_filter_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:book', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:tag_filter_modifier', 1), [' A ', ' B ', ' C '], { + // A: '#forge:chunks', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:mod_filter_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'prettypipes:wrench', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:redstone_module', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:redstone_torch', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:filter_increase_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:iron_bars', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:low_crafting_module', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:crafting_table', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:medium_crafting_module', 1), [' A ', 'ABA', ' C '], { + // A: '#forge:nuggets/invar', + // B: 'prettypipes:low_crafting_module', + // C: '#forge:ingots/invar' + // }), + // shapedRecipe(item.of('prettypipes:high_crafting_module', 1), [' A ', 'ABA', ' C '], { + // A: '#forge:nuggets/electrum', + // B: 'prettypipes:medium_crafting_module', + // C: '#forge:ingots/electrum' + // }), + // shapedRecipe(item.of('prettypipes:pipe', 12), [' ', 'ABA', ' '], { + // A: '#forge:ingots/tin', + // B: '#forge:glass/colorless' + // }), + // shapedRecipe(item.of('prettypipes:item_terminal', 1), [' B ', 'CAD', 'EFE'], { + // A: 'thermal:machine_frame', + // B: 'minecraft:observer', + // C: 'prettypipes:high_extraction_module', + // D: 'prettypipes:high_retrieval_module', + // E: '#forge:gears/invar', + // F: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:pressurizer', 1), [' E ', 'BAB', 'CDC'], { + // A: 'thermal:machine_frame', + // B: 'prettypipes:high_speed_module', + // C: '#forge:gears/invar', + // D: 'thermal:rf_coil', + // E: 'prettypipes:pipe' + // }), + // shapedRecipe(item.of('prettypipes:round_robin_sorting_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:clock', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), + // shapedRecipe(item.of('prettypipes:random_sorting_modifier', 1), [' A ', ' B ', ' C '], { + // A: 'minecraft:dropper', + // B: 'prettypipes:blank_module', + // C: 'thermal:redstone_servo' + // }), shapedRecipe(item.of('bloodmagic:demonwillgauge', 1), [' B ', 'ACA', ' B '], { A: '#forge:ingots/tin', B: '#forge:nuggets/tin', @@ -323,74 +323,74 @@ events.listen('recipes', function (event) { A: '#forge:gems/charged_certus_quartz', B: '#forge:dyes/green' }), - shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { - A: 'alexsmobs:roadrunner_feather', - B: '#forge:ingots/enderium', - C: 'ars_nouveau:mana_fiber', - D: 'paraglider:deku_leaf', - E: 'ars_nouveau:glyph_launch', - F: 'ars_nouveau:glyph_slowfall' - }), - shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { - A: 'thermal:lightning_charge', - B: '#mekanism:alloys/atomic', - C: 'thermal:hazmat_fabric', - D: 'paraglider:deku_leaf', - E: 'thermal:hazmat_boots', - F: 'alexsmobs:frontier_cap' - }), + // shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { + // A: 'alexsmobs:roadrunner_feather', + // B: '#forge:ingots/enderium', + // C: 'ars_nouveau:mana_fiber', + // D: 'paraglider:deku_leaf', + // E: 'ars_nouveau:glyph_launch', + // F: 'ars_nouveau:glyph_slowfall' + // }), + // shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { + // A: 'thermal:lightning_charge', + // B: '#mekanism:alloys/atomic', + // C: 'thermal:hazmat_fabric', + // D: 'paraglider:deku_leaf', + // E: 'thermal:hazmat_boots', + // F: 'alexsmobs:frontier_cap' + // }), shapedRecipe('minecraft:chest', ['AAA', 'A A', 'AAA'], { A: '#minecraft:planks' - }), - shapedRecipe( - Item.of('morphtool:tool', { - 'morphtool:is_morphing': 1, - 'morphtool:data': { - blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 }, - powah: { id: 'powah:wrench', Count: 1, tag: { PowahWrenchNBT: {} } }, - resourcefulbees: { id: 'resourcefulbees:scraper', Count: 1 }, - astralsorcery: { id: 'astralsorcery:wand', Count: 1 }, - pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench', Count: 1 }, - immersiveengineering: { id: 'immersiveengineering:hammer', Count: 1, tag: { Damage: 0 } }, - transport: { id: 'transport:rail_breaker', Count: 1 }, - pedestals: { id: 'pedestals:linkingtool', Count: 1 }, - botania: { id: 'botania:twig_wand', Count: 1, tag: { color1: 0, color2: 0 } }, - ars_nouveau: { id: 'ars_nouveau:dominion_wand', Count: 1, tag: {} }, - mekanism: { id: 'mekanism:configurator', Count: 1 }, - bloodmagic: { id: 'bloodmagic:ritualtinkerer', Count: 1 }, - thermal: { id: 'thermal:wrench', Count: 1 }, - rftoolsbase: { id: 'rftoolsbase:smartwrench', Count: 1 }, - create: { - id: 'create:wrench', - Count: 1, - tag: { - 'morphtool:is_morphing': 1, - 'morphtool:displayName': { translate: 'item.create.wrench' }, - display: { - Name: { - translate: 'morphtool.sudo_name', - with: [{ color: 'green', translate: 'item.create.wrench' }] - } - } - } - }, - chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1, tag: { Damage: 0 } }, - refinedstorage: { id: 'refinedstorage:wrench', Count: 1 }, - quantumstorage: { id: 'quantumstorage:hammer', Count: 1, tag: { mode: 'link' } }, - prettypipes: { id: 'prettypipes:wrench', Count: 1 }, - storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 } - } - }), - ['ABA', 'CFD', 'AEA'], - { - A: 'minecraft:redstone_block', - B: '#forge:gears/gold', - C: '#forge:gears/iron', - D: '#forge:gears/silver', - E: '#forge:gears/copper', - F: 'morphtool:tool' - } - ) + }) + // shapedRecipe( + // Item.of('morphtool:tool', { + // 'morphtool:is_morphing': 1, + // 'morphtool:data': { + // blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 }, + // powah: { id: 'powah:wrench', Count: 1, tag: { PowahWrenchNBT: {} } }, + // resourcefulbees: { id: 'resourcefulbees:scraper', Count: 1 }, + // astralsorcery: { id: 'astralsorcery:wand', Count: 1 }, + // pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench', Count: 1 }, + // immersiveengineering: { id: 'immersiveengineering:hammer', Count: 1, tag: { Damage: 0 } }, + // transport: { id: 'transport:rail_breaker', Count: 1 }, + // pedestals: { id: 'pedestals:linkingtool', Count: 1 }, + // botania: { id: 'botania:twig_wand', Count: 1, tag: { color1: 0, color2: 0 } }, + // ars_nouveau: { id: 'ars_nouveau:dominion_wand', Count: 1, tag: {} }, + // mekanism: { id: 'mekanism:configurator', Count: 1 }, + // bloodmagic: { id: 'bloodmagic:ritualtinkerer', Count: 1 }, + // thermal: { id: 'thermal:wrench', Count: 1 }, + // rftoolsbase: { id: 'rftoolsbase:smartwrench', Count: 1 }, + // create: { + // id: 'create:wrench', + // Count: 1, + // tag: { + // 'morphtool:is_morphing': 1, + // 'morphtool:displayName': { translate: 'item.create.wrench' }, + // display: { + // Name: { + // translate: 'morphtool.sudo_name', + // with: [{ color: 'green', translate: 'item.create.wrench' }] + // } + // } + // } + // }, + // chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1, tag: { Damage: 0 } }, + // refinedstorage: { id: 'refinedstorage:wrench', Count: 1 }, + // quantumstorage: { id: 'quantumstorage:hammer', Count: 1, tag: { mode: 'link' } }, + // prettypipes: { id: 'prettypipes:wrench', Count: 1 }, + // storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 } + // } + // }), + // ['ABA', 'CFD', 'AEA'], + // { + // A: 'minecraft:redstone_block', + // B: '#forge:gears/gold', + // C: '#forge:gears/iron', + // D: '#forge:gears/silver', + // E: '#forge:gears/copper', + // F: 'morphtool:tool' + // } + // ) ]; recipes.forEach(function (recipe) { diff --git a/kubejs/server_scripts/fellies/kubejs/base/recipes/shapeless.js b/kubejs/server_scripts/fellies/kubejs/base/recipes/shapeless.js index ec9fdf3..ec3d481 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/recipes/shapeless.js +++ b/kubejs/server_scripts/fellies/kubejs/base/recipes/shapeless.js @@ -3,68 +3,68 @@ events.listen('recipes', (event) => { shapelessRecipe('botania:enchanted_soil', ['minecraft:grass_block', 'botania:overgrowth_seed']), shapelessRecipe('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']), shapelessRecipe('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']), - shapelessRecipe('simplefarming:cornbread', ['#forge:grain', '#forge:crops/corn', '#forge:grain']), + // shapelessRecipe('simplefarming:cornbread', ['#forge:grain', '#forge:crops/corn', '#forge:grain']), shapelessRecipe('minecraft:chest', ['#forge:chests/wooden']), - shapelessRecipe('minecraft:crafting_table', [ - 'craftingstation:crafting_station_slab', - 'craftingstation:crafting_station_slab' - ]), - shapelessRecipe('simplefarming:fish_sandwich', [ - '#forge:bread', - 'aquaculture:fish_fillet_cooked', - 'aquaculture:fish_fillet_cooked', - '#forge:crops/tomato', - '#forge:salad_ingredients' - ]), - shapelessRecipe('simplefarming:sushi', [ - '#forge:grain', - 'minecraft:dried_kelp', - 'aquaculture:fish_fillet_raw', - 'aquaculture:fish_fillet_raw' - ]), - shapelessRecipe('simplefarming:fish_fillet', [ - '#forge:grain', - '#forge:grain', - 'aquaculture:fish_fillet_cooked', - 'aquaculture:fish_fillet_cooked' - ]), - shapelessRecipe(item.of('additionalbars:crossed_iron_bars', 9), [ - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars', - 'minecraft:iron_bars' - ]), + // shapelessRecipe('minecraft:crafting_table', [ + // 'craftingstation:crafting_station_slab', + // 'craftingstation:crafting_station_slab' + // ]), + // shapelessRecipe('simplefarming:fish_sandwich', [ + // '#forge:bread', + // 'aquaculture:fish_fillet_cooked', + // 'aquaculture:fish_fillet_cooked', + // '#forge:crops/tomato', + // '#forge:salad_ingredients' + // ]), + // shapelessRecipe('simplefarming:sushi', [ + // '#forge:grain', + // 'minecraft:dried_kelp', + // 'aquaculture:fish_fillet_raw', + // 'aquaculture:fish_fillet_raw' + // ]), + // shapelessRecipe('simplefarming:fish_fillet', [ + // '#forge:grain', + // '#forge:grain', + // 'aquaculture:fish_fillet_cooked', + // 'aquaculture:fish_fillet_cooked' + // ]), + // shapelessRecipe(item.of('additionalbars:crossed_iron_bars', 9), [ + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars', + // 'minecraft:iron_bars' + // ]), shapelessRecipe('minecraft:wheat_seeds', ['minecraft:wheat']), shapelessRecipe('quark:root', ['minecraft:vine', '#forge:dyes/brown']), shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'patchouli:modded_for_dummies' }), [ 'minecraft:book', '#forge:dyes/yellow' ]), - shapelessRecipe(item.of('bambooeverything:bamboo_bundle', 2), ['thermal:bamboo_block', 'thermal:bamboo_block']), + // shapelessRecipe(item.of('bambooeverything:bamboo_bundle', 2), ['thermal:bamboo_block', 'thermal:bamboo_block']), shapelessRecipe(item.of('thermal:bamboo_block', 2), ['quark:bamboo_block', 'quark:bamboo_block']), - shapelessRecipe(item.of('quark:bamboo_block', 2), [ - 'bambooeverything:bamboo_bundle', - 'bambooeverything:bamboo_bundle' - ]), + // shapelessRecipe(item.of('quark:bamboo_block', 2), [ + // 'bambooeverything:bamboo_bundle', + // 'bambooeverything:bamboo_bundle' + // ]), shapelessRecipe('minecraft:crafting_table', ['#forge:workbench']), shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'resourcefulbees:fifty_shades_of_bees' }), [ 'minecraft:sugar', 'minecraft:book' ]), - shapelessRecipe('prettypipes:pipe_frame', [ - 'minecraft:item_frame', - 'prettypipes:pipe', - '#forge:dusts/redstone' - ]), - shapelessRecipe('prettypipes:crafting_terminal', [ - 'prettypipes:item_terminal', - 'prettypipes:low_crafting_module' - ]), + // shapelessRecipe('prettypipes:pipe_frame', [ + // 'minecraft:item_frame', + // 'prettypipes:pipe', + // '#forge:dusts/redstone' + // ]), + // shapelessRecipe('prettypipes:crafting_terminal', [ + // 'prettypipes:item_terminal', + // 'prettypipes:low_crafting_module' + // ]), shapelessRecipe('ars_nouveau:mana_gem', ['emendatusenigmatica:arcane_gem']), shapelessRecipe('emendatusenigmatica:arcane_gem', ['ars_nouveau:mana_gem']), shapelessRecipe('botania:fertilizer', [ @@ -108,10 +108,10 @@ events.listen('recipes', (event) => { }, theoneprobe: { id: 'theoneprobe:probenote', Count: 1 }, astralsorcery: { id: 'astralsorcery:tome', Count: 1 }, - ftbquests: { id: 'ftbquests:book', Count: 1 }, - alexsmobs: { id: 'alexsmobs:animal_dictionary', Count: 1 }, + // ftbquests: { id: 'ftbquests:book', Count: 1 }, + // alexsmobs: { id: 'alexsmobs:animal_dictionary', Count: 1 }, immersiveengineering: { id: 'immersiveengineering:manual', Count: 1 }, - eidolon: { id: 'eidolon:codex', Count: 1 }, + // eidolon: { id: 'eidolon:codex', Count: 1 }, botania: { id: 'botania:lexicon', Count: 1, tag: {} }, thermal: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'thermal:guidebook' } }, patchouli: { @@ -143,20 +143,20 @@ events.listen('recipes', (event) => { Count: 1, tag: { 'patchouli:book': 'naturesaura:book' } }, - pedestals: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'pedestals:manual' } }, + // pedestals: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'pedestals:manual' } }, transport: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'transport:guide' } }, engineersdecor: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'engineersdecor:engineersdecor_manual' } }, - occultism: { id: 'occultism:dictionary_of_spirits', Count: 1 }, + // occultism: { id: 'occultism:dictionary_of_spirits', Count: 1 }, solcarrot: { id: 'solcarrot:food_book', Count: 1 }, - modularrouters: { - id: 'patchouli:guide_book', - Count: 1, - tag: { 'patchouli:book': 'modularrouters:book' } - }, + // modularrouters: { + // id: 'patchouli:guide_book', + // Count: 1, + // tag: { 'patchouli:book': 'modularrouters:book' } + // }, tmechworks: { id: 'tmechworks:book', Count: 1 }, ars_nouveau: { id: 'ars_nouveau:worn_notebook', Count: 1 }, bloodmagic: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'bloodmagic:guide' } } diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/blocks/forge/ores.js b/kubejs/server_scripts/fellies/kubejs/base/tags/blocks/forge/ores.js index 0ee4258..dcf6d4a 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/blocks/forge/ores.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/blocks/forge/ores.js @@ -2,8 +2,8 @@ events.listen('block.tags', function (event) { event .get('forge:ores') .add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense']) - .add('minecraft:ancient_debris') - .add('occultism:iesnium_ore'); + .add('minecraft:ancient_debris'); + // .add('occultism:iesnium_ore'); event .get('forge:ores/dimensional') .add([ diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ingots.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ingots.js index 5e0b40f..4772c00 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ingots.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ingots.js @@ -14,9 +14,9 @@ events.listen('item.tags', function (event) { .add('immersiveengineering:ingot_constantan') .add('immersiveengineering:ingot_electrum') .add('immersiveengineering:ingot_hop_graphite') - .add('mythicbotany:alfsteel_ingot') - .add('industrialforegoing:pink_slime_ingot') - .add('occultism:iesnium_ingot'); + // .add('mythicbotany:alfsteel_ingot') + .add('industrialforegoing:pink_slime_ingot'); + // .add('occultism:iesnium_ingot'); event.get('forge:ingots/copper').add('immersiveengineering:ingot_copper'); event.get('forge:ingots/alfsteel').add('mythicbotany:alfsteel_ingot'); diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/lights.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/lights.js index 14eb31a..d82159f 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/lights.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/lights.js @@ -303,7 +303,7 @@ events.listen('item.tags', function (event) { 'naturesaura:light_staff', 'naturesaura:spawn_lamp', - 'occultism:candle_white', + // 'occultism:candle_white', 'pneumaticcraft:kerosene_lamp', 'pneumaticcraft:wall_lamp_black', diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/manuals.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/manuals.js index 35dd2bd..d71adc5 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/manuals.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/manuals.js @@ -10,7 +10,7 @@ events.listen('item.tags', function (event) { 'ars_nouveau:worn_notebook', 'astralsorcery:tome', 'alexsmobs:animal_dictionary', - 'occultism:dictionary_of_spirits' + // 'occultism:dictionary_of_spirits' ]; event.get('forge:manuals').add(items); }); diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/nuggets.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/nuggets.js index fc18556..cd6c0e7 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/nuggets.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/nuggets.js @@ -7,8 +7,8 @@ events.listen('item.tags', function (event) { .add('immersiveengineering:nugget_nickel') .add('immersiveengineering:nugget_uranium') .add('immersiveengineering:nugget_constantan') - .add('immersiveengineering:nugget_electrum') - .add('occultism:iesnium_nugget'); + .add('immersiveengineering:nugget_electrum'); + // .add('occultism:iesnium_nugget'); event.get('forge:nuggets/iron_copper').add('#forge:nuggets/iron').add('#forge:nuggets/copper'); event.get('forge:nuggets/gold_bronze').add('#forge:nuggets/gold').add('#forge:nuggets/bronze'); diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ores.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ores.js index 23f9b8d..b74f3eb 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ores.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ores.js @@ -2,8 +2,8 @@ events.listen('item.tags', function (event) { event .get('forge:ores') .add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense']) - .add('minecraft:ancient_debris') - .add('occultism:iesnium_ore'); + .add('minecraft:ancient_debris'); + // .add('occultism:iesnium_ore'); event .get('forge:ores/dimensional') .add([ diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/storage_blocks.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/storage_blocks.js index 4e18b37..a8d679e 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/storage_blocks.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/storage_blocks.js @@ -13,7 +13,7 @@ events.listen('item.tags', function (event) { .add('immersiveengineering:storage_electrum') .add('immersiveengineering:coke') .add('powah:uraninite_block') - .add('occultism:iesnium_block') + // .add('occultism:iesnium_block') .add('naturesaura:infused_iron_block') .add('naturesaura:tainted_gold_block'); diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tallow.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tallow.js index f3958ad..cab3828 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tallow.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tallow.js @@ -1,3 +1,3 @@ events.listen('item.tags', (event) => { - event.add('forge:tallow', ['quark:tallow', 'eidolon:tallow', 'occultism:tallow']); + event.add('forge:tallow', ['quark:tallow']); }); diff --git a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tools/pickaxes.js b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tools/pickaxes.js index 1e54b4e..55f2995 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tools/pickaxes.js +++ b/kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tools/pickaxes.js @@ -1,10 +1,10 @@ events.listen('item.tags', function (event) { var items = [ - 'aquaculture:neptunium_pickaxe', - 'botania:elementium_pickaxe', - 'botania:glass_pickaxe', - 'botania:manasteel_pick', - 'botania:terra_pick', + // 'aquaculture:neptunium_pickaxe', + // 'botania:elementium_pickaxe', + // 'botania:glass_pickaxe', + // 'botania:manasteel_pick', + // 'botania:terra_pick', 'immersiveengineering:pickaxe_steel', 'mekanismtools:bronze_pickaxe', 'mekanismtools:lapis_lazuli_pickaxe', @@ -18,22 +18,22 @@ events.listen('item.tags', function (event) { 'minecraft:netherite_pickaxe', 'minecraft:stone_pickaxe', 'minecraft:wooden_pickaxe', - 'mythicbotany:alfsteel_pick', + // 'mythicbotany:alfsteel_pick', 'naturesaura:infused_iron_pickaxe', 'naturesaura:sky_pickaxe', - 'undergarden:utheric_pickaxe', - 'undergarden:froststeel_pickaxe', - 'undergarden:cloggrum_pickaxe', + // 'undergarden:utheric_pickaxe', + // 'undergarden:froststeel_pickaxe', + // 'undergarden:cloggrum_pickaxe', 'bloodmagic:soulpickaxe', 'astralsorcery:crystal_pickaxe', 'astralsorcery:infused_crystal_pickaxe', - 'undergarden:forgotten_pickaxe', - 'occultism:infused_pickaxe', - 'eidolon:reversal_pick', - 'mapperbase:steel_pickaxe', - 'aiotbotania:livingrock_pickaxe', - 'aiotbotania:livingwood_pickaxe', - 'occultism:iesnium_pickaxe' + // 'undergarden:forgotten_pickaxe', + // 'occultism:infused_pickaxe', + // 'eidolon:reversal_pick', + // 'mapperbase:steel_pickaxe', + // 'aiotbotania:livingrock_pickaxe', + // 'aiotbotania:livingwood_pickaxe', + // 'occultism:iesnium_pickaxe' ]; event.get('forge:tools').add(items); event.get('forge:tools/pickaxe').add(items); diff --git a/kubejs/server_scripts/fellies/kubejs/base/unification/additions.js b/kubejs/server_scripts/fellies/kubejs/base/unification/additions.js index 98b98eb..ece23b2 100644 --- a/kubejs/server_scripts/fellies/kubejs/base/unification/additions.js +++ b/kubejs/server_scripts/fellies/kubejs/base/unification/additions.js @@ -35,8 +35,8 @@ events.listen('recipes', function (event) { immersiveengineering_ore_processing(event, material, ore, gem); immersiveengineering_press_plates(event, material, ingot, gem, plate); - occultism_ore_crushing(event, material, ore, dust, gem); - occultism_ingot_gem_crushing(event, material, ingot, dust, gem); + // occultism_ore_crushing(event, material, ore, dust, gem); + // occultism_ingot_gem_crushing(event, material, ingot, dust, gem); pedestals_ore_crushing(event, material, ore, dust, gem); pedestals_ingot_gem_crushing(event, material, ingot, dust, gem); @@ -582,104 +582,104 @@ function immersiveengineering_press_plates(event, material, ingot, gem, plate) { event.recipes.immersiveengineering.metal_press(output, input, mold).energy(2400); } -function occultism_ore_crushing(event, material, ore, dust, gem) { - if (ore == air) { - return; - } +// function occultism_ore_crushing(event, material, ore, dust, gem) { +// if (ore == air) { +// return; +// } - blacklistedMaterials = ['silver']; +// blacklistedMaterials = ['silver']; - for (var i = 0; i < blacklistedMaterials.length; i++) { - if (blacklistedMaterials[i] == material) { - return; - } - } +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } - var count; - switch (material) { - case 'redstone': - count = 6; - break; - case 'coal': - count = 4; - break; - case 'lapis': - count = 9; - break; - case 'quartz': - count = 3; - break; - case 'sulfur': - count = 6; - break; - case 'apatite': - count = 12; - break; - case 'fluorite': - count = 6; - break; - case 'dimensional': - count = 8; - break; - default: - count = 2; - } +// var count; +// switch (material) { +// case 'redstone': +// count = 6; +// break; +// case 'coal': +// count = 4; +// break; +// case 'lapis': +// count = 9; +// break; +// case 'quartz': +// count = 3; +// break; +// case 'sulfur': +// count = 6; +// break; +// case 'apatite': +// count = 12; +// break; +// case 'fluorite': +// count = 6; +// break; +// case 'dimensional': +// count = 8; +// break; +// default: +// count = 2; +// } - var output, - input = 'forge:ores/' + material, - output = dust; - if (gem != air) { - output = gem; - } +// var output, +// input = 'forge:ores/' + material, +// output = dust; +// if (gem != air) { +// output = gem; +// } - event.custom({ - type: 'occultism:crushing', - ingredient: { - tag: input - }, - result: { - item: output, - count: count - }, - crushing_time: 100 - }); -} +// event.custom({ +// type: 'occultism:crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: count +// }, +// crushing_time: 100 +// }); +// } -function occultism_ingot_gem_crushing(event, material, ingot, dust, gem) { - if (dust == air) { - return; - } +// function occultism_ingot_gem_crushing(event, material, ingot, dust, gem) { +// if (dust == air) { +// return; +// } - blacklistedMaterials = ['silver']; +// blacklistedMaterials = ['silver']; - for (var i = 0; i < blacklistedMaterials.length; i++) { - if (blacklistedMaterials[i] == material) { - return; - } - } +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } - var input, - output = dust; - if (ingot != air) { - input = 'forge:ingots/' + material; - } else if (gem != air) { - input = 'forge:gems/' + material; - } else { - return; - } +// var input, +// output = dust; +// if (ingot != air) { +// input = 'forge:ingots/' + material; +// } else if (gem != air) { +// input = 'forge:gems/' + material; +// } else { +// return; +// } - event.custom({ - type: 'occultism:crushing', - ingredient: { - tag: input - }, - result: { - item: output, - count: 1 - }, - crushing_time: 100 - }); -} +// event.custom({ +// type: 'occultism:crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: 1 +// }, +// crushing_time: 100 +// }); +// } function pedestals_ore_crushing(event, material, ore, dust, gem) { if (ore == air) { diff --git a/kubejs/server_scripts/fellies/kubejs/constants.js b/kubejs/server_scripts/fellies/kubejs/constants.js index e10de61..c7412f4 100644 --- a/kubejs/server_scripts/fellies/kubejs/constants.js +++ b/kubejs/server_scripts/fellies/kubejs/constants.js @@ -33,16 +33,16 @@ const modPriorities = [ 'kubejs', 'pneumaticcraft', 'create', - 'occultism', + // 'occultism', 'tmechworks', 'industrialforegoing', 'botania', 'quark', - 'pedestals', + // 'pedestals', 'refinedstorage', - 'mapperbase', + // 'mapperbase', 'bloodmagic', - 'eidolon', + // 'eidolon', 'morevanillalib' ]; @@ -80,9 +80,9 @@ var woodVariantsToConstruct = [ 'minecraft:spruce', 'minecraft:warped', 'minecraft:crimson', - 'undergarden:smogstem', - 'undergarden:wigglewood', - 'undergarden:grongle', + // 'undergarden:smogstem', + // 'undergarden:wigglewood', + // 'undergarden:grongle', 'biomesoplenty:cherry', 'biomesoplenty:dead', 'biomesoplenty:fir', @@ -182,23 +182,23 @@ woodVariantsToConstruct.forEach((variant) => { }); const generatableCobblestone = [ - 'byg:dacite_cobblestone', - 'byg:ether_stone', - 'byg:red_rock', - 'byg:scoria_cobblestone', - 'byg:soapstone', - 'embellishcraft:basalt_cobblestone', - 'embellishcraft:gneiss_cobblestone', - 'embellishcraft:jade_cobblestone', - 'embellishcraft:larvikite_cobblestone', - 'embellishcraft:marble_cobblestone', - 'embellishcraft:slate_cobblestone', + // 'byg:dacite_cobblestone', + // 'byg:ether_stone', + // 'byg:red_rock', + // 'byg:scoria_cobblestone', + // 'byg:soapstone', + // 'embellishcraft:basalt_cobblestone', + // 'embellishcraft:gneiss_cobblestone', + // 'embellishcraft:jade_cobblestone', + // 'embellishcraft:larvikite_cobblestone', + // 'embellishcraft:marble_cobblestone', + // 'embellishcraft:slate_cobblestone', 'create:andesite_cobblestone', 'create:diorite_cobblestone', 'create:granite_cobblestone', 'quark:cobbedstone', - 'undergarden:depthrock', - 'undergarden:shiverstone', + // 'undergarden:depthrock', + // 'undergarden:shiverstone', 'create:dark_scoria_cobblestone', 'create:scoria_cobblestone', 'create:gabbro_cobblestone', @@ -213,18 +213,18 @@ const generatableStone = [ 'biomesoplenty:black_sandstone', 'biomesoplenty:orange_sandstone', 'biomesoplenty:white_sandstone', - 'byg:black_sandstone', - 'byg:blue_sandstone', - 'byg:dacite', - 'byg:purple_sandstone', - 'byg:scoria_stone', - 'byg:white_sandstone', - 'embellishcraft:basalt', - 'embellishcraft:gneiss', - 'embellishcraft:jade', - 'embellishcraft:larvikite', - 'embellishcraft:marble', - 'embellishcraft:slate', + // 'byg:black_sandstone', + // 'byg:blue_sandstone', + // 'byg:dacite', + // 'byg:purple_sandstone', + // 'byg:scoria_stone', + // 'byg:white_sandstone', + // 'embellishcraft:basalt', + // 'embellishcraft:gneiss', + // 'embellishcraft:jade', + // 'embellishcraft:larvikite', + // 'embellishcraft:marble', + // 'embellishcraft:slate', 'minecraft:red_sandstone', 'minecraft:sandstone', 'quark:basalt', diff --git a/mods/ExtraStorage-1.16.4-1.2.2.jar b/mods/ExtraStorage-1.16.4-1.3.1.jar similarity index 68% rename from mods/ExtraStorage-1.16.4-1.2.2.jar rename to mods/ExtraStorage-1.16.4-1.3.1.jar index b6333ff..803420c 100644 Binary files a/mods/ExtraStorage-1.16.4-1.2.2.jar and b/mods/ExtraStorage-1.16.4-1.3.1.jar differ diff --git a/mods/NetherPortalFix_1.16.3-7.2.1.jar b/mods/NetherPortalFix_1.16.3-7.2.1.jar deleted file mode 100644 index 227e9e2..0000000 Binary files a/mods/NetherPortalFix_1.16.3-7.2.1.jar and /dev/null differ diff --git a/mods/ars_nouveau-1.16.4-1.11.1.jar b/mods/ars_nouveau-1.16.4-1.11.2.jar similarity index 86% rename from mods/ars_nouveau-1.16.4-1.11.1.jar rename to mods/ars_nouveau-1.16.4-1.11.2.jar index 900e49b..fc0558e 100644 Binary files a/mods/ars_nouveau-1.16.4-1.11.1.jar and b/mods/ars_nouveau-1.16.4-1.11.2.jar differ diff --git a/mods/minecolonies-0.13.581-ALPHA-universal.jar b/mods/minecolonies-0.13.584-ALPHA-universal.jar similarity index 88% rename from mods/minecolonies-0.13.581-ALPHA-universal.jar rename to mods/minecolonies-0.13.584-ALPHA-universal.jar index 4cc48a9..9220275 100644 Binary files a/mods/minecolonies-0.13.581-ALPHA-universal.jar and b/mods/minecolonies-0.13.584-ALPHA-universal.jar differ