diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1133139636.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1133139636.json index c3c3054..a35d663 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1133139636.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1133139636.json @@ -11,30 +11,56 @@ "Damage:2": 126, "id:8": "gregtech:meta_fuel_rod" }, - "name:8": "§4超能硅岩燃料棒" + "name:8": "§4超能硅岩燃料棒", + "tasklogic:8": "OR" } }, "questID:3": 1133139636, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 126, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 126, "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 126, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 126, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1262227851.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1262227851.json index 9964b97..05f6089 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1262227851.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1262227851.json @@ -11,30 +11,56 @@ "Damage:2": 2341, "id:8": "gtlitecore:meta_fuel_rod" }, - "name:8": "§3MOX燃料棒" + "name:8": "§3MOX燃料棒", + "tasklogic:8": "OR" } }, "questID:3": 1262227851, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 2341, + "id:8": "gtlitecore:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 2341, "id:8": "gtlitecore:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 2341, "id:8": "gtlitecore:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 2341, "id:8": "gtlitecore:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1387463929.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1387463929.json index cfbf1d1..375d685 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1387463929.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1387463929.json @@ -4,37 +4,63 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "通过§2晶质铀矿§r的处理可以获得一些§e镤§r,因此这也是一种聚变起始点的选择。\n\n镤燃料棒的离心产物是§2铀§r与§a铀-235§r。", "frame:8": "JAGGED", "icon:10": { "Count:3": 1, "Damage:2": 86, "id:8": "gregtech:meta_fuel_rod" }, - "name:8": "§6裂变起始点:镤" + "name:8": "§6裂变起始点:镤", + "tasklogic:8": "OR" } }, "questID:3": 1387463929, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 86, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 86, "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 86, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 86, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1578798472.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1578798472.json index 11a4c3e..46bfdf4 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1578798472.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1578798472.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "与§2钍§r的情况相同,§a铀§r也拥有大量的矿物来源,同时可以通过研磨§c红花岗岩§r来获得,因此也不失为一种好的裂变起始点选择。\n\n铀燃料棒的离心产物是§9镎§r与§b锕§r。", "frame:8": "JAGGED", "icon:10": { "Count:3": 1, @@ -15,6 +15,24 @@ } }, "questID:3": 1578798472, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 116, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1720750929.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1720750929.json index 0f4a6df..1690083 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1720750929.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1720750929.json @@ -4,37 +4,63 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "一种经济的裂变起始元素,可以从§c红花岗岩§r里提取出大量的§2钍§r来合成,各类§e放射性矿石§r的产物或副产物中也常见其的身影。\n\n钍燃料棒的离心产物是§6镤§r与§a铀-238§r。\n\n§3如果只是想获得镤,那么使用钍燃料棒仅为可选项,晶质铀矿处理中可以直接获得镤,但相对复杂一些。", "frame:8": "JAGGED", "icon:10": { "Count:3": 1, "Damage:2": 109, "id:8": "gregtech:meta_fuel_rod" }, - "name:8": "§2裂变起始点:钍" + "name:8": "§2裂变起始点:钍", + "tasklogic:8": "OR" } }, "questID:3": 1720750929, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 109, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 109, "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 109, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 109, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/1749720537.json b/config/betterquesting/DefaultQuests/Quests/1844759518/1749720537.json index 4597b3b..10b7868 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/1749720537.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/1749720537.json @@ -11,30 +11,56 @@ "Damage:2": 125, "id:8": "gregtech:meta_fuel_rod" }, - "name:8": "§6富集硅岩燃料棒" + "name:8": "§6富集硅岩燃料棒", + "tasklogic:8": "OR" } }, "questID:3": 1749720537, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 125, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 125, "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 125, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 125, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/1844759518/641044601.json b/config/betterquesting/DefaultQuests/Quests/1844759518/641044601.json index a2b5171..d91891f 100644 --- a/config/betterquesting/DefaultQuests/Quests/1844759518/641044601.json +++ b/config/betterquesting/DefaultQuests/Quests/1844759518/641044601.json @@ -11,30 +11,56 @@ "Damage:2": 124, "id:8": "gregtech:meta_fuel_rod" }, - "name:8": "§a硅岩燃料棒" + "name:8": "§a硅岩燃料棒", + "tasklogic:8": "OR" } }, "questID:3": 641044601, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 124, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" - }, - "1:10": { - "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { "Count:3": 1, "Damage:2": 124, "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 124, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 124, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1513557014.json b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1513557014.json index e60f01b..5dc5a08 100644 --- a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1513557014.json +++ b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1513557014.json @@ -13,37 +13,56 @@ "id:8": "gregtech:meta_fuel_rod" }, "name:8": "§c裂变起始点:钚", - "questlogic:8": "OR" + "questlogic:8": "OR", + "tasklogic:8": "OR" } }, "questID:3": 1513557014, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 701, + "id:8": "gtlitecore:gtlite_meta_item_1" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 81, + "id:8": "gregtech:meta_dust" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, "requiredItems:9": { "0:10": { - "Count:3": 16, + "Count:3": 1, "Damage:2": 81, - "id:8": "gregtech:meta_dust" + "id:8": "gregtech:meta_fuel_rod" } }, "taskID:8": "bq_standard:retrieval" }, "1:10": { "index:3": 1, - "optional:1": 1, "requiredItems:9": { "0:10": { - "Count:3": 1, - "Damage:2": 81, - "id:8": "gregtech:meta_fuel_rod" - }, - "1:10": { "Count:3": 1, "Damage:2": 81, "id:8": "gregtech:meta_fuel_rod_enriched" - }, - "2:10": { + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { "Count:3": 1, "Damage:2": 81, "id:8": "gregtech:meta_fuel_rod_high_density" diff --git a/index.toml b/index.toml index 3775677..539e08b 100644 --- a/index.toml +++ b/index.toml @@ -1030,11 +1030,11 @@ hash = "53a1de6930d939b1ef45170101e3cfd746f44327c2b35a81c1d2d80d8ba3155f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1133139636.json" -hash = "f851ab117602c21605863b98fb27a9a80013c7f3307cbe8214e59d5e19776eee" +hash = "527a4647feb9bd58960c4ba6c63f46b99cb1b65c922a42634cadeb900ac0742d" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1262227851.json" -hash = "7e995962d4e5d992c7170f0cedf564ac57dceff285afa76e79c286f5af4e8774" +hash = "0662cabaac5d9006eda4dc66cb01588478076b2e4d49a401626dddedd06ad445" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1371896621.json" @@ -1042,7 +1042,7 @@ hash = "4111abc72e1a9af9539c282a3e61dfa7e260668cd7f478634a74169b3fff7b62" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1387463929.json" -hash = "6c2d6ff3f86c0176f51556938fd9459c54252001a14dfc5bcede849c7df0d3c5" +hash = "66f08c17359b2e508f0c73c5f144ca889631673341727a4e4e6c12d4c479b25c" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1464280039.json" @@ -1058,7 +1058,7 @@ hash = "84e36d8bb0560bd0f12ee6e51055ea881b628e20d4d107db6531fffe5ccd6052" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1578798472.json" -hash = "5a88846882000f5fdd5a73637d5d717ec23ec703036df9386953be5f260f5cd8" +hash = "3e7df3aaabc25ec05f86f4e292671341c9a41c13206093b272beddbeb0a71b7a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/165241322.json" @@ -1070,11 +1070,11 @@ hash = "f572ad484163a939d27e1beec9606ec205f61907886718952b7f5c4f492cd230" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1720750929.json" -hash = "7b739cf5b9e0b07d9a5b0aa2ed9cdcfcae26b757d6556cf68686e31a38e3c062" +hash = "8c7b4c0ffc50851db5b1c23168604f988acdb0097c62f2b524a38060220eee3b" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1749720537.json" -hash = "35ed11519d8aed13d6dacdea3a0fcaf73d756cfaa01e28f64aa9f2e26f745368" +hash = "ff1a1da96bf511388b4828051e60496da4ec0d126a85729fd042107bc219d756" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/1914145006.json" @@ -1090,7 +1090,7 @@ hash = "a5e01c2fdc9f56d1b5a6f7fad40de6bbb55fd7cff7a493dbb8160654321a1486" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/641044601.json" -hash = "3a8354a3b1848d3b8769a535a411524ea4a03fbb45e09ca915b1aa0ba18523d9" +hash = "b2e15cf7061cf5203799310af41311f9c230b416e8f9d5d7c77d1ee0e23e2ac6" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1844759518/684008546.json" @@ -2634,7 +2634,7 @@ hash = "a88d1a6e1d987e3a7284d35fc655cf51d735974607ad4a7e5ecb688a9b99d7f5" [[files]] file = "config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1513557014.json" -hash = "24e95b19fcaddcc294e9f0e219fc440dd0b22616cce4666556d2a010b7f780d2" +hash = "d93f2a5e9b8a1b48cd8d72ff8ebd752fd90a57dce042704c79ab18068941dc0b" [[files]] file = "config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/1775197747.json" @@ -3439,7 +3439,7 @@ metafile = true [[files]] file = "mods/gtlitecore-1.0.0.jar" -hash = "1eae81d109a63ec14b82d2398127b3250b3981420a41a4b07c99bbf3e2ee8851" +hash = "1d0aa72c4632c13f0b15fc5aafd0c6b1e5f325dc1fd30b0331537f8ceebeaac4" [[files]] file = "mods/had-enough-characters.pw.toml" @@ -3448,7 +3448,7 @@ metafile = true [[files]] file = "mods/had-enough-items.pw.toml" -hash = "d8b3509f5f37d126f296db936248cff5aa0b99c0afdddd6fa28a2460880759ca" +hash = "3e809ef558b0bda17403200bdddbf841321869122de181a8fee1952826deae97" metafile = true [[files]] @@ -3488,7 +3488,7 @@ metafile = true [[files]] file = "mods/just-enough-characters.pw.toml" -hash = "abacf8f21c596f0ae9f1f26746a958089c3841e76cef22b4117b5dbe9efccfc3" +hash = "5a9a8278de81281cb61f1b8f4e5bc93fb5196d756f49cfbaabf424d0569b0255" metafile = true [[files]] diff --git a/mods/gtlitecore-1.0.0.jar b/mods/gtlitecore-1.0.0.jar index 3894b60..4564d61 100644 Binary files a/mods/gtlitecore-1.0.0.jar and b/mods/gtlitecore-1.0.0.jar differ diff --git a/mods/had-enough-items.pw.toml b/mods/had-enough-items.pw.toml index 500885e..9f60c64 100644 --- a/mods/had-enough-items.pw.toml +++ b/mods/had-enough-items.pw.toml @@ -1,13 +1,13 @@ name = "Had Enough Items" -filename = "HadEnoughItems_1.12.2-4.32.0.jar" +filename = "HadEnoughItems_1.12.2-4.35.0.jar" side = "both" [download] hash-format = "sha1" -hash = "666d562a804c9e55261bf2e504168138ea07f832" +hash = "5fec099c2b1bd429b826fa011eb304a6c58dc878" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 8405357 +file-id = 8934963 project-id = 557549 diff --git a/mods/just-enough-characters.pw.toml b/mods/just-enough-characters.pw.toml index d75dde9..9f71877 100644 --- a/mods/just-enough-characters.pw.toml +++ b/mods/just-enough-characters.pw.toml @@ -4,10 +4,10 @@ side = "client" [download] hash-format = "sha1" -hash = "c9d2ab3a9cb5593008ca7470c45727fe27235030" +hash = "cada3601a67075accc8f8c9f254866cd8d952dd8" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 7424367 +file-id = 8581272 project-id = 250702 diff --git a/pack.toml b/pack.toml index 17809cc..8e9b3d5 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "2170c1571c6a67f66dab360bcea822e2a46368fef5ba55af2c73f4c05f715270" +hash = "8c2c4edaf51b1918948735b912c321ad0a3f3d125fb644ee3fec2f461e29c5fb" [versions] forge = "14.23.5.2860"