diff --git a/kubejs/data/minecraft/tags/items/trim_materials.json b/kubejs/data/minecraft/tags/items/trim_materials.json new file mode 100644 index 000000000..92c745e4b --- /dev/null +++ b/kubejs/data/minecraft/tags/items/trim_materials.json @@ -0,0 +1,18 @@ +{ + "values": [ + "minecraft:amethyst_shard", + "gtceu:bismuth_ingot", + "minecraft:diamond", + "minecraft:emerald", + "minecraft:gold_ingot", + "minecraft:lapis_lazuli", + "gtceu:opal_gem", + "gtceu:raw_pyrite", + "gtceu:rose_gold_ingot", + "gtceu:ruby_gem", + "gtceu:sapphire_gem", + "gtceu:silver_ingot", + "gtceu:sterling_silver_ingot", + "gtceu:topaz_gem" + ] +} diff --git a/kubejs/data/minecraft/trim_material/amethyst.json b/kubejs/data/minecraft/trim_material/amethyst.json new file mode 100644 index 000000000..85226bf80 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/amethyst.json @@ -0,0 +1,9 @@ +{ + "asset_name": "amethyst_tfc", + "description": { + "color": "#9A5CC6", + "translate": "trim_material.tfc.amethyst" + }, + "ingredient": "minecraft:amethyst_shard", + "item_model_index": 0 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/bismuth.json b/kubejs/data/minecraft/trim_material/bismuth.json new file mode 100644 index 000000000..3bda00884 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/bismuth.json @@ -0,0 +1,9 @@ +{ + "asset_name": "bismuth_tfc", + "description": { + "color": "#8bbbc4", + "translate": "trim_material.tfc.bismuth" + }, + "ingredient": "gtceu:bismuth_ingot", + "item_model_index": 1 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/diamond.json b/kubejs/data/minecraft/trim_material/diamond.json new file mode 100644 index 000000000..c2b9a7a78 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/diamond.json @@ -0,0 +1,9 @@ +{ + "asset_name": "diamond_tfc", + "description": { + "color": "#6EECD2", + "translate": "trim_material.tfc.diamond" + }, + "ingredient": "minecraft:diamond", + "item_model_index": 0.1 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/emerald.json b/kubejs/data/minecraft/trim_material/emerald.json new file mode 100644 index 000000000..f068f749c --- /dev/null +++ b/kubejs/data/minecraft/trim_material/emerald.json @@ -0,0 +1,9 @@ +{ + "asset_name": "emerald_tfc", + "description": { + "color": "#11A036", + "translate": "trim_material.tfc.emerald" + }, + "ingredient": "minecraft:emerald", + "item_model_index": 0.2 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/gold.json b/kubejs/data/minecraft/trim_material/gold.json new file mode 100644 index 000000000..61d5d90e4 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/gold.json @@ -0,0 +1,9 @@ +{ + "asset_name": "gold_tfc", + "description": { + "color": "#DEB12D", + "translate": "trim_material.tfc.gold" + }, + "ingredient": "minecraft:gold_ingot", + "item_model_index": 0.9 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/lapis.json b/kubejs/data/minecraft/trim_material/lapis.json new file mode 100644 index 000000000..cf00d9059 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/lapis.json @@ -0,0 +1,9 @@ +{ + "asset_name": "lapis", + "description": { + "color": "#416E97", + "translate": "trim_material.minecraft.lapis" + }, + "ingredient": "tfc:gem/lapis_lazuli", + "item_model_index": 0.9 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/lapis_lazuli.json b/kubejs/data/minecraft/trim_material/lapis_lazuli.json new file mode 100644 index 000000000..e44b3674e --- /dev/null +++ b/kubejs/data/minecraft/trim_material/lapis_lazuli.json @@ -0,0 +1,9 @@ +{ + "asset_name": "lapis_lazuli_tfc", + "description": { + "color": "#416E97", + "translate": "trim_material.tfc.lapis_lazuli" + }, + "ingredient": "minecraft:lapis_lazuli", + "item_model_index": 0.3 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/opal.json b/kubejs/data/minecraft/trim_material/opal.json new file mode 100644 index 000000000..86c8e32cc --- /dev/null +++ b/kubejs/data/minecraft/trim_material/opal.json @@ -0,0 +1,9 @@ +{ + "asset_name": "opal_tfc", + "description": { + "color": "#75e7eb", + "translate": "trim_material.tfc.opal" + }, + "ingredient": "gtceu:opal_gem", + "item_model_index": 0.4 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/pyrite.json b/kubejs/data/minecraft/trim_material/pyrite.json new file mode 100644 index 000000000..c1b699a37 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/pyrite.json @@ -0,0 +1,9 @@ +{ + "asset_name": "pyrite_tfc", + "description": { + "color": "#e6c44c", + "translate": "trim_material.tfc.pyrite" + }, + "ingredient": "gtceu:raw_pyrite", + "item_model_index": 0.4 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/rose_gold.json b/kubejs/data/minecraft/trim_material/rose_gold.json new file mode 100644 index 000000000..a00816ab4 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/rose_gold.json @@ -0,0 +1,9 @@ +{ + "asset_name": "rose_gold_tfc", + "description": { + "color": "#fcdd86", + "translate": "trim_material.tfc.rose_gold" + }, + "ingredient": "gtceu:rose_gold_ingot", + "item_model_index": 0.95 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/ruby.json b/kubejs/data/minecraft/trim_material/ruby.json new file mode 100644 index 000000000..02729ff7d --- /dev/null +++ b/kubejs/data/minecraft/trim_material/ruby.json @@ -0,0 +1,9 @@ +{ + "asset_name": "ruby_tfc", + "description": { + "color": "#971607", + "translate": "trim_material.tfc.ruby" + }, + "ingredient": "gtceu:ruby_gem", + "item_model_index": 0.5 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/sapphire.json b/kubejs/data/minecraft/trim_material/sapphire.json new file mode 100644 index 000000000..4d7661b8a --- /dev/null +++ b/kubejs/data/minecraft/trim_material/sapphire.json @@ -0,0 +1,9 @@ +{ + "asset_name": "sapphire_tfc", + "description": { + "color": "#183dde", + "translate": "trim_material.tfc.sapphire" + }, + "ingredient": "gtceu:sapphire_gem", + "item_model_index": 0.6 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/silver.json b/kubejs/data/minecraft/trim_material/silver.json new file mode 100644 index 000000000..bea687bed --- /dev/null +++ b/kubejs/data/minecraft/trim_material/silver.json @@ -0,0 +1,9 @@ +{ + "asset_name": "silver_tfc", + "description": { + "color": "#edeadf", + "translate": "trim_material.tfc.silver" + }, + "ingredient": "gtceu:silver_ingot", + "item_model_index": 0.8 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/sterling_silver.json b/kubejs/data/minecraft/trim_material/sterling_silver.json new file mode 100644 index 000000000..de8d2dd4d --- /dev/null +++ b/kubejs/data/minecraft/trim_material/sterling_silver.json @@ -0,0 +1,9 @@ +{ + "asset_name": "sterling_silver_tfc", + "description": { + "color": "#ccc7b6", + "translate": "trim_material.tfc.sterling_silver" + }, + "ingredient": "gtceu:sterling_silver_ingot", + "item_model_index": 0.85 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/topaz.json b/kubejs/data/minecraft/trim_material/topaz.json new file mode 100644 index 000000000..5438319e3 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/topaz.json @@ -0,0 +1,9 @@ +{ + "asset_name": "topaz_tfc", + "description": { + "color": "#c27a0e", + "translate": "trim_material.tfc.topaz" + }, + "ingredient": "gtceu:topaz_gem", + "item_model_index": 0.7 +} \ No newline at end of file diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index e3225c1d9..06533d14c 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -14,6 +14,9 @@ const registerCreateItemTags = (event) => { if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) }) + + event.add('minecraft:trimmable_armor', 'create:copper_diving_helmet') + event.add('minecraft:trimmable_armor', 'create:copper_diving_boots') } const registerCreateBlockTags = (event) => { @@ -41,4 +44,4 @@ const registerCreateFluidTags = (event) => { // Добавляем тег для скрытия в EMI event.add('c:hidden_from_recipe_viewers', 'create:chocolate') event.add('c:hidden_from_recipe_viewers', 'create:honey') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 49e685f98..a22373f97 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -13,6 +13,8 @@ const registerFirmaLifeItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + event.add('minecraft:trimmable_armor', '#firmalife:beekeeper_armor') + // Удаление тегов у руд event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } @@ -38,4 +40,4 @@ const registerFirmaLifeFluidTags = (event) => { const registerFirmaLifePlacedFeatures = (event) => { event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 6917a4e25..b40435892 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -12,6 +12,10 @@ const registerGTCEUItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + global.GTCEU_ARMORS.forEach(item => { + event.add('minecraft:trimmable_armor', item) + }) + // Добавление тега EMI для скрытия всех руд event.add('c:hidden_from_recipe_viewers', '#forge:ores') diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 6bd15580c..d2460cc23 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -23,6 +23,7 @@ ServerEvents.tags('item', event => { registerHotOrNotItemTags(event) registerRailWaysItemTags(event) registerSophisticatedBackpacksItemTags(event) + registerTFCAmbientalItemTags(event) registerTFCItemTags(event) }) @@ -142,4 +143,4 @@ ServerEvents.recipes(event => { registerToolBeltRecipes(event) registerTreeTapRecipes(event) registerWaterFlasksRecipes(event) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 90ee6a491..dad20c8a7 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2336,27 +2336,6 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Шаблоны брони - - event.remove({id: 'minecraft:wild_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:wayfinder_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:ward_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:vex_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:tide_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:spire_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:snout_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:silence_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:shaper_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:sentry_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:rib_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:raiser_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:host_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:eye_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:dune_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:coast_armor_trim_smithing_template_smithing_trim'}) - - //#endregion - //#region Кольчуга event.remove({id: 'gtceu:shaped/chainmail_boots'}) @@ -2505,28 +2484,6 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Выход: Шаблоны брони - - event.remove({ id: 'minecraft:coast_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:vex_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:host_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:rib_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:spire_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:tide_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:eye_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:raiser_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:wild_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:shaper_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:snout_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:dune_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:netherite_upgrade_smithing_template' }) - event.remove({ id: 'minecraft:wayfinder_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:ward_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:silence_armor_trim_smithing_template' }) - event.remove({ id: 'minecraft:sentry_armor_trim_smithing_template' }) - - //#endregion - //#region Выход: Компаратор event.remove({id: 'minecraft:comparator'}) diff --git a/kubejs/server_scripts/tfcambiental/tags.js b/kubejs/server_scripts/tfcambiental/tags.js new file mode 100644 index 000000000..b87eeef63 --- /dev/null +++ b/kubejs/server_scripts/tfcambiental/tags.js @@ -0,0 +1,21 @@ +// priority: 0 + +const registerTFCAmbientalItemTags = (event) => { + + event.add('minecraft:trimmable_armor', 'tfcambiental:wool_hat') + event.add('minecraft:trimmable_armor', 'tfcambiental:wool_sweater') + event.add('minecraft:trimmable_armor', 'tfcambiental:wool_pants') + event.add('minecraft:trimmable_armor', 'tfcambiental:wool_boots') + event.add('minecraft:trimmable_armor', 'tfcambiental:silk_cowl') + event.add('minecraft:trimmable_armor', 'tfcambiental:silk_shirt') + event.add('minecraft:trimmable_armor', 'tfcambiental:silk_pants') + event.add('minecraft:trimmable_armor', 'tfcambiental:silk_shoes') + event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_cowl') + event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_shirt') + event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_pants') + event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_shoes') + event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_hat') + event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_tunic') + event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_pants') + event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_boots') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 7d4ac80ab..625436f6b 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -49,5 +49,25 @@ global.GTCEU_DISABLED_ITEMS = [ ]; global.GTCEU_HIDED_ITEMS = [ - + 'gtceu:netherrack_dust', + 'gtceu:small_netherrack_dust', + 'gtceu:tiny_netherrack_dust' +]; + +global.GTCEU_ARMORS = [ + 'gtceu:hazmat_chestpiece', + 'gtceu:hazmat_leggings', + 'gtceu:hazmat_boots', + 'gtceu:hazmat_headpiece', + 'gtceu:nanomuscle_chestplate', + 'gtceu:nanomuscle_leggings', + 'gtceu:nanomuscle_boots', + 'gtceu:nanomuscle_helmet', + // typo in gtceu + 'gtceu:avanced_nanomuscle_chestplate', + 'gtceu:quarktech_chestplate', + 'gtceu:quarktech_leggings', + 'gtceu:quarktech_boots', + 'gtceu:quarktech_helmet', + 'gtceu:advanced_quarktech_chestplate' ]; diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index ca7218bb3..c0aee03a0 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -491,23 +491,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:burn_pottery_sherd', // Шаблоны брони - /*'minecraft:wayfinder_armor_trim_smithing_template', - 'minecraft:dune_armor_trim_smithing_template', - 'minecraft:snout_armor_trim_smithing_template', - 'minecraft:shaper_armor_trim_smithing_template', - 'minecraft:coast_armor_trim_smithing_template', - 'minecraft:vex_armor_trim_smithing_template', - 'minecraft:host_armor_trim_smithing_template', - 'minecraft:rib_armor_trim_smithing_template', - 'minecraft:silence_armor_trim_smithing_template', - 'minecraft:spire_armor_trim_smithing_template', - 'minecraft:tide_armor_trim_smithing_template', - 'minecraft:eye_armor_trim_smithing_template', - 'minecraft:raiser_armor_trim_smithing_template', - 'minecraft:wild_armor_trim_smithing_template', - 'minecraft:sentry_armor_trim_smithing_template', - 'minecraft:ward_armor_trim_smithing_template',*/ - 'minecraft:netherite_upgrade_smithing_template', + 'minecraft:netherite_upgrade_smithing_template', // Свечи 'minecraft:candle',