1
0
mirror of https://git.fellies.tech/minecraft/fellies.git synced 2021-02-13 10:18:48 +00:00

v0.7-1.16.5-36.0.14

This commit is contained in:
2021-02-06 12:14:20 +01:00
parent 207b72d5cd
commit 53798412f5
77 changed files with 855 additions and 383 deletions

View File

@ -72,7 +72,6 @@ const modPriorities = [
'immersiveengineering',
'thermal',
'mekanism',
'jaopca',
'kubejs',
'pneumaticcraft',
'create',
@ -80,7 +79,6 @@ const modPriorities = [
'quark',
'refinedstorage',
'bloodmagic',
'morevanillalib',
'titanium'
];

View File

@ -1,4 +0,0 @@
events.listen('recipes', (event) => {
// Mana and artifice
// event.blasting('mana-and-artifice:vinteum_dust', 'emendatusenigmatica:arcane_ore');
});

View File

@ -0,0 +1,14 @@
// priority: 99
/*
* Supported types:
* altar, array, soulforge, arc, alchemytable
*
* Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-blood-magic
*/
events.listen('recipes', e => {
const {
altar, array, soulforge, arc, alchemytable
} = e.recipes.bloodmagic;
});

View File

@ -0,0 +1,22 @@
// priority: 99
/*
* Supported types:
* conversion, crushing, cutting, milling, basin, mixing, compacting,
* pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting
*
* Notes:
* mixing and compacting supports .heated() and .superheated()
* mechanical_crafting correlates to vanilla shaped crafting
*
* Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-create
*/
events.listen('recipes', e => {
const {
conversion, crushing, cutting, milling, basin, mixing, compacting,
pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting
} = e.recipes.create;
pressing(Item.of('#forge:storage_blocks/coal', 9), 'kubejs:graphite_one');
});

View File

@ -0,0 +1,16 @@
// priority: 99
/*
* Supported types:
* alloy, blast_furnace, blast_furnace_fuel, coke_oven, cloche, fertilizer,
* metal_press, arc_furnace, crusher, sawmill
*
* Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-immersive-engineering
*/
events.listen('recipes', e => {
const {
alloy, blast_furnace, blast_furnace_fuel, coke_oven, cloche, fertilizer,
metal_press, arc_furnace, crusher, sawmill
} = e.recipes.immersiveengineering;
});

View File

@ -0,0 +1,15 @@
// priority: 99
/*
* Supported types:
* crushing, enriching, smelting, combining, compressing, purifying, injecting,
* metallurgic_infusing, sawing
*
* Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-mekanism
*/
events.listen('recipes', e => {
const {
crushing, enriching, smelting, combining, compressing, purifying, injecting, metallurgic_infusing, sawing
} = e.recipes.mekanism;
});

View File

@ -0,0 +1,4 @@
// priority: 99
events.listen('recipes', e => {
});

View File

@ -0,0 +1,41 @@
// priority: 99
events.listen('recipes', e => {
// Minecraft
e.shaped(Item.of('minecraft:stick', 16), ['A', 'A'], {
A: '#minecraft:logs'
});
e.shaped('minecraft:hopper', ['ABA', 'ABA', ' A '], {
A: '#forge:ingots/iron',
B: '#minecraft:logs'
});
e.shaped('minecraft:furnace', ['LLL', 'L L', 'LLL'], {
L: '#forge:stone'
});
// Xreliquary
e.shaped(Item.of('minecraft:glowstone_dust', 6), [
'H ',
' H ',
' H'
], {
H: 'xreliquary:witch_hat'
});
e.shaped(Item.of('minecraft:gunpowder', 6), [
' H ',
' H ',
' H '
], {
H: 'xreliquary:witch_hat'
});
e.shaped(Item.of('minecraft:redstone', 6), [
'H ',
' H ',
'H '
], {
H: 'xreliquary:witch_hat'
});
});

View File

@ -0,0 +1,20 @@
events.listen('recipes', e => {
// Additional Lights
e.shapeless('additional_lights:fire_for_standing_torch_s', ['#fellies:minicoal']);
e.shapeless('additional_lights:fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal']);
e.shapeless('additional_lights:fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal']);
e.shapeless('additional_lights:fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal']);
e.shapeless('additional_lights:soul_fire_for_standing_torch_s', ['#fellies:minicoal', '#forge:soul_sand']);
e.shapeless('additional_lights:soul_fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal', '#forge:soul_sand']);
e.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']);
e.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']);
// Minecraft
e.shapeless('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']);
e.shapeless('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']);
e.shapeless('minecraft:chest', ['#forge:chests/wooden']);
e.shapeless('minecraft:wheat_seeds', ['minecraft:wheat']);
// RF Tools
e.shapeless('rftoolsbase:dimensionalshard', ['emendatusenigmatica:dimensional_gem']);
});

