some emi improvements

kubejs/assets/emi/index/stacks/items.json

@@ -0,0 +1,6 @@
+{
+    "filters": [
+        "/tfc:ore/[^*]+/[^*]+/",
+        "/firmalife:ore/[^*]+/[^*]+/"
+    ]
+}

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"
+        }
+    ]
+}

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)
-}
+}*/

kubejs/server_scripts/ae2/tags.js

@@ -1,5 +1,5 @@
 // priority: 0
 
 const registerAE2ItemTags = (event) => {
-    
+    event.add('c:hidden_from_recipe_viewers', 'ae2:facade')
 }

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/[^*]+/[^*]+/")
+}

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`
 

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')

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)
 })
 

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/[^*]+/[^*]+/")
 }