1
0
mirror of https://git.fellies.tech/minecraft/fellies.git synced 2021-02-13 10:18:48 +00:00
This commit is contained in:
2021-01-31 16:23:02 +01:00
parent b17248b785
commit 5e1e0a28a1
117 changed files with 2563 additions and 592 deletions

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'
];

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

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

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

View File

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

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

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