View File

@ -0,0 +1,4 @@
// priority: 99
events.listen('recipes', e => {
});

View File

@ -0,0 +1,4 @@
// priority: 99
events.listen('recipes', e => {
});

View File

@ -1,83 +1,82 @@
events.listen('recipes', (event) => {
// Additional Lights
event.remove({output: 'additional_lights:fire_for_standing_torch_s'});
event.remove({output: 'additional_lights:fire_for_standing_torch_l'});
event.remove({output: 'additional_lights:fire_for_fire_pit_s'});
event.remove({output: 'additional_lights:fire_for_fire_pit_l'});
event.remove({output: 'additional_lights:soul_fire_for_standing_torch_s'});
event.remove({output: 'additional_lights:soul_fire_for_standing_torch_l'});
event.remove({output: 'additional_lights:soul_fire_for_fire_pit_s'});
event.remove({output: 'additional_lights:soul_fire_for_fire_pit_l'});
// priority: 98
// Environmental Core
event.remove({input: 'envirocore:aethium', output: 'envirocore:aethium'});
event.remove({input: 'envirocore:litherite', output: 'envirocore:litherite'});
events.listen('recipes', e => {
var idsToRemove = [
// Additional Lights
'additional_lights:fire_for_standing_torch_s',
'additional_lights:fire_for_standing_torch_l',
'additional_lights:fire_for_fire_pit_s',
'additional_lights:fire_for_fire_pit_l',
'additional_lights:soul_fire_for_standing_torch_s',
'additional_lights:soul_fire_for_standing_torch_l',
'additional_lights:soul_fire_for_fire_pit_s',
'additional_lights:soul_fire_for_fire_pit_l',
// Extra Storage
event.remove({id: 'extrastorage:part/storagepart_256k'});
event.remove({id: 'extrastorage:part/storagepart_1024k'});
event.remove({id: 'extrastorage:part/storagepart_4096k'});
event.remove({id: 'extrastorage:part/storagepart_16384k'});
event.remove({id: 'extrastorage:part/storagepart_16384k_fluid'});
event.remove({id: 'extrastorage:part/storagepart_65536k_fluid'});
event.remove({id: 'extrastorage:part/storagepart_262144k_fluid'});
event.remove({id: 'extrastorage:part/storagepart_1048576k_fluid'});
event.remove({id: 'extrastorage:disk/shaped/disk_256k'});
event.remove({id: 'extrastorage:disk/shaped/disk_1024k'});
event.remove({id: 'extrastorage:disk/shaped/disk_4096k'});
event.remove({id: 'extrastorage:disk/shaped/disk_16384k'});
event.remove({id: 'extrastorage:disk/shaped/disk_16384k_fluid'});
event.remove({id: 'extrastorage:disk/shaped/disk_65536k_fluid'});
event.remove({id: 'extrastorage:disk/shaped/disk_262144k_fluid'});
event.remove({id: 'extrastorage:disk/shaped/disk_1048576k_fluid'});
event.remove({id: 'extrastorage:disk/shapeless/disk_256k'});
event.remove({id: 'extrastorage:disk/shapeless/disk_1024k'});
event.remove({id: 'extrastorage:disk/shapeless/disk_4096k'});
event.remove({id: 'extrastorage:disk/shapeless/disk_16384k'});
event.remove({id: 'extrastorage:disk/shapeless/disk_16384k_fluid'});
event.remove({id: 'extrastorage:disk/shapeless/disk_65536k_fluid'});
event.remove({id: 'extrastorage:disk/shapeless/disk_262144k_fluid'});
event.remove({id: 'extrastorage:disk/shapeless/disk_1048576k_fluid'});
// Extra Storage
'extrastorage:part/storagepart_256k',
'extrastorage:part/storagepart_1024k',
'extrastorage:part/storagepart_4096k',
'extrastorage:part/storagepart_16384k',
'extrastorage:part/storagepart_16384k_fluid',
'extrastorage:part/storagepart_65536k_fluid',
'extrastorage:part/storagepart_262144k_fluid',
'extrastorage:part/storagepart_1048576k_fluid',
'extrastorage:disk/shaped/disk_256k',
'extrastorage:disk/shaped/disk_1024k',
'extrastorage:disk/shaped/disk_4096k',
'extrastorage:disk/shaped/disk_16384k',
'extrastorage:disk/shaped/disk_16384k_fluid',
'extrastorage:disk/shaped/disk_65536k_fluid',
'extrastorage:disk/shaped/disk_262144k_fluid',
'extrastorage:disk/shaped/disk_1048576k_fluid',
'extrastorage:disk/shapeless/disk_256k',
'extrastorage:disk/shapeless/disk_1024k',
'extrastorage:disk/shapeless/disk_4096k',
'extrastorage:disk/shapeless/disk_16384k',
'extrastorage:disk/shapeless/disk_16384k_fluid',
'extrastorage:disk/shapeless/disk_65536k_fluid',
'extrastorage:disk/shapeless/disk_262144k_fluid',
'extrastorage:disk/shapeless/disk_1048576k_fluid',
// Iron Rods
'immersiveengineering:crafting/stick_iron',
// Iron Rods
event.remove({id: 'immersiveengineering:crafting/stick_iron'});
// Mekanism
'mekanism:storage_blocks/charcoal',
// Mana and Artifice
// event.remove({id: 'mana-and-artifice:vinteum_dust'});
// event.remove({id: 'mana_and_artifice:vinteum_dust_blast_furnace'});
// Pams
'pamhc2foodextended:pralinesitem',
// Mekanism
event.remove({id: 'mekanism:storage_blocks/charcoal'});
// Thermal Series
'thermal:parts/emerald_gear',
'thermal:storage/bamboo_block',
'thermal:storage/gunpowder_block',
'thermal:storage/sugar_cane_block',
'thermal:storage/beetroot_block',
'thermal:storage/apple_block',
'thermal:storage/potato_block',
'thermal:storage/carrot_block',
'thermal:storage/charcoal_block',
'thermal:storage/sawdust_block',
'thermal:machine/press/packing3x3/press_bamboo_packing',
'thermal:machine/press/packing3x3/press_gunpowder_packing',
'thermal:machine/press/packing3x3/press_sugar_cane_packing',
'thermal:machine/press/packing3x3/press_beetroot_packing',
'thermal:machine/press/packing3x3/press_apple_packing',
'thermal:machine/press/packing3x3/press_potato_packing',
'thermal:machine/press/packing3x3/press_carrot_packing',
'thermal:machine/press/packing3x3/press_charcoal_packing',
'thermal:machine/press/packing3x3/press_sawdust_packing',
'thermal:phytogro_4',
'thermal:phytogro_8',
// Pams
event.remove({id: 'pamhc2foodextended:pralinesitem'});
// Thermal Series
event.remove({id: 'thermal:parts/emerald_gear'});
event.remove({id: 'thermal:storage/bamboo_block'});
event.remove({id: 'thermal:storage/gunpowder_block'});
event.remove({id: 'thermal:storage/sugar_cane_block'});
event.remove({id: 'thermal:storage/beetroot_block'});
event.remove({id: 'thermal:storage/apple_block'});
event.remove({id: 'thermal:storage/potato_block'});
event.remove({id: 'thermal:storage/carrot_block'});
event.remove({id: 'thermal:storage/charcoal_block'});
event.remove({id: 'thermal:storage/sawdust_block'});
event.remove({id: 'thermal:machine/press/packing3x3/press_bamboo_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_gunpowder_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_sugar_cane_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_beetroot_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_apple_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_potato_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_carrot_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_charcoal_packing'});
event.remove({id: 'thermal:machine/press/packing3x3/press_sawdust_packing'});
event.remove({id: 'thermal:phytogro_4'});
event.remove({id: 'thermal:phytogro_8'});
// Xreliquary
event.remove({id: 'xreliquary:items/uncrafting/redstone'});
event.remove({id: 'xreliquary:items/uncrafting/gunpowder_witch_hat'});
event.remove({id: 'xreliquary:items/uncrafting/glowstone_dust'});
});
// Xreliquary
'xreliquary:items/uncrafting/redstone',
'xreliquary:items/uncrafting/gunpowder_witch_hat',
'xreliquary:items/uncrafting/glowstone_dust',
]
idsToRemove.forEach(remove => {
e.remove({id: remove})
})
})

