diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 3e3c1016c..3a853b920 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -3,11 +3,5 @@ const registerAdAstraRecipes = (event) => { // Удаление рецептов мода - // event.remove({ mod: 'ad_astra' }); - - event.remove({ id: 'ad_astra:recipes/steel_trapdoor' }) - event.remove({ id: 'ad_astra:recipes/steel_door' }) - event.remove({ id: 'ad_astra:recipes/hammer' }) - event.remove({ id: 'ad_astra:recipes/iron_rod' }) - event.remove({ id: 'ad_astra:hammering/steel_plate' }) + event.remove({ mod: 'ad_astra' }); } \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js new file mode 100644 index 000000000..65ee76271 --- /dev/null +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -0,0 +1,9 @@ +// priority: 0 + +const registerAdAstraItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.AD_ASTRA_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index e410a6d02..efb62c39a 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -6,6 +6,7 @@ const registerCreateRecipes = (event) => { event.remove({ mod: 'create' }); // Деревянная пластина для шестеренки + /* event.shaped('gtceu:wood_plate', [ ' A', ' B ', @@ -33,7 +34,7 @@ const registerCreateRecipes = (event) => { ], { A: 'create:shaft', B: 'gtceu:wood_gear', - }); + });*/ // todo: использовать ютилити методы для создания рецептов ниже (порядок, heatItem -> heatRecipe -> любые другие тфкшные) // galvanized_iron diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 7e3eb6fea..fbc428f2c 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -1,6 +1,12 @@ // priority: 0 -const registerCreateTags = (event) => { +const registerCreateItemTags = (event) => { + // Удаление тегов у отключенных предметов + global.CREATE_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) + + // TODO: move to TFG-MOD event.add('forge:ingots/galvanized_iron', 'kubejs:galvanized_iron'); } diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index ca3a8b3d4..a399c62fb 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -1,5 +1,13 @@ // priority: 0 +const registerFirmaLifeItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} + const registerFirmaLifePlacedFeatures = (event) => { event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index 515e19831..741edff8c 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -7,9 +7,9 @@ const modifyLootGT = (event) => { event.addBlockLootModifier(`gtceu:tfc_${stoneType}_${material}_ore`) .removeLoot(Ingredient.all) .addWeightedLoot([ - Item.of(`gtceu:rich_raw_${material}`).withChance(25), - Item.of(`gtceu:raw_${material}`).withChance(50), - Item.of(`gtceu:poor_raw_${material}`).withChance(25) + Item.of(`gtceu:rich_raw_${material}`).withChance(15), + Item.of(`gtceu:raw_${material}`).withChance(25), + Item.of(`gtceu:poor_raw_${material}`).withChance(60) ]); } }) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 38401c56d..49fc252bd 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -5,8 +5,10 @@ */ ServerEvents.tags('item', event => { registerTFCItemTags(event) + registerFirmaLifeItemTags(event) // registerMinecraftItemTags(event) - // registerCreateItemTags(event) + registerCreateItemTags(event) + registerAdAstraItemTags(event) }) /** @@ -59,10 +61,10 @@ ServerEvents.recipes(event => { registerWaterFlasksRecipes(event) // registerMinecraftRecipes(event) // registerGTCEURecipes(event) - // registerCreateRecipes(event) + registerCreateRecipes(event) // registerAE2Recipes(event) // registerComputerCraftRecipes(event) - // registerAdAstraRecipes(event) + registerAdAstraRecipes(event) // registerTreeTapRecipes(event) // registerMoreRedRecipes(event) // registerSophisticatedBackpacksRecipes(event) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 0a1dc6723..d5d05a3c6 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -2,7 +2,7 @@ const registerTFCItemTags = (event) => { - // Удаление тегов у откоюченных предметов + // Удаление тегов у отключенных предметов global.TFC_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) }) diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index 8d67c9fa5..7ee0fbf20 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -24,7 +24,7 @@ const registerToolBeltRecipes = (event) => { ], { A: '#forge:string', B: '#forge:leather', - C: '#forge:plates/steel' + C: '#forge:plates/wrought_iron' }) // ToolBelt с размером 3 diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index cf9277aef..626b95165 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -1,15 +1,40 @@ // priority: 0 /** - * Список хранит предметы, + * Список хранит предметы, * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ global.AD_ASTRA_DISABLED_ITEMS = [ - 'ad_astra:steel_ingot', - 'ad_astra:steel_plate', - 'ad_astra:steel_nugget', - 'ad_astra:steel_door', - 'ad_astra:steel_trapdoor', - 'ad_astra:iron_plate', - 'ad_astra:iron_rod' -]; \ No newline at end of file + // Random + "ad_astra:steel_ingot", + "ad_astra:steel_plate", + "ad_astra:iron_plate", + "ad_astra:iron_rod", + "ad_astra:steel_nugget", + "ad_astra:steel_trapdoor", + "ad_astra:steel_door", + + // Ores + "ad_astra:glacio_lapis_ore", + "ad_astra:moon_cheese_ore", + "ad_astra:moon_desh_ore", + "ad_astra:deepslate_desh_ore", + "ad_astra:moon_iron_ore", + "ad_astra:moon_ice_shard_ore", + "ad_astra:deepslate_ice_shard_ore", + "ad_astra:mars_iron_ore", + "ad_astra:mars_diamond_ore", + "ad_astra:mars_ostrum_ore", + "ad_astra:deepslate_ostrum_ore", + "ad_astra:mars_ice_shard_ore", + "ad_astra:venus_coal_ore", + "ad_astra:venus_gold_ore", + "ad_astra:venus_diamond_ore", + "ad_astra:venus_calorite_ore", + "ad_astra:deepslate_calorite_ore", + "ad_astra:mercury_iron_ore", + "ad_astra:glacio_ice_shard_ore", + "ad_astra:glacio_coal_ore", + "ad_astra:glacio_copper_ore", + "ad_astra:glacio_iron_ore", +]; diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 7e9ece65c..5c406cbca 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -5,17 +5,29 @@ * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ global.CREATE_DISABLED_ITEMS = [ - "create:zinc_ore", - "create:deepslate_zinc_ore", - "create:crushed_raw_silver", - "create:crushed_raw_tin", - "create:crushed_raw_nickel", - "create:copper_sheet", - "create:brass_sheet", - "create:iron_sheet", - "create:golden_sheet", - "create:zinc_ingot", - "create:brass_ingot", + // Ores + 'create:zinc_ore', + 'create:deepslate_zinc_ore', + + // Raw Ores + 'create:raw_zinc', + + // Nuggets + 'create:copper_nugget', + 'create:zinc_nugget', + 'create:brass_nugget', + + // Sheets + 'create:copper_sheet', + 'create:brass_sheet', + 'create:iron_sheet', + 'create:golden_sheet', + + // Ingot + 'create:zinc_ingot', + 'create:brass_ingot', + + // Flour 'create:wheat_flour', 'create:wheat_flour' ]; \ No newline at end of file diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js new file mode 100644 index 000000000..42d7db061 --- /dev/null +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -0,0 +1,29 @@ +// priority: 0 + +/** + * Список хранит предметы, + * у которых должны быть удалены тэги и они должны быть скрыты в REI. + */ +global.FIRMALIFE_DISABLED_ITEMS = [ + + // Chromite + 'firmalife:ore/small_chromite', + 'firmalife:ore/poor_chromite', + 'firmalife:ore/normal_chromite', + 'firmalife:ore/rich_chromite', + 'firmalife:metal/ingot/chromium', + 'firmalife:metal/double_ingot/chromium', + 'firmalife:metal/sheet/chromium', + 'firmalife:metal/double_sheet/chromium', + 'firmalife:metal/rod/chromium', + + // Stainless Steel + + 'firmalife:metal/ingot/stainless_steel', + 'firmalife:metal/double_ingot/stainless_steel', + 'firmalife:metal/sheet/stainless_steel', + 'firmalife:metal/double_sheet/stainless_steel', + 'firmalife:metal/rod/stainless_steel', + + // Other +]; \ No newline at end of file