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

306
kubejs[e6]/client_scripts/constants.js Normal file
View File

@ -0,0 +1,306 @@
//priority: 1000
const refinedStorageItems = [
'grid',
'crafting_grid',
'pattern_grid',
'fluid_grid',
'controller',
'creative_controller',
'network_receiver',
'network_transmitter',
'relay',
'detector',
'security_manager',
'wireless_transmitter',
'crafter',
'crafting_monitor',
'disk_manipulator',
'crafter_manager'
];
// Items added here will get recipes for Pedestals & Cobblegen Randomizer cobblegens.
const generatableCobblestone = [
'byg:dacite_cobblestone',
'byg:ether_stone',
'byg:red_rock',
'byg:scoria_cobblestone',
'byg:soapstone',
'embellishcraft:basalt_cobblestone',
'embellishcraft:gneiss_cobblestone',
'embellishcraft:jade_cobblestone',
'embellishcraft:larvikite_cobblestone',
'embellishcraft:marble_cobblestone',
'embellishcraft:slate_cobblestone',
'create:andesite_cobblestone',
'create:diorite_cobblestone',
'create:granite_cobblestone',
'quark:cobbedstone',
'undergarden:depthrock',
'undergarden:shiverstone',
'create:dark_scoria_cobblestone',
'create:scoria_cobblestone',
'create:gabbro_cobblestone',
'create:dolomite_cobblestone',
'create:weathered_limestone_cobblestone',
'create:limestone_cobblestone'
];
// Items added here will get recipes for Pedestals & Cobblegen Randomizer stonegens.
const generatableStone = [
'minecraft:andesite',
'minecraft:diorite',
'minecraft:granite',
'biomesoplenty:black_sandstone',
'biomesoplenty:orange_sandstone',
'biomesoplenty:white_sandstone',
'byg:black_sandstone',
'byg:blue_sandstone',
'byg:dacite',
'byg:purple_sandstone',
'byg:pink_sandstone',
'byg:scoria_stone',
'byg:white_sandstone',
'embellishcraft:basalt',
'embellishcraft:gneiss',
'embellishcraft:jade',
'embellishcraft:larvikite',
'embellishcraft:marble',
'embellishcraft:slate',
'minecraft:red_sandstone',
'minecraft:sandstone',
'quark:basalt',
'quark:brimstone',
'quark:jasper',
'quark:limestone',
'quark:marble',
'quark:permafrost',
'quark:slate',
'astralsorcery:marble_raw',
'create:dark_scoria',
'create:scoria',
'create:gabbro',
'create:dolomite',
'create:weathered_limestone',
'create:limestone'
];
const generatableBasalt = [];
const colors = [
'cyan',
'purple',
'blue',
'brown',
'green',
'red',
'black',
'white',
'orange',
'magenta',
'light_blue',
'yellow',
'lime',
'pink',
'gray',
'light_gray'
];
var itemsToHide = [
'ars_nouveau:arcane_brick',
'ars_nouveau:arcane_ore',
'bloodmagic:coalsand',
'bloodmagic:saltpeter',
'bloodmagic:sulfur',
'create:powdered_obsidian',
'create:honey_bucket',
'eidolon:tallow',
'immersiveengineering:dust_saltpeter',
'immersiveengineering:dust_wood',
'mapperbase:bitumen_ore',
'mapperbase:iron_plate',
'mapperbase:iron_rod',
'mapperbase:raw_bitumen',
'morevanillalib:obsidian_shard',
'pedestals:dustflour',
'powah:uraninite_ore',
'powah:uraninite_ore_dense',
'powah:uraninite_ore_poor',
'powah:uraninite_raw',
'powah:uraninite_raw_dense',
'powah:uraninite_raw_poor',
'quark:biotite',
'quark:biotite_ore',
'quark:tallow',
'thermal:coal_coke',
'thermal:coal_coke_block',
'thermal:ender_pearl_dust',
'thermal:sawdust',
'supplementaries:pedestal',
'supplementaries:crank',
'supplementaries:cog_block',
'supplementaries:redstone_illuminator',
'supplementaries:turn_table',
'supplementaries:jar',
'supplementaries:jar_tinted',
'supplementaries:firefly_jar',
'supplementaries:stone_lamp',
'supplementaries:sack',
'supplementaries:blackboard'
];
var regexHide = [
/emendatusenigmatica:\w+_andesite_ore/,
/emendatusenigmatica:\w+_gabbro_ore/,
/emendatusenigmatica:\w+_c_limestone_ore/,
/emendatusenigmatica:\w+_scoria_ore/,
/emendatusenigmatica:\w+_weathered_limestone_ore/,
/emendatusenigmatica:\w+_jasper_ore/,
/emendatusenigmatica:\w+_marble_ore/,
/emendatusenigmatica:\w+_slate_ore/,
/emendatusenigmatica:\w+_netherrack_ore/,
/emendatusenigmatica:\w+_blackstone_ore/,
/emendatusenigmatica:\w+_end_stone_ore/,
/emendatusenigmatica:\w+_mossy_stone_ore/,
/emendatusenigmatica:\w+_granite_ore/,
/emendatusenigmatica:\w+_diorite_ore/,
/emendatusenigmatica:\w+_sand_ore/,
/emendatusenigmatica:\w+_gravel_ore/,
/titanium:\w+_gear/,
/thermal:\w+_dust/,
/thermal:\w+_gear/,
/thermal:\w+_ingot/,
/thermal:\w+_nugget/,
/thermal:\w+_ore/,
/thermal:\w+_plate/,
/tmechworks:\w+_ingot/,
/tmechworks:\w+_nugget/,
/tmechworks:\w+_ore/,
/pedestals:dust/,
/mekanism:\w+_ore/,
/minecraft:\w+_ore/,
/immersiveengineering:plate_/,
/immersiveengineering:stick_/,
/create:\w+_sheet/,
/create:\w+_nugget/,
/create:\w+_ingot/,
/create:\w+_ore/,
/immersiveposts:stick_/,
/buildersaddition:\w+_rod/,
/eidolon:\w+_ore/,
/byg:pendorite/,
/byg:ametrine/,
/emendatusenigmatica:\w+certus/,
/emendatusenigmatica:\w+fluix/,
/mapperbase:steel/,
/rftoolsbase:dimensionalshard/
];
const disabledItems = [
'aquaculture:wooden_fillet_knife',
'aquaculture:stone_fillet_knife',
'aquaculture:iron_fillet_knife',
'aquaculture:gold_fillet_knife',
'aquaculture:diamond_fillet_knife',
'bloodmagic:sand_netherite',
'bloodmagic:gravel_netherite_scrap',
'bloodmagic:fragment_netherite_scrap',
'byg:ametrine_block',
'byg:ametrine_boots',
'byg:ametrine_chestplate',
'byg:ametrine_gems',
'byg:ametrine_helmet',
'byg:ametrine_horse_armor',
'byg:ametrine_leggings',
'byg:ametrine_ore',
'byg:pendorite_axe',
'byg:pendorite_battleaxe',
'byg:pendorite_block',
'byg:pendorite_hoe',
'byg:pendorite_horse_armor',
'byg:pendorite_ore',
'byg:pendorite_pickaxe',
'byg:pendorite_scraps',
'byg:pendorite_shovel',
'byg:pendorite_sword',
'mapperbase:steel_fence',
'mapperbase:steel_axe',
'mapperbase:steel_pickaxe',
'mapperbase:steel_shovel',
'mapperbase:steel_hoe',
'mapperbase:steel_sword',
'mapperbase:steel_helmet',
'mapperbase:steel_chestplate',
'mapperbase:steel_leggings',
'mapperbase:steel_boots',
'mythicbotany:raindeletia',
'mythicbotany:raindeletia_floating',
'mythicbotany:wither_aconite',
'mythicbotany:wither_aconite_floating',
'quark:pipe',
'quark:potato_crate',
'quark:beetroot_crate',
'quark:carrot_crate',
'thermal:beetroot_block',
'thermal:carrot_block',
'thermal:potato_block',
'thermal:sugar_cane_block'
];
const materialsToUnify = [
'iron',
'gold',
'copper',
'silver',
'zinc',
'brass',
'lead',
'tin',
'compressed_iron',
'nickel',
'aluminum',
'uranium',
'bronze',
'electrum',
'constantan',
'steel',
'osmium',
'diamond',
'lapis',
'emerald',
'quartz',
'coal',
'charcoal',
'obsidian',
'ender',
'fluix',
'saltpeter',
'fluorite',
'invar',
'signalum',
'lumium',
'enderium',
'sulfur',
'cinnabar',
'niter',
'potassium_nitrate',
'saltpeter',
'apatite',
'bitumen',
'redstone',
'glowstone',
'arcane',
'mana',
'certus_quartz',
'charged_certus_quartz',
'iesnium',
'dimensional',
'cloggrum',
'froststeel',
'regalium',
'utherium',
'coal_coke',
'starmetal'
];

