diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 359495c3f..7e93d9ba3 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -1,8 +1,7 @@ // priority: 1 REIEvents.hide('item', event => { - - hideMinecraftStuff(event) + //hideMinecraftStuff(event) /*hideTFCStuff(event) hideFirmaLifeStuff(event) hideGTCEUStuff(event) @@ -21,7 +20,6 @@ REIEvents.groupEntries(event => { }) REIEvents.removeCategories(event => { - registerMinecraftCategories(event) registerGTCEUCategories(event) registerMoreRedCategories(event) }) diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index 094c705e5..7b54d5ec2 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -2,19 +2,8 @@ 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/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index d8d52913a..507e3160b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1065,6 +1065,8 @@ const registerMinecraftRecipes = (event) => { .EUt(2) // Lime + event.remove({id: 'minecraft:lime_dye_from_smelting'}) + event.recipes.gtceu.extractor('lime_dye') .itemInputs('1x tfc:plant/moss') .itemOutputs('2x minecraft:lime_dye') @@ -1103,6 +1105,7 @@ const registerMinecraftRecipes = (event) => { .EUt(2) // Orange + event.remove({id: 'tfc:crafting/vanilla/orange_dye_from_sylvite'}) event.remove({id: 'minecraft:orange_dye_from_torchflower'}) event.remove({id: 'minecraft:orange_dye_from_orange_tulip'}) event.remove({id: 'gtceu:extractor/orange_tulip_dye'}) @@ -1389,7 +1392,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.canner('jack_o_lantern') .itemInputs('tfc:pumpkin') - .itemOutputs('2x minecraft:pink_dye', 'minecraft:glowstone_dust') + .itemOutputs('minecraft:jack_o_lantern') .duration(100) .EUt(4) @@ -1528,7 +1531,7 @@ const registerMinecraftRecipes = (event) => { .duration(50) .EUt(30) - event.recipes.gtceu.large_chemical_reactor('glistening_melon_slice') + event.recipes.gtceu.large_chemical_reactor('glistening_melon_slice') .itemInputs('tfc:food/melon_slice', '6x #forge:nuggets/gold') .itemOutputs('minecraft:glistering_melon_slice') .duration(50) @@ -1672,6 +1675,70 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Трибуна + + event.remove({ id: 'tfc:Crafting/vanilla/lectern' }) + + //#endregion + + //#region Выход: Золотое яблоко + + event.remove({ id: 'minecraft:golden_apple' }) + + event.recipes.gtceu.chemical_reactor('golden_apple') + .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') + .itemOutputs('minecraft:golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.large_chemical_reactor('golden_apple') + .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') + .itemOutputs('minecraft:golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.chemical_reactor('golden_apple_1') + .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') + .itemOutputs('minecraft:golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.large_chemical_reactor('golden_apple_1') + .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') + .itemOutputs('minecraft:golden_apple') + .duration(50) + .EUt(30) + + //#endregion + + //#region Выход: Зачарованное золотое яблоко + + event.recipes.gtceu.chemical_reactor('notch_apple') + .itemInputs('tfc:food/green_apple', '8x minecraft:gold_block') + .itemOutputs('minecraft:enchanted_golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.large_chemical_reactor('notch_apple') + .itemInputs('tfc:food/green_apple', '8x minecraft:gold_block') + .itemOutputs('minecraft:enchanted_golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.chemical_reactor('notch_apple_1') + .itemInputs('tfc:food/red_apple', '8x minecraft:gold_block') + .itemOutputs('minecraft:enchanted_golden_apple') + .duration(50) + .EUt(30) + + event.recipes.gtceu.large_chemical_reactor('notch_apple_1') + .itemInputs('tfc:food/red_apple', '8x minecraft:gold_block') + .itemOutputs('minecraft:enchanted_golden_apple') + .duration(50) + .EUt(30) + + //#endregion + //#region Шаблоны брони event.remove({id: 'minecraft:wild_armor_trim_smithing_template_smithing_trim'}) @@ -1863,9 +1930,7 @@ const registerMinecraftRecipes = (event) => { //#endregion - - - + diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 06f760506..ebe46c29d 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -676,6 +676,27 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:end_rod', 'minecraft:brush', 'minecraft:bookshelf', + '/spawn_egg/', + 'minecraft:enchanted_book', + 'minecraft:repeating_command_block', + 'minecraft:command_block', + 'minecraft:azalea', + 'minecraft:light', + 'minecraft:azalea', + 'minecraft:flowering_azalea', + 'minecraft:azalea_leaves', + 'minecraft:flowering_azalea_leaves', + 'minecraft:dirt_path', + 'minecraft:mushroom_stem', + 'minecraft:brown_mushroom_block', + 'minecraft:red_mushroom_block', + 'minecraft:dragon_egg', + 'minecraft:end_portal_frame', + 'minecraft:mushroom_stew', + 'minecraft:structure_void', + 'minecraft:lectern', + 'minecraft:sea_pickle', + 'minecraft:apple' ]; global.VANILLA_WOOD_TYPES = [