View File

@ -1,14 +1,6 @@
events.listen('recipes', (event) => {
// Immersive Engineering
// event.replaceInput({}, '#minecraft:planks', 'minecraft:gold_nugget');
// event.replaceOutput({}, 'minecraft:stick', 'minecraft:oak_sapling');
// Extra Storage
// event.replaceInput({}, 'extrastorage:storagepart_256k', 'extradisks:256k_storage_part');
// event.replaceInput({}, 'extrastorage:storagepart_1024k', 'extradisks:1024k_storage_part');
// event.replaceInput({}, 'extrastorage:storagepart_4096k', 'extradisks:4096k_storage_part');
// event.replaceInput({}, 'extrastorage:storagepart_16384k', 'extradisks:16384k_storage_part');
// priority: 98
events.listen('recipes', e => {
// Mana and Artifice
event.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane');
e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane');
});

View File

@ -1,27 +0,0 @@
events.listen('recipes', (event) => {
// Xreliquary
event.shaped(Item.of('minecraft:glowstone_dust', 6), [
'H ',
' H ',
' H'
], {
H: 'xreliquary:witch_hat'
});
event.shaped(Item.of('minecraft:gunpowder', 6), [
' H ',
' H ',
' H '
], {
H: 'xreliquary:witch_hat'
});
event.shaped(Item.of('minecraft:redstone', 6), [
'H ',
' H ',
'H '
], {
H: 'xreliquary:witch_hat'
});
});

View File

@ -1,11 +0,0 @@
events.listen('recipes', (event) => {
// Additional Lights
event.shapeless('additional_lights:fire_for_standing_torch_s', ['#fellies:minicoal']);
event.shapeless('additional_lights:fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal']);
event.shapeless('additional_lights:fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal']);
event.shapeless('additional_lights:fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal']);
event.shapeless('additional_lights:soul_fire_for_standing_torch_s', ['#fellies:minicoal', '#forge:soul_sand']);
event.shapeless('additional_lights:soul_fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal', '#forge:soul_sand']);
event.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']);
event.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']);
});