117
kubejs[e6]/client_scripts/global_constants.js
View File

@ -1,116 +1 @@
//priority: 1001
const disabledItems = [
'aquaculture:wooden_fillet_knife',
'aquaculture:stone_fillet_knife',
'aquaculture:iron_fillet_knife',
'aquaculture:gold_fillet_knife',
'aquaculture:diamond_fillet_knife',
'bloodmagic:sand_netherite',
'bloodmagic:gravel_netherite_scrap',
'bloodmagic:fragment_netherite_scrap',
'byg:ametrine_block',
'byg:ametrine_boots',
'byg:ametrine_chestplate',
'byg:ametrine_gems',
'byg:ametrine_helmet',
'byg:ametrine_horse_armor',
'byg:ametrine_leggings',
'byg:ametrine_ore',
'byg:pendorite_axe',
'byg:pendorite_battleaxe',
'byg:pendorite_block',
'byg:pendorite_hoe',
'byg:pendorite_horse_armor',
'byg:pendorite_ore',
'byg:pendorite_pickaxe',
'byg:pendorite_scraps',
'byg:pendorite_shovel',
'byg:pendorite_sword',
'mapperbase:steel_fence',
'mapperbase:steel_axe',
'mapperbase:steel_pickaxe',
'mapperbase:steel_shovel',
'mapperbase:steel_hoe',
'mapperbase:steel_sword',
'mapperbase:steel_helmet',
'mapperbase:steel_chestplate',
'mapperbase:steel_leggings',
'mapperbase:steel_boots',
'mythicbotany:raindeletia',
'mythicbotany:raindeletia_floating',
'mythicbotany:wither_aconite',
'mythicbotany:wither_aconite_floating',
'quark:pipe',
'quark:potato_crate',
'quark:beetroot_crate',
'quark:carrot_crate',
'thermal:beetroot_block',
'thermal:carrot_block',
'thermal:potato_block',
'thermal:sugar_cane_block'
];
const materialsToUnify = [
'iron',
'gold',
'copper',
'silver',
'zinc',
'brass',
'lead',
'tin',
'compressed_iron',
'nickel',
'aluminum',
'uranium',
'bronze',
'electrum',
'constantan',
'steel',
'osmium',
'diamond',
'lapis',
'emerald',
'quartz',
'coal',
'charcoal',
'obsidian',
'ender',
'fluix',
'saltpeter',
'fluorite',
'invar',
'signalum',
'lumium',
'enderium',
'sulfur',
'cinnabar',
'niter',
'potassium_nitrate',
'saltpeter',
'apatite',
'bitumen',
'redstone',
'glowstone',
'arcane',
'mana',
'certus_quartz',
'charged_certus_quartz',
'iesnium',
'dimensional',
'cloggrum',
'froststeel',
'regalium',
'utherium',
'coal_coke',
'starmetal'
];
global.materialsToUnify = materialsToUnify;
global.disabledItems = disabledItems;
//TODO: Remove in 0.4.0

