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

Updates

Browse Source
This commit is contained in:
Citali
2021-01-31 16:23:02 +01:00
parent b17248b785
commit 5e1e0a28a1
117 changed files with 2563 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/remove.js
View File

@ -184,7 +184,11 @@ events.listen('recipes', function (event) {
input: '#forge:ores/nickel',
type: 'thermal:smelter'
});
event.remove({
input: 'minecraft:fire_charge',
mod: 'thermal',
type: 'minecraft:crafting_shapeless'
});
event.remove({ type: 'pedestals:pedestal_crushing', output: '#forge:dyes' });
event.remove({ type: 'create:milling', output: '#forge:dyes' });
event.remove({ type: 'create:crushing', output: '#forge:dyes' });

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js
View File

@ -1,5 +1,6 @@
events.listen('recipes', function (event) {
event.replaceInput({}, 'refinedstorage:silicon', '#forge:silicon');
event.replaceInput({}, 'refinedstorage:crafter', '#refinedstorage:crafter');
event.replaceInput({}, 'thermal:cinnabar', '#forge:gems/cinnabar');
event.replaceInput({}, 'thermal:sulfur', '#forge:gems/sulfur');
event.replaceInput({}, 'thermal:apatite', '#forge:gems/apatite');

46
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shaped.js
View File

@ -342,26 +342,26 @@ events.listen('recipes', function (event) {
shapedRecipe(
Item.of('morphtool:tool').nbt({
'morphtool:data': {
blockcarpentry: { id: 'blockcarpentry:texture_wrench' },
powah: { id: 'powah:wrench' },
resourcefulbees: { id: 'resourcefulbees:scraper' },
astralsorcery: { id: 'astralsorcery:wand' },
pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench' },
immersiveengineering: { id: 'immersiveengineering:hammer' },
transport: { id: 'transport:rail_breaker' },
pedestals: { id: 'pedestals:linkingtool' },
botania: { id: 'botania:twig_wand', tag: { color1: 0, color2: 0 } },
ars_nouveau: { id: 'ars_nouveau:dominion_wand' },
mekanism: { id: 'mekanism:configurator' },
bloodmagic: { id: 'bloodmagic:ritualtinkerer' },
thermal: { id: 'thermal:wrench' },
rftoolsbase: { id: 'rftoolsbase:smartwrench' },
create: { id: 'create:wrench' },
chiselsandbits: { id: 'chiselsandbits:wrench_wood' },
refinedstorage: { id: 'refinedstorage:wrench' },
quantumstorage: { id: 'quantumstorage:hammer' },
prettypipes: { id: 'prettypipes:wrench' },
storagedrawers: { id: 'storagedrawers:drawer_key' }
blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 },
powah: { id: 'powah:wrench', Count: 1 },
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 },
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 },
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 },
chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1 },
refinedstorage: { id: 'refinedstorage:wrench', Count: 1 },
quantumstorage: { id: 'quantumstorage:hammer', Count: 1 },
prettypipes: { id: 'prettypipes:wrench', Count: 1 },
storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 }
}
}),
['ABA', 'CFD', 'AEA'],
@ -389,7 +389,11 @@ events.listen('recipes', function (event) {
];
recipes.forEach(function (recipe) {
event.shaped(recipe.result, recipe.pattern, recipe.key);
if (recipe.id) {
event.shaped(recipe.result, recipe.pattern, recipe.key).id(recipe.id);
} else {
event.shaped(recipe.result, recipe.pattern, recipe.key);
}
});
buildWoodVariants.forEach((wood) => {

13
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js
View File

@ -162,10 +162,19 @@ events.listen('recipes', (event) => {
'#forge:wax',
'#forge:string'
]),
shapelessRecipe(Item.of('occultism:tallow', 9), ['quark:tallow_block'])
shapelessRecipe(Item.of('occultism:tallow', 9), ['quark:tallow_block']),
shapelessRecipe(
'minecraft:writable_book',
['minecraft:book', '#forge:dyes/black', '#forge:feathers'],
'minecraft:writable_book'
)
];
recipes.forEach(function (recipe) {
event.shapeless(recipe.result, recipe.ingredients);
if (recipe.id) {
event.shapeless(recipe.result, recipe.ingredients).id(recipe.id);
} else {
event.shapeless(recipe.result, recipe.ingredients);
}
});
});