Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 …
Browse files Browse the repository at this point in the history 
…into develop
  • Loading branch information
@NielsPilgaard
NielsPilgaard committed Jan 20, 2021
2 parents 64f31d2 + 41594e3 commit 681a728
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 78 deletions.
4 changes: 2 additions & 2 deletions config/Mekanism/tools.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
#Efficiency of refined_glowstone paxels.
refined_glowstonePaxelEfficiency = 14.0
#Efficiency of refined_glowstone tools.
refined_glowstoneEfficiency = 12.0
refined_glowstoneEfficiency = 11.0
#Harvest level of refined_glowstone paxels.
#Range: > 0
refined_glowstonePaxelHarvestLevel = 3
Expand Down Expand Up @@ -404,7 +404,7 @@
#Efficiency of refined_obsidian paxels.
refined_obsidianPaxelEfficiency = 13.0
#Efficiency of refined_obsidian tools.
refined_obsidianEfficiency = 11.0
refined_obsidianEfficiency = 10
#Maximum durability of refined_obsidian tools.
#Range: > 1
refined_obsidianToolMaxUses = 2500
Expand Down
20 changes: 0 additions & 20 deletions kubejs/client_scripts/item_modifiers/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,12 @@
var itemsToHide = [
'ars_nouveau:arcane_brick',
'ars_nouveau:arcane_ore',
'emendatusenigmatica:certus_quartz_block',
'emendatusenigmatica:certus_quartz_chunk',
'emendatusenigmatica:certus_quartz_dust',
'emendatusenigmatica:certus_quartz_gem',
'emendatusenigmatica:certus_quartz_ore',
'emendatusenigmatica:charged_certus_quartz_block',
'emendatusenigmatica:charged_certus_quartz_chunk',
'emendatusenigmatica:charged_certus_quartz_gem',
'emendatusenigmatica:charged_certus_quartz_ore',
'emendatusenigmatica:fluix_block',
'emendatusenigmatica:fluix_dust',
'emendatusenigmatica:fluix_gem',
'immersiveengineering:dust_saltpeter',
'immersiveengineering:dust_wood',
'mapperbase:bitumen_ore',
'mapperbase:iron_plate',
'mapperbase:iron_rod',
'mapperbase:raw_bitumen',
'mapperbase:steel_ingot',
'mapperbase:steel_nugget',
'mapperbase:steel_plate',
'mapperbase:steel_rod',
'morevanillalib:obsidian_shard',
'pedestals:dustflour',
'powah:uraninite_ore',
Expand All @@ -39,10 +23,6 @@ var itemsToHide = [
'thermal:coal_coke_block',
'thermal:ender_pearl_dust',
'thermal:sawdust',
'rftoolsbase:dimensionalshard',
'rftoolsbase:dimensionalshard_overworld',
'rftoolsbase:dimensionalshard_nether',
'rftoolsbase:dimensionalshard_end',
'supplementaries:pedestal',
'supplementaries:crank',
'supplementaries:cog_block',
Expand Down
117 changes: 64 additions & 53 deletions kubejs/client_scripts/item_modifiers/jei_hide.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,11 @@ events.listen('jei.hide.items', (event) => {
return;
}
itemsToHide.push(
'emendatusenigmatica:' + material + '_andesite_ore',
'emendatusenigmatica:' + material + '_gabbro_ore',
'emendatusenigmatica:' + material + '_c_limestone_ore',
'emendatusenigmatica:' + material + '_scoria_ore',
'emendatusenigmatica:' + material + '_weathered_limestone_ore',
'emendatusenigmatica:' + material + '_jasper_ore',
'emendatusenigmatica:' + material + '_marble_ore',
'emendatusenigmatica:' + material + '_slate_ore',
'emendatusenigmatica:' + material + '_netherrack_ore',
'emendatusenigmatica:' + material + '_blackstone_ore',
'emendatusenigmatica:' + material + '_end_stone_ore',
'emendatusenigmatica:' + material + '_mossy_stone_ore',
'emendatusenigmatica:' + material + '_granite_ore',
'emendatusenigmatica:' + material + '_diorite_ore',
'emendatusenigmatica:' + material + '_sand_ore',
'emendatusenigmatica:' + material + '_gravel_ore',
'titanium:' + material + '_gear',
'thermal:' + material,
'thermal:' + material + '_dust',
'thermal:' + material + '_gear',
'thermal:' + material + '_ingot',
'thermal:' + material + '_nugget',
'thermal:' + material + '_ore',
'thermal:' + material + '_plate',
'tmechworks:' + material + '_ingot',
'tmechworks:' + material + '_nugget',
'tmechworks:' + material + '_ore',
'pedestals:dust' + material,
'mekanism:' + material + '_gem',
'mekanism:' + material + '_ore',
'mekanism:dust_' + material,
'mekanism:ingot_' + material,
'mekanism:nugget_' + material,
'minecraft:' + material + '_ore',
'immersiveengineering:dust_' + material,
'immersiveengineering:ingot_' + material,
'immersiveengineering:nugget_' + material,
'immersiveengineering:ore_' + material,
'immersiveengineering:plate_' + material,
'immersiveengineering:stick_' + material,
'bloodmagic:' + material + 'fragment',
'bloodmagic:' + material + 'gravel',
'bloodmagic:' + material + 'sand',
'create:' + material + '_sheet',
'create:' + material + '_nugget',
'create:' + material + '_ingot',
'create:' + material + '_ore',
'immersiveposts:stick_' + material,
'buildersaddition:' + material + '_rod',
'occultism:' + material + '_ingot',
'occultism:' + material + '_ore',
'occultism:' + material + '_dust',
'occultism:' + material + '_nugget',
'occultism:' + material + '_block',
'eidolon:' + material + '_ingot',
'eidolon:' + material + '_nugget',
'eidolon:' + material + '_ore'
'occultism:' + material + '_block'
);
});

Expand All @@ -75,4 +23,67 @@ events.listen('jei.hide.items', (event) => {
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+_gem/,
/mekanism:\w+_ore/,
/mekanism:dust_/,
/mekanism:ingot_/,
/mekanism:nugget_/,
/minecraft:\w+_ore/,
/immersiveengineering:dust_/,
/immersiveengineering:ingot_/,
/immersiveengineering:nugget_/,
/immersiveengineering:ore_/,
/immersiveengineering:plate_/,
/immersiveengineering:stick_/,
/bloodmagic:\w+fragment/,
/bloodmagic:\w+gravel/,
/bloodmagic:\w+sand/,
/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);
});
});
2 changes: 1 addition & 1 deletion kubejs/data/tetra/materials/metal/alfsteel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"tints": { "glyph": "f5b540", "texture": "f28a3f" },
"textures": ["shiny", "default"],
"material": { "tag": "forge:ingots/alfsteel", "count": 1 },
"requiredTools": { "hammer": 5 }
"requiredTools": { "hammer": 6 }
}
2 changes: 1 addition & 1 deletion kubejs/data/tetra/materials/metal/compat/manasteel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"textures": ["shiny", "default"],
"material": { "tag": "forge:ingots/manasteel", "count": 1 },
"improvements": { "mana_repair": 3 },
"requiredTools": { "hammer": 2 }
"requiredTools": { "hammer": 3 }
}
2 changes: 1 addition & 1 deletion kubejs/data/tetra/materials/metal/compat/terrasteel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"textures": ["shiny", "default"],
"material": { "tag": "forge:ingots/terrasteel", "count": 1 },
"improvements": { "mana_repair": 1 },
"requiredTools": { "hammer": 3 }
"requiredTools": { "hammer": 5 }
}

0 comments on commit 681a728

Please sign in to comment.