26
kubejs[e6]/client_scripts/item_modifiers/jei_descriptions.js
View File

@ -10,6 +10,12 @@ events.listen('jei.information', (event) => {
description: [
'Obtained by left-clicking a Starmetal Ingot in-world. See the Astral Tome for more information.'
]
},
{
item: 'buildinggadgets:construction_paste',
description: [
'Obtained by breaking a Dense Construction Block with a Pickaxe.'
]
}
]
};
@ -18,10 +24,28 @@ events.listen('jei.information', (event) => {
event.add(item.item, item.description);
});
global.disabledItems.forEach((item) => {
disabledItems.forEach((item) => {
event.add(
item,
"This item has been disabled, if you managed to obtain it please report it on Enigmatica 6's issue tracker: https://github.com/NillerMedDild/Enigmatica6/issues"
);
});
refinedStorageItems.forEach((item) => {
event.add(`refinedstorage:${item}`, 'Can be dyed through crafting or by right clicking it with dye in-world.');
});
generatableCobblestone.forEach((cobblestone) => {
event.add(
cobblestone,
'Can be generated in a Vanilla Cobblestone Generator. The block below where the Cobblestone generates needs to be a Block of Iron.'
);
});
generatableStone.forEach((stone) => {
event.add(
stone,
'Can be generated in a Vanilla Stone Generator. The block below where the Stone generates needs to be a Block of Diamond.'
);
});
});

