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);
}
});
});

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/ars_nouveau/enchanting_apparatus.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

4
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/crushing.js
View File

@ -4,6 +4,10 @@ events.listen('recipes', (event) => {
{
outputs: [Item.of('emendatusenigmatica:obsidian_dust'), Item.of('minecraft:obsidian').withChance(0.75)],
input: 'minecraft:obsidian'
},
{
outputs: [Item.of('buildinggadgets:construction_paste', 3), Item.of('buildinggadgets:construction_paste').withChance(0.75), Item.of('buildinggadgets:construction_paste').withChance(0.50)],
input: 'buildinggadgets:construction_block_dense'
}
]
};

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/milling_flowers.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

4
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/mixing.js
View File

@ -20,6 +20,10 @@ events.listen('recipes', (event) => {
{
inputs: ['#forge:storage_blocks/coal'],
output: Item.of('emendatusenigmatica:coke_gem', 9)
},
{
inputs: ['#forge:ingots/iron', '#forge:ingots/lead'],
output: Item.of('eidolon:pewter_ingot', 2)
}
],
recipes_superheated: [

13
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/splashing.js Normal file
View File

@ -0,0 +1,13 @@
events.listen('recipes', (event) => {
var data = {
recipes: [
{
output: 'buildinggadgets:construction_block_dense',
input: 'buildinggadgets:construction_block_powder'
}
]
};
data.recipes.forEach((recipe) => {
event.recipes.create.splashing(recipe.output, recipe.input);
});
});

22
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/alloy.js Normal file
View File

@ -0,0 +1,22 @@
events.listen('recipes', (event) => {
var data = {
recipes: [
{
input1: '#forge:ingots/copper',
input2: '#forge:ingots/zinc',
output: item.of('emendatusenigmatica:brass_ingot', 2)
},
{
input1: '#forge:ingots/iron',
input2: '#forge:ingots/lead',
output: Item.of('eidolon:pewter_ingot', 2)
},
]
};
event.remove({id: 'immersiveengineering:alloysmelter/brass'});
data.recipes.forEach((recipe) => {
event.recipes.immersiveengineering.alloy(recipe.output, recipe.input1, recipe.input2);
});
});

22
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/arc_furnace.js Normal file
View File

@ -0,0 +1,22 @@
events.listen('recipes', (event) => {
var data = {
recipes: [
{
input1: '#forge:ingots/copper',
secondaries: ['#forge:ingots/zinc'],
outputs: [item.of('emendatusenigmatica:brass_ingot', 2)]
},
{
input1: '#forge:ingots/iron',
secondaries: ['#forge:ingots/lead'],
outputs: [Item.of('eidolon:pewter_ingot', 2)]
}
]
};
event.remove({id: 'immersiveengineering:arcfurnace/alloy_brass'})
data.recipes.forEach((recipe) => {
event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries);
});
});

5
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/crusher.js
View File

@ -85,6 +85,11 @@ events.listen('recipes', (event) => {
input: 'biomesoplenty:white_sandstone',
output: item.of('biomesoplenty:white_sand', 2),
secondary: [item.of('emendatusenigmatica:potassium_nitrate_gem').chance(0.5)]
},
{
input: 'buildinggadgets:construction_block_dense',
output: item.of('buildinggadgets:construction_paste', 3),
secondary: [item.of('buildinggadgets:construction_paste', 2).chance(0.5)]
}
]
};

4
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crushing.js
View File

@ -28,6 +28,10 @@ events.listen('recipes', function (event) {
{
input: '#forge:stone',
output: 'minecraft:cobblestone'
},
{
input: 'buildinggadgets:construction_block_dense',
output: Item.of('buildinggadgets:construction_paste', 3)
}
]
};

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/enriching_byg_flowers.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

21
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/injecting.js Normal file
View File

@ -0,0 +1,21 @@
events.listen('recipes', function (event) {
var data = {
recipes: [
{
output: 'buildinggadgets:construction_block_dense',
input: 'buildinggadgets:construction_block_powder',
gas: {gas: 'mekanism:steam', amount: 200}
},
{
output: 'buildinggadgets:construction_block_dense',
input: 'buildinggadgets:construction_block_powder',
gas: {gas: 'mekanism:water_vapor', amount: 200}
}
]
};
data.recipes.forEach((recipe) => {
event.recipes.mekanism.injecting(recipe.output, recipe.input, recipe.gas)
});
});

15
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smithing.js Normal file
View File

@ -0,0 +1,15 @@
// This is commented out because using /reload breaks AIOT recipes when this is present
// events.listen('recipes', (event) => {
// var data = {
// recipes: [
// {
// input1: 'aiotbotania:terra_aiot',
// input2: 'mythicbotany:alfsteel_armor_upgrade',
// output: 'aiotbotania:alfsteel_aiot'
// }
// ]
// };
// data.recipes.forEach((recipe) => {
// event.smithing(recipe.output, recipe.input1, recipe.input2);
// })
// });

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing_flowers.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

19
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler.js Normal file
View File

