diff --git a/kubejs/assets/emi/index/stacks/items.json b/kubejs/assets/emi/index/stacks/items.json new file mode 100644 index 000000000..13b131138 --- /dev/null +++ b/kubejs/assets/emi/index/stacks/items.json @@ -0,0 +1,6 @@ +{ + "filters": [ + "/tfc:ore/[^*]+/[^*]+/", + "/firmalife:ore/[^*]+/[^*]+/" + ] +} \ No newline at end of file diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json new file mode 100644 index 000000000..52980972b --- /dev/null +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -0,0 +1,31 @@ +{ + "filters": [ + { + "category": "minecraft:campfire_cooking" + }, + { + "category": "emi:anvil_repairing" + }, + { + "category": "emi:world_interaction" + }, + { + "category": "gtceu:primitive_blast_furnace" + }, + { + "category": "create:mystery_conversion" + }, + { + "category": "jumbofurnace:jumbo_furnace_upgrade" + }, + { + "category": "jumbofurnace:jumbo_smelting" + }, + { + "category": "emi:composting" + }, + { + "category": "emi:fuel" + } + ] +} \ No newline at end of file diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 3b2566af2..f54c2948f 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -1,5 +1,6 @@ // priority: 1 +/* if (Platform.isLoaded('jei')) { JEIEvents.hideItems(event => { @@ -59,4 +60,4 @@ const removeCategories = (event) => { registerMinecraftCategories(event) registerGTCEUCategories(event) registerMoreRedCategories(event) -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index e2e317252..e6b5e5ac1 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -1,5 +1,5 @@ // priority: 0 const registerAE2ItemTags = (event) => { - + event.add('c:hidden_from_recipe_viewers', 'ae2:facade') } diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index a399c62fb..1658e1c68 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -1,14 +1,24 @@ // priority: 0 const registerFirmaLifeItemTags = (event) => { - - // Удаление тегов у отключенных предметов - global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) + removeAllTagsFromDisabledItemsFirmaLife(event) +} + +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) + }) + + // Удаление тегов у руд + event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") +} diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index 73a1dee2e..6ceb2001d 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -9,11 +9,11 @@ const registerGTCEULoots = (event) => { let stoneTypeMaterial = GTMaterials.get(stoneType) let stoneTypeDust = null - if (!stoneTypeMaterial != null) stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1) + if (stoneTypeMaterial != null) stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1) let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1) let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1) - let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1).withChance(0.2) + let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1) let blockName = `gtceu:${stoneType}_${material.getName()}_ore` diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 30411dc83..6f2e5c385 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -7,8 +7,10 @@ const registerGTCEUItemTags = (event) => { event.removeAllTagsFrom(item) }) - //#region Пыли стоунтайпов в один тэг + // Добавление тега EMI для скрытия всех руд + event.add('c:hidden_from_recipe_viewers', '#forge:ores') + //#region Пыли стоунтайпов в один тэг event.add('tfg:stone_dusts', 'gtceu:gabbro_dust') event.add('tfg:stone_dusts', 'gtceu:shale_dust') event.add('tfg:stone_dusts', 'gtceu:claystone_dust') diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index a9cf4c2cb..1e9c01c81 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -32,6 +32,8 @@ ServerEvents.tags('item', event => { */ ServerEvents.tags('block', event => { registerTFCBlockTags(event) + registerFirmaLifeBlockTags(event) + registerComputerCraftBlockTags(event) }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index c039fef28..873735bd8 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -1,12 +1,6 @@ // priority: 0 const registerTFCItemTags = (event) => { - - // Удаление тегов у отключенных предметов - global.TFC_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) - // Теги для соответствия инструментов TFC и GT event.add('tfc:swords', '#minecraft:swords') event.add('tfc:pickaxes', '#minecraft:pickaxes') @@ -167,6 +161,8 @@ const registerTFCItemTags = (event) => { event.add(`tfg:rock_walls`, `tfc:rock/${slabType}/${stoneTypeName}_wall`) }) }) + + removeAllTagsFromDisabledItemsTFC(event) } const registerTFCBlockTags = (event) => { @@ -213,6 +209,8 @@ 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) } const registerTFCFluidTags = (event) => { @@ -394,4 +392,14 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/surface_sphalerite') 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