From 0501e1007f4fc1b89d28ffcd4486b5ba8674f9b6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 6 Feb 2024 18:09:13 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BD=D0=BE=D0=B3=D0=BE,=20=D0=B2=20=D0=BE=D1=81=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=BA=D0=B2=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 16 + .../quests/chapters/primitive_age.snbt | 505 ++++++++++++------ .../ftbquests/quests/chapters/steam_age.snbt | 225 +++----- config/gtceu.yaml | 8 + config/jsg/jsgConfig_1.0/Debug.toml | 2 + config/jsg/jsgConfig_1.0/DialHomeDevice.toml | 55 ++ config/jsg/jsgConfig_1.0/General.toml | 52 ++ config/jsg/jsgConfig_1.0/Stargate.toml | 217 ++++++++ config/jsg/jsgDimensions_1.0.json | 88 +++ kubejs/server_scripts/minecraft/recipes.js | 1 + .../sophisticated_backpacks/recipes.js | 54 +- kubejs/server_scripts/tfc/recipes.js | 2 +- kubejs/startup_scripts/create/constants.js | 3 +- mods | 2 +- 14 files changed, 914 insertions(+), 316 deletions(-) create mode 100644 config/jsg/jsgConfig_1.0/Debug.toml create mode 100644 config/jsg/jsgConfig_1.0/DialHomeDevice.toml create mode 100644 config/jsg/jsgConfig_1.0/General.toml create mode 100644 config/jsg/jsgConfig_1.0/Stargate.toml create mode 100644 config/jsg/jsgDimensions_1.0.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 9279e5cf8..00f0987c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [0.6.12] - Planned on 15.02.2024 +### Changes +- Повсеместно улучшены квесты примитивной и стальной эры. +- Добавлены ключи перевода для всех квестов примитивной и стальной эры. +- Удалена примитивная помпа GTCEu. +- Добавлено множество рецептов в миксере дублирующие рецепты бочки TFC. +- Удалено множество рецептов незер блоков и предметов, будут возвращены, когда будет добавлен ад. +- Исправлен рецепт лампы ищ TFC. +- Добавлено больше рецептов для предметов TFC, через машины GTCEu. +- Добавлено больше рецептов для предметов FirmaLife, через машины GTCEu. +- Удален блок стекла из Create. +- Исправлены наименования рецептов мода sophisticated backpack. +- Исправлено отображение границ чанков. +- Заменены бутылочки из Minecraft на TFC варианты. +- Добавлен TFC рецепт стеклодувки для стеклянной трубки. + ## [0.6.11] - 05.02.2024 ### Changes - Fixed smelting recipe of rich raw ores. diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 5f76c1da1..ef682cb79 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -467,7 +467,7 @@ type: "item" }] x: 15.0d - y: 9.0d + y: 8.0d } { dependencies: ["70D40085219B1CC2"] @@ -487,7 +487,7 @@ type: "item" }] x: 15.0d - y: 10.0d + y: 9.0d } { dependencies: ["70D40085219B1CC2"] @@ -506,8 +506,8 @@ } type: "item" }] - x: 15.0d - y: 11.0d + x: 16.5d + y: 10.0d } { dependencies: [ @@ -984,8 +984,8 @@ } type: "item" }] - x: -6.0d - y: 9.0d + x: 0.0d + y: 12.5d } { dependencies: ["297996E158D0A289"] @@ -1733,15 +1733,8 @@ id: "3029097F88B8AABF" size: 1.5d tasks: [{ - id: "4DF45DB51EF758E4" - item: { - Count: 1b - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:poor_raw_graphite)item(gtceu:raw_graphite)item(gtceu:rich_raw_graphite))" - } - } - title: "Any Graphite Ore" + id: "37D21B5266C73385" + item: "gtceu:crushed_graphite_ore" type: "item" }] x: 12.0d @@ -1755,8 +1748,8 @@ item: "tfc:crucible" type: "item" }] - x: 16.5d - y: 11.0d + x: 18.5d + y: 10.0d } { dependencies: ["57A961BF9EE3F0A4"] @@ -1777,7 +1770,7 @@ type: "item" }] x: 16.5d - y: 10.0d + y: 9.0d } { dependencies: ["6E07D20BECE4AB91"] @@ -1788,7 +1781,7 @@ type: "item" }] x: 16.5d - y: 9.0d + y: 8.0d } { dependencies: [ @@ -1853,6 +1846,7 @@ { dependencies: ["4F5C883CC5282151"] id: "6E24ECF6CEE950D1" + size: 2.0d tasks: [{ id: "0CC93715D33E6211" item: { @@ -1866,7 +1860,7 @@ type: "item" }] x: 16.5d - y: -1.5d + y: -8.5d } { dependencies: ["06C7B7138EDE4B38"] @@ -2833,8 +2827,8 @@ match_nbt: false type: "item" }] - x: -13.0d - y: 10.0d + x: -6.0d + y: 7.5d } { dependencies: ["2765DB2E20A745F8"] @@ -2851,8 +2845,8 @@ title: "Any #forge:glass" type: "item" }] - x: -13.0d - y: 8.5d + x: -4.0d + y: 6.5d } { dependencies: ["4BB76F3E38A2AFFB"] @@ -2862,8 +2856,8 @@ item: "tfc:ceramic/pot" type: "item" }] - x: -6.0d - y: 7.5d + x: 0.0d + y: 9.0d } { dependencies: [ @@ -2873,18 +2867,20 @@ ] id: "6E13B0241CB1D536" size: 2.0d + subtitle: "Did you think we would force you to use treetaps...?" tasks: [{ id: "44C1C7857D5E60D7" item: "gtceu:sticky_resin" type: "item" }] - x: -6.0d - y: 5.0d + x: 5.0d + y: 9.0d } { dependencies: ["76EF4D00586A8B74"] hide_dependency_lines: true id: "3CE7C64290BADE9F" + size: 1.5d tasks: [{ icon: "tfc:wood/log/kapok" id: "33278CA851060438" @@ -2894,8 +2890,8 @@ to_observe: "tfc:kapok_logs" type: "observation" }] - x: -11.0d - y: 5.0d + x: 0.0d + y: 7.5d } { dependencies: ["3CE7C64290BADE9F"] @@ -2914,8 +2910,8 @@ } type: "item" }] - x: -9.5d - y: 5.5d + x: 1.5d + y: 7.0d } { dependencies: [ @@ -2938,8 +2934,8 @@ match_nbt: true type: "item" }] - x: -8.0d - y: 5.0d + x: 3.0d + y: 7.5d } { dependencies: ["2765DB2E20A745F8"] @@ -2956,8 +2952,8 @@ title: "Any #forge:glass_panes" type: "item" }] - x: -11.5d - y: 8.5d + x: -4.0d + y: 7.5d } { dependencies: ["645D1F1C55674079"] @@ -2986,8 +2982,8 @@ item: "tfc:lens" type: "item" }] - x: -14.5d - y: 8.5d + x: -6.0d + y: 5.5d } { dependencies: ["2765DB2E20A745F8"] @@ -3004,8 +3000,8 @@ title: "Any #tfc:glass_bottles" type: "item" }] - x: -14.5d - y: 11.5d + x: -7.5d + y: 7.5d } { dependencies: ["2765DB2E20A745F8"] @@ -3015,8 +3011,8 @@ item: "tfc:empty_jar" type: "item" }] - x: -13.0d - y: 11.5d + x: -7.0d + y: 5.5d } { dependencies: ["2765DB2E20A745F8"] @@ -3026,8 +3022,8 @@ item: "tfc:lamp_glass" type: "item" }] - x: -11.5d - y: 11.5d + x: -7.5d + y: 8.5d } { dependencies: ["2765DB2E20A745F8"] @@ -3037,8 +3033,8 @@ item: "firmalife:reinforced_glass" type: "item" }] - x: -14.5d - y: 10.0d + x: -4.0d + y: 8.5d } { dependencies: ["370D5A954DCBFD34"] @@ -3048,8 +3044,8 @@ item: "minecraft:compass" type: "item" }] - x: -14.0d - y: 7.0d + x: -6.5d + y: 4.0d } { dependencies: ["370D5A954DCBFD34"] @@ -3059,8 +3055,8 @@ item: "minecraft:spyglass" type: "item" }] - x: -15.0d - y: 7.0d + x: -5.5d + y: 4.0d } { dependencies: ["17C487CFAE48B01B"] @@ -3077,11 +3073,14 @@ title: "Any #tfc:lamps" type: "item" }] - x: -11.5d - y: 13.0d + x: -9.0d + y: 8.5d } { - dependencies: ["3CE7C64290BADE9F"] + dependencies: [ + "3CE7C64290BADE9F" + "4B8BAB2494C82C36" + ] id: "463F14478757D8E8" tasks: [{ id: "5930A278D214573B" @@ -3089,38 +3088,34 @@ match_nbt: false type: "item" }] - x: -9.5d - y: 4.5d + x: 1.5d + y: 8.0d } { - dependencies: ["253860AD4DF4224C"] + dependencies: [ + "253860AD4DF4224C" + "15E8DFB91603906B" + ] id: "37034449C5583151" tasks: [{ id: "65C9755F4CB3A287" item: "tfc:powder/sulfur" type: "item" }] - x: -6.0d - y: 3.0d + x: 10.5d + y: 9.0d } { dependencies: ["0EB682B44D83D12A"] hide_dependency_lines: true id: "253860AD4DF4224C" tasks: [{ - id: "52D61470CEF41419" - item: { - Count: 1b - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:poor_raw_sulfur)item(gtceu:raw_sulfur)item(gtceu:rich_raw_sulfur))" - } - } - title: "Any Sulfur Ore" + id: "6E70D453F693036D" + item: "gtceu:crushed_sulfur_ore" type: "item" }] - x: -6.0d - y: 1.5d + x: 10.5d + y: 7.5d } { dependencies: ["095104BA3C842978"] @@ -3868,7 +3863,7 @@ title: "Любые опоры" type: "item" }] - x: 14.0d + x: 13.0d y: 12.5d } { @@ -3886,7 +3881,7 @@ title: "Любой ткацкий станок" type: "item" }] - x: 10.5d + x: 13.0d y: 3.0d } { @@ -3897,7 +3892,7 @@ item: "minecraft:paper" type: "item" }] - x: 20.0d + x: 21.5d y: 3.0d } { @@ -3913,8 +3908,8 @@ to_observe: "tfc:crop/papyrus" type: "observation" }] - x: 14.0d - y: 6.5d + x: 27.0d + y: 1.0d } { dependencies: ["0D47455ABB97C81D"] @@ -3924,7 +3919,7 @@ item: "tfc:papyrus_strip" type: "item" }] - x: 14.0d + x: 24.0d y: 1.0d } { @@ -3938,7 +3933,7 @@ item: "tfc:soaked_papyrus_strip" type: "item" }] - x: 18.0d + x: 19.5d y: 1.0d } { @@ -3952,22 +3947,25 @@ item: "tfc:unrefined_paper" type: "item" }] - x: 18.0d + x: 19.5d y: 3.0d } { dependencies: [ "42FD437930CA74C7" "2658E7679CD42ACD" + "593CC9165759B714" ] + dependency_requirement: "one_completed" + hide_dependency_lines: true id: "5346CD3039C4B55A" tasks: [{ id: "3634DBCEBC5306F4" item: "minecraft:map" type: "item" }] - x: 19.0d - y: -2.0d + x: 21.0d + y: -0.5d } { dependencies: ["2658E7679CD42ACD"] @@ -3977,22 +3975,25 @@ item: "minecraft:name_tag" type: "item" }] - x: 22.5d + x: 24.0d y: 3.0d } { dependencies: [ "2658E7679CD42ACD" "42FD437930CA74C7" + "593CC9165759B714" ] + dependency_requirement: "one_completed" + hide_dependency_lines: true id: "20F878A238471ED7" tasks: [{ id: "33347A566327E820" item: "minecraft:book" type: "item" }] - x: 20.0d - y: -3.0d + x: 22.0d + y: -1.5d } { dependencies: ["45D907EF7902A200"] @@ -4022,8 +4023,8 @@ item: "minecraft:leather" type: "item" }] - x: 15.5d - y: -3.0d + x: 13.5d + y: -6.0d } { dependencies: [ @@ -4036,8 +4037,8 @@ item: "firmalife:pineapple_leather" type: "item" }] - x: 10.5d - y: -6.5d + x: 12.5d + y: 0.0d } { dependencies: [ @@ -4057,8 +4058,8 @@ title: "Любая приготовленная шкура" type: "item" }] - x: 12.0d - y: 0.0d + x: 6.5d + y: -7.0d } { dependencies: [ @@ -4078,8 +4079,8 @@ title: "Любая обскобленная шкура" type: "item" }] - x: 9.0d - y: 0.0d + x: 5.0d + y: -7.0d } { dependencies: [ @@ -4099,8 +4100,8 @@ title: "Any #tfc:soaked_hides" type: "item" }] - x: 9.0d - y: -1.5d + x: 5.0d + y: -8.5d } { dependencies: [ @@ -4122,8 +4123,8 @@ title: "Any #tfc:raw_hides" type: "item" }] - x: 6.5d - y: -1.5d + x: 3.5d + y: -8.5d } { dependencies: ["76EF4D00586A8B74"] @@ -4141,8 +4142,8 @@ title: "Any #tfc:sheepskin_hides" type: "item" }] - x: 6.5d - y: -5.0d + x: 8.0d + y: 0.0d } { dependencies: [ @@ -4155,8 +4156,8 @@ item: "tfc:silk_cloth" type: "item" }] - x: 12.0d - y: -6.5d + x: 14.5d + y: 0.0d } { dependencies: [ @@ -4169,8 +4170,8 @@ item: "tfc:burlap_cloth" type: "item" }] - x: 10.5d - y: -8.0d + x: 13.5d + y: 0.0d } { dependencies: [ @@ -4184,8 +4185,8 @@ item: "tfc:wool_cloth" type: "item" }] - x: 10.5d - y: -5.0d + x: 11.5d + y: 0.0d } { dependencies: ["665BC6BB76CE0EA3"] @@ -4195,8 +4196,8 @@ item: "minecraft:white_wool" type: "item" }] - x: 8.0d - y: -4.0d + x: 11.0d + y: 2.0d } { dependencies: [ @@ -4210,7 +4211,7 @@ type: "item" }] x: 6.5d - y: -3.0d + y: -1.5d } { dependencies: ["0546B04FC0F85C8C"] @@ -4243,8 +4244,8 @@ item: "tfc:wool_yarn" type: "item" }] - x: 9.0d - y: -3.0d + x: 8.0d + y: -1.5d } { dependencies: ["76EF4D00586A8B74"] @@ -4259,8 +4260,8 @@ to_observe: "tfc:wild_crop/jute" type: "observation" }] - x: 16.5d - y: -10.0d + x: 19.5d + y: -4.0d } { dependencies: [ @@ -4274,12 +4275,16 @@ item: "tfc:jute_fiber" type: "item" }] - x: 16.5d - y: -8.0d + x: 15.0d + y: -4.0d } { - dependencies: ["4E37B4C1A68FFE59"] + dependencies: [ + "4E37B4C1A68FFE59" + "095104BA3C842978" + ] id: "6A4FB96DB86D6CAB" + size: 1.5d tasks: [{ id: "1500208D4CBDD15A" item: { @@ -4297,8 +4302,8 @@ } type: "item" }] - x: 9.0d - y: -8.0d + x: 19.5d + y: 4.5d } { dependencies: ["4E37B4C1A68FFE59"] @@ -4349,8 +4354,8 @@ type: "item" } ] - x: 9.0d - y: -9.5d + x: 15.5d + y: -2.5d } { dependencies: ["4E37B4C1A68FFE59"] @@ -4401,8 +4406,8 @@ type: "item" } ] - x: 10.5d - y: -9.5d + x: 15.5d + y: -1.5d } { dependencies: [ @@ -4415,8 +4420,8 @@ item: "firmalife:pineapple_yarn" type: "item" }] - x: 9.0d - y: -6.5d + x: 8.0d + y: -3.0d } { dependencies: [ @@ -4430,8 +4435,8 @@ item: "firmalife:pineapple_fiber" type: "item" }] - x: 5.0d - y: -6.5d + x: 6.5d + y: -3.0d } { dependencies: ["76EF4D00586A8B74"] @@ -4451,8 +4456,8 @@ } type: "item" }] - x: 3.5d - y: -8.0d + x: 6.5d + y: -4.5d } { dependencies: ["76EF4D00586A8B74"] @@ -4463,8 +4468,8 @@ item: "firmalife:drying_mat" type: "item" }] - x: 5.0d - y: -8.0d + x: 8.0d + y: -4.5d } { dependencies: ["314212B496B2D3C3"] @@ -4515,8 +4520,8 @@ type: "item" } ] - x: 14.0d - y: -6.5d + x: 18.0d + y: 1.5d } { dependencies: ["665BC6BB76CE0EA3"] @@ -4533,8 +4538,8 @@ title: "Any #minecraft:beds" type: "item" }] - x: 8.0d - y: -5.5d + x: 10.0d + y: 2.0d } { dependencies: [ @@ -4590,11 +4595,15 @@ type: "item" } ] - x: 13.0d - y: -5.0d + x: 9.75d + y: -4.5d } { - dependencies: ["42FD437930CA74C7"] + dependencies: [ + "42FD437930CA74C7" + "593CC9165759B714" + ] + dependency_requirement: "one_completed" id: "3D889F02ABAFEB85" tasks: [ { @@ -4653,13 +4662,14 @@ type: "item" } ] - x: 15.5d - y: -5.0d + x: 11.5d + y: -5.5d } { dependencies: [ - "42FD437930CA74C7" "6BC4DB9BEE8E6640" + "42FD437930CA74C7" + "593CC9165759B714" ] dependency_requirement: "one_completed" id: "4A957A44753A5B84" @@ -4674,24 +4684,21 @@ } type: "item" }] - x: 14.0d - y: -4.0d + x: 11.0d + y: -3.5d } { - dependencies: [ - "42FD437930CA74C7" - "6BC4DB9BEE8E6640" - ] - dependency_requirement: "one_completed" + dependencies: ["1E1A13F6B8D24207"] id: "4E39A32FAA011FF5" + size: 2.0d tasks: [{ id: "79E2F0E9233F4A86" item: "sophisticatedbackpacks:backpack" match_nbt: false type: "item" }] - x: 14.0d - y: -3.0d + x: 27.0d + y: 3.0d } { dependencies: ["25E35E929922B872"] @@ -4717,7 +4724,11 @@ y: 9.0d } { - dependencies: ["42FD437930CA74C7"] + dependencies: [ + "42FD437930CA74C7" + "593CC9165759B714" + ] + dependency_requirement: "one_completed" id: "51A6F6EC85D7CDF7" size: 2.0d tasks: [{ @@ -4725,8 +4736,8 @@ item: "tfc:bellows" type: "item" }] - x: 19.0d - y: -5.0d + x: 13.302380952381057d + y: -2.280952380952357d } { dependencies: ["76EF4D00586A8B74"] @@ -4738,8 +4749,202 @@ item: "minecraft:string" type: "item" }] - x: 12.0d - y: -9.5d + x: 18.0d + y: 0.0d + } + { + dependencies: [ + "314212B496B2D3C3" + "665BC6BB76CE0EA3" + ] + dependency_requirement: "one_completed" + hide_dependency_lines: true + id: "706F66F81DDEAA2D" + tasks: [{ + id: "59433C4042267637" + item: "minecraft:painting" + type: "item" + }] + x: 21.0d + y: -1.5d + } + { + dependencies: [ + "42FD437930CA74C7" + "593CC9165759B714" + ] + dependency_requirement: "one_completed" + hide_dependency_lines: true + id: "61C41D648B6BD1B1" + tasks: [{ + id: "154A263744D9BD15" + item: "minecraft:item_frame" + type: "item" + }] + x: 22.0d + y: -0.5d + } + { + dependencies: [ + "4F5C883CC5282151" + "06F1724135B11DDF" + ] + hide_dependency_lines: true + id: "3D3508CB85E24741" + tasks: [{ + id: "1305D6C4E52B055B" + item: "tfcastikorcarts:wheel/acacia" + type: "item" + }] + x: 13.5d + y: 6.5d + } + { + dependencies: ["3D3508CB85E24741"] + id: "219306E39AD47499" + tasks: [{ + id: "74EB9E449D473FC9" + item: "tfcastikorcarts:supply_cart/acacia" + type: "item" + }] + x: 14.5d + y: 6.5d + } + { + dependencies: ["3D3508CB85E24741"] + id: "146B900F623869B5" + tasks: [{ + id: "54A97AF79AA8E551" + item: "tfcastikorcarts:plow/acacia" + type: "item" + }] + x: 14.0d + y: 5.5d + } + { + dependencies: ["3D3508CB85E24741"] + id: "671C2E5239C4E644" + tasks: [{ + id: "575BC984BA6ED21C" + item: "tfcastikorcarts:animal_cart/acacia" + type: "item" + }] + x: 15.0d + y: 5.5d + } + { + dependencies: ["70D40085219B1CC2"] + id: "1A28C8439C0DEC68" + tasks: [{ + id: "586CBB50F542C2EE" + item: { + Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfcchannelcasting:unfired_channel" + } + type: "item" + }] + x: 15.0d + y: 11.0d + } + { + dependencies: ["70D40085219B1CC2"] + id: "5773060592E254AF" + tasks: [{ + id: "53663E2AA8284479" + item: { + Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfcchannelcasting:unfired_mold_table" + } + type: "item" + }] + x: 15.0d + y: 12.0d + } + { + dependencies: ["1A28C8439C0DEC68"] + id: "2E3834B5FA53CC37" + tasks: [{ + id: "487D2E3A7B940B10" + item: "tfcchannelcasting:channel" + type: "item" + }] + x: 16.5d + y: 11.0d + } + { + dependencies: ["5773060592E254AF"] + id: "4BCDA03CE74059FA" + tasks: [{ + id: "4A483474864ADD17" + item: "tfcchannelcasting:mold_table" + type: "item" + }] + x: 16.5d + y: 12.0d + } + { + dependencies: ["297996E158D0A289"] + id: "30CC45D36D640C8F" + tasks: [{ + id: "0A1674892B490462" + item: { + Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfcchannelcasting:unfired_heart_mold" + } + type: "item" + }] + x: -6.0d + y: 24.0d + } + { + dependencies: ["30CC45D36D640C8F"] + id: "4BC384B85E698C86" + tasks: [{ + id: "5DE11577CF333011" + item: { + Count: 1b + ForgeCaps: { + Parent: { + heat: 0.0f + ticks: 0L + } + } + id: "tfcchannelcasting:heart_mold" + tag: { } + } + type: "item" + }] + x: -9.0d + y: 24.0d + } + { + dependencies: ["2765DB2E20A745F8"] + id: "04D4E196824D53C4" + tasks: [{ + id: "0121A0A3EFBF3A46" + item: "gtceu:glass_tube" + type: "item" + }] + x: -5.0d + y: 5.5d } ] title: "Primitive Age" diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt index f2c2a43df..71328ec09 100644 --- a/config/ftbquests/quests/chapters/steam_age.snbt +++ b/config/ftbquests/quests/chapters/steam_age.snbt @@ -6,14 +6,52 @@ icon: "gtceu:bronze_brick_casing" id: "3B89FB8839204148" order_index: 1 - quest_links: [{ - id: "582A6B4135EABE27" - linked_quest: "5C7B69F45F076A79" - shape: "gear" - size: 3.0d - x: -3.0d - y: 0.0d - }] + quest_links: [ + { + id: "582A6B4135EABE27" + linked_quest: "5C7B69F45F076A79" + shape: "gear" + size: 3.0d + x: -3.0d + y: 0.0d + } + { + id: "1C86D83D29134EBE" + linked_quest: "253860AD4DF4224C" + x: 5.5d + y: -4.5d + } + { + id: "09E0E263CC81CD99" + linked_quest: "2658E7679CD42ACD" + x: 9.5d + y: 4.5d + } + { + id: "26D1A18BE2F694C4" + linked_quest: "6E13B0241CB1D536" + x: 7.5d + y: 3.0d + } + { + id: "580358D6164B9CEA" + linked_quest: "04D4E196824D53C4" + x: 2.5d + y: -1.5d + } + { + id: "4DFB0BF29099F2A1" + linked_quest: "5BBF0B6AED98072E" + x: 2.5d + y: 0.0d + } + { + id: "190A7A8C49F390C2" + linked_quest: "478D0DF94D7495EF" + x: -0.5d + y: -3.0d + } + ] quests: [ { dependencies: ["253860AD4DF4224C"] @@ -63,43 +101,6 @@ x: 7.5d y: -3.0d } - { - dependencies: ["2658E7679CD42ACD"] - description: [ - "Obtaining paper is both more difficult and less efficient than in vanilla. Thanks, Greg." - "" - "You'll need to grind &aSugar Canes&r into &aPaper Dust&r, and then smush the dust with a mallet and water." - "{@pagebreak}" - "&9Note 1:&r Don't worry, we're not cruel enough to have the recipe consume the bucket." - "{@pagebreak}" - "&9Note 2:&r Make a manual Sugar Cane farm. You could also automate one with Observers and Pistons. Shoutout to any &aNomifactory&r veterans." - "{@pagebreak}" - "&9Note 3:&r As a reminder, Bone Meal can be used on Sugar Canes." - "{@pagebreak}" - "&9Note 4:&r When you reach &7LV&r, you'll be able to make Paper from Wood." - "{@pagebreak}" - "&9Note 5:&r The Crafting Station makes this microcrafting absolutely &2trivial&r - use it!" - "{@pagebreak}" - "&9Note 6:&r Paper will be used as a poor wrapping material for the upcoming resistors." - "{@pagebreak}" - "&9Note 7:&r It is truly a pleasure to share this moment with you, our fellow Greg enjoyer." - "{@pagebreak}" - "&l&3Lore:&r&o In GTCEu 1.12.2, Paper Dust was instead named Chad, prompting this quest to be full of memes." - ] - id: "76B70EF552B35779" - shape: "rsquare" - size: 1.0d - subtitle: "#realism" - tasks: [{ - count: 4L - id: "5DCE370285F5B2C6" - item: "minecraft:paper" - type: "item" - }] - title: "Greg has struck again" - x: 11.5d - y: 1.5d - } { dependencies: ["5C7B69F45F076A79"] description: [ @@ -159,11 +160,11 @@ } ] title: "Malding" - x: 4.0d + x: 2.5d y: -3.0d } { - dependencies: ["249374557D095913"] + dependencies: ["5BBF0B6AED98072E"] description: [ "Not many items are made in the &3Extractor&r during the &6Steam Age&r, but it's used to make &9Rubber&r, which you'll need after Steel." "" @@ -180,35 +181,14 @@ }] title: "Steam Extractor" x: 4.0d - y: -1.5d - } - { - dependencies: ["6E13B0241CB1D536"] - description: [ - "Grow &dRubber Trees&r and cut them down to get &aSticky Resin&r." - "" - "If you're playing on a difficulty other than &bPeaceful&r, Sticky Resin can be obtained from Slimeballs." - "{@pagebreak}" - ] - id: "3144DC68B266730C" - size: 1.0d - subtitle: "Did you think we would force you to use treetaps...?" - tasks: [{ - count: 32L - id: "67D04A48C5473D10" - item: "gtceu:sticky_resin" - type: "item" - }] - title: "Sticky Resin" - x: 7.5d - y: 1.5d + y: 0.0d } { dependencies: [ - "3144DC68B266730C" "236C886D50A99785" "1436DB89E21264F3" "22997534983F6812" + "6E13B0241CB1D536" ] description: [ "Rubber is an excellent insulation material, and that's exactly what it's used for in GTCEu." @@ -240,8 +220,8 @@ } { dependencies: [ - "3144DC68B266730C" - "76B70EF552B35779" + "2658E7679CD42ACD" + "6E13B0241CB1D536" ] description: [ "Resistors are components that will be used to make your first Circuit." @@ -261,7 +241,7 @@ }] title: "Electronics #1: Resistors" x: 9.5d - y: 1.5d + y: 3.0d } { dependencies: ["5C7B69F45F076A79"] @@ -338,10 +318,10 @@ }] title: "Steam Alloy Smelter" x: 2.5d - y: 0.0d + y: 1.5d } { - dependencies: ["249374557D095913"] + dependencies: ["04D4E196824D53C4"] description: [ "Crafting Vacuum Tubes might make you question your existence. Sorry about that." "" @@ -361,51 +341,6 @@ }] title: "Electronics #3: Vacuum Tubes" x: 4.0d - y: 0.0d - } - { - dependencies: [ - "22997534983F6812" - "48AED37B4E20A99A" - ] - description: [ - "Use Mortars or a Macerator (your choice) to microcraft your way to Glass Dust, which you can then turn into a &aGlass Block&r." - "" - "If you are lost, a more detailed guide for this process is on the next page, but &dwe urge you to nose around JEI&r and figure out the recipe on your own. Being able to navigate JEI and parse recipes is an &6essential skill&r for completing this pack." - "" - "Glass will be easier later on. You've probably already noticed that juicy &3Arc Furnace&r recipe - don't worry, we'll get there soon." - "" - "Glass tubes will be required for your first Electronic Circuit." - "{@pagebreak}" - "Lost? Worry not!" - "" - "First, use a &3method of pulverisation&r to turn Sand into &9Quartz Sand Dust&r." - "" - "Next, crush down some Flint into &9Flint Dust&r, and split this dust into tiny piles in a crafting grid." - "" - "Combine the two into &9Glass Dust&r, which can be molded into Glass in an Alloy Smelter with a &9Block Mold&r." - "" - "Finally, Glass!" - ] - icon: "minecraft:glass" - id: "249374557D095913" - shape: "rsquare" - size: 1.0d - subtitle: "Must be satisfying, right?" - tasks: [ - { - id: "4B958F6E2AA74763" - item: "minecraft:glass" - type: "item" - } - { - id: "16FC5B5DCBBEE53E" - item: "gtceu:glass_tube" - type: "item" - } - ] - title: "Glass, at last!" - x: 2.5d y: -1.5d } { @@ -427,8 +362,8 @@ type: "item" }] title: "Red Alloy" - x: 5.5d - y: 0.0d + x: 4.0d + y: 1.5d } { dependencies: [ @@ -551,12 +486,12 @@ }] title: "Steam Macerator" x: -0.5d - y: 1.5d + y: 3.0d } { dependencies: [ - "3144DC68B266730C" "1C50A758A1DE25CB" + "6E13B0241CB1D536" ] description: [ "Macerate Wood into Wood Pulp, then compress it into Wood Plates. Combine it with Resin to make an empty board." @@ -573,15 +508,8 @@ tasks: [ { id: "3704C06203B7485A" - item: { - Count: 1b - id: "itemfilters:tag" - tag: { - value: "forge:plates/wood" - } - } + item: "gtceu:wood_plate" optional_task: true - title: "Wood Plates" type: "item" } { @@ -592,7 +520,7 @@ ] title: "Electronics #2: Circuit Boards" x: 5.5d - y: 1.5d + y: 3.0d } { dependencies: ["1C50A758A1DE25CB"] @@ -617,7 +545,7 @@ }] title: "What is this Mess?!" x: -0.5d - y: 3.0d + y: 4.5d } { dependencies: ["1C50A758A1DE25CB"] @@ -663,7 +591,7 @@ ] title: "Steam Grinder" x: 1.0d - y: 3.0d + y: 4.5d } { dependencies: ["011EC2CE0111C9A0"] @@ -790,7 +718,7 @@ }] title: "Item Pipes" x: 2.5d - y: 3.0d + y: 4.5d } { dependencies: ["5C7B69F45F076A79"] @@ -825,6 +753,31 @@ x: -7.0d y: 1.5d } + { + dependencies: [ + "478D0DF94D7495EF" + "1931FC6DEAC29646" + ] + description: [""] + id: "39E8CE6A86731567" + tasks: [{ + id: "725E42CDF19B0495" + item: "gtceu:glass_dust" + type: "item" + }] + x: 1.0d + y: -3.0d + } + { + id: "00990B10AD5E694A" + tasks: [{ + id: "5B380855F40BD574" + title: "test" + type: "checkmark" + }] + x: 1.0d + y: -4.5d + } ] subtitle: ["Harness the power of Steam and learn the basics"] title: "Steam Age" diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 3448687b4..24e293d29 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -255,6 +255,14 @@ client: # Default: true useVBO: true + # Duration of the multiblock in-world preview (s) + # Default: 10 + inWorldPreviewDuration: 10 + + # Duration of UI animations in ms + # Default: 300 + animationTime: 300 + # Config options for Tools and Armor tools: # Random chance for electric tools to take actual damage diff --git a/config/jsg/jsgConfig_1.0/Debug.toml b/config/jsg/jsgConfig_1.0/Debug.toml new file mode 100644 index 000000000..d4d364e4d --- /dev/null +++ b/config/jsg/jsgConfig_1.0/Debug.toml @@ -0,0 +1,2 @@ +"Render invisible blocks" = false + diff --git a/config/jsg/jsgConfig_1.0/DialHomeDevice.toml b/config/jsg/jsgConfig_1.0/DialHomeDevice.toml new file mode 100644 index 000000000..562443a34 --- /dev/null +++ b/config/jsg/jsgConfig_1.0/DialHomeDevice.toml @@ -0,0 +1,55 @@ +#SIDE: SERVER +#Range: 1 ~ 64 +"DHD range's radius horizontal" = 25 +#SIDE: SERVER +#Range: 1 ~ 64 +"DHD range's radius vertical" = 15 +#SIDE: SERVER +#Range: 1 ~ 64 +"Universe dialer max horizontal reach radius" = 10 +#SIDE: SERVER/CLIENT +#Range: 1 ~ 128000 +"DHD's max fluid capacity" = 16000 +#When capacity upgrade is placed in the DHD, +#then multiply internal capacity by this number +#SIDE: SERVER/CLIENT +#Range: 1.0 ~ 5.0 +"Capacity upgrade multiplier" = 2.0 +#SIDE: SERVER +#Range: 1 ~ 50000 +"Energy per 1mB Naquadah" = 10240 +#Energy per 1mB is multiplied by this +#when efficiency upgrade is placed in the DHD +#SIDE: SERVER +#Range: 1.0 ~ 5.0 +"Efficiency upgrade multiplier" = 1.4 +#SIDE: SERVER +#Range: 0.0 ~ 1.0 +"Cold fusion reactor activation energy level" = 0.9 +#SIDE: SERVER +#Range: 0.0 ~ 1.0 +"Cold fusion reactor deactivation energy level" = 0.98 +#THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI +#SIDE: SERVER +"Enable press sound when dialing with computer" = false +#Enable opening last chevron while dialing milkyway gate with dhd +#THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI +#SIDE: SERVER +"Enable opening last chevron while dialing with dhd" = true +#SIDE: CLIENT +"Enable hint when dialing on DHDs with notebook page" = true + +["Dialing helper colors"] + #Set colors of each dial helper button + #You should use HEX values + #SIDE: CLIENT + Normal = "#7FFFFF" + #Set colors of each dial helper button + #You should use HEX values + #SIDE: CLIENT + ExtraSymbols = "#E56BEE" + #Set colors of each dial helper button + #You should use HEX values + #SIDE: CLIENT + Origin = "#7FFF7F" + diff --git a/config/jsg/jsgConfig_1.0/General.toml b/config/jsg/jsgConfig_1.0/General.toml new file mode 100644 index 000000000..1e67f99b5 --- /dev/null +++ b/config/jsg/jsgConfig_1.0/General.toml @@ -0,0 +1,52 @@ +#Should JSG check for update on startup? +#SIDE: CLIENT +"Check for updates" = false +#Specifies transparency of glyphs on notebook page +#SIDE: CLIENT +#Range: 0.0 ~ 1.0 +"Notebook page Glyph transparency" = 0.75 +#Greater values render the Page more to the center of the screen, smaller render it closer to the borders. +#0 - for standard 16:9 (default), +#0.2 - for 4:3. +#SIDE: CLIENT +#Range: 0.0 ~ 1.0 +"Notebook Page offset" = 0.0 +#Render light of some textures. +#Disable this if it causes lags. +#SIDE: CLIENT +"Render emissive textures" = true +#SIDE: CLIENT +"Change title to w/ JSG" = true +#Disable fadeout when going through a gate or using transport rings or victim of Destiny FTL jump +#SIDE: CLIENT +"Disable white fadeout" = false +#Specifies what unit will be used to display temperatures +#SIDE: CLIENT +#Allowed Values: KELVIN, CELSIUS, FAHRENHEITS +"Temperature unit" = "CELSIUS" +#SIDE: CLIENT +#Range: 0 ~ 100 +"Destiny CO2 blaster particles count/tick" = 5 +#SIDE: SERVER +"Enable teleports using End Portal" = false +#SIDE: SERVER +"Enable teleports using Nether Portal" = false +#Disables showing custom main menu +#WARNING! - Requires reloading! +#SIDE: CLIENT +"Disable JSG main menu" = true +#Specifies how many images can be used as background of mainmenu. (starts from 0) +#DO NOT CHANGE THIS IF YOU DO NOT KNOW WHAT ARE YOU DOING! +#WARNING! - Requires reloading! +#SIDE: CLIENT +"Main menu background images count" = 7 +#WARNING! - Requires reloading! +#SIDE: CLIENT +"Enable Tau'ri logo on startup" = false +#SIDE: CLIENT +"Enable debug mode in main menu" = false +#SIDE: CLIENT +"Play music in main menu" = false +#SIDE: CLIENT +"Play loading music" = false + diff --git a/config/jsg/jsgConfig_1.0/Stargate.toml b/config/jsg/jsgConfig_1.0/Stargate.toml new file mode 100644 index 000000000..4ffae03cf --- /dev/null +++ b/config/jsg/jsgConfig_1.0/Stargate.toml @@ -0,0 +1,217 @@ +#Defines size of stargate's model +#SIDE: SERVER/CLIENT +#Allowed Values: SMALL, MEDIUM, LARGE +"Stargate size" = "MEDIUM" +#Format: "modid:blockid", for example: +#"minecraft:red_wool" +#"minecraft:stone" +#SIDE: SERVER +"Kawoosh invincible blocks" = ["minecraft:snow_layer", "minecraft:rail", "minecraft:golden_rail", "minecraft:detector_rail", "minecraft:activator_rail", "minecraft:carpet", "minecraft:stone_pressure_plate", "minecraft:wooden_pressure_plate", "minecraft:light_weighted_pressure_plate", "minecraft:heavy_weighted_pressure_plate"] +#Format: "modid:entityid", for example: +#"minecraft:zombie" +#"minecraft:creeper" +#SIDE: SERVER +"Entities to spawn" = ["minecraft:zombie", "minecraft:skeleton"] + +[Mechanics] + #Enable wrench to be used as disassembling tool for gates? + #This can bypass for example claimed chunks (from FTB) on servers... + #If false - will be set iron pickaxe as correct tool + #SIDE: SERVER + "Enable wrench to disassemble gate" = true + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + "Enable burried state for gates" = true + #SIDE: SERVER/CLIENT + #Range: 0 ~ 15000 + "Orlin's gate max open count" = 2 + #SIDE: SERVER/CLIENT + #Range: > 5 + "Universe dialer nearby radius" = 1024 + #Should gate explode when its overheated? + #SIDE: SERVER + "Enable gate overheat with explosion" = true + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 1.7976931348623157E308 + "Max stargate heat" = 83400.0 + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 1.0 + "Chance of lighting strike that charge a gate" = 5.000000237487257E-4 + #If target gate is dialing and this option is set to true, + #the target gate will stop dialing and open incoming wormhole. + #If this is set to false and the dialed gate dialing address, + #the connection will not established. + #If it cause issues, set it to false. + #SIDE: SERVER + "Connect to dialing gate" = true + #Change this to true, if you want to use 8 chevrons between pegasus and milkyway gates + #SIDE: SERVER + "Use 8 chevrons between MW and PG gates" = true + #If you want to dial UNI-UNI only with seven symbols (interdimensional for example), set this to true + #SIDE: SERVER + "Need only 7 symbols between Uni gates" = false + +[Iris] + #If set to 'false' player get killed by iris on entering event horizon + #SIDE: SERVER + "Iris kills at destination" = true + #Set it to true, if u want to bypass + #shield/iris damage by creative gamemode + #SIDE: SERVER + "Allow creative bypass" = true + #SIDE: SERVER + "Can iris destroy blocks" = false + #Should iris break when its overheated? + #SIDE: SERVER + "Enable iris overheat collapse" = true + #Durability of Titanium iris + #set it to 0, if u want to make it unbreakable + #SIDE: SERVER/CLIENT + #Range: 0 ~ 500000 + "Titanium iris durability" = 500 + #Durability of Trinium iris + #set it to 0, if u want to make it unbreakable + #SIDE: SERVER/CLIENT + #Range: 0 ~ 500000 + "Trinium iris durability" = 1000 + #Energy/tick used for make shield closed + #SIDE: SERVER + #Range: 0 ~ 500000 + "Shield power draw" = 500 + #SIDE: SERVER/CLIENT + #Range: 1 ~ 32 + "Maximum iris code length" = 9 + #0 - disables unbreaking on iris + #100 - unbreaking makes iris unbreakable + #SIDE: SERVER + #Range: 0 ~ 100 + "Unbreaking chance per level" = 10 + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 1.7976931348623157E308 + "Max titanium iris heat" = 1668.0 + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 1.7976931348623157E308 + "Max trinium iris heat" = 3336.0 + +[Power] + #SIDE: SERVER/CLIENT + #Range: > 4608 + "Stargate's internal buffer size" = 71280000 + #SIDE: SERVER + #Range: 1 ~ 500000 + "Stargate's max power throughput" = 26360 + #SIDE: SERVER + #Range: 0 ~ 500000 + "Stargate wormhole open power draw" = 4608 + #SIDE: SERVER + #Range: 0 ~ 50 + "Stargate wormhole sustain power draw" = 2 + #Seconds of energy left before gate becomes unstable + #SIDE: SERVER + #Range: 1 ~ 120 + "Stargate instability threshold" = 20 + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 100.0 + "Orlin's gate energy multiplier" = 2.0 + #SIDE: SERVER/CLIENT + #Range: 0.0 ~ 100.0 + "Universe gate energy multiplier" = 2.0 + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER/CLIENT + #Range: 0 ~ 3 + "Capacitors supported by Universe gates" = 1 + #Specifies the multiplier of power needed to keep the gate alive + #when 8-symbols address is dialed + #SIDE: SERVER + #Range: 0.0 ~ 100.0 + "Stargate eight symbols address power mul" = 1.2999999523162842 + #Specifies the multiplier of power needed to keep the gate alive + #when 9-symbols address is dialed + #SIDE: SERVER + #Range: 0.0 ~ 100.0 + "Stargate nine symbols address power mul" = 1.7000000476837158 + +[Visual] + #Below this biome temperature the gate will receive frosty texture. + #Set to negative value to disable. + #SIDE: CLIENT + #Range: 0.0 ~ 5.0 + "Temperature threshold for frosty overlay" = 0.10000000149011612 + #Specify what blocks can not be used as camo for gates. + #These blocks are only additional. There are also blocks that are internally coded + #and can not be deleted from the blacklist! + #Format: "modid:block", for example: + #"minecraft:stone" + #"minecraft:cobblestone" + #SIDE: SERVER/CLIENT + "Camo blocks blacklist" = [] + #If the incoming animations of gates generate issues, set it to false + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + "Allow incoming animations" = true + #Speed up dialing with computer on MW and UNI gates + #SIDE: SERVER/CLIENT + "Faster MilkyWay and Universe gates computer dial" = false + #Enable fast dialing on gates by default + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER/CLIENT + "Enable fast dialing of gates" = false + #SIDE: CLIENT + "Render not placed blocks of stargate" = true + +[PointOfOrigins] + #SIDE: CLIENT + "Enable different Point Of Origins for MW gate" = true + #Specifies Point Of Origins that were added by any resource pack. + #This options is required to load all models of added origins! + #Format: "id:name", for example: + #"6:Tollan" + #"7:P4X-256" + #!DO NOT CHANGE ANYTHING IF YOU DON'T KNOW WHAT ARE YOU DOING! + #SIDE: CLIENT/SERVER + "Custom added points of origin" = [] + +[EventHorizon] + #SIDE: SERVER + "Enable wrong side killing" = true + #SIDE: SERVER + #Range: 0.0 ~ 1.0 + "Unstable Event Horizon chance of death" = 0.07000000029802322 + #SIDE: SERVER + "Disable new kawoosh model (from 4_11_0_0)" = false + #SIDE: CLIENT + "Render EHs even if they are not rendering" = true + +[AutoClose] + #SIDE: SERVER + "Autoclose enabled" = true + #SIDE: SERVER + #Range: 1 ~ 300 + "Seconds to autoclose with no players nearby" = 5 + +[OpenTimeLimit] + #In seconds (2280 = 38 minutes) + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + #Range: 5 ~ 3000 + "Maximum seconds of gate should be open" = 240 + #What happens after gate's open time reaches limit? + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + #Allowed Values: DISABLED, CLOSE_GATE, DRAW_MORE_POWER + "Gate open time limit mode" = "DRAW_MORE_POWER" + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + #Range: 0 ~ 50000 + "Power draw after opened time limit" = 10000 + +[RandomIncomingGenerator] + #Enable random incoming wormholes generator + #THIS OPTION CAN BE OVERRIDE BY SETTING IT IN STARGATE GUI + #SIDE: SERVER + "Enable random incoming wormholes" = true + #10 = 1% + #SIDE: SERVER + #Range: 0 ~ 100 + "Chance of spawning per 10 seconds" = 1 + diff --git a/config/jsg/jsgDimensions_1.0.json b/config/jsg/jsgDimensions_1.0.json new file mode 100644 index 000000000..74ad87e0b --- /dev/null +++ b/config/jsg/jsgDimensions_1.0.json @@ -0,0 +1,88 @@ +{ + "ae2:spatial_storage": { + "name": "ae2:spatial_storage", + "distance": 12, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:mars": { + "name": "gcyr:mars", + "distance": 13, + "groups": [], + "milkyWayOrigins": {} + }, + "minecraft:overworld": { + "name": "minecraft:overworld", + "distance": 0, + "groups": [ + "netherOv" + ], + "milkyWayOrigins": {} + }, + "gcyr:venus_orbit": { + "name": "gcyr:venus_orbit", + "distance": 6, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:venus": { + "name": "gcyr:venus", + "distance": 12, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:overworld_orbit": { + "name": "gcyr:overworld_orbit", + "distance": 5, + "groups": [], + "milkyWayOrigins": {} + }, + "minecraft:the_nether": { + "name": "minecraft:the_nether", + "distance": 5, + "groups": [ + "netherOv" + ], + "milkyWayOrigins": { + "NORMAL": 2 + } + }, + "gcyr:mercury_orbit": { + "name": "gcyr:mercury_orbit", + "distance": 10, + "groups": [], + "milkyWayOrigins": {} + }, + "minecraft:the_end": { + "name": "minecraft:the_end", + "distance": 10, + "groups": [], + "milkyWayOrigins": { + "NORMAL": 1 + } + }, + "gcyr:luna_orbit": { + "name": "gcyr:luna_orbit", + "distance": 14, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:luna": { + "name": "gcyr:luna", + "distance": 9, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:mercury": { + "name": "gcyr:mercury", + "distance": 5, + "groups": [], + "milkyWayOrigins": {} + }, + "gcyr:mars_orbit": { + "name": "gcyr:mars_orbit", + "distance": 7, + "groups": [], + "milkyWayOrigins": {} + } +} \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 2882a9622..0fb337fab 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2526,6 +2526,7 @@ const registerMinecraftRecipes = (event) => { global.MINECRAFT_DYE_NAMES.forEach(dye => { event.remove({ id: `minecraft:${dye}_bed` }) + event.remove({ id: `minecraft:dye_${dye}_bed` }) if (dye != "white") event.recipes.gtceu.chemical_bath(`${dye}_bed`) diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 945c3d0d8..f3cd028e0 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -14,10 +14,10 @@ const registerSophisticatedBackpacksRecipes = (event) => { 'BBB' ], { A: '#forge:string', - B: 'minecraft:leather', + B: '#forge:leather', C: '#forge:chests/wooden', D: 'minecraft:name_tag' - }); + }).id('tfg:sophisticated_backpacks/shaped/backpack') // Железный рюкзак event.custom({ @@ -50,7 +50,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:iron_backpack" } - }).id('sophisticatedbackpacks:iron_backpack_upgrade') + }).id('tfg:sophisticated_backpacks/shaped/iron_backpack') // Золотой рюкзак event.custom({ @@ -83,7 +83,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:gold_backpack" } - }).id('sophisticatedbackpacks:gold_backpack_upgrade') + }).id('tfg:sophisticated_backpacks/shaped/gold_backpack') // Алмазный рюкзак event.custom({ @@ -116,7 +116,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:diamond_backpack" } - }).id('sophisticatedbackpacks:diamond_backpack_upgrade') + }).id('tfg:sophisticated_backpacks/shaped/diamond_backpack') // Незеритовый рюкзак event.custom({ @@ -149,7 +149,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:netherite_backpack" } - }).id('sophisticatedbackpacks:netherite_backpack_upgrade') + }).id('tfg:sophisticated_backpacks/shaped/netherite_backpack') // Апгрейды @@ -163,7 +163,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: '#forge:rods/long/wrought_iron', C: 'minecraft:leather', D: '#forge:plates/steel' - }); + }).id('tfg:sophisticated_backpacks/shaped/upgrade_base') // Улучшение - подбиратель event.shaped('sophisticatedbackpacks:pickup_upgrade', [ @@ -178,13 +178,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: 'gtceu:hv_robot_arm', F: '#gtceu:circuits/hv', G: '#gtceu:batteries/hv' - }); + }).id('tfg:sophisticated_backpacks/shaped/pickup_upgrade') // Улучшение - улучшенный подбиратель event.shapeless('sophisticatedbackpacks:advanced_pickup_upgrade', [ 'sophisticatedbackpacks:pickup_upgrade', '#gtceu:circuits/ev' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_pickup_upgrade') // Улучшение - фильтр event.shaped('sophisticatedbackpacks:filter_upgrade', [ @@ -200,13 +200,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { F: 'gtceu:lv_robot_arm', G: '#gtceu:circuits/lv', H: 'gtceu:item_tag_filter' - }); + }).id('tfg:sophisticated_backpacks/shaped/filter_upgrade') // Улучшение - улучшенный фильтр event.shapeless('sophisticatedbackpacks:advanced_filter_upgrade', [ 'sophisticatedbackpacks:filter_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_filter_upgrade') // Улучшение - магнит event.shaped('sophisticatedbackpacks:magnet_upgrade', [ @@ -219,13 +219,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:circuits/hv', D: 'sophisticatedbackpacks:upgrade_base', E: '#gtceu:batteries/hv' - }); + }).id('tfg:sophisticated_backpacks/shaped/magnet_upgrade') // Улучшение - улучшенный магнит event.shapeless('sophisticatedbackpacks:advanced_magnet_upgrade', [ 'sophisticatedbackpacks:magnet_upgrade', '#gtceu:circuits/ev' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_magnet_upgrade') // Улучшение - уничтожитель event.shaped('sophisticatedbackpacks:void_upgrade', [ @@ -240,13 +240,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: '#forge:tools/wrenches', F: 'gtceu:brass_normal_item_pipe', G: '#forge:ender_pearls' - }); + }).id('tfg:sophisticated_backpacks/shaped/void_upgrade') // Улучшение - улучшенный уничтожитель event.shapeless('sophisticatedbackpacks:advanced_void_upgrade', [ 'sophisticatedbackpacks:void_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_void_upgrade') // Улучшение - Deposit event.shaped('sophisticatedbackpacks:deposit_upgrade', [ @@ -260,13 +260,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { D: 'gtceu:lv_conveyor_module', E: 'sophisticatedbackpacks:upgrade_base', F: 'gtceu:lv_robot_arm' - }); + }).id('tfg:sophisticated_backpacks/shaped/deposit_upgrade') // Улучшение - улучшенный Deposit event.shapeless('sophisticatedbackpacks:advanced_deposit_upgrade', [ 'sophisticatedbackpacks:deposit_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_deposit_upgrade') // Улучшение - Restock event.shaped('sophisticatedbackpacks:restock_upgrade', [ @@ -280,13 +280,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { D: '#gtceu:batteries/lv', E: 'gtceu:manganese_phosphide_single_wire', F: '#gtceu:circuits/lv', - }); + }).id('tfg:sophisticated_backpacks/shaped/restock_upgrade') // Улучшение - улучшенный Restock event.shapeless('sophisticatedbackpacks:advanced_restock_upgrade', [ 'sophisticatedbackpacks:restock_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_restock_upgrade') // Улучшение - Refill event.shaped('sophisticatedbackpacks:refill_upgrade', [ @@ -299,13 +299,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:batteries/lv', D: 'gtceu:lv_robot_arm', E: 'sophisticatedbackpacks:upgrade_base' - }); + }).id('tfg:sophisticated_backpacks/shaped/refill_upgrade') // Улучшение - улучшенный Refill event.shapeless('sophisticatedbackpacks:advanced_refill_upgrade', [ 'sophisticatedbackpacks:refill_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_refill_upgrade') // Улучшение - Everlasting event.shaped('sophisticatedbackpacks:everlasting_upgrade', [ @@ -318,7 +318,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:circuits/zpm', D: 'sophisticatedbackpacks:upgrade_base', E: '#gtceu:batteries/zpm' - }); + }).id('tfg:sophisticated_backpacks/shaped/everlasting_upgrade') // Улучшение - верстак event.shaped('sophisticatedbackpacks:crafting_upgrade', [ @@ -330,7 +330,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: '#tfc:workbenches', C: '#forge:plates/steel', D: 'sophisticatedbackpacks:upgrade_base', - }); + }).id('tfg:sophisticated_backpacks/shaped/crafting_upgrade') // Улучшение - Stack Lvl. 1 event.shaped('sophisticatedbackpacks:stack_upgrade_tier_1', [ @@ -343,7 +343,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:batteries/iv', D: 'sophisticatedbackpacks:upgrade_base', E: 'gtceu:iv_field_generator' - }); + }).id('tfg:sophisticated_backpacks/shaped/stack_upgrade_tier_1') // Улучшение - проигрыватель event.shaped('sophisticatedbackpacks:jukebox_upgrade', [ @@ -355,7 +355,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: 'minecraft:jukebox', C: '#forge:plates/steel', D: 'sophisticatedbackpacks:upgrade_base', - }); + }).id('tfg:sophisticated_backpacks/shaped/jukebox_upgrade') // Улучшение - ToolSwapper event.shaped('sophisticatedbackpacks:tool_swapper_upgrade', [ @@ -370,11 +370,11 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: 'sophisticatedbackpacks:upgrade_base', F: '#tfc:shovels', G: '#tfc:axes', - }); + }).id('tfg:sophisticated_backpacks/shaped/tool_swapper_upgrade') // Улучшение - улучшенный ToolSwapper event.shapeless('sophisticatedbackpacks:advanced_tool_swapper_upgrade', [ 'sophisticatedbackpacks:tool_swapper_upgrade', '#gtceu:circuits/mv' - ]); + ]).id('tfg:sophisticated_backpacks/shapeless/advanced_tool_swapper_upgrade') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index b511729d1..5c94c3021 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2889,7 +2889,7 @@ const registerTFCRecipes = (event) => { // Lamp Glass event.recipes.gtceu.alloy_smelter(`tfg:tfc/lamp_glass`) .itemInputs('#tfc:glass_batches') - .notConsumable('tfg:unfinished_lamps') + .notConsumable('#tfg:unfinished_lamps') .itemOutputs('tfc:lamp_glass') .duration(100) .EUt(2) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index c9e7d270c..7e1358b06 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -468,5 +468,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:empty_blaze_burner', 'create:minecart_contraption', 'create:furnace_minecart_contraption', - 'create:chest_minecart_contraption' + 'create:chest_minecart_contraption', + 'create:framed_glass_pane' ]; \ No newline at end of file diff --git a/mods b/mods index 982df0a06..0d398aa41 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 982df0a06d17580d8c6b4d4fc1457705811b8e95 +Subproject commit 0d398aa4147e08510747f7c26f26616819a611e5