disable emi + ore work

config/jei/ingredient-list-mod-sort-order.ini

@@ -7,3 +7,4 @@ Sophisticated Backpacks
 Sophisticated Core
 Create Crafts & Additions
 Create: Steam 'n' Rails
+Greate

config/jei/recipe-category-sort-order.ini

@@ -70,3 +70,59 @@ createaddition:liquid_burning
 createaddition:rolling
 greate:crushing
 greate:milling
+gtceu:alloy_blast_smelter
+gtceu:alloy_smelter
+gtceu:arc_furnace
+gtceu:assembler
+gtceu:assembly_line
+gtceu:autoclave
+gtceu:bender
+gtceu:brewery
+gtceu:canner
+gtceu:centrifuge
+gtceu:chemical_bath
+gtceu:chemical_reactor
+gtceu:circuit_assembler
+gtceu:coke_oven
+gtceu:combustion_generator
+gtceu:compressor
+gtceu:cracker
+gtceu:create_mixer
+gtceu:cutter
+gtceu:distillation_tower
+gtceu:distillery
+gtceu:electric_blast_furnace
+gtceu:electric_furnace
+gtceu:electrolyzer
+gtceu:electromagnetic_separator
+gtceu:extractor
+gtceu:extruder
+gtceu:fermenter
+gtceu:fluid_heater
+gtceu:fluid_solidifier
+gtceu:forge_hammer
+gtceu:forming_press
+gtceu:fusion_reactor
+gtceu:gas_collector
+gtceu:gas_turbine
+gtceu:implosion_compressor
+gtceu:large_boiler
+gtceu:large_chemical_reactor
+gtceu:laser_engraver
+gtceu:lathe
+gtceu:macerator
+gtceu:mixer
+gtceu:multiblock_info
+gtceu:ore_washer
+gtceu:packer
+gtceu:plasma_generator
+gtceu:polarizer
+gtceu:primitive_blast_furnace
+gtceu:pyrolyse_oven
+gtceu:rock_breaker
+gtceu:sifter
+gtceu:steam_boiler
+gtceu:steam_turbine
+gtceu:thermal_centrifuge
+gtceu:vacuum_freezer
+gtceu:wiremill

config/xaerominimap.txt

@@ -1,5 +1,5 @@
 #CONFIG ONLY OPTIONS
-ignoreUpdate:365
+ignoreUpdate:367
 settingsButton:false
 allowWrongWorldTeleportation:false
 differentiateByServerAddress:true

config/xaerominimap_entities.json

@@ -18,8 +18,8 @@
     "displayNameWhenIconFails": true,
     "entityNumber": 1000.0,
     "alwaysDisplayNametags": false,
-    "startFadingAt": 0.0,
     "dotSize": 2.0,
+    "startFadingAt": 0.0,
     "renderOverMinimapFrame": 1.0,
     "icons": 1.0,
     "heightLimit": 20.0,

config/xaeroworldmap.txt

@@ -1,4 +1,4 @@
-ignoreUpdate:167
+ignoreUpdate:168
 updateNotification:true
 allowInternetAccess:true
 differentiateByServerAddress:true

kubejs/assets/kubejs/lang/en_us.json

@@ -1,4 +1,7 @@
 {
+    "tagprefix.poor_raw_ore": "Poor %s Ore",
+    "tagprefix.rich_raw_ore": "Rich %s Ore",
+
     "tagprefix.tfc_gabbro": "Gabbro %s Ore",
     "tagprefix.tfc_shale": "Shale %s Ore",
     "tagprefix.tfc_claystone": "Claystone %s Ore",

kubejs/server_scripts/gregtech/loot.js

@@ -0,0 +1,20 @@
+// priority: 0
+
+const modifyLootGT = (event) => {
+    global.allTFCStoneTypeNames.forEach(stoneType => {
+        GTRegistries.MATERIALS.forEach(material => {
+            if (material.hasProperty($PropertyKey.ORE))
+            {
+                const blockName = `gtceu:tfc_${stoneType}_${material}_ore`
+
+                event.addBlockLootModifier(blockName)
+                    .removeLoot(Ingredient.all)
+                    .addWeightedLoot([
+                        Item.of(`gtceu:${material}_rich_raw_ore`).withChance(25),
+                        Item.of(`gtceu:${material}_raw_ore`).withChance(50),
+                        Item.of(`gtceu:${material}_poor_raw_ore`).withChance(25)
+                    ]);
+            }
+        })
+    })
+}

kubejs/server_scripts/gregtech/tags.js

@@ -0,0 +1,30 @@
+// priority: 0
+
+const $PropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey")
+
+const registerBlockTagsGT = (event) => {
+    
+    // Регистрация дополнительных тэгов для руд gtceu, 
+    // только для тех, что используются в жилах с рудой
+    
+    global.allTFCStoneTypeNames.forEach(stoneType => {
+        GTRegistries.MATERIALS.forEach(material => {
+            if (material.hasProperty($PropertyKey.ORE))
+            {
+                const blockName = `gtceu:tfc_${stoneType}_${material}_ore`
+
+                event.add("minecraft:needs_iron_tool", blockName)
+                event.add("minecraft:mineable/pickaxe", blockName)
+                event.add("tfc:can_collapse", blockName)
+                event.add("tfc:can_start_collapse", blockName)
+                event.add("tfc:monster_spawn_on", blockName)
+                event.add("tfc:prospectable", blockName)
+                event.add("tfc:rock/ores", blockName)
+            }
+        })
+    })
+}
+
+const registerItemTagsGT = (event) => {
+    
+}

kubejs/server_scripts/mainServerScript.js

@@ -2,4 +2,16 @@
 
 ServerEvents.highPriorityData(event => {
     addOreVeins(event);
-})
+})
+
+ServerEvents.tags('block', event => {
+    registerBlockTagsGT(event)
+})
+
+ServerEvents.tags('item', event => {
+    registerItemTagsGT(event)
+})
+
+LootJS.modifiers((event) => {
+    modifyLootGT(event)
+});

kubejs/startup_scripts/constants.js

@@ -871,15 +871,15 @@ global.veins = [
         stoneTypes: ["quartzite", "slate", "phyllite", "schist", "gneiss", "marble"],
         ores: [
             {
-                weight: 0,
+                weight: 35,
                 material: "sulfur"
             },
             {
-                weight: 0,
+                weight: 40,
                 material: "sphalerite"
             },
             {
-                weight: 0,
+                weight: 25,
                 material: "pyrite"
             }
         ],
@@ -1425,7 +1425,7 @@ global.veins = [
         stoneTypes: ["shale", "claystone", "chert"],
         ores: [
             {
-                weight: 100,
+                //weight: 100,
                 material: "sylvite"
             }
         ]

kubejs/startup_scripts/gregtech/customMaterials.js

@@ -1,10 +1,9 @@
 const $OreProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty")
-const $OrePropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey")
+const $PropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey")
 
 const registerMaterials = (event) => {
-    GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty());
-    //GTMaterials.Gypsum.setProperty($OrePropertyKey.ORE, new $OreProperty());
-    GTMaterials.Borax.setProperty($OrePropertyKey.ORE, new $OreProperty());
+    GTMaterials.Bismuth.setProperty($PropertyKey.ORE, new $OreProperty());
+    GTMaterials.Borax.setProperty($PropertyKey.ORE, new $OreProperty());
 
     event.create('sylvite')
         .dust()