135
kubejs[e6]/client_scripts/item_modifiers/jei_hide.js
View File

@ -1,134 +1 @@
events.listen('jei.hide.items', (event) => {
global.materialsToUnify.forEach((material) => {
if (material == 'iesnium' || material == 'graphite' || material == 'hop_graphite') {
return;
}
itemsToHide.push(
'occultism:' + material + '_ingot',
'occultism:' + material + '_ore',
'occultism:' + material + '_dust',
'occultism:' + material + '_nugget',
'occultism:' + material + '_block',
'immersiveengineering:ingot_' + material,
'immersiveengineering:dust_' + material,
'immersiveengineering:nugget_' + material,
'mekanism:nugget_' + material,
'mekanism:dust_' + material,
'mekanism:ingot_' + material,
'mekanism:block_' + material
);
});
var itemsToHide = [
'ars_nouveau:arcane_brick',
'ars_nouveau:arcane_ore',
'bloodmagic:coalsand',
'bloodmagic:saltpeter',
'bloodmagic:sulfur',
'create:powdered_obsidian',
'create:honey_bucket',
'eidolon:tallow',
'immersiveengineering:dust_saltpeter',
'immersiveengineering:dust_wood',
'mapperbase:bitumen_ore',
'mapperbase:iron_plate',
'mapperbase:iron_rod',
'mapperbase:raw_bitumen',
'morevanillalib:obsidian_shard',
'pedestals:dustflour',
'powah:uraninite_ore',
'powah:uraninite_ore_dense',
'powah:uraninite_ore_poor',
'powah:uraninite_raw',
'powah:uraninite_raw_dense',
'powah:uraninite_raw_poor',
'quark:biotite',
'quark:biotite_ore',
'quark:tallow',
'thermal:coal_coke',
'thermal:coal_coke_block',
'thermal:ender_pearl_dust',
'thermal:sawdust',
'supplementaries:pedestal',
'supplementaries:crank',
'supplementaries:cog_block',
'supplementaries:redstone_illuminator',
'supplementaries:turn_table',
'supplementaries:jar',
'supplementaries:jar_tinted',
'supplementaries:firefly_jar',
'supplementaries:stone_lamp',
'supplementaries:sack',
'supplementaries:blackboard'
];
itemsToHide.forEach((disabledItem) => {
if (!item.of(disabledItem).isEmpty()) {
event.hide(disabledItem);
}
});
global.disabledItems.forEach((disabledItem) => {
if (!item.of(disabledItem).isEmpty()) {
event.hide(disabledItem);
}
});
var regexHide = [
/emendatusenigmatica:\w+_andesite_ore/,
/emendatusenigmatica:\w+_gabbro_ore/,
/emendatusenigmatica:\w+_c_limestone_ore/,
/emendatusenigmatica:\w+_scoria_ore/,
/emendatusenigmatica:\w+_weathered_limestone_ore/,
/emendatusenigmatica:\w+_jasper_ore/,
/emendatusenigmatica:\w+_marble_ore/,
/emendatusenigmatica:\w+_slate_ore/,
/emendatusenigmatica:\w+_netherrack_ore/,
/emendatusenigmatica:\w+_blackstone_ore/,
/emendatusenigmatica:\w+_end_stone_ore/,
/emendatusenigmatica:\w+_mossy_stone_ore/,
/emendatusenigmatica:\w+_granite_ore/,
/emendatusenigmatica:\w+_diorite_ore/,
/emendatusenigmatica:\w+_sand_ore/,
/emendatusenigmatica:\w+_gravel_ore/,
/titanium:\w+_gear/,
/thermal:\w+_dust/,
/thermal:\w+_gear/,
/thermal:\w+_ingot/,
/thermal:\w+_nugget/,
/thermal:\w+_ore/,
/thermal:\w+_plate/,
/tmechworks:\w+_ingot/,
/tmechworks:\w+_nugget/,
/tmechworks:\w+_ore/,
/pedestals:dust/,
/mekanism:\w+_ore/,
/minecraft:\w+_ore/,
/immersiveengineering:plate_/,
/immersiveengineering:stick_/,
/create:\w+_sheet/,
/create:\w+_nugget/,
/create:\w+_ingot/,
/create:\w+_ore/,
/immersiveposts:stick_/,
/buildersaddition:\w+_rod/,
/eidolon:\w+_ingot/,
/eidolon:\w+_nugget/,
/eidolon:\w+_ore/,
/byg:pendorite/,
/byg:ametrine/,
/emendatusenigmatica:\w+certus/,
/emendatusenigmatica:\w+fluix/,
/mapperbase:steel/,
/rftoolsbase:dimensionalshard/
];
regexHide.forEach((regexExpression) => {
event.hide(regexExpression);
});
});
onEvent('jei.hide.fluids', (event) => {
event.hide('cofh_core:honey');
event.hide('create:honey');
});
//TODO: Remove in 0.4.0

