diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 83ed4b056..96c282f78 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -7,3 +7,4 @@ Sophisticated Backpacks Sophisticated Core Create Crafts & Additions Create: Steam 'n' Rails +Greate diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index a21a9c6d1..59a4d1b39 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/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 diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt index ade1526f3..fada9ee39 100644 --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -1,5 +1,5 @@ #CONFIG ONLY OPTIONS -ignoreUpdate:365 +ignoreUpdate:367 settingsButton:false allowWrongWorldTeleportation:false differentiateByServerAddress:true diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 93efd9076..46474f8c6 100644 --- a/config/xaerominimap_entities.json +++ b/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, diff --git a/config/xaeroworldmap.txt b/config/xaeroworldmap.txt index 37075ed81..a9f2fcd5b 100644 --- a/config/xaeroworldmap.txt +++ b/config/xaeroworldmap.txt @@ -1,4 +1,4 @@ -ignoreUpdate:167 +ignoreUpdate:168 updateNotification:true allowInternetAccess:true differentiateByServerAddress:true diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index adbc74e3b..af1d22cc4 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/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", diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js new file mode 100644 index 000000000..4afca31ee --- /dev/null +++ b/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) + ]); + } + }) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js new file mode 100644 index 000000000..a3b208a89 --- /dev/null +++ b/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) => { + +} \ No newline at end of file diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index b51da02f9..c976aae82 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -2,4 +2,16 @@ ServerEvents.highPriorityData(event => { addOreVeins(event); -}) \ No newline at end of file +}) + +ServerEvents.tags('block', event => { + registerBlockTagsGT(event) +}) + +ServerEvents.tags('item', event => { + registerItemTagsGT(event) +}) + +LootJS.modifiers((event) => { + modifyLootGT(event) +}); \ No newline at end of file diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js index 11c4beb54..7d23016c7 100644 --- a/kubejs/startup_scripts/constants.js +++ b/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" } ] diff --git a/kubejs/startup_scripts/gregtech/customMaterials.js b/kubejs/startup_scripts/gregtech/customMaterials.js index 53e5ecd93..c70555edc 100644 --- a/kubejs/startup_scripts/gregtech/customMaterials.js +++ b/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() diff --git a/mods/emi-1.0.23+1.20.1+forge.jar b/mods/emi-1.0.23+1.20.1+forge.jard similarity index 100% rename from mods/emi-1.0.23+1.20.1+forge.jar rename to mods/emi-1.0.23+1.20.1+forge.jard diff --git a/mods/lootjs-forge-1.20.1-2.10.3.jar b/mods/lootjs-forge-1.20.1-2.10.3.jar new file mode 100644 index 000000000..36f659ce0 Binary files /dev/null and b/mods/lootjs-forge-1.20.1-2.10.3.jar differ