View File

@ -1,4 +0,0 @@
events.listen('recipes', (event) => {
// Mana and artifice
// event.smelting('mana-and-artifice:vinteum_dust', 'emendatusenigmatica:arcane_ore');
});

View File

@ -0,0 +1,20 @@
// priority: 99
/*
* Supported types:
* furnace, sawmill, pulverizer, smelter, centrifuge, press,
* crucible, chiller, refinery, brewer, bottler,
* insolator, pulverizer_catalyst, smelter_catalyst, insolator_catalyst,
* stirling_fuel, compression_fuel, magmatic_fuel, numismatic_fuel, lapidary_fuel
*
* Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-thermal
*/
events.listen('recipes', e => {
const {
furnace, sawmill, pulverizer, smelter, centrifuge, press,
crucible, chiller, refinery, brewer, bottler,
insolator, pulverizer_catalyst, smelter_catalyst, insolator_catalyst,
stirling_fuel, compression_fuel, magmatic_fuel, numismatic_fuel, lapidary_fuel
} = e.recipes.thermal;
});

View File

@ -0,0 +1,77 @@
events.listen('block.tags', e => {
// Missing Stair Tags
var woodenStairs = [
'astralsorcery:infused_wood_stairs'
]
var stoneStairs = [
'astralsorcery:marble_stairs',
'astralsorcery:black_marble_stairs'
]
e.get('minecraft:stairs')
.add(woodenStairs)
.add(stoneStairs)
// Missing Slab Tags
var woodenSlabs = [
'astralsorcery:infused_wood_slab'
]
var stoneSlabs = [
'astralsorcery:marble_slab',
'astralsorcery:black_marble_slab'
]
e.get('minecraft:slabs')
.add(woodenSlabs)
.add(stoneSlabs)
e.get('minecraft:wooden_slabs')
.add(woodenSlabs)
// Sandstone Tags
var orangeSandstones = [
'biomesoplenty:orange_sandstone',
'biomesoplenty:smooth_orange_sandstone',
'biomesoplenty:cut_orange_sandstone',
'biomesoplenty:chiseled_orange_sandstone'
]
e.get('forge:sandstone/orange')
.add(orangeSandstones)
var whiteSandstones = [
'biomesoplenty:white_sandstone',
'biomesoplenty:smooth_white_sandstone',
'biomesoplenty:cut_white_sandstone',
'biomesoplenty:chiseled_white_sandstone'
]
e.get('forge:sandstone/white')
.add(whiteSandstones)
var blackSandstones = [
'biomesoplenty:black_sandstone',
'biomesoplenty:smooth_black_sandstone',
'biomesoplenty:cut_black_sandstone',
'biomesoplenty:chiseled_black_sandstone'
]
e.get('forge:sandstone/black')
.add(blackSandstones)
var soulSandstones = [
'quark:soul_sandstone',
'quark:soul_sandstone_bricks',
'quark:smooth_soul_sandstone',
'quark:cut_soul_sandstone',
'quark:chiseled_soul_sandstone'
]
e.get('forge:sandstone/soul')
.add(soulSandstones)
e.add('forge:sandstone/colorless', 'quark:sandstone_bricks')
e.add('forge:sandstone/red', 'quark:red_sandstone_bricks')
})