@ -0,0 +1,19 @@
events.listen('recipes', (event) => {
var data = {
recipes: [
{
input: 'minecraft:glass_bottle',
fluid: fluid.of('pneumaticcraft:memory_essence', 250),
output: 'minecraft:experience_bottle'
},
{
input: 'buildinggadgets:construction_block_powder',
fluid: fluid.of('minecraft:water', 1000),
output: 'buildinggadgets:construction_block_dense'
}
]
};
data.recipes.forEach((recipe) => {
event.recipes.thermal.bottler(recipe.output, [recipe.fluid, recipe.input]);
});
});

32
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler_experience.js
View File

@ -1,31 +1 @@
events.listen('recipes', (event) => {
var data = {
recipes: [
{
fluid: 'industrialforegoing:essence'
},
{
fluid: 'pneumaticcraft:memory_essence'
}
]
};
data.recipes.forEach((recipe) => {
event.recipes.thermal.bottler({
type: 'thermal.bottler',
ingredient: [
{
item: 'minecraft:glass_bottle'
},
{
fluid: recipe.fluid,
amount: 250
}
],
result: [
{
item: 'minecraft:experience_bottle'
}
]
});
});
});
//TODO: Remove in 0.4.0

1
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/centrifuge_flowers.js Normal file
View File

@ -0,0 +1 @@
//TODO: Remove in 0.4.0

15
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js
View File

