Minecraft/Fellies
1
0
Fork 0
mirror of https://git.fellies.tech/minecraft/fellies.git synced 2021-02-13 10:18:48 +00:00
Code Releases 2 Activity

Change configs

Browse Source
This commit is contained in:
Citali
2021-01-24 11:30:19 +01:00
parent cf92a95071
commit f74aa7dabb
23 changed files with 548 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/emendatusenigmatica-common.toml
View File

@ -666,7 +666,7 @@
baseline = 32 baseline = 32
#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 12] #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 12]
#Range: 0 ~ 256 #Range: 0 ~ 256
spread = 12 spread = 20
["Osmium Config"."The Nether"] ["Osmium Config"."The Nether"]
#Activate/Deactivate the Ore Gen in The Nether [Default: false] #Activate/Deactivate the Ore Gen in The Nether [Default: false]

2
config/quark-common.toml
View File

@ -382,7 +382,7 @@
"Reacharound Placing" = true "Reacharound Placing" = true
"Replace Scaffolding" = true "Replace Scaffolding" = true
"Sign Editing" = true "Sign Editing" = true
"Simple Harvest" = true "Simple Harvest" = false
"Snow Golem Player Heads" = true "Snow Golem Player Heads" = true
"Springy Slime" = true "Springy Slime" = true
"Utility Recipes" = true "Utility Recipes" = true

14
kubejs/client_scripts/item_modifiers/jei_hide.js
View File

@ -72,15 +72,15 @@ events.listen('jei.hide.items', (event) => {
/create:\w+_ingot/, /create:\w+_ingot/,
/create:\w+_ore/, /create:\w+_ore/,
/immersiveposts:stick_/, /immersiveposts:stick_/,
/buildersaddition:\w+_rod/, // /buildersaddition:\w+_rod/,
/eidolon:\w+_ingot/, // /eidolon:\w+_ingot/,
/eidolon:\w+_nugget/, // /eidolon:\w+_nugget/,
/eidolon:\w+_ore/, // /eidolon:\w+_ore/,
/byg:pendorite/, // /byg:pendorite/,
/byg:ametrine/, // /byg:ametrine/,
/emendatusenigmatica:\w+certus/, /emendatusenigmatica:\w+certus/,
/emendatusenigmatica:\w+fluix/, /emendatusenigmatica:\w+fluix/,
/mapperbase:steel/, // /mapperbase:steel/,
/rftoolsbase:dimensionalshard/ /rftoolsbase:dimensionalshard/
]; ];
regexHide.forEach((regexExpression) => { regexHide.forEach((regexExpression) => {

86
kubejs/data/botanypots/recipes/crops/datura.json
View File

@ -1,43 +1,43 @@
{ // {
"type": "botanypots:crop", // "type": "botanypots:crop",
"seed": { // "seed": {
"item": "occultism:datura_seeds" // "item": "occultism:datura_seeds"
}, // },
"categories": [ // "categories": [
"dirt", // "dirt",
"farmland" // "farmland"
], // ],
"growthTicks": 800, // "growthTicks": 800,
"display": { // "display": {
"block": "occultism:datura", // "block": "occultism:datura",
"properties": { // "properties": {
"age": 5 // "age": 5
} // }
}, // },
"results": [ // "results": [
{ // {
"chance": 0.75, // "chance": 0.75,
"output": { // "output": {
"item": "occultism:datura" // "item": "occultism:datura"
}, // },
"minRolls": 1, // "minRolls": 1,
"maxRolls": 1 // "maxRolls": 1
}, // },
{ // {
"chance": 0.05, // "chance": 0.05,
"output": { // "output": {
"item": "occultism:datura" // "item": "occultism:datura"
}, // },
"minRolls": 1, // "minRolls": 1,
"maxRolls": 2 // "maxRolls": 2
}, // },
{ // {
"chance": 0.05, // "chance": 0.05,
"output": { // "output": {
"item": "occultism:datura_seeds" // "item": "occultism:datura_seeds"
}, // },
"minRolls": 1, // "minRolls": 1,
"maxRolls": 2 // "maxRolls": 2
} // }
] // ]
} // }

36
kubejs/data/farmingforblockheads/farmingforblockheads_compat/occultism_saplings.json
View File

@ -1,18 +1,18 @@
{ // {
"modId": "quark", // "modId": "quark",
"group": { // "group": {
"name": "Occultism Saplings", // "name": "Occultism Saplings",
"enabledByDefault": true, // "enabledByDefault": true,
"defaultPayment": { // "defaultPayment": {
"item": "occultism:spirit_attuned_gem" // "item": "occultism:spirit_attuned_gem"
}, // },
"defaultCategory": "farmingforblockheads:saplings" // "defaultCategory": "farmingforblockheads:saplings"
}, // },
"customEntries": [ // "customEntries": [
{ // {
"output": { // "output": {
"item": "occultism:otherworld_sapling_natural" // "item": "occultism:otherworld_sapling_natural"
} // }
} // }
] // ]
} // }

2
kubejs/server_scripts/fellies/kubejs/base/recipes/replace_input.js
View File

@ -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:ingots/iron', '#forge:ingots/iron_copper');
event.replaceInput({ mod: 'powah' }, '#forge:nuggets/iron', '#forge:nuggets/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'); event.replaceInput({}, tallow, '#forge:tallow');
}); });

534
kubejs/server_scripts/fellies/kubejs/base/recipes/shaped.js
View File

