From 0146c4ddab5a7f8149ccc8ec63711c205f410de7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 13 Jan 2024 09:52:13 +0700 Subject: [PATCH] support jei and rei --- kubejs/client_scripts/main_client_script.js | 73 ++++++++++++++------- kubejs/server_scripts/gregtech/recipes.js | 2 - 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 7dad3c070..e7305904d 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -1,6 +1,40 @@ // priority: 1 -JEIEvents.hideItems(event => { +if (Platform.isLoaded('jei')) { + + JEIEvents.hideItems(event => { + hideItems(event) + }) + + JEIEvents.hideFluids(event => { + hideFluids(event) + }) + + JEIEvents.removeCategories(event => { + removeCategories(event) // Не работает с EMI + JEI + }) + +} else if (Platform.isLoaded('rei')) { + + REIEvents.hide('items', event => { + hideItems(event) + }) + + REIEvents.hide('fluids', event => { + hideFluids(event) + }) + + REIEvents.removeCategories(event => { + removeCategories(event) + }) + + REIEvents.groupEntries(event => { + groupItems(event) + }) + +} + +const hideItems = (event) => { hideMinecraftStuff(event) hideTFCStuff(event) hideFirmaLifeStuff(event) @@ -14,32 +48,23 @@ JEIEvents.hideItems(event => { hideCreateAdditionsStuff(event) hideChiselAndBitsStuff(event) hideFTBQuestsStuff(event) -}) +} -// REIEvents.groupEntries(event => { -// groupGTCEUStuff(event) -// groupTFCStuff(event) -// }) - -JEIEvents.removeCategories(event => { - // НЕ РАБОТАЕТ СУКА, РАЗРАБ НАСРАЛ! - - // registerMinecraftCategories(event) - // registerGTCEUCategories(event) - // registerMoreRedCategories(event) - // 'jumbofurnace:jumbo_furnace_upgrade, - // event.remove('minecraft:campfire_cooking') - // event.remove('jumbofurnace:jumbo_smelting') - - // console.log(event.getCategoryIds()) - - // event.getCategoryIds() -}) - -JEIEvents.hideFluids(event => { +const hideFluids = (event) => { hideTFCFluids(event) hideFirmaLifeFluids(event) hideCreateFluids(event) hideCreateAdditionsFluids(event) -}) \ No newline at end of file +} + +const removeCategories = (event) => { + registerMinecraftCategories(event) + registerGTCEUCategories(event) + registerMoreRedCategories(event) +} + +const groupItems = (event) => { + groupGTCEUStuff(event) + groupTFCStuff(event) +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 6cd6626b1..6b7b90df5 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,7 +1,5 @@ // priority: 0 - - const registerGTCEURecipes = (event) => { //#region Выход: Удобрение