View File

@ -0,0 +1,118 @@
events.listen('item.tags', e => {
// Missing #forge:sapling item tags.
var saplings = [
'quark:yellow_blossom_sapling',
'quark:lavender_blossom_sapling',
'quark:pink_blossom_sapling',
'quark:blue_blossom_sapling',
'quark:orange_blossom_sapling',
'quark:red_blossom_sapling',
'biomesoplenty:origin_sapling',
'biomesoplenty:flowering_oak_sapling',
'biomesoplenty:rainbow_birch_sapling',
'biomesoplenty:yellow_autumn_sapling',
'biomesoplenty:orange_autumn_sapling',
'biomesoplenty:maple_sapling',
'biomesoplenty:fir_sapling',
'biomesoplenty:redwood_sapling',
'biomesoplenty:white_cherry_sapling',
'biomesoplenty:pink_cherry_sapling',
'biomesoplenty:mahogany_sapling',
'biomesoplenty:jacaranda_sapling',
'biomesoplenty:palm_sapling',
'biomesoplenty:willow_sapling',
'biomesoplenty:dead_sapling',
'biomesoplenty:magic_sapling',
'biomesoplenty:umbran_sapling',
'biomesoplenty:hellbark_sapling'
]
e.get('forge:sapling').add(saplings)
// Missing Wall Tags
var stoneWalls = [
'bloodmagic:dungeon_brick_wall',
'bloodmagic:dungeon_polished_wall'
]
e.get('minecraft:walls')
.add(stoneWalls)
// Missing Stair Tags
var woodenStairs = [
'astralsorcery:infused_wood_stairs'
]
var stoneStairs = [
'astralsorcery:marble_stairs',
'astralsorcery:black_marble_stairs'
]
e.get('minecraft:stairs')
.add(woodenStairs)
.add(stoneStairs)
// Missing Slab Tags
var woodenSlabs = [
'astralsorcery:infused_wood_slab'
]
var stoneSlabs = [
'astralsorcery:marble_slab',
'astralsorcery:black_marble_slab'
]
e.get('minecraft:slabs')
.add(woodenSlabs)
.add(stoneSlabs)
e.get('minecraft:wooden_slabs')
.add(woodenSlabs)
// Sandstone Tags
var orangeSandstones = [
'biomesoplenty:orange_sandstone',
'biomesoplenty:smooth_orange_sandstone',
'biomesoplenty:cut_orange_sandstone',
'biomesoplenty:chiseled_orange_sandstone'
]
e.get('forge:sandstone/orange')
.add(orangeSandstones)
var whiteSandstones = [
'biomesoplenty:white_sandstone',
'biomesoplenty:smooth_white_sandstone',
'biomesoplenty:cut_white_sandstone',
'biomesoplenty:chiseled_white_sandstone'
]
e.get('forge:sandstone/white')
.add(whiteSandstones)
var blackSandstones = [
'biomesoplenty:black_sandstone',
'biomesoplenty:smooth_black_sandstone',
'biomesoplenty:cut_black_sandstone',
'biomesoplenty:chiseled_black_sandstone'
]
e.get('forge:sandstone/black')
.add(blackSandstones)
var soulSandstones = [
'quark:soul_sandstone',
'quark:soul_sandstone_bricks',
'quark:smooth_soul_sandstone',
'quark:cut_soul_sandstone',
'quark:chiseled_soul_sandstone'
]
e.get('forge:sandstone/soul')
.add(soulSandstones)
e.add('forge:sandstone/colorless', 'quark:sandstone_bricks')
e.add('forge:sandstone/red', 'quark:red_sandstone_bricks')
// Misc Missing Tags
e.add('forge:dusts/obsidian', 'create:powdered_obsidian')
})