@ -24,11 +24,11 @@ events.listen('recipes', function (event) {
C: 'refinedstorage:wireless_grid', C: 'refinedstorage:wireless_grid',
D: 'minecraft:crafting_table' D: 'minecraft:crafting_table'
}), }),
shapedRecipe('simplefarming:fish_and_chips', [' A ', 'BCB', ' A '], { // shapedRecipe('simplefarming:fish_and_chips', [' A ', 'BCB', ' A '], {
A: '#forge:crops/potato', // A: '#forge:crops/potato',
B: '#forge:grain', // B: '#forge:grain',
C: 'aquaculture:fish_fillet_cooked' // C: 'aquaculture:fish_fillet_cooked'
}), // }),
shapedRecipe('quantumstorage:tank', ['CBC', 'BLB', 'CCC'], { shapedRecipe('quantumstorage:tank', ['CBC', 'BLB', 'CCC'], {
L: 'mekanism:ultimate_fluid_tank', L: 'mekanism:ultimate_fluid_tank',
C: '#forge:ingots/compressed_iron', C: '#forge:ingots/compressed_iron',
@ -75,24 +75,24 @@ events.listen('recipes', function (event) {
shapedRecipe('decorative_blocks:lattice', ['A A', ' ', 'A A'], { shapedRecipe('decorative_blocks:lattice', ['A A', ' ', 'A A'], {
A: '#forge:rods/wooden' A: '#forge:rods/wooden'
}), }),
shapedRecipe(item.of('valhelsia_structures:oak_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:oak_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:oak_log' // A: 'minecraft:oak_log'
}), // }),
shapedRecipe(item.of('valhelsia_structures:spruce_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:spruce_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:spruce_log' // A: 'minecraft:spruce_log'
}), // }),
shapedRecipe(item.of('valhelsia_structures:birch_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:birch_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:birch_log' // A: 'minecraft:birch_log'
}), // }),
shapedRecipe(item.of('valhelsia_structures:jungle_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:jungle_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:jungle_log' // A: 'minecraft:jungle_log'
}), // }),
shapedRecipe(item.of('valhelsia_structures:dark_oak_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:dark_oak_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:dark_oak_log' // A: 'minecraft:dark_oak_log'
}), // }),
shapedRecipe(item.of('valhelsia_structures:acacia_post', 6), ['A', 'A', 'A'], { // shapedRecipe(item.of('valhelsia_structures:acacia_post', 6), ['A', 'A', 'A'], {
A: 'minecraft:acacia_log' // A: 'minecraft:acacia_log'
}), // }),
shapedRecipe(item.of('minecraft:ladder', 4), ['A A', 'ABA', 'A A'], { shapedRecipe(item.of('minecraft:ladder', 4), ['A A', 'ABA', 'A A'], {
A: '#forge:rods/wooden', A: '#forge:rods/wooden',
B: '#minecraft:planks' B: '#minecraft:planks'
@ -101,184 +101,184 @@ events.listen('recipes', function (event) {
A: '#engineersdecor:brick_ingots', A: '#engineersdecor:brick_ingots',
B: '#forge:slag' B: '#forge:slag'
}), }),
shapedRecipe(item.of('prettypipes:wrench', 1), [' A ', 'AB ', ' B'], { // shapedRecipe(item.of('prettypipes:wrench', 1), [' A ', 'AB ', ' B'], {
A: '#forge:nuggets/iron', // A: '#forge:nuggets/iron',
B: 'prettypipes:pipe' // B: 'prettypipes:pipe'
}), // }),
shapedRecipe(item.of('prettypipes:blank_module', 3), [' A ', 'BBB', 'CCC'], { // shapedRecipe(item.of('prettypipes:blank_module', 3), [' A ', 'BBB', 'CCC'], {
A: '#forge:dusts/redstone', // A: '#forge:dusts/redstone',
B: 'minecraft:stone_slab', // B: 'minecraft:stone_slab',
C: '#forge:nuggets/copper' // C: '#forge:nuggets/copper'
}), // }),
shapedRecipe(item.of('prettypipes:low_extraction_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_extraction_module', 1), [' A ', ' B ', ' C '], {
A: '#forge:dusts/redstone', // A: '#forge:dusts/redstone',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_extraction_module', 1), [' C ', 'ABA', ' A '], { // shapedRecipe(item.of('prettypipes:medium_extraction_module', 1), [' C ', 'ABA', ' A '], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_extraction_module', // B: 'prettypipes:low_extraction_module',
C: '#forge:ingots/invar' // C: '#forge:ingots/invar'
}), // }),
shapedRecipe(item.of('prettypipes:high_extraction_module', 1), [' C ', 'ABA', ' A '], { // shapedRecipe(item.of('prettypipes:high_extraction_module', 1), [' C ', 'ABA', ' A '], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_extraction_module', // B: 'prettypipes:medium_extraction_module',
C: '#forge:ingots/electrum' // C: '#forge:ingots/electrum'
}), // }),
shapedRecipe(item.of('prettypipes:low_filter_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_filter_module', 1), [' A ', ' B ', ' C '], {
A: '#forge:paper', // A: '#forge:paper',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_filter_module', 1), [' C ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:medium_filter_module', 1), [' C ', 'ABA', ' C '], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_filter_module', // B: 'prettypipes:low_filter_module',
C: 'minecraft:iron_bars' // C: 'minecraft:iron_bars'
}), // }),
shapedRecipe(item.of('prettypipes:high_filter_module', 1), [' C ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:high_filter_module', 1), [' C ', 'ABA', ' C '], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_filter_module', // B: 'prettypipes:medium_filter_module',
C: 'minecraft:iron_bars' // C: 'minecraft:iron_bars'
}), // }),
shapedRecipe(item.of('prettypipes:low_speed_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_speed_module', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:sugar', // A: 'minecraft:sugar',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_speed_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:medium_speed_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_speed_module', // B: 'prettypipes:low_speed_module',
C: 'minecraft:sugar' // C: 'minecraft:sugar'
}), // }),
shapedRecipe(item.of('prettypipes:high_speed_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:high_speed_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_speed_module', // B: 'prettypipes:medium_speed_module',
C: 'minecraft:sugar' // C: 'minecraft:sugar'
}), // }),
shapedRecipe(item.of('prettypipes:low_low_priority_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_low_priority_module', 1), [' A ', ' B ', ' C '], {
A: '#forge:nuggets/lead', // A: '#forge:nuggets/lead',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:medium_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_low_priority_module', // B: 'prettypipes:low_low_priority_module',
C: '#forge:nuggets/lead' // C: '#forge:nuggets/lead'
}), // }),
shapedRecipe(item.of('prettypipes:high_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:high_low_priority_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_low_priority_module', // B: 'prettypipes:medium_low_priority_module',
C: '#forge:nuggets/lead' // C: '#forge:nuggets/lead'
}), // }),
shapedRecipe(item.of('prettypipes:low_high_priority_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_high_priority_module', 1), [' A ', ' B ', ' C '], {
A: '#forge:nuggets/silver', // A: '#forge:nuggets/silver',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:medium_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_high_priority_module', // B: 'prettypipes:low_high_priority_module',
C: '#forge:nuggets/silver' // C: '#forge:nuggets/silver'
}), // }),
shapedRecipe(item.of('prettypipes:high_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], { // shapedRecipe(item.of('prettypipes:high_high_priority_module', 1), ['ACA', 'CBC', 'ACA'], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_high_priority_module', // B: 'prettypipes:medium_high_priority_module',
C: '#forge:nuggets/silver' // C: '#forge:nuggets/silver'
}), // }),
shapedRecipe(item.of('prettypipes:low_retrieval_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_retrieval_module', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:observer', // A: 'minecraft:observer',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_retrieval_module', 1), [' A ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:medium_retrieval_module', 1), [' A ', 'ABA', ' C '], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_retrieval_module', // B: 'prettypipes:low_retrieval_module',
C: '#forge:ingots/invar' // C: '#forge:ingots/invar'
}), // }),
shapedRecipe(item.of('prettypipes:high_retrieval_module', 1), [' A ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:high_retrieval_module', 1), [' A ', 'ABA', ' C '], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_retrieval_module', // B: 'prettypipes:medium_retrieval_module',
C: '#forge:ingots/electrum' // C: '#forge:ingots/electrum'
}), // }),
shapedRecipe(item.of('prettypipes:stack_size_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:stack_size_module', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:comparator', // A: 'minecraft:comparator',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:damage_filter_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:damage_filter_modifier', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:stone_pickaxe', // A: 'minecraft:stone_pickaxe',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:nbt_filter_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:nbt_filter_modifier', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:book', // A: 'minecraft:book',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:tag_filter_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:tag_filter_modifier', 1), [' A ', ' B ', ' C '], {
A: '#forge:chunks', // A: '#forge:chunks',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:mod_filter_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:mod_filter_modifier', 1), [' A ', ' B ', ' C '], {
A: 'prettypipes:wrench', // A: 'prettypipes:wrench',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:redstone_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:redstone_module', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:redstone_torch', // A: 'minecraft:redstone_torch',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:filter_increase_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:filter_increase_modifier', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:iron_bars', // A: 'minecraft:iron_bars',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:low_crafting_module', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:low_crafting_module', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:crafting_table', // A: 'minecraft:crafting_table',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:medium_crafting_module', 1), [' A ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:medium_crafting_module', 1), [' A ', 'ABA', ' C '], {
A: '#forge:nuggets/invar', // A: '#forge:nuggets/invar',
B: 'prettypipes:low_crafting_module', // B: 'prettypipes:low_crafting_module',
C: '#forge:ingots/invar' // C: '#forge:ingots/invar'
}), // }),
shapedRecipe(item.of('prettypipes:high_crafting_module', 1), [' A ', 'ABA', ' C '], { // shapedRecipe(item.of('prettypipes:high_crafting_module', 1), [' A ', 'ABA', ' C '], {
A: '#forge:nuggets/electrum', // A: '#forge:nuggets/electrum',
B: 'prettypipes:medium_crafting_module', // B: 'prettypipes:medium_crafting_module',
C: '#forge:ingots/electrum' // C: '#forge:ingots/electrum'
}), // }),
shapedRecipe(item.of('prettypipes:pipe', 12), [' ', 'ABA', ' '], { // shapedRecipe(item.of('prettypipes:pipe', 12), [' ', 'ABA', ' '], {
A: '#forge:ingots/tin', // A: '#forge:ingots/tin',
B: '#forge:glass/colorless' // B: '#forge:glass/colorless'
}), // }),
shapedRecipe(item.of('prettypipes:item_terminal', 1), [' B ', 'CAD', 'EFE'], { // shapedRecipe(item.of('prettypipes:item_terminal', 1), [' B ', 'CAD', 'EFE'], {
A: 'thermal:machine_frame', // A: 'thermal:machine_frame',
B: 'minecraft:observer', // B: 'minecraft:observer',
C: 'prettypipes:high_extraction_module', // C: 'prettypipes:high_extraction_module',
D: 'prettypipes:high_retrieval_module', // D: 'prettypipes:high_retrieval_module',
E: '#forge:gears/invar', // E: '#forge:gears/invar',
F: 'thermal:redstone_servo' // F: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:pressurizer', 1), [' E ', 'BAB', 'CDC'], { // shapedRecipe(item.of('prettypipes:pressurizer', 1), [' E ', 'BAB', 'CDC'], {
A: 'thermal:machine_frame', // A: 'thermal:machine_frame',
B: 'prettypipes:high_speed_module', // B: 'prettypipes:high_speed_module',
C: '#forge:gears/invar', // C: '#forge:gears/invar',
D: 'thermal:rf_coil', // D: 'thermal:rf_coil',
E: 'prettypipes:pipe' // E: 'prettypipes:pipe'
}), // }),
shapedRecipe(item.of('prettypipes:round_robin_sorting_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:round_robin_sorting_modifier', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:clock', // A: 'minecraft:clock',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('prettypipes:random_sorting_modifier', 1), [' A ', ' B ', ' C '], { // shapedRecipe(item.of('prettypipes:random_sorting_modifier', 1), [' A ', ' B ', ' C '], {
A: 'minecraft:dropper', // A: 'minecraft:dropper',
B: 'prettypipes:blank_module', // B: 'prettypipes:blank_module',
C: 'thermal:redstone_servo' // C: 'thermal:redstone_servo'
}), // }),
shapedRecipe(item.of('bloodmagic:demonwillgauge', 1), [' B ', 'ACA', ' B '], { shapedRecipe(item.of('bloodmagic:demonwillgauge', 1), [' B ', 'ACA', ' B '], {
A: '#forge:ingots/tin', A: '#forge:ingots/tin',
B: '#forge:nuggets/tin', B: '#forge:nuggets/tin',
@ -323,74 +323,74 @@ events.listen('recipes', function (event) {
A: '#forge:gems/charged_certus_quartz', A: '#forge:gems/charged_certus_quartz',
B: '#forge:dyes/green' B: '#forge:dyes/green'
}), }),
shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { // shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], {
A: 'alexsmobs:roadrunner_feather', // A: 'alexsmobs:roadrunner_feather',
B: '#forge:ingots/enderium', // B: '#forge:ingots/enderium',
C: 'ars_nouveau:mana_fiber', // C: 'ars_nouveau:mana_fiber',
D: 'paraglider:deku_leaf', // D: 'paraglider:deku_leaf',
E: 'ars_nouveau:glyph_launch', // E: 'ars_nouveau:glyph_launch',
F: 'ars_nouveau:glyph_slowfall' // F: 'ars_nouveau:glyph_slowfall'
}), // }),
shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], { // shapedRecipe('magicfeather:magicfeather', ['CFC', 'BDB', 'AEA'], {
A: 'thermal:lightning_charge', // A: 'thermal:lightning_charge',
B: '#mekanism:alloys/atomic', // B: '#mekanism:alloys/atomic',
C: 'thermal:hazmat_fabric', // C: 'thermal:hazmat_fabric',
D: 'paraglider:deku_leaf', // D: 'paraglider:deku_leaf',
E: 'thermal:hazmat_boots', // E: 'thermal:hazmat_boots',
F: 'alexsmobs:frontier_cap' // F: 'alexsmobs:frontier_cap'
}), // }),
shapedRecipe('minecraft:chest', ['AAA', 'A A', 'AAA'], { shapedRecipe('minecraft:chest', ['AAA', 'A A', 'AAA'], {
A: '#minecraft:planks' A: '#minecraft:planks'
}), })
shapedRecipe( // shapedRecipe(
Item.of('morphtool:tool', { // Item.of('morphtool:tool', {
'morphtool:is_morphing': 1, // 'morphtool:is_morphing': 1,
'morphtool:data': { // 'morphtool:data': {
blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 }, // blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 },
powah: { id: 'powah:wrench', Count: 1, tag: { PowahWrenchNBT: {} } }, // powah: { id: 'powah:wrench', Count: 1, tag: { PowahWrenchNBT: {} } },
resourcefulbees: { id: 'resourcefulbees:scraper', Count: 1 }, // resourcefulbees: { id: 'resourcefulbees:scraper', Count: 1 },
astralsorcery: { id: 'astralsorcery:wand', Count: 1 }, // astralsorcery: { id: 'astralsorcery:wand', Count: 1 },
pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench', Count: 1 }, // pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench', Count: 1 },
immersiveengineering: { id: 'immersiveengineering:hammer', Count: 1, tag: { Damage: 0 } }, // immersiveengineering: { id: 'immersiveengineering:hammer', Count: 1, tag: { Damage: 0 } },
transport: { id: 'transport:rail_breaker', Count: 1 }, // transport: { id: 'transport:rail_breaker', Count: 1 },
pedestals: { id: 'pedestals:linkingtool', Count: 1 }, // pedestals: { id: 'pedestals:linkingtool', Count: 1 },
botania: { id: 'botania:twig_wand', Count: 1, tag: { color1: 0, color2: 0 } }, // botania: { id: 'botania:twig_wand', Count: 1, tag: { color1: 0, color2: 0 } },
ars_nouveau: { id: 'ars_nouveau:dominion_wand', Count: 1, tag: {} }, // ars_nouveau: { id: 'ars_nouveau:dominion_wand', Count: 1, tag: {} },
mekanism: { id: 'mekanism:configurator', Count: 1 }, // mekanism: { id: 'mekanism:configurator', Count: 1 },
bloodmagic: { id: 'bloodmagic:ritualtinkerer', Count: 1 }, // bloodmagic: { id: 'bloodmagic:ritualtinkerer', Count: 1 },
thermal: { id: 'thermal:wrench', Count: 1 }, // thermal: { id: 'thermal:wrench', Count: 1 },
rftoolsbase: { id: 'rftoolsbase:smartwrench', Count: 1 }, // rftoolsbase: { id: 'rftoolsbase:smartwrench', Count: 1 },
create: { // create: {
id: 'create:wrench', // id: 'create:wrench',
Count: 1, // Count: 1,
tag: { // tag: {
'morphtool:is_morphing': 1, // 'morphtool:is_morphing': 1,
'morphtool:displayName': { translate: 'item.create.wrench' }, // 'morphtool:displayName': { translate: 'item.create.wrench' },
display: { // display: {
Name: { // Name: {
translate: 'morphtool.sudo_name', // translate: 'morphtool.sudo_name',
with: [{ color: 'green', translate: 'item.create.wrench' }] // with: [{ color: 'green', translate: 'item.create.wrench' }]
} // }
} // }
} // }
}, // },
chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1, tag: { Damage: 0 } }, // chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1, tag: { Damage: 0 } },
refinedstorage: { id: 'refinedstorage:wrench', Count: 1 }, // refinedstorage: { id: 'refinedstorage:wrench', Count: 1 },
quantumstorage: { id: 'quantumstorage:hammer', Count: 1, tag: { mode: 'link' } }, // quantumstorage: { id: 'quantumstorage:hammer', Count: 1, tag: { mode: 'link' } },
prettypipes: { id: 'prettypipes:wrench', Count: 1 }, // prettypipes: { id: 'prettypipes:wrench', Count: 1 },
storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 } // storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 }
} // }
}), // }),
['ABA', 'CFD', 'AEA'], // ['ABA', 'CFD', 'AEA'],
{ // {
A: 'minecraft:redstone_block', // A: 'minecraft:redstone_block',
B: '#forge:gears/gold', // B: '#forge:gears/gold',
C: '#forge:gears/iron', // C: '#forge:gears/iron',
D: '#forge:gears/silver', // D: '#forge:gears/silver',
E: '#forge:gears/copper', // E: '#forge:gears/copper',
F: 'morphtool:tool' // F: 'morphtool:tool'
} // }
) // )
]; ];
recipes.forEach(function (recipe) { recipes.forEach(function (recipe) {

118
kubejs/server_scripts/fellies/kubejs/base/recipes/shapeless.js
View File

@ -3,68 +3,68 @@ events.listen('recipes', (event) => {
shapelessRecipe('botania:enchanted_soil', ['minecraft:grass_block', 'botania:overgrowth_seed']), shapelessRecipe('botania:enchanted_soil', ['minecraft:grass_block', 'botania:overgrowth_seed']),
shapelessRecipe('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']), shapelessRecipe('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']),
shapelessRecipe('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']), 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:chest', ['#forge:chests/wooden']),
shapelessRecipe('minecraft:crafting_table', [ // shapelessRecipe('minecraft:crafting_table', [
'craftingstation:crafting_station_slab', // 'craftingstation:crafting_station_slab',
'craftingstation:crafting_station_slab' // 'craftingstation:crafting_station_slab'
]), // ]),
shapelessRecipe('simplefarming:fish_sandwich', [ // shapelessRecipe('simplefarming:fish_sandwich', [
'#forge:bread', // '#forge:bread',
'aquaculture:fish_fillet_cooked', // 'aquaculture:fish_fillet_cooked',
'aquaculture:fish_fillet_cooked', // 'aquaculture:fish_fillet_cooked',
'#forge:crops/tomato', // '#forge:crops/tomato',
'#forge:salad_ingredients' // '#forge:salad_ingredients'
]), // ]),
shapelessRecipe('simplefarming:sushi', [ // shapelessRecipe('simplefarming:sushi', [
'#forge:grain', // '#forge:grain',
'minecraft:dried_kelp', // 'minecraft:dried_kelp',
'aquaculture:fish_fillet_raw', // 'aquaculture:fish_fillet_raw',
'aquaculture:fish_fillet_raw' // 'aquaculture:fish_fillet_raw'
]), // ]),
shapelessRecipe('simplefarming:fish_fillet', [ // shapelessRecipe('simplefarming:fish_fillet', [
'#forge:grain', // '#forge:grain',
'#forge:grain', // '#forge:grain',
'aquaculture:fish_fillet_cooked', // 'aquaculture:fish_fillet_cooked',
'aquaculture:fish_fillet_cooked' // 'aquaculture:fish_fillet_cooked'
]), // ]),
shapelessRecipe(item.of('additionalbars:crossed_iron_bars', 9), [ // 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', // '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('minecraft:wheat_seeds', ['minecraft:wheat']),
shapelessRecipe('quark:root', ['minecraft:vine', '#forge:dyes/brown']), shapelessRecipe('quark:root', ['minecraft:vine', '#forge:dyes/brown']),
shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'patchouli:modded_for_dummies' }), [ shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'patchouli:modded_for_dummies' }), [
'minecraft:book', 'minecraft:book',
'#forge:dyes/yellow' '#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('thermal:bamboo_block', 2), ['quark:bamboo_block', 'quark:bamboo_block']),
shapelessRecipe(item.of('quark:bamboo_block', 2), [ // shapelessRecipe(item.of('quark:bamboo_block', 2), [
'bambooeverything:bamboo_bundle', // 'bambooeverything:bamboo_bundle',
'bambooeverything:bamboo_bundle' // 'bambooeverything:bamboo_bundle'
]), // ]),
shapelessRecipe('minecraft:crafting_table', ['#forge:workbench']), shapelessRecipe('minecraft:crafting_table', ['#forge:workbench']),
shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'resourcefulbees:fifty_shades_of_bees' }), [ shapelessRecipe(item.of('patchouli:guide_book', { 'patchouli:book': 'resourcefulbees:fifty_shades_of_bees' }), [
'minecraft:sugar', 'minecraft:sugar',
'minecraft:book' 'minecraft:book'
]), ]),
shapelessRecipe('prettypipes:pipe_frame', [ // shapelessRecipe('prettypipes:pipe_frame', [
'minecraft:item_frame', // 'minecraft:item_frame',
'prettypipes:pipe', // 'prettypipes:pipe',
'#forge:dusts/redstone' // '#forge:dusts/redstone'
]), // ]),
shapelessRecipe('prettypipes:crafting_terminal', [ // shapelessRecipe('prettypipes:crafting_terminal', [
'prettypipes:item_terminal', // 'prettypipes:item_terminal',
'prettypipes:low_crafting_module' // 'prettypipes:low_crafting_module'
]), // ]),
shapelessRecipe('ars_nouveau:mana_gem', ['emendatusenigmatica:arcane_gem']), shapelessRecipe('ars_nouveau:mana_gem', ['emendatusenigmatica:arcane_gem']),
shapelessRecipe('emendatusenigmatica:arcane_gem', ['ars_nouveau:mana_gem']), shapelessRecipe('emendatusenigmatica:arcane_gem', ['ars_nouveau:mana_gem']),
shapelessRecipe('botania:fertilizer', [ shapelessRecipe('botania:fertilizer', [
@ -108,10 +108,10 @@ events.listen('recipes', (event) => {
}, },
theoneprobe: { id: 'theoneprobe:probenote', Count: 1 }, theoneprobe: { id: 'theoneprobe:probenote', Count: 1 },
astralsorcery: { id: 'astralsorcery:tome', Count: 1 }, astralsorcery: { id: 'astralsorcery:tome', Count: 1 },
ftbquests: { id: 'ftbquests:book', Count: 1 }, // ftbquests: { id: 'ftbquests:book', Count: 1 },
alexsmobs: { id: 'alexsmobs:animal_dictionary', Count: 1 }, // alexsmobs: { id: 'alexsmobs:animal_dictionary', Count: 1 },
immersiveengineering: { id: 'immersiveengineering:manual', 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: {} }, botania: { id: 'botania:lexicon', Count: 1, tag: {} },
thermal: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'thermal:guidebook' } }, thermal: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'thermal:guidebook' } },
patchouli: { patchouli: {
@ -143,20 +143,20 @@ events.listen('recipes', (event) => {
Count: 1, Count: 1,
tag: { 'patchouli:book': 'naturesaura:book' } 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' } }, transport: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'transport:guide' } },
engineersdecor: { engineersdecor: {
id: 'patchouli:guide_book', id: 'patchouli:guide_book',
Count: 1, Count: 1,
tag: { 'patchouli:book': 'engineersdecor:engineersdecor_manual' } 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 }, solcarrot: { id: 'solcarrot:food_book', Count: 1 },
modularrouters: { // modularrouters: {
id: 'patchouli:guide_book', // id: 'patchouli:guide_book',
Count: 1, // Count: 1,
tag: { 'patchouli:book': 'modularrouters:book' } // tag: { 'patchouli:book': 'modularrouters:book' }
}, // },
tmechworks: { id: 'tmechworks:book', Count: 1 }, tmechworks: { id: 'tmechworks:book', Count: 1 },
ars_nouveau: { id: 'ars_nouveau:worn_notebook', Count: 1 }, ars_nouveau: { id: 'ars_nouveau:worn_notebook', Count: 1 },
bloodmagic: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'bloodmagic:guide' } } bloodmagic: { id: 'patchouli:guide_book', Count: 1, tag: { 'patchouli:book': 'bloodmagic:guide' } }

4
kubejs/server_scripts/fellies/kubejs/base/tags/blocks/forge/ores.js
View File

@ -2,8 +2,8 @@ events.listen('block.tags', function (event) {
event event
.get('forge:ores') .get('forge:ores')
.add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense']) .add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense'])
.add('minecraft:ancient_debris') .add('minecraft:ancient_debris');
.add('occultism:iesnium_ore'); // .add('occultism:iesnium_ore');
event event
.get('forge:ores/dimensional') .get('forge:ores/dimensional')
.add([ .add([

6
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ingots.js
View File

@ -14,9 +14,9 @@ events.listen('item.tags', function (event) {
.add('immersiveengineering:ingot_constantan') .add('immersiveengineering:ingot_constantan')
.add('immersiveengineering:ingot_electrum') .add('immersiveengineering:ingot_electrum')
.add('immersiveengineering:ingot_hop_graphite') .add('immersiveengineering:ingot_hop_graphite')
.add('mythicbotany:alfsteel_ingot') // .add('mythicbotany:alfsteel_ingot')
.add('industrialforegoing:pink_slime_ingot') .add('industrialforegoing:pink_slime_ingot');
.add('occultism:iesnium_ingot'); // .add('occultism:iesnium_ingot');
event.get('forge:ingots/copper').add('immersiveengineering:ingot_copper'); event.get('forge:ingots/copper').add('immersiveengineering:ingot_copper');
event.get('forge:ingots/alfsteel').add('mythicbotany:alfsteel_ingot'); event.get('forge:ingots/alfsteel').add('mythicbotany:alfsteel_ingot');

2
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/lights.js
View File

@ -303,7 +303,7 @@ events.listen('item.tags', function (event) {
'naturesaura:light_staff', 'naturesaura:light_staff',
'naturesaura:spawn_lamp', 'naturesaura:spawn_lamp',
'occultism:candle_white', // 'occultism:candle_white',
'pneumaticcraft:kerosene_lamp', 'pneumaticcraft:kerosene_lamp',
'pneumaticcraft:wall_lamp_black', 'pneumaticcraft:wall_lamp_black',

2
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/manuals.js
View File

@ -10,7 +10,7 @@ events.listen('item.tags', function (event) {
'ars_nouveau:worn_notebook', 'ars_nouveau:worn_notebook',
'astralsorcery:tome', 'astralsorcery:tome',
'alexsmobs:animal_dictionary', 'alexsmobs:animal_dictionary',
'occultism:dictionary_of_spirits' // 'occultism:dictionary_of_spirits'
]; ];
event.get('forge:manuals').add(items); event.get('forge:manuals').add(items);
}); });

4
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/nuggets.js
View File

@ -7,8 +7,8 @@ events.listen('item.tags', function (event) {
.add('immersiveengineering:nugget_nickel') .add('immersiveengineering:nugget_nickel')
.add('immersiveengineering:nugget_uranium') .add('immersiveengineering:nugget_uranium')
.add('immersiveengineering:nugget_constantan') .add('immersiveengineering:nugget_constantan')
.add('immersiveengineering:nugget_electrum') .add('immersiveengineering:nugget_electrum');
.add('occultism:iesnium_nugget'); // .add('occultism:iesnium_nugget');
event.get('forge:nuggets/iron_copper').add('#forge:nuggets/iron').add('#forge:nuggets/copper'); 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'); event.get('forge:nuggets/gold_bronze').add('#forge:nuggets/gold').add('#forge:nuggets/bronze');

4
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/ores.js
View File

@ -2,8 +2,8 @@ events.listen('item.tags', function (event) {
event event
.get('forge:ores') .get('forge:ores')
.add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense']) .add(['powah:uraninite_ore_poor', 'powah:uraninite_ore', 'powah:uraninite_ore_dense'])
.add('minecraft:ancient_debris') .add('minecraft:ancient_debris');
.add('occultism:iesnium_ore'); // .add('occultism:iesnium_ore');
event event
.get('forge:ores/dimensional') .get('forge:ores/dimensional')
.add([ .add([

2
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/storage_blocks.js
View File

@ -13,7 +13,7 @@ events.listen('item.tags', function (event) {
.add('immersiveengineering:storage_electrum') .add('immersiveengineering:storage_electrum')
.add('immersiveengineering:coke') .add('immersiveengineering:coke')
.add('powah:uraninite_block') .add('powah:uraninite_block')
.add('occultism:iesnium_block') // .add('occultism:iesnium_block')
.add('naturesaura:infused_iron_block') .add('naturesaura:infused_iron_block')
.add('naturesaura:tainted_gold_block'); .add('naturesaura:tainted_gold_block');

2
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tallow.js
View File

@ -1,3 +1,3 @@
events.listen('item.tags', (event) => { events.listen('item.tags', (event) => {
event.add('forge:tallow', ['quark:tallow', 'eidolon:tallow', 'occultism:tallow']); event.add('forge:tallow', ['quark:tallow']);
}); });

32
kubejs/server_scripts/fellies/kubejs/base/tags/items/forge/tools/pickaxes.js
View File

@ -1,10 +1,10 @@
events.listen('item.tags', function (event) { events.listen('item.tags', function (event) {
var items = [ var items = [
'aquaculture:neptunium_pickaxe', // 'aquaculture:neptunium_pickaxe',
'botania:elementium_pickaxe', // 'botania:elementium_pickaxe',
'botania:glass_pickaxe', // 'botania:glass_pickaxe',
'botania:manasteel_pick', // 'botania:manasteel_pick',
'botania:terra_pick', // 'botania:terra_pick',
'immersiveengineering:pickaxe_steel', 'immersiveengineering:pickaxe_steel',
'mekanismtools:bronze_pickaxe', 'mekanismtools:bronze_pickaxe',
'mekanismtools:lapis_lazuli_pickaxe', 'mekanismtools:lapis_lazuli_pickaxe',
@ -18,22 +18,22 @@ events.listen('item.tags', function (event) {
'minecraft:netherite_pickaxe', 'minecraft:netherite_pickaxe',
'minecraft:stone_pickaxe', 'minecraft:stone_pickaxe',
'minecraft:wooden_pickaxe', 'minecraft:wooden_pickaxe',
'mythicbotany:alfsteel_pick', // 'mythicbotany:alfsteel_pick',
'naturesaura:infused_iron_pickaxe', 'naturesaura:infused_iron_pickaxe',
'naturesaura:sky_pickaxe', 'naturesaura:sky_pickaxe',
'undergarden:utheric_pickaxe', // 'undergarden:utheric_pickaxe',
'undergarden:froststeel_pickaxe', // 'undergarden:froststeel_pickaxe',
'undergarden:cloggrum_pickaxe', // 'undergarden:cloggrum_pickaxe',
'bloodmagic:soulpickaxe', 'bloodmagic:soulpickaxe',
'astralsorcery:crystal_pickaxe', 'astralsorcery:crystal_pickaxe',
'astralsorcery:infused_crystal_pickaxe', 'astralsorcery:infused_crystal_pickaxe',
'undergarden:forgotten_pickaxe', // 'undergarden:forgotten_pickaxe',
'occultism:infused_pickaxe', // 'occultism:infused_pickaxe',
'eidolon:reversal_pick', // 'eidolon:reversal_pick',
'mapperbase:steel_pickaxe', // 'mapperbase:steel_pickaxe',
'aiotbotania:livingrock_pickaxe', // 'aiotbotania:livingrock_pickaxe',
'aiotbotania:livingwood_pickaxe', // 'aiotbotania:livingwood_pickaxe',
'occultism:iesnium_pickaxe' // 'occultism:iesnium_pickaxe'
]; ];
event.get('forge:tools').add(items); event.get('forge:tools').add(items);
event.get('forge:tools/pickaxe').add(items); event.get('forge:tools/pickaxe').add(items);

180
kubejs/server_scripts/fellies/kubejs/base/unification/additions.js
View File

@ -35,8 +35,8 @@ events.listen('recipes', function (event) {
immersiveengineering_ore_processing(event, material, ore, gem); immersiveengineering_ore_processing(event, material, ore, gem);
immersiveengineering_press_plates(event, material, ingot, gem, plate); immersiveengineering_press_plates(event, material, ingot, gem, plate);
occultism_ore_crushing(event, material, ore, dust, gem); // occultism_ore_crushing(event, material, ore, dust, gem);
occultism_ingot_gem_crushing(event, material, ingot, dust, gem); // occultism_ingot_gem_crushing(event, material, ingot, dust, gem);
pedestals_ore_crushing(event, material, ore, dust, gem); pedestals_ore_crushing(event, material, ore, dust, gem);
pedestals_ingot_gem_crushing(event, material, ingot, 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); event.recipes.immersiveengineering.metal_press(output, input, mold).energy(2400);
} }
function occultism_ore_crushing(event, material, ore, dust, gem) { // function occultism_ore_crushing(event, material, ore, dust, gem) {
if (ore == air) { // if (ore == air) {
return; // return;
} // }
blacklistedMaterials = ['silver']; // blacklistedMaterials = ['silver'];
for (var i = 0; i < blacklistedMaterials.length; i++) { // for (var i = 0; i < blacklistedMaterials.length; i++) {
if (blacklistedMaterials[i] == material) { // if (blacklistedMaterials[i] == material) {
return; // return;
} // }
} // }
var count; // var count;
switch (material) { // switch (material) {
case 'redstone': // case 'redstone':
count = 6; // count = 6;
break; // break;
case 'coal': // case 'coal':
count = 4; // count = 4;
break; // break;
case 'lapis': // case 'lapis':
count = 9; // count = 9;
break; // break;
case 'quartz': // case 'quartz':
count = 3; // count = 3;
break; // break;
case 'sulfur': // case 'sulfur':
count = 6; // count = 6;
break; // break;
case 'apatite': // case 'apatite':
count = 12; // count = 12;
break; // break;
case 'fluorite': // case 'fluorite':
count = 6; // count = 6;
break; // break;
case 'dimensional': // case 'dimensional':
count = 8; // count = 8;
break; // break;
default: // default:
count = 2; // count = 2;
} // }
var output, // var output,
input = 'forge:ores/' + material, // input = 'forge:ores/' + material,
output = dust; // output = dust;
if (gem != air) { // if (gem != air) {
output = gem; // output = gem;
} // }
event.custom({ // event.custom({
type: 'occultism:crushing', // type: 'occultism:crushing',
ingredient: { // ingredient: {
tag: input // tag: input
}, // },
result: { // result: {
item: output, // item: output,
count: count // count: count
}, // },
crushing_time: 100 // crushing_time: 100
}); // });
} // }
function occultism_ingot_gem_crushing(event, material, ingot, dust, gem) { // function occultism_ingot_gem_crushing(event, material, ingot, dust, gem) {
if (dust == air) { // if (dust == air) {
return; // return;
} // }
blacklistedMaterials = ['silver']; // blacklistedMaterials = ['silver'];
for (var i = 0; i < blacklistedMaterials.length; i++) { // for (var i = 0; i < blacklistedMaterials.length; i++) {
if (blacklistedMaterials[i] == material) { // if (blacklistedMaterials[i] == material) {
return; // return;
} // }
} // }
var input, // var input,
output = dust; // output = dust;
if (ingot != air) { // if (ingot != air) {
input = 'forge:ingots/' + material; // input = 'forge:ingots/' + material;
} else if (gem != air) { // } else if (gem != air) {
input = 'forge:gems/' + material; // input = 'forge:gems/' + material;
} else { // } else {
return; // return;
} // }
event.custom({ // event.custom({
type: 'occultism:crushing', // type: 'occultism:crushing',
ingredient: { // ingredient: {
tag: input // tag: input
}, // },
result: { // result: {
item: output, // item: output,
count: 1 // count: 1
}, // },
crushing_time: 100 // crushing_time: 100
}); // });
} // }
function pedestals_ore_crushing(event, material, ore, dust, gem) { function pedestals_ore_crushing(event, material, ore, dust, gem) {
if (ore == air) { if (ore == air) {

64
kubejs/server_scripts/fellies/kubejs/constants.js
View File

@ -33,16 +33,16 @@ const modPriorities = [
'kubejs', 'kubejs',
'pneumaticcraft', 'pneumaticcraft',
'create', 'create',
'occultism', // 'occultism',
'tmechworks', 'tmechworks',
'industrialforegoing', 'industrialforegoing',
'botania', 'botania',
'quark', 'quark',
'pedestals', // 'pedestals',
'refinedstorage', 'refinedstorage',
'mapperbase', // 'mapperbase',
'bloodmagic', 'bloodmagic',
'eidolon', // 'eidolon',
'morevanillalib' 'morevanillalib'
]; ];
@ -80,9 +80,9 @@ var woodVariantsToConstruct = [
'minecraft:spruce', 'minecraft:spruce',
'minecraft:warped', 'minecraft:warped',
'minecraft:crimson', 'minecraft:crimson',
'undergarden:smogstem', // 'undergarden:smogstem',
'undergarden:wigglewood', // 'undergarden:wigglewood',
'undergarden:grongle', // 'undergarden:grongle',
'biomesoplenty:cherry', 'biomesoplenty:cherry',
'biomesoplenty:dead', 'biomesoplenty:dead',
'biomesoplenty:fir', 'biomesoplenty:fir',
@ -182,23 +182,23 @@ woodVariantsToConstruct.forEach((variant) => {
}); });
const generatableCobblestone = [ const generatableCobblestone = [
'byg:dacite_cobblestone', // 'byg:dacite_cobblestone',
'byg:ether_stone', // 'byg:ether_stone',
'byg:red_rock', // 'byg:red_rock',
'byg:scoria_cobblestone', // 'byg:scoria_cobblestone',
'byg:soapstone', // 'byg:soapstone',
'embellishcraft:basalt_cobblestone', // 'embellishcraft:basalt_cobblestone',
'embellishcraft:gneiss_cobblestone', // 'embellishcraft:gneiss_cobblestone',
'embellishcraft:jade_cobblestone', // 'embellishcraft:jade_cobblestone',
'embellishcraft:larvikite_cobblestone', // 'embellishcraft:larvikite_cobblestone',
'embellishcraft:marble_cobblestone', // 'embellishcraft:marble_cobblestone',
'embellishcraft:slate_cobblestone', // 'embellishcraft:slate_cobblestone',
'create:andesite_cobblestone', 'create:andesite_cobblestone',
'create:diorite_cobblestone', 'create:diorite_cobblestone',
'create:granite_cobblestone', 'create:granite_cobblestone',
'quark:cobbedstone', 'quark:cobbedstone',
'undergarden:depthrock', // 'undergarden:depthrock',
'undergarden:shiverstone', // 'undergarden:shiverstone',
'create:dark_scoria_cobblestone', 'create:dark_scoria_cobblestone',
'create:scoria_cobblestone', 'create:scoria_cobblestone',
'create:gabbro_cobblestone', 'create:gabbro_cobblestone',
@ -213,18 +213,18 @@ const generatableStone = [
'biomesoplenty:black_sandstone', 'biomesoplenty:black_sandstone',
'biomesoplenty:orange_sandstone', 'biomesoplenty:orange_sandstone',
'biomesoplenty:white_sandstone', 'biomesoplenty:white_sandstone',
'byg:black_sandstone', // 'byg:black_sandstone',
'byg:blue_sandstone', // 'byg:blue_sandstone',
'byg:dacite', // 'byg:dacite',
'byg:purple_sandstone', // 'byg:purple_sandstone',
'byg:scoria_stone', // 'byg:scoria_stone',
'byg:white_sandstone', // 'byg:white_sandstone',
'embellishcraft:basalt', // 'embellishcraft:basalt',
'embellishcraft:gneiss', // 'embellishcraft:gneiss',
'embellishcraft:jade', // 'embellishcraft:jade',
'embellishcraft:larvikite', // 'embellishcraft:larvikite',
'embellishcraft:marble', // 'embellishcraft:marble',
'embellishcraft:slate', // 'embellishcraft:slate',
'minecraft:red_sandstone', 'minecraft:red_sandstone',
'minecraft:sandstone', 'minecraft:sandstone',
'quark:basalt', 'quark:basalt',

BIN
mods/ExtraStorage-1.16.4-1.2.2.jar → mods/ExtraStorage-1.16.4-1.3.1.jar
View File

Binary file not shown.

BIN
mods/NetherPortalFix_1.16.3-7.2.1.jar
View File

Binary file not shown.

BIN
mods/ars_nouveau-1.16.4-1.11.1.jar → mods/ars_nouveau-1.16.4-1.11.2.jar
View File

Binary file not shown.

BIN
mods/minecolonies-0.13.581-ALPHA-universal.jar → mods/minecolonies-0.13.584-ALPHA-universal.jar
View File

Binary file not shown.