diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 872c69ba7..359495c3f 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -1,9 +1,9 @@ // priority: 1 REIEvents.hide('item', event => { - /* + hideMinecraftStuff(event) - hideTFCStuff(event) + /*hideTFCStuff(event) hideFirmaLifeStuff(event) hideGTCEUStuff(event) hideCreateStuff(event) @@ -17,6 +17,7 @@ REIEvents.hide('item', event => { REIEvents.groupEntries(event => { /*groupGTCEUStuff(event) groupTFCStuff(event)*/ + groupMinecraftStuff(event) }) REIEvents.removeCategories(event => { diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index 425dbb9c3..bcad23a6d 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -2,8 +2,19 @@ const hideMinecraftStuff = (event) => { global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.hide(item) + //event.hide(item) }) + + //event.hide(/spawn_egg/) + //event.hide('minecraft:light') + //event.hide('minecraft:repeating_command_block') + //event.hide('minecraft:command_block') + //event.hide('minecraft:structure_void') + // event.hide('minecraft:barrier') +} + +const groupMinecraftStuff = (event) => { + } const registerMinecraftCategories = (event) => { diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index b0ad71cc2..de8b5ddc6 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -511,6 +511,19 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Выход: Бумажная пыль + + event.remove({ id: 'gtceu:shaped/paper_dust' }) + + //#endregion + + //#region Выход: Метан + + event.remove({ id: 'gtceu:centrifuge/red_mushroom_separation' }) + event.remove({ id: 'gtceu:centrifuge/brown_mushroom_separation' }) + + //#endregion + // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 740ca8131..047ea368d 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1206,13 +1206,74 @@ const registerMinecraftRecipes = (event) => { //#endregion - + //#region Выход: Бумага + event.remove({ id: 'gtceu:shaped/paper' }) + event.remove({ id: 'gtceu:chemical_bath/paper_from_sugar_cane' }) + event.remove({ id: 'gtceu:chemical_bath/paper_from_sugar_cane_distilled' }) + event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') + .itemInputs('tfc:papyrus') + .inputFluids(Fluid.of('gtceu:distilled_water', 100)) + .itemOutputs('minecraft:paper') + .duration(100) + .EUt(7) + event.recipes.gtceu.chemical_bath('paper_from_papyrus') + .itemInputs('tfc:papyrus') + .inputFluids(Fluid.of('minecraft:water', 100)) + .itemOutputs('minecraft:paper') + .duration(100) + .EUt(7) + //#endregion + //#region Выход: Сахар + + event.remove({ id: 'gtceu:shaped/sugar' }) + event.remove({ id: 'minecraft:sugar_from_honey_bottle' }) + event.remove({ id: 'gtceu:macerator/macerate_sugar_cane' }) + + event.recipes.gtceu.centrifuge('sugar') + .itemInputs('tfc:food/sugarcane') + .inputFluids(Fluid.of('minecraft:water', 600)) + .itemOutputs('minecraft:sugar') + .duration(800) + .EUt(6) + + //#endregion + + //#region Выход: Ферментированный паучий глаз + + event.remove({ id: 'minecraft:fermented_spider_eye' }) + event.remove({ id: 'gtceu:mixer/fermented_spider_eye_red' }) + event.remove({ id: 'gtceu:mixer/fermented_spider_eye_brown' }) + event.remove({ id: 'gtceu:create_mixer/fermented_spider_eye_red' }) + event.remove({ id: 'gtceu:create_mixer/fermented_spider_eye_brown' }) + + //#endregion + + //#region Выход: Семена тыквы + + event.remove({ id: 'minecraft:pumpkin_seeds' }) + event.remove({ id: 'gtceu:macerator/macerate_pumpkin' }) + + //#endregion + + //#region Выход: Семена арбуза + + event.remove({ id: 'gtceu:macerator/macerate_melon_slice' }) + event.remove({ id: 'gtceu:macerator/macerate_melon_block' }) + + //#endregion + + /* + event.recipes.gtceu.canner('jack_o_lantern') + .itemInputs('tfc:pumpkin') + .itemOutputs('2x minecraft:pink_dye', 'minecraft:glowstone_dust') + .duration(100) + .EUt(4)*/ //#region Выход: @@ -1561,15 +1622,6 @@ const registerMinecraftRecipes = (event) => { 'tfc:firestarter' ]) - // Стекло - event.recipes.gtceu.arc_furnace('glass_from_sand') - .itemInputs('#forge:sand') - .itemOutputs('2x minecraft:glass') - .duration(20) - .EUt(30) - - - // TripWire Hook event.shapeless('minecraft:tripwire_hook', [ '#forge:rods/wood', @@ -1636,19 +1688,7 @@ const registerMinecraftRecipes = (event) => { event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane_distilled'}) event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane'}) - event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') - .itemInputs('tfc:papyrus') - .inputFluids(Fluid.of('gtceu:distilled_water', 100)) - .itemOutputs('minecraft:paper') - .duration(100) - .EUt(7) - - event.recipes.gtceu.chemical_bath('paper_from_papyrus') - .itemInputs('tfc:papyrus') - .inputFluids(Fluid.of('minecraft:water', 100)) - .itemOutputs('minecraft:paper') - .duration(100) - .EUt(7) + @@ -1826,16 +1866,6 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Фикс рецептов тыквы - - event.remove({ id: 'gtceu:macerator/macerate_pumpkin' }) - - event.recipes.gtceu.canner('jack_o_lantern') - .itemInputs('tfc:pumpkin') - .itemOutputs('2x minecraft:pink_dye', 'minecraft:glowstone_dust') - .duration(100) - .EUt(4) - - //#endregion + */ } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 6cd7dd2c4..30813cf92 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -412,6 +412,19 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:sculk_catalyst', 'minecraft:sculk_shrieker', 'minecraft:dead_bush', + 'minecraft:sugar_cane', + 'minecraft:red_mushroom', + 'minecraft:brown_mushroom', + 'minecraft:kelp', + 'minecraft:dried_kelp_block', + 'minecraft:dried_kelp', + 'minecraft:pink_petals', + 'minecraft:wheat_seeds', + 'minecraft:pumpkin_seeds', + 'minecraft:melon_seeds', + 'minecraft:wheat_seeds', + 'minecraft:torchflower_seeds', + 'minecraft:beetroot_seeds', /* // Other