From ca7b677b548851b5c5ebb01a434e408d52228555 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 15 Jul 2023 10:35:18 -0400 Subject: [PATCH] cleanup --- .../constants/jei_hidden_disabled.js | 14 ++++++ .../expert/recipes/enigmatica/blasting.js | 3 ++ .../expert/recipes/enigmatica/remove.js | 44 ++++++++++--------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index 5e08c590c..5826f7c23 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -283,6 +283,7 @@ jei.expert.items.disabled = [ 'create:electron_tube', 'create:mechanical_crafter', 'create:experience_nugget', + 'create:andesite_alloy_block', 'createaddition:alternator', 'createaddition:modular_accumulator', @@ -290,6 +291,16 @@ jei.expert.items.disabled = [ 'createaddition:portable_energy_interface', 'createaddition:digital_adapter', + 'emendatusenigmatica:refined_glowstone_nugget', + 'emendatusenigmatica:refined_glowstone_ingot', + 'emendatusenigmatica:refined_glowstone_block', + 'emendatusenigmatica:refined_obsidian_dust', + 'emendatusenigmatica:refined_obsidian_nugget', + 'emendatusenigmatica:refined_obsidian_ingot', + 'emendatusenigmatica:refined_obsidian_block', + 'emendatusenigmatica:andesite_block', + 'emendatusenigmatica:andesite_ingot', + 'immersiveengineering:capacitor_hv', 'immersiveengineering:capacitor_lv', 'immersiveengineering:capacitor_mv', @@ -387,6 +398,9 @@ jei.expert.items.disabled = [ /mekanism:.*_control_circuit/, /mekanism:hazmat/, /mekanism:scuba/, + 'mekanism:pellet_plutonium', + 'mekanism:alloy_atomic', + 'mekanism:alloy_infused', 'mekanism:upgrade_stone_generator', 'mekanism:upgrade_filter', 'mekanism:logistical_sorter', diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js b/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js index 9e9ad7f55..46f129141 100644 --- a/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js +++ b/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js @@ -84,6 +84,9 @@ ServerEvents.recipes((event) => { const metals = Object.keys(metal_properties); metals.forEach((metal) => { + if (metal == 'refined_obsidian') { + return; + } let preferredIngot = AlmostUnified.getPreferredItemForTag(`forge:ingots/${metal}`).getId(); if (Item.exists(`emendatusenigmatica:${metal}_dust`) && !preferredIngot.includes('graphite')) { recipes.push({ diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js index 9b8fb54a4..9b3b66608 100644 --- a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js @@ -57,7 +57,7 @@ ServerEvents.recipes((event) => { { id: 'ae2:network/blocks/energy_dense_energy_cell' }, { id: 'ae2:network/blocks/quantum_link' }, { id: 'ae2:network/blocks/controller' }, - { id: `ae2:network/crafting/cpu_crafting_unit` }, + { id: 'ae2:network/crafting/cpu_crafting_unit' }, { id: 'ae2:network/parts/quartz_fiber_part' }, { id: 'ae2:network/wireless_terminal' }, { id: 'ae2:network/upgrade_wireless_crafting_terminal' }, @@ -89,6 +89,7 @@ ServerEvents.recipes((event) => { { id: /create:pressing\/.*_ingot/ }, { id: /create:brass_(ladder|scaffolding|bars)_from_ingots_brass_stonecutting/ }, { id: /create:copycat_.*_from_ingots_zinc_stonecutting/ }, + { id: /create:.*andesite_alloy/ }, { id: 'create:crafting/kinetics/white_sail' }, { id: 'create:crafting/kinetics/empty_blaze_burner' }, { id: 'create:crafting/kinetics/mechanical_crafter' }, @@ -99,8 +100,8 @@ ServerEvents.recipes((event) => { { id: 'create:mixing/andesite_alloy' }, { id: 'create:mechanical_crafting/wand_of_symmetry' }, { id: 'create:mechanical_crafting/extendo_grip' }, - { id: `create:mechanical_crafting/crushing_wheel` }, - { id: `create:mechanical_crafting/potato_cannon` }, + { id: 'create:mechanical_crafting/crushing_wheel' }, + { id: 'create:mechanical_crafting/potato_cannon' }, { id: 'create:item_application/brass_casing_from_wood' }, { id: 'create:item_application/brass_casing_from_log' }, { id: 'create:conversion_0' }, @@ -126,8 +127,9 @@ ServerEvents.recipes((event) => { { id: /emendatusenigmatica:rod\/from_ingot/ }, { id: /emendatusenigmatica:gear\/from_ingot/ }, { id: /emendatusenigmatica:dust\/from_gem/ }, + { id: /emendatusenigmatica:.*andesite/ }, - { id: `enigmaticunity:dim_source_producer` }, + { id: 'enigmaticunity:dim_source_producer' }, { id: 'farmersdelight:integration/immersiveengineering/metalpress/pumpkin' }, @@ -143,7 +145,7 @@ ServerEvents.recipes((event) => { { id: 'hexerei:blood_sigil_from_mixing_cauldron' }, { id: 'hexerei:herb_jar_from_mixing_cauldron' }, { id: 'hexerei:mixing_cauldron' }, - { id: `hexerei:moon_dust_from_mixing_cauldron` }, + { id: 'hexerei:moon_dust_from_mixing_cauldron' }, { id: /empty_shell/, mod: 'immersiveengineering' }, { id: /empty_casing/, mod: 'immersiveengineering' }, @@ -172,7 +174,7 @@ ServerEvents.recipes((event) => { { id: 'immersiveengineering:crafting/current_transformer' }, { id: 'immersiveengineering:crafting/redstone_breaker' }, { id: 'immersiveengineering:crafting/breaker_switch' }, - { id: `immersiveengineering:crafting/cloche` }, + { id: 'immersiveengineering:crafting/cloche' }, { id: 'immersiveengineering:blueprint/electron_tube' }, { id: 'immersiveengineering:blueprint/component_electronic' }, { id: 'immersiveengineering:blueprint/light_bulb' }, @@ -204,7 +206,7 @@ ServerEvents.recipes((event) => { { id: 'industrialforegoing:dissolution_chamber/mechanical_dirt' }, { id: 'industrialforegoing:dissolution_chamber/pink_slime_ingot' }, { id: 'industrialforegoing:crusher/sand_silicon' }, - { id: `industrialforegoing:laser_drill_fluid/ether_gas` }, + { id: 'industrialforegoing:laser_drill_fluid/ether_gas' }, { id: 'industrialforegoing:machine_frame_pity' }, { id: 'industrialforegoing:plastic' }, { id: 'industrialforegoing:washing_factory' }, @@ -212,7 +214,7 @@ ServerEvents.recipes((event) => { { id: 'industrialforegoing:fluid_sieving_machine' }, { id: 'industrialforegoing:ore_laser_base' }, { id: 'industrialforegoing:fluid_laser_base' }, - { id: `industrialforegoing:dryrubber` }, + { id: 'industrialforegoing:dryrubber' }, { id: 'industrialforegoing:latex_processing_unit' }, { id: 'industrialforegoing:mob_duplicator' }, { id: 'industrialforegoing:bioreactor' }, @@ -252,6 +254,8 @@ ServerEvents.recipes((event) => { { id: /mekanism:thermal_evaporation/ }, { id: /mekanism:control_circuit/ }, { id: /mekanism:upgrade\// }, + { id: /refined_obsidian/ }, + { id: /refined_glowstone/ }, { id: 'mekanism:crushing/charcoal_dust' }, { id: 'mekanism:enriching/hdpe_sheet' }, { id: 'mekanism:compat/ae2/fluix_crystal_to_dust' }, @@ -443,10 +447,10 @@ ServerEvents.recipes((event) => { { id: 'powah:crafting/energizing_rod_basic' }, { id: 'powah:energizing/ender_core' }, { id: 'powah:energizing/blazing_crystal' }, - { id: `powah:energizing/spirited_crystal` }, - { id: `powah:energizing/niotic_crystal` }, - { id: `powah:energizing/energized_steel` }, - { id: `powah:energizing/nitro_crystal` }, + { id: 'powah:energizing/spirited_crystal' }, + { id: 'powah:energizing/niotic_crystal' }, + { id: 'powah:energizing/energized_steel' }, + { id: 'powah:energizing/nitro_crystal' }, { id: /powah:crafting\/(thermo_generator|solar_panel|furnator|magmator|reactor|energy|cable|battery|ender)/ @@ -482,14 +486,14 @@ ServerEvents.recipes((event) => { { id: 'sophisticatedstorage:gold_to_diamond_tier_upgrade' }, { id: 'sophisticatedstorage:stack_upgrade_tier_4' }, - { id: `spirit:soul_engulfing/soul_powder` }, - { id: `spirit:soul_engulfing/soul_powder_block` }, - { id: `spirit:soul_engulfing/soul_slate` }, - { id: `spirit:soul_engulfing/soul_steel` }, - { id: `spirit:soul_engulfing/soul_steel_block` }, - { id: `spirit:soul_engulfing/crude_soul_crystal` }, - { id: `spirit:soul_engulfing/soul_crystal_shard` }, - { id: `spirit:soul_engulfing/soul_crystal` }, + { id: 'spirit:soul_engulfing/soul_powder' }, + { id: 'spirit:soul_engulfing/soul_powder_block' }, + { id: 'spirit:soul_engulfing/soul_slate' }, + { id: 'spirit:soul_engulfing/soul_steel' }, + { id: 'spirit:soul_engulfing/soul_steel_block' }, + { id: 'spirit:soul_engulfing/crude_soul_crystal' }, + { id: 'spirit:soul_engulfing/soul_crystal_shard' }, + { id: 'spirit:soul_engulfing/soul_crystal' }, { id: 'starbunclemania:fluid_jar' }, { id: 'starbunclemania:fluid_sourcelink' },