diff --git a/kubejs/assets/emi/index/stacks/items.json b/kubejs/assets/emi/index/stacks/items.json index 13b131138..c9288b43b 100644 --- a/kubejs/assets/emi/index/stacks/items.json +++ b/kubejs/assets/emi/index/stacks/items.json @@ -1,6 +1,8 @@ { "filters": [ "/tfc:ore/[^*]+/[^*]+/", - "/firmalife:ore/[^*]+/[^*]+/" + "/firmalife:ore/[^*]+/[^*]+/", + "ae2:facade", + "chiselandbits:block_bit" ] } \ No newline at end of file diff --git a/kubejs/client_scripts/example.js b/kubejs/client_scripts/example.js new file mode 100644 index 000000000..c283f7462 --- /dev/null +++ b/kubejs/client_scripts/example.js @@ -0,0 +1,3 @@ +// priority: 1 + +console.log('TerraFirmaGreg the best modpack in the world :)') \ No newline at end of file diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js deleted file mode 100644 index f54c2948f..000000000 --- a/kubejs/client_scripts/main_client_script.js +++ /dev/null @@ -1,63 +0,0 @@ -// priority: 1 - -/* -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 => {}) -} - -const hideItems = (event) => { - hideMinecraftStuff(event) - hideTFCStuff(event) - hideFirmaLifeStuff(event) - hideFirmaCivStuff(event) - hideGTCEUStuff(event) - hideCreateStuff(event) - hideAE2Stuff(event) - hideSophisticatedBackpacksStuff(event) - hideMoreRedStuff(event) - hideRailWaysStuff(event) - hideCreateAdditionsStuff(event) - // hideChiselAndBitsStuff(event) - hideFTBQuestsStuff(event) -} - -const hideFluids = (event) => { - hideTFCFluids(event) - hideFirmaLifeFluids(event) - - hideCreateFluids(event) - hideCreateAdditionsFluids(event) -} - -const removeCategories = (event) => { - registerMinecraftCategories(event) - registerGTCEUCategories(event) - registerMoreRedCategories(event) -}*/ \ No newline at end of file diff --git a/kubejs/client_scripts/mods/create.js b/kubejs/client_scripts/mods/create.js deleted file mode 100644 index 5f7fa8d98..000000000 --- a/kubejs/client_scripts/mods/create.js +++ /dev/null @@ -1,12 +0,0 @@ -// priority: 0 - -const hideCreateStuff = (event) => { - global.CREATE_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const hideCreateFluids = (event) => { - event.hide('create:chocolate') - event.hide('create:honey') -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/create_additions.js b/kubejs/client_scripts/mods/create_additions.js deleted file mode 100644 index f09c56a26..000000000 --- a/kubejs/client_scripts/mods/create_additions.js +++ /dev/null @@ -1,12 +0,0 @@ -// priority: 0 - -const hideCreateAdditionsStuff = (event) => { - global.CREATE_ADDITIONS_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const hideCreateAdditionsFluids = (event) => { - event.hide('createaddition:seed_oil') - event.hide('createaddition:bioethanol') -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/firmaciv.js b/kubejs/client_scripts/mods/firmaciv.js deleted file mode 100644 index 7dac5d6be..000000000 --- a/kubejs/client_scripts/mods/firmaciv.js +++ /dev/null @@ -1,8 +0,0 @@ -// priority: 0 - -const hideFirmaCivStuff = (event) => { - global.FIRMACIV_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - diff --git a/kubejs/client_scripts/mods/firmalife.js b/kubejs/client_scripts/mods/firmalife.js deleted file mode 100644 index 169a6be49..000000000 --- a/kubejs/client_scripts/mods/firmalife.js +++ /dev/null @@ -1,24 +0,0 @@ -// priority: 0 - -const hideFirmaLifeStuff = (event) => { - global.TFC_STONE_TYPES.forEach(stoneTypeName => { - global.TFC_ORE_TYPES.forEach(oreTypeName => { - global.FIRMALIFE_ORE_MATERIALS.forEach(oreMaterialName => { - event.hide(`firmalife:ore/${oreTypeName}_${oreMaterialName}/${stoneTypeName}`) - }) - }) - }) - - global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) - - global.FIRMALIFE_HIDED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const hideFirmaLifeFluids = (event) => { - event.hide('firmalife:metal/chromium') - event.hide('firmalife:metal/stainless_steel') -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/ftb_quests.js b/kubejs/client_scripts/mods/ftb_quests.js deleted file mode 100644 index fe6e4010c..000000000 --- a/kubejs/client_scripts/mods/ftb_quests.js +++ /dev/null @@ -1,7 +0,0 @@ -// priority: 0 - -const hideFTBQuestsStuff = (event) => { - global.FTB_QUESTS_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/gtceu.js b/kubejs/client_scripts/mods/gtceu.js deleted file mode 100644 index 96e4e1d7d..000000000 --- a/kubejs/client_scripts/mods/gtceu.js +++ /dev/null @@ -1,11 +0,0 @@ -// priority: 0 - -const hideGTCEUStuff = (event) => { - global.GTCEU_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const registerGTCEUCategories = (event) => { - event.remove('gtceu:primitive_blast_furnace') -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js deleted file mode 100644 index deba6d1b0..000000000 --- a/kubejs/client_scripts/mods/minecraft.js +++ /dev/null @@ -1,21 +0,0 @@ -// priority: 0 - -const hideMinecraftStuff = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const registerMinecraftCategories = (event) => { - event.remove('minecraft:plugins/campfire') - event.remove('minecraft:plugins/blasting') - event.remove('minecraft:plugins/smoking') - event.remove('minecraft:plugins/brewing') - event.remove('minecraft:plugins/composting') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/stripping') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/pathing') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/waxing') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/wax_scraping') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/oxidizing') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/oxidation_scraping') // TODO: Сделать с вариантами TFC -} diff --git a/kubejs/client_scripts/mods/more_red.js b/kubejs/client_scripts/mods/more_red.js deleted file mode 100644 index 996917e6b..000000000 --- a/kubejs/client_scripts/mods/more_red.js +++ /dev/null @@ -1,12 +0,0 @@ -// priority: 0 - -const hideMoreRedStuff = (event) => { - global.MORE_RED_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const registerMoreRedCategories = (event) => { - event.remove('jumbofurnace:jumbo_smelting') - event.remove('jumbofurnace:jumbo_furnace_upgrade') -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/railways.js b/kubejs/client_scripts/mods/railways.js deleted file mode 100644 index cee5d3c3d..000000000 --- a/kubejs/client_scripts/mods/railways.js +++ /dev/null @@ -1,7 +0,0 @@ -// priority: 0 - -const hideRailWaysStuff = (event) => { - global.RAIL_WAYS_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/sophisticated_backpacks.js b/kubejs/client_scripts/mods/sophisticated_backpacks.js deleted file mode 100644 index 60c04791d..000000000 --- a/kubejs/client_scripts/mods/sophisticated_backpacks.js +++ /dev/null @@ -1,7 +0,0 @@ -// priority: 0 - -const hideSophisticatedBackpacksStuff = (event) => { - global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/tfc.js b/kubejs/client_scripts/mods/tfc.js deleted file mode 100644 index 7918034c1..000000000 --- a/kubejs/client_scripts/mods/tfc.js +++ /dev/null @@ -1,51 +0,0 @@ -// priority: 0 - -const hideTFCStuff = (event) => { - // Hide unused TFC ores - global.TFC_STONE_TYPES.forEach(stoneTypeName => { - global.TFC_SIMPLE_MATERIALS.forEach(material => { - event.hide(`tfc:ore/${material}/${stoneTypeName}`) - }) - - global.TFC_ORE_TYPES.forEach(oreTypeName => { - global.TFC_ORE_MATERIALS.forEach(oreMaterialName => { - event.hide(`tfc:ore/${oreTypeName}_${oreMaterialName}/${stoneTypeName}`) - }) - }) - }) - - global.TFC_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} - -const hideTFCFluids = (event) => { - event.hide('tfc:metal/bismuth') - event.hide('tfc:metal/bismuth_bronze') - event.hide('tfc:metal/bronze') - event.hide('tfc:metal/black_bronze') - event.hide('tfc:metal/brass') - event.hide('tfc:metal/copper') - event.hide('tfc:metal/gold') - event.hide('tfc:metal/nickel') - event.hide('tfc:metal/rose_gold') - event.hide('tfc:metal/silver') - event.hide('tfc:metal/tin') - event.hide('tfc:metal/zinc') - event.hide('tfc:metal/sterling_silver') - event.hide('tfc:metal/wrought_iron') - event.hide('tfc:metal/steel') - event.hide('tfc:metal/black_steel') - event.hide('tfc:metal/red_steel') - event.hide('tfc:metal/blue_steel') - event.hide('tfc:metal/cast_iron') - event.hide('tfc:metal/pig_iron') - event.hide('tfc:metal/high_carbon_steel') - event.hide('tfc:metal/high_carbon_black_steel') - event.hide('tfc:metal/high_carbon_red_steel') - event.hide('tfc:metal/high_carbon_blue_steel') - event.hide('tfc:metal/weak_steel') - event.hide('tfc:metal/weak_red_steel') - event.hide('tfc:metal/weak_blue_steel') - event.hide('tfc:metal/unknown') -} \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index de053d208..719cf7567 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -6,8 +6,6 @@ const registerAE2ItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - - event.add('c:hidden_from_recipe_viewers', 'ae2:facade') } const registerAE2BlockTags = (event) => { diff --git a/kubejs/server_scripts/chisel_and_bits/tags.js b/kubejs/server_scripts/chisel_and_bits/tags.js index 65e1ae733..5d8eb69dc 100644 --- a/kubejs/server_scripts/chisel_and_bits/tags.js +++ b/kubejs/server_scripts/chisel_and_bits/tags.js @@ -6,8 +6,6 @@ const registerChiselAndBitsItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - - // event.add('c:hidden_from_recipe_viewers', 'ae2:facade') // hide bits } const registerChiselAndBitsBlockTags = (event) => { diff --git a/kubejs/server_scripts/computer_craft/tags.js b/kubejs/server_scripts/computer_craft/tags.js index 6aa24c4ef..fac76d256 100644 --- a/kubejs/server_scripts/computer_craft/tags.js +++ b/kubejs/server_scripts/computer_craft/tags.js @@ -1,5 +1,9 @@ // priority: 0 +const registerComputerCraftItemTags = (event) => { + // Nothing here for now :) +} + const registerComputerCraftBlockTags = (event) => { event.add('computercraft:turtle_hoe_harvestable', '#tfc:mineable_with_sharp_tool') } \ No newline at end of file diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index ebd8a22cb..343015087 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -5,8 +5,10 @@ const registerCreateItemTags = (event) => { // Удаление тегов у отключенных предметов global.CREATE_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) }) + // Тэги для ручек и сидушек global.MINECRAFT_DYE_NAMES.forEach(dye => { event.add('tfg:colored_valve_handles', `create:${dye}_valve_handle`) @@ -14,7 +16,26 @@ const registerCreateItemTags = (event) => { }) } +const registerCreateBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.CREATE_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) + + // Тэги для ручек и сидушек + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.add('tfg:colored_valve_handles', `create:${dye}_valve_handle`) + + if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) + }) +} + + const registerCreateFluidTags = (event) => { event.add('create:bottomless/allow', 'tfc:fresh_water') event.add('create:bottomless/allow', 'tfc:salt_water') + + //event.hide('create:chocolate') + //event.hide('create:honey') } \ No newline at end of file diff --git a/kubejs/server_scripts/create_additions/tags.js b/kubejs/server_scripts/create_additions/tags.js index 504bac330..a2487bc41 100644 --- a/kubejs/server_scripts/create_additions/tags.js +++ b/kubejs/server_scripts/create_additions/tags.js @@ -5,5 +5,19 @@ const registerCreateAdditionsItemTags = (event) => { // Удаление тегов у отключенных предметов global.CREATE_ADDITIONS_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) + + event.add('c:hidden_from_recipe_viewers', item) }) } + +const registerCreateAdditionsBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.CREATE_ADDITIONS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} + + +//event.hide('createaddition:seed_oil') +//event.hide('createaddition:bioethanol') \ No newline at end of file diff --git a/kubejs/server_scripts/firmaciv/tags.js b/kubejs/server_scripts/firmaciv/tags.js new file mode 100644 index 000000000..b50cccc3d --- /dev/null +++ b/kubejs/server_scripts/firmaciv/tags.js @@ -0,0 +1,18 @@ +// priority: 0 + +const registerFirmaCivItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FIRMACIV_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerFirmaCivBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FIRMACIV_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 1658e1c68..fd26cab16 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -1,19 +1,24 @@ // priority: 0 const registerFirmaLifeItemTags = (event) => { - removeAllTagsFromDisabledItemsFirmaLife(event) + + // Удаление тегов у отключенных предметов + global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + + // Просто предметы для скрытия + global.FIRMALIFE_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) + + // Удаление тегов у руд + event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } const registerFirmaLifeBlockTags = (event) => { - removeAllTagsFromDisabledItemsFirmaLife(event) -} - -const registerFirmaLifePlacedFeatures = (event) => { - event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') - event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') -} - -const removeAllTagsFromDisabledItemsFirmaLife = (event) => { + // Удаление тегов у отключенных предметов global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) @@ -22,3 +27,11 @@ const removeAllTagsFromDisabledItemsFirmaLife = (event) => { // Удаление тегов у руд event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } + +const registerFirmaLifePlacedFeatures = (event) => { + event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') + event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') +} + +// event.hide('firmalife:metal/chromium') +// event.hide('firmalife:metal/stainless_steel') \ No newline at end of file diff --git a/kubejs/server_scripts/ftb_quests/tags.js b/kubejs/server_scripts/ftb_quests/tags.js index c8d1e108b..0cd39557c 100644 --- a/kubejs/server_scripts/ftb_quests/tags.js +++ b/kubejs/server_scripts/ftb_quests/tags.js @@ -2,6 +2,15 @@ const registerFTBQuestsItemTags = (event) => { + // Удаление тегов у отключенных предметов + global.FTB_QUESTS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerFTBQuestsBlockTags = (event) => { + // Удаление тегов у отключенных предметов global.FTB_QUESTS_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 6f2e5c385..5df2de65c 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -5,6 +5,7 @@ const registerGTCEUItemTags = (event) => { // Удаление тегов у отключенных предметов global.GTCEU_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) }) // Добавление тега EMI для скрытия всех руд @@ -35,7 +36,12 @@ const registerGTCEUItemTags = (event) => { event.add('tfg:stone_dusts', 'gtceu:stone_dust') //#endregion - - event.add('forge:storage_blocks/treated_wood', 'gtceu:treated_wood_planks') - +} + +const registerGTCEUBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.GTCEU_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) } diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 6f46c7e38..45c59b48f 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -7,36 +7,40 @@ const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelp * Событие регистрации предмет-тэгов. */ ServerEvents.tags('item', event => { - registerTFCItemTags(event) - registerFirmaLifeItemTags(event) - - registerMinecraftItemTags(event) - - registerGTCEUItemTags(event) - registerAE2ItemTags(event) - + registerChiselAndBitsItemTags(event) + registerComputerCraftItemTags(event) registerCreateItemTags(event) registerCreateAdditionsItemTags(event) - registerRailWaysItemTags(event) - - registerMoreRedItemTags(event) - - registerSophisticatedBackpacksItemTags(event) - - registerChiselAndBitsItemTags(event) + registerFirmaCivItemTags(event) + registerFirmaLifeItemTags(event) registerFTBQuestsItemTags(event) + registerGTCEUItemTags(event) + registerMinecraftItemTags(event) // + registerMoreRedItemTags(event) + registerRailWaysItemTags(event) + registerSophisticatedBackpacksItemTags(event) + registerTFCItemTags(event) }) /** * Событие регистрации блок-тэгов. */ ServerEvents.tags('block', event => { - registerTFCBlockTags(event) - registerFirmaLifeBlockTags(event) - + registerAE2BlockTags(event) registerChiselAndBitsBlockTags(event) registerComputerCraftBlockTags(event) + registerCreateBlockTags(event) + registerCreateAdditionsBlockTags(event) + registerFirmaCivBlockTags(event) + registerFirmaLifeBlockTags(event) + registerFTBQuestsBlockTags(event) + registerGTCEUBlockTags(event) + registerMinecraftBlockTags(event) + registerMoreRedBlockTags(event) + registerRailWaysBlockTags(event) + registerSophisticatedBackpacksBlockTags(event) + registerTFCBlockTags(event) }) /** @@ -48,7 +52,7 @@ ServerEvents.tags('fluid', event => { }) /** - * Событие регистрации генератора структур. + * Событие регистрации тегов структур. */ ServerEvents.tags('worldgen/placed_feature', event => { registerTFCPlacedFeatures(event) @@ -56,16 +60,16 @@ ServerEvents.tags('worldgen/placed_feature', event => { }) /** - * Здесь регистрируются файлы датапаков общие. - * Срабатывает до инициализации рецептов. + * Событие регистрации датапаков (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). + * Срабатывает до инициализации рецептов, но после тегов. */ ServerEvents.highPriorityData(event => { registerComputerCraftData(event) }) /** - * Здесь регистрируются файлы датапаков TFC. - * Срабатывает до инициализации рецептов. + * Событие регистрации датапаков для TFC (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). + * Срабатывает до инициализации рецептов, но после тегов. */ TFCEvents.data(event => { registerTFCDataForTFC(event) @@ -75,11 +79,28 @@ TFCEvents.data(event => { registerTFCDataForGTCEU(event) }) +/** + * Событие регистрации лут-тейблов. + * Срабатывает до инициализации рецептов, но после датапаков и тегов. + */ +LootJS.modifiers((event) => { + registerGTCEULoots(event) +}); + +/** + * Событие регистрации рудных жил. + * Не представляю когда срабатывает, но явно после тегов и датапаков. + */ +GTCEuServerEvents.oreVeins(event => { + event.removeAll() +}) + /** * Событие регистрации рецептов. - * Срабатывает после инициализации датапаков. + * Срабатывает после инициализации датапаков и тегов. */ ServerEvents.recipes(event => { + /* registerTFCRecipes(event) registerFirmaLifeRecipes(event) registerFirmaCivRecipes(event) @@ -109,19 +130,5 @@ ServerEvents.recipes(event => { registerFTBQuestsRecipes(event) - // registerChiselAndBitsRecipes(event) -}) - -/** - * Событие регистрации лут-тейблов. - */ -LootJS.modifiers((event) => { - registerGTCEULoots(event) -}); - -/** - * Событие регистрации рудных жил. - */ -GTCEuServerEvents.oreVeins(event => { - event.removeAll() + registerChiselAndBitsRecipes(event)*/ }) \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 5370f4317..41074ff42 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -3,7 +3,18 @@ const registerMinecraftItemTags = (event) => { global.MINECRAFT_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) }) + // Теперь обсидиан сторадж блок + event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') +} + +const registerMinecraftBlockTags = (event) => { + global.MINECRAFT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) + + // Теперь обсидиан сторадж блок event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') } \ No newline at end of file diff --git a/kubejs/server_scripts/more_red/tags.js b/kubejs/server_scripts/more_red/tags.js index 032198b34..535ea19ee 100644 --- a/kubejs/server_scripts/more_red/tags.js +++ b/kubejs/server_scripts/more_red/tags.js @@ -2,6 +2,15 @@ const registerMoreRedItemTags = (event) => { + // Удаление тегов у отключенных предметов + global.MORE_RED_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerMoreRedBlockags = (event) => { + // Удаление тегов у отключенных предметов global.MORE_RED_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) diff --git a/kubejs/server_scripts/railways/tags.js b/kubejs/server_scripts/railways/tags.js index 18b2f0cbe..81863a6be 100644 --- a/kubejs/server_scripts/railways/tags.js +++ b/kubejs/server_scripts/railways/tags.js @@ -2,6 +2,15 @@ const registerRailWaysItemTags = (event) => { + // Удаление тегов у отключенных предметов + global.RAIL_WAYS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerRailWaysBlockTags = (event) => { + // Удаление тегов у отключенных предметов global.RAIL_WAYS_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) diff --git a/kubejs/server_scripts/sophisticated_backpacks/tags.js b/kubejs/server_scripts/sophisticated_backpacks/tags.js index 0a46fbf8a..521958111 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/tags.js +++ b/kubejs/server_scripts/sophisticated_backpacks/tags.js @@ -1,6 +1,16 @@ // priority: 0 const registerSophisticatedBackpacksItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerSophisticatedBackpacksBlockTags = (event) => { + // Удаление тегов у отключенных предметов global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 873735bd8..f0dce81a2 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -162,7 +162,14 @@ const registerTFCItemTags = (event) => { }) }) - removeAllTagsFromDisabledItemsTFC(event) + // Удаление тегов у отключенных предметов + global.TFC_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + + // Удаление тегов у руд + event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } const registerTFCBlockTags = (event) => { @@ -210,7 +217,13 @@ const registerTFCBlockTags = (event) => { event.add('tfc:glass_basin_blocks', 'tfc:white_kaolin_clay') event.add('tfc:glass_pouring_table', 'tfc:white_kaolin_clay') - removeAllTagsFromDisabledItemsTFC(event) + // Удаление тегов у отключенных предметов + global.TFC_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) + + // Удаление тегов у руд + event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } const registerTFCFluidTags = (event) => { @@ -393,13 +406,32 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/surface_tetrahedrite') event.add('tfc:in_biome/veins', 'tfg:geode') } - -const removeAllTagsFromDisabledItemsTFC = (event) => { - // Удаление тегов у отключенных предметов - global.TFC_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) - - // Удаление тегов у руд - event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") -} \ No newline at end of file +/* +event.hide('tfc:metal/bismuth') +event.hide('tfc:metal/bismuth_bronze') +event.hide('tfc:metal/bronze') +event.hide('tfc:metal/black_bronze') +event.hide('tfc:metal/brass') +event.hide('tfc:metal/copper') +event.hide('tfc:metal/gold') +event.hide('tfc:metal/nickel') +event.hide('tfc:metal/rose_gold') +event.hide('tfc:metal/silver') +event.hide('tfc:metal/tin') +event.hide('tfc:metal/zinc') +event.hide('tfc:metal/sterling_silver') +event.hide('tfc:metal/wrought_iron') +event.hide('tfc:metal/steel') +event.hide('tfc:metal/black_steel') +event.hide('tfc:metal/red_steel') +event.hide('tfc:metal/blue_steel') +event.hide('tfc:metal/cast_iron') +event.hide('tfc:metal/pig_iron') +event.hide('tfc:metal/high_carbon_steel') +event.hide('tfc:metal/high_carbon_black_steel') +event.hide('tfc:metal/high_carbon_red_steel') +event.hide('tfc:metal/high_carbon_blue_steel') +event.hide('tfc:metal/weak_steel') +event.hide('tfc:metal/weak_red_steel') +event.hide('tfc:metal/weak_blue_steel') +event.hide('tfc:metal/unknown')*/ \ No newline at end of file diff --git a/kubejs/startup_scripts/firmaciv/constants.js b/kubejs/startup_scripts/firmaciv/constants.js index 34ecdc8a0..ffbbeedda 100644 --- a/kubejs/startup_scripts/firmaciv/constants.js +++ b/kubejs/startup_scripts/firmaciv/constants.js @@ -5,10 +5,10 @@ * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ global.FIRMACIV_DISABLED_ITEMS = [ - 'firmaciv:copper_bolt', - 'firmaciv:kayak_with_paddle_icon_only', - 'firmaciv:canoe_icon_only', - 'firmaciv:canoe_with_paddle_icon_only', - 'firmaciv:rowboat_icon_only', - 'firmaciv:wood/canoe_component_block/mangrove' + //'firmaciv:copper_bolt', + //'firmaciv:kayak_with_paddle_icon_only', + //'firmaciv:canoe_icon_only', + //'firmaciv:canoe_with_paddle_icon_only', + //'firmaciv:rowboat_icon_only', + //'firmaciv:wood/canoe_component_block/mangrove' ]; \ No newline at end of file