From 7c38d12863bb55e2aca06422878eedb6cc2a3106 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 28 Apr 2024 14:02:01 +0700 Subject: [PATCH] Port #322 - part 1 --- CHANGELOG.md | 1 + config/embeddium-options.json | 4 +- config/enhancedvisuals-client.json | 29 ++ .../quests/chapters/primitive_age.snbt | 17 +- kubejs/server_scripts/framedblocks/recipes.js | 426 ++++++++++++++++++ kubejs/server_scripts/framedblocks/tags.js | 18 + kubejs/server_scripts/main_server_script.js | 3 + kubejs/server_scripts/minecraft/recipes.js | 8 +- .../startup_scripts/framedblocks/constants.js | 6 + kubejs/startup_scripts/minecraft/constants.js | 1 + 10 files changed, 507 insertions(+), 6 deletions(-) create mode 100644 kubejs/server_scripts/framedblocks/recipes.js create mode 100644 kubejs/server_scripts/framedblocks/tags.js create mode 100644 kubejs/startup_scripts/framedblocks/constants.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 85cb1cf7d..358e4a665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ - Добавлены рецепты/квесты для MegaCells (в работе) (FriendlyCube). - Добавлены рецепты/квесты для FramedBlocks (в работе) (FriendlyCube). ### Fixes +- Исправлен рецепт на золотые рельсы из ваниллы. - Исправлен квест на RTM койлы, а точнее его название и описание. - Исправлено кол-во металла содержащееся в кольцах, теперь 36. - Исправлено кол-во металла содержащиеся в болтах, теперь 18. diff --git a/config/embeddium-options.json b/config/embeddium-options.json index 8166d7c0e..ff443abf5 100644 --- a/config/embeddium-options.json +++ b/config/embeddium-options.json @@ -23,7 +23,7 @@ }, "notifications": { "force_disable_donation_prompts": false, - "has_cleared_donation_button": false, - "has_seen_donation_prompt": false + "has_cleared_donation_button": true, + "has_seen_donation_prompt": true } } \ No newline at end of file diff --git a/config/enhancedvisuals-client.json b/config/enhancedvisuals-client.json index ae9616eee..933327881 100644 --- a/config/enhancedvisuals-client.json +++ b/config/enhancedvisuals-client.json @@ -363,6 +363,35 @@ "disabled": false, "opacity": 1.0 } + }, + "rain": { + "enabled": true, + "opacity": 1.0, + "duration": { + "min": 100, + "max": 100 + }, + "drop": { + "disabled": false, + "opacity": 1.0, + "animationSpeed": 0, + "scale": { + "min": 0.1, + "max": 0.5 + }, + "red": 41, + "green": 76, + "blue": 149, + "alpha": 255 + }, + "delay": { + "min": 0, + "max": 0 + }, + "amount": { + "min": 1, + "max": 1 + } } } } \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 36767fd72..26f7a133b 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -363,7 +363,7 @@ "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:lumber)" } } - title: "Любые пиломатериалы" + title: "Any Lumber" type: "item" }] x: 8.0d @@ -2570,8 +2570,8 @@ item: "minecraft:bowl" type: "item" }] - x: 9.5d - y: 4.5d + x: 10.5d + y: 4.0d } { dependencies: ["3B2261F507B53EDC"] @@ -5148,6 +5148,17 @@ x: 0.5d y: 1.5d } + { + dependencies: ["4F5C883CC5282151"] + id: "2A3FEA1A48B598D1" + tasks: [{ + id: "616E6313036EF00C" + item: "framedblocks:framed_cube" + type: "item" + }] + x: 9.0d + y: 5.0d + } ] title: "Primitive Age" } diff --git a/kubejs/server_scripts/framedblocks/recipes.js b/kubejs/server_scripts/framedblocks/recipes.js new file mode 100644 index 000000000..b1fd12662 --- /dev/null +++ b/kubejs/server_scripts/framedblocks/recipes.js @@ -0,0 +1,426 @@ +// priority: 0 + +const registerFramedBlocksRecipes = (event) => { + + event.remove({ id: 'framedblocks:framed_torch' }) + event.remove({ id: 'framedblocks:framing_saw/framed_torch' }) + event.remove({ id: 'framedblocks:framed_soul_torch' }) + event.remove({ id: 'framedblocks:framing_saw/framed_soul_torch' }) + + //#region Framed Iron Door + event.shaped('framedblocks:framed_iron_door', [ + 'ABA' + ], { + A: '#forge:plates/wrought_iron', + B: 'framedblocks:framed_door' + }).id('framedblocks:framed_iron_door') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + "count": 2, + "ingredient": { + "tag": "forge:plates/wrought_iron" + } + } + ], + material: 3072, + result: { + item: "framedblocks:framed_iron_door" + } + }).id('framedblocks:framing_saw/framed_iron_door') + //#endregion + + //#region Framed Iron Trapdoor + event.shapeless('framedblocks:framed_iron_trapdoor', [ + 'framedblocks:framed_trapdoor', + '#forge:plates/wrought_iron' + ]).id('framedblocks:framed_iron_trapdoor') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "forge:plates/wrought_iron" + } + } + ], + material: 1536, + result: { + item: "framedblocks:framed_iron_trapdoor" + } + }).id('framedblocks:framing_saw/framed_iron_trapdoor') + //#endregion + + //#region Framed Obsidian Pressure Plate + event.shaped('framedblocks:framed_obsidian_pressure_plate', [ + 'AA', + 'BB' + ], { + A: '#forge:plates/obsidian', + B: 'framedblocks:framed_cube' + }).id('framedblocks:framed_obsidian_pressure_plate') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "forge:plates/obsidian" + } + } + ], + material: 1536, + result: { + item: "framedblocks:framed_obsidian_pressure_plate" + } + }).id('framedblocks:framing_saw/framed_obsidian_pressure_plate') + //#endregion + + //#region Framed Gold Pressure Plate + event.shaped('framedblocks:framed_gold_pressure_plate', [ + 'AA', + 'BB' + ], { + A: '#forge:plates/gold', + B: 'framedblocks:framed_cube' + }).id('framedblocks:framed_gold_pressure_plate') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "forge:plates/gold" + } + } + ], + material: 1536, + result: { + item: "framedblocks:framed_gold_pressure_plate" + } + }).id('framedblocks:framing_saw/framed_gold_pressure_plate') + //#endregion + + //#region Framed Iron Pressure Plate + event.shaped('framedblocks:framed_iron_pressure_plate', [ + 'AA', + 'BB' + ], { + A: '#forge:plates/iron', + B: 'framedblocks:framed_cube' + }).id('framedblocks:framed_iron_pressure_plate') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "forge:plates/iron" + } + } + ], + material: 1536, + result: { + item: "framedblocks:framed_iron_pressure_plate" + } + }).id('framedblocks:framing_saw/framed_iron_pressure_plate') + //#endregion + + //#region Framed Hanging Sign + event.shaped('6x framedblocks:framed_hanging_sign', [ + 'A A', + 'BBB', + 'BBB' + ], { + A: '#tfg:metal_chains', + B: 'framedblocks:framed_cube' + }).id('framedblocks:framed_hanging_sign') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "tfg:metal_chains" + } + } + ], + material: 3072, + result: { + count: 2, + item: "framedblocks:framed_hanging_sign" + } + }).id('framedblocks:framing_saw/framed_hanging_sign') + //#endregion + + //#region Framed Collapsible Copycat Block + event.shaped('4x framedblocks:framed_collapsible_copycat_block', [ + 'ABA', + 'B B', + 'ABA' + ], { + A: 'framedblocks:framed_cube', + B: '#forge:sheets/copper' + }).id('framedblocks:framed_collapsible_copycat_block') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 1, + ingredient: { + tag: "forge:plates/copper" + } + } + ], + material: 6144, + result: { + item: "framedblocks:framed_collapsible_copycat_block" + } + }).id('framedblocks:framing_saw/framed_collapsible_copycat_block') + //#endregion + + //#region Framed Fancy Rail Block + event.shaped('32x framedblocks:framed_fancy_rail', [ + 'A A', + 'ABA', + 'A A' + ], { + A: '#forge:rods/wrought_iron', + B: 'framedblocks:framed_cube' + }).id('framedblocks:framed_fancy_rail') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 6, + ingredient: { + tag: "forge:rods/wrought_iron" + } + } + ], + material: 6144, + result: { + count: 32, + item: "framedblocks:framed_fancy_rail" + } + }).id('framedblocks:framing_saw/framed_fancy_rail') + //#endregion + + //#region Framed Fancy Powered Rail Block + event.shaped('16x framedblocks:framed_fancy_powered_rail', [ + 'A A', + 'ABA', + 'ACA' + ], { + A: '#forge:rods/gold', + B: 'framedblocks:framed_cube', + C: 'minecraft:redstone' + }).id('framedblocks:framed_fancy_powered_rail') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 6, + ingredient: { + tag: "forge:rods/gold" + } + }, + { + count: 1, + ingredient: { + tag: "forge:dusts/redstone" + } + } + ], + material: 6144, + result: { + count: 16, + item: "framedblocks:framed_fancy_powered_rail" + } + }).id('framedblocks:framing_saw/framed_fancy_powered_rail') + //#endregion + + //#region Framed Fancy Detector Rail Block + event.shaped('4x framedblocks:framed_fancy_detector_rail', [ + 'ABA', + 'ACA', + 'ADA' + ], { + A: '#forge:rods/wrought_iron', + B: '#minecraft:stone_pressure_plates', + C: 'framedblocks:framed_cube', + D: 'minecraft:redstone', + }).id('framedblocks:framed_fancy_detector_rail') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 6, + ingredient: { + tag: "forge:rods/wrought_iron" + } + }, + { + count: 1, + ingredient: { + tag: "forge:dusts/redstone" + } + }, + { + count: 1, + ingredient: { + tag: "minecraft:stone_pressure_plates" + } + } + ], + material: 6144, + result: { + count: 4, + item: "framedblocks:framed_fancy_detector_rail" + } + }).id('framedblocks:framing_saw/framed_fancy_detector_rail') + //#endregion + + //#region Framed Fancy Activator Rail Block + event.shaped('4x framedblocks:framed_fancy_activator_rail', [ + 'ABA', + 'ACA', + 'ABA' + ], { + A: '#forge:rods/wrought_iron', + B: 'framedblocks:framed_cube', + C: 'minecraft:redstone_torch' + }).id('framedblocks:framed_fancy_activator_rail') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + count: 6, + ingredient: { + tag: "forge:rods/wrought_iron" + } + }, + { + count: 1, + ingredient: { + item: "minecraft:redstone_torch" + } + } + ], + material: 6144, + result: { + count: 4, + item: "framedblocks:framed_fancy_activator_rail" + } + }).id('framedblocks:framing_saw/framed_fancy_activator_rail') + //#endregion + + // Framed Raiforcement + event.shaped('32x framedblocks:framed_reinforcement', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/obsidian', + B: '#forge:plates/wrought_iron', + C: '#forge:frames' + }).id('framedblocks:framed_reinforcement') + + // Framed Key + event.shaped('framedblocks:framed_key', [ + 'AAB', + 'CC ' + ], { + A: '#forge:rods/wooden', + B: 'framedblocks:framed_cube', + C: '#forge:nuggets/wrought_iron' + }).id('framedblocks:framed_key') + + // Framed Cube + event.shaped('4x framedblocks:framed_cube', [ + 'ABA', + 'B B', + 'ABA' + ], { + A: '#minecraft:planks', + B: '#forge:rods/wooden' + }).id('framedblocks:framed_cube') + + // Framed Fence + event.shaped('3x framedblocks:framed_fence', [ + 'ABA', + 'ABA', + ], { + A: 'framedblocks:framed_cube', + B: '#forge:rods/wooden' + }).id('framedblocks:framed_fence') + + // Framed Fence Gate + event.shaped('framedblocks:framed_fence_gate', [ + 'ABA', + 'ABA', + ], { + B: 'framedblocks:framed_cube', + A: '#forge:rods/wooden' + }).id('framedblocks:framed_fence_gate') + + // Framed Ladder + event.shaped('3x framedblocks:framed_ladder', [ + 'A A', + 'ABA', + 'A A' + ], { + A: 'framedblocks:framed_cube', + B: '#forge:rods/wooden' + }).id('framedblocks:framed_ladder') + + // Framing Saw + event.shaped('framedblocks:framing_saw', [ + ' B ', + 'AAA', + ], { + A: 'framedblocks:framed_cube', + B: 'gtceu:wrought_iron_buzz_saw_blade' + }).id('framedblocks:framing_saw') + + // Powered Framing Saw + event.shaped('framedblocks:powered_framing_saw', [ + 'ABA', + 'CAD', + 'EEE' + ], { + A: '#forge:glass', + B: 'gtceu:wrought_iron_buzz_saw_blade', + C: 'gtceu:lv_electric_motor', + D: 'gtceu:lv_electric_motor', + E: 'framedblocks:framed_cube' + }).id('framedblocks:powered_framing_saw') + +} + +// //#region Framed +// event.shaped('framedblocks:', [ +// '', +// '', +// '' +// ], { +// A: '', +// B: '', +// C: '' +// }).id('framedblocks:') + +// event.custom().id('framedblocks:framing_saw/') +// //#endregion \ No newline at end of file diff --git a/kubejs/server_scripts/framedblocks/tags.js b/kubejs/server_scripts/framedblocks/tags.js new file mode 100644 index 000000000..85ad85c81 --- /dev/null +++ b/kubejs/server_scripts/framedblocks/tags.js @@ -0,0 +1,18 @@ +// priority: 0 + +const registerFramedBlocksItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FRAMEDBLOCKS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerFramedBlocksBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.FRAMEDBLOCKS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index f21de1cf1..bedd1d969 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -12,6 +12,7 @@ ServerEvents.tags('item', event => { registerCreateAdditionsItemTags(event) registerFirmaCivItemTags(event) registerFirmaLifeItemTags(event) + registerFramedBlocksItemTags(event) registerFTBQuestsItemTags(event) registerGTCEUItemTags(event) registerMinecraftItemTags(event) @@ -34,6 +35,7 @@ ServerEvents.tags('block', event => { registerCreateAdditionsBlockTags(event) registerFirmaCivBlockTags(event) registerFirmaLifeBlockTags(event) + registerFramedBlocksBlockTags(event) registerFTBQuestsBlockTags(event) registerGTCEUBlockTags(event) registerMinecraftBlockTags(event) @@ -114,6 +116,7 @@ ServerEvents.recipes(event => { registerExposureRecipes(event) registerFirmaCivRecipes(event) registerFirmaLifeRecipes(event) + registerFramedBlocksRecipes(event) registerFTBQuestsRecipes(event) registerGTCEURecipes(event) registerHandGliderRecipes(event) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 5c95b742f..70ec2b5f9 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2174,6 +2174,12 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Цепи + + event.remove({ id: 'minecraft:chain' }) + + //#endregion + //#region Выход: Светильник адский event.remove({ id: 'minecraft:soul_lantern' }) @@ -3088,7 +3094,7 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:powered_rail' }) event.recipes.gtceu.assembler('powered_rail') - .itemInputs('6x #forge:rods/gold', '#forge:rods/wooden', '#forge:dusts/redstone') + .itemInputs('6x #forge:rods/gold', '2x #forge:rods/wooden', '#forge:dusts/redstone') .circuit(1) .itemOutputs('16x minecraft:powered_rail') .duration(100) diff --git a/kubejs/startup_scripts/framedblocks/constants.js b/kubejs/startup_scripts/framedblocks/constants.js new file mode 100644 index 000000000..e84b9f059 --- /dev/null +++ b/kubejs/startup_scripts/framedblocks/constants.js @@ -0,0 +1,6 @@ +// priority: 0 + +global.FRAMEDBLOCKS_DISABLED_ITEMS = [ + 'framedblocks:framed_soul_torch', + 'framedblocks:framed_torch' +]; \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index f1c2468f8..329cfd31d 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -583,6 +583,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:dried_kelp_block', 'minecraft:dried_kelp', 'minecraft:pink_petals', + 'minecraft:chain', 'minecraft:peony', 'minecraft:rose_bush', 'minecraft:lilac',