@ -3,7 +3,6 @@ events.listen('recipes', function (event) {
recipes: [
{
inputs: ['#forge:ores/nickel'],
experience: 0.2,
outputs: [
item.of('emendatusenigmatica:nickel_ingot'),
item.of('minecraft:iron_ingot').chance(0.1),
@ -12,7 +11,6 @@ events.listen('recipes', function (event) {
},
{
inputs: ['#forge:ores/aluminum'],
experience: 0.2,
outputs: [
item.of('emendatusenigmatica:aluminum_ingot'),
item.of('minecraft:iron_ingot').chance(0.1),
@ -21,7 +19,6 @@ events.listen('recipes', function (event) {
},
{
inputs: ['#forge:ores/uranium'],
experience: 0.2,
outputs: [
item.of('emendatusenigmatica:uranium_ingot'),
item.of('emendatusenigmatica:lead_ingot').chance(0.1),
@ -30,7 +27,6 @@ events.listen('recipes', function (event) {
},
{
inputs: ['#forge:ores/osmium'],
experience: 0.2,
outputs: [
item.of('emendatusenigmatica:osmium_ingot'),
item.of('emendatusenigmatica:tin_ingot').chance(0.1),
@ -39,7 +35,6 @@ events.listen('recipes', function (event) {
},
{
inputs: ['#forge:ores/zinc'],
experience: 0.2,
outputs: [
item.of('emendatusenigmatica:zinc_ingot'),
item.of('minecraft:gold_ingot').chance(0.1),
@ -48,18 +43,20 @@ events.listen('recipes', function (event) {
},
{
inputs: [item.of('minecraft:netherite_scrap', 4), item.of('minecraft:gold_ingot', 2)],
experience: 0.2,
outputs: ['minecraft:netherite_ingot']
},
{
inputs: [item.of('minecraft:iron_ingot', 1), ingredient.of('#forge:dusts/coal_coke', 1)],
experience: 0.2,
inputs: ['#forge:ingots/iron', '#forge:dusts/coal_coke'],
outputs: ['emendatusenigmatica:steel_ingot']
},
{
inputs: ['#forge:ingots/iron', '#forge:ingots/lead'],
outputs: [Item.of('eidolon:pewter_ingot', 2)]
}
]
};
data.recipes.forEach((recipe) => {
event.recipes.thermal.smelter(recipe.outputs, recipe.inputs).experience(recipe.experience);
event.recipes.thermal.smelter(recipe.outputs, recipe.inputs);
});
});

6
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/insolator.js
View File

@ -381,6 +381,12 @@ events.listen('recipes', (event) => {
],
energyModifier: 3.0,
waterModifier: 3.0
},
{
input: 'undergarden:glowing_kelp',
outputs: [item.of('undergarden:glowing_kelp').chance(2.0)],
energyModifier: 1.0,
waterModifier: 1.0
}
]
};

8
kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/pulverizer.js
View File

@ -129,6 +129,14 @@ events.listen('recipes', function (event) {
item.of('emendatusenigmatica:potassium_nitrate_gem').chance(0.3)
],
experience: 0.2
},
{
input: 'buildinggadgets:construction_block_dense',
outputs: [
item.of('buildinggadgets:construction_paste', 3),
item.of('buildinggadgets:construction_paste', 2).chance(0.5)
],
experience: 0.2
}
]
};

9
kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/blocks/forge/candles.js Normal file
View File

@ -0,0 +1,9 @@
events.listen('block.tags', (event) => {
colors.forEach((color) => {
event.get('forge:candles').add('quark:' + color + '_candle');
});
candles.forEach((candle) => {
event.get('forge:candles').add(candle);
});
});

24
kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/fluids/minecraft/fluids.js
View File

@ -1,12 +1,12 @@
events.listen('fluid.tags', function (event) {
event
.get('minecraft:water')
.remove([
'create:honey',
'create:flowing_honey',
'create:chocolate',
'create:flowing_chocolate',
'undergarden:virulent_mix_source',
'undergarden:virulent_mix_flowing'
]);
});
// events.listen('fluid.tags', function (event) {
// event
// .get('minecraft:water')
// .remove([
// 'create:honey',
// 'create:flowing_honey',
// 'create:chocolate',
// 'create:flowing_chocolate',
// 'undergarden:virulent_mix_source',
// 'undergarden:virulent_mix_flowing'
// ]);
// });

14
kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/dustrialdecor/dustrialdecor.js Normal file
View File

@ -0,0 +1,14 @@
events.listen('item.tags', function (event) {
var irontags = ['', '_aluminum', '_lead', '_tin', '_copper', '_brass'];
irontags.forEach(function (tag) {
event.remove('forge:ingots/iron' + tag, 'dustrial_decor:rusty_iron_ingot');
});
event.remove('forge:nuggets/iron', 'dustrial_decor:rusty_iron_nugget');
event.remove('forge:nuggets/iron_copper', 'dustrial_decor:rusty_iron_nugget');
//Script seems to remove the default forge tags too, max says it's a bug with kubejs' recursive removal. Temp fix is to just readd them manually (or leave them without it)
event.get('forge:ingots').add('dustrial_decor:rusty_iron_ingot');
event.get('forge:nuggets').add('dustrial_decor:rusty_iron_nugget');
});

11
kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/enigmatica/quests.js Normal file
View File

@ -0,0 +1,11 @@
events.listen('item.tags', (event) => {
event
.get('enigmatica:quests/storage/gold_to_diamond')
.add(['ironchest:diamond_chest', 'ironchest:gold_to_diamond_chest_upgrade']);
event
.get('enigmatica:quests/storage/iron_to_gold')
.add(['ironchest:gold_chest', 'ironchest:iron_to_gold_chest_upgrade']);
event
.get('enigmatica:quests/storage/wood_to_iron')
.add(['ironchest:iron_chest', 'ironchest:wood_to_iron_chest_upgrade']);
});

9
kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/forge/candles.js Normal file
View File

@ -0,0 +1,9 @@
events.listen('item.tags', (event) => {
colors.forEach((color) => {
event.get('forge:candles').add('quark:' + color + '_candle');
});
candles.forEach((candle) => {
event.get('forge:candles').add(candle);
});
});

4
kubejs[e6]/server_scripts/enigmatica/kubejs/base/unification/additions.js
View File

@ -732,8 +732,8 @@ function thermal_press_wires(event, material, wire) {
return;
}
var output = wire,
input = item.of('#forge:ingots/' + material, 2),
var output = item.of(wire, 2),
input = '#forge:ingots/' + material,
mold = 'immersiveengineering:mold_wire';
event.recipes.thermal.press(output, [input, mold]).energy(2400);
}

15
kubejs[e6]/server_scripts/enigmatica/kubejs/constants.js
View File

@ -1,7 +1,7 @@
//priority: 1000
const air = 'minecraft:air';
//
const beamRecipes = [
{ output: 'decorative_blocks:hellbark_beam', input: 'biomesoplenty:hellbark_logs' },
{ output: 'decorative_blocks:jungle_beam', input: 'minecraft:jungle_logs' },
@ -332,6 +332,19 @@ const honeyVarieties = [
'resourcefulbees:wither_honey'
];
const candles =[
'buildersaddition:large_candle',
'buildersaddition:large_soul_candle',
'buildersaddition:candle',
'buildersaddition:soul_candle',
'eidolon:candle',
'eidolon:candlestick',
'occultism:candle_white',
'supplementaries:candelabra',
'supplementaries:candelabra_silver',
'supplementaries:candle_holder'
];
const dyeSources = [
{
input: 'biomesoplenty:blue_hydrangea',

9
kubejs[e6]/server_scripts/enigmatica/kubejs/functions.js
View File

@ -1,11 +1,11 @@
//priority: 1000
function shapedRecipe(result, pattern, key) {
return { result: result, pattern: pattern, key: key };
function shapedRecipe(result, pattern, key, id) {
return { result: result, pattern: pattern, key: key, id: id };
}
function shapelessRecipe(result, ingredients) {
return { result: result, ingredients: ingredients };
function shapelessRecipe(result, ingredients, id) {
return { result: result, ingredients: ingredients, id: id };
}
function unificationBlacklistEntry(material, type) {
return { material: material, type: type };
@ -39,7 +39,6 @@ function compareIndices(a, b, tag) {
console.error('[' + a + ', ' + b + '] were both unaccounted for in mod unification' + (tag ? ' for ' + tag : '!'));
return 0;
}
function wrapArray(array) {
return utils.listOf(array).toArray();
}