4
kubejs[e6]/client_scripts/item_modifiers/jei_hide_fluids.js Normal file
View File

@ -0,0 +1,4 @@
onEvent('jei.hide.fluids', (event) => {
event.hide('cofh_core:honey');
event.hide('create:honey');
});

44
kubejs[e6]/client_scripts/item_modifiers/jei_hide_items.js Normal file
View File

@ -0,0 +1,44 @@
events.listen('jei.hide.items', (event) => {
materialsToUnify.forEach((material) => {
if (material == 'iesnium' || material == 'graphite' || material == 'hop_graphite') {
return;
}
itemsToHide.push(
'occultism:' + material + '_ingot',
'occultism:' + material + '_ore',
'occultism:' + material + '_dust',
'occultism:' + material + '_nugget',
'occultism:' + material + '_block',
'immersiveengineering:ingot_' + material,
'immersiveengineering:dust_' + material,
'immersiveengineering:nugget_' + material,
'mekanism:nugget_' + material,
'mekanism:dust_' + material,
'mekanism:ingot_' + material,
'mekanism:block_' + material,
'eidolon:ingot_' + material,
'eidolon:nugget_' + material,
'eidolon:block_' + material
);
});
itemsToHide.forEach((disabledItem) => {
if (!item.of(disabledItem).isEmpty()) {
event.hide(disabledItem);
}
});
disabledItems.forEach((disabledItem) => {
if (!item.of(disabledItem).isEmpty()) {
event.hide(disabledItem);
}
});
colors.forEach((color) => {
event.hide('/refinedstorage:' + color + '\\w/');
});
regexHide.forEach((regexExpression) => {
event.hide(regexExpression);
});
});

15
kubejs[e6]/client_scripts/item_modifiers/tooltips.js
View File

@ -1,8 +1,7 @@
// events.listen('client.item_tooltip', function (event) {
// switch (event.item.id) {
// case 'appliedenergistics2:quantum_entangled_singularity':
// event.add(
// 'To create drop 1 Singularity and 1 Ender Dust (From Applied Energistics) and cause an explosion within range of the items.'
// );
// }
// });
onEvent('client.item_tooltip', (event) => {
refinedStorageItems.forEach((item) => {
if (event.item.id == 'refinedstorage:' + item) {
event.add('Can be dyed through crafting or by right clicking it with dye in-world.');
}
});
});

11
kubejs[e6]/data/botanypots/recipes/crops/glitterkelp.json Normal file
View File

@ -0,0 +1,11 @@
{
"type": "botanypots:crop",
"seed": { "item": "undergarden:glowing_kelp" },
"categories": ["water"],
"growthTicks": 1000,
"display": { "block": "undergarden:glowing_kelp_plant", "renderFluid": false },
"results": [
{ "chance": 0.75, "output": { "item": "undergarden:glowing_kelp" }, "minRolls": 1, "maxRolls": 1 },
{ "chance": 0.05, "output": { "item": "undergarden:glowing_kelp" }, "minRolls": 1, "maxRolls": 2 }
]
}

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