diff --git a/config/betterquesting/DefaultQuests/QuestLines/1121539277.json b/config/betterquesting/DefaultQuests/QuestLines/1121539277.json index 4cba1d6..90a0e9e 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/1121539277.json +++ b/config/betterquesting/DefaultQuests/QuestLines/1121539277.json @@ -3,7 +3,7 @@ "order:3": 6, "properties:10": { "betterquesting:10": { - "desc:8": "更高的电压，更高的产能", + "desc:8": "更高的电压，更高的产能。", "icon:10": { "Count:3": 1, "Damage:2": 10004, diff --git a/config/betterquesting/DefaultQuests/QuestLines/1509941381.json b/config/betterquesting/DefaultQuests/QuestLines/1509941381.json index ff5a050..191c2c6 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/1509941381.json +++ b/config/betterquesting/DefaultQuests/QuestLines/1509941381.json @@ -3,7 +3,7 @@ "order:3": 4, "properties:10": { "betterquesting:10": { - "desc:8": "关于发电的诸多技巧", + "desc:8": "关于发电的诸多技巧，伴随你的整个游戏流程。", "icon:10": { "Count:3": 1, "Damage:2": 581, diff --git a/config/betterquesting/DefaultQuests/QuestLines/1844759518.json b/config/betterquesting/DefaultQuests/QuestLines/1844759518.json index 957f968..59e1e80 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/1844759518.json +++ b/config/betterquesting/DefaultQuests/QuestLines/1844759518.json @@ -3,7 +3,7 @@ "order:3": 9, "properties:10": { "betterquesting:10": { - "desc:8": "裂变链条与元素生产", + "desc:8": "裂变链条与元素生产。", "icon:10": { "Count:3": 1, "Damage:2": 2, diff --git a/config/betterquesting/DefaultQuests/QuestLines/1868627010.json b/config/betterquesting/DefaultQuests/QuestLines/1868627010.json index 9e2ea01..2c42107 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/1868627010.json +++ b/config/betterquesting/DefaultQuests/QuestLines/1868627010.json @@ -3,7 +3,7 @@ "order:3": 8, "properties:10": { "betterquesting:10": { - "desc:8": "整合已有的科技，追逐未知的科技", + "desc:8": "整合已有的科技，追逐未知的科技。", "icon:10": { "Count:3": 1, "Damage:2": 10008, diff --git a/config/betterquesting/DefaultQuests/QuestLines/343719817.json b/config/betterquesting/DefaultQuests/QuestLines/343719817.json index aff326a..19c96fb 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/343719817.json +++ b/config/betterquesting/DefaultQuests/QuestLines/343719817.json @@ -3,7 +3,7 @@ "order:3": 7, "properties:10": { "betterquesting:10": { - "desc:8": "从流水线到化学工业化", + "desc:8": "从流水线到化学工业化。", "icon:10": { "Count:3": 1, "Damage:2": 10002, diff --git a/config/betterquesting/DefaultQuests/QuestLines/377583359.json b/config/betterquesting/DefaultQuests/QuestLines/377583359.json index fdfc0b2..9f3d7fc 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/377583359.json +++ b/config/betterquesting/DefaultQuests/QuestLines/377583359.json @@ -3,7 +3,7 @@ "order:3": 10, "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "从量变到质变，第一次科技革命到来了！", "icon:10": { "Count:3": 1, "Damage:2": 10019, diff --git a/config/betterquesting/DefaultQuests/QuestLines/717308044.json b/config/betterquesting/DefaultQuests/QuestLines/717308044.json index 250cb08..1661fb2 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/717308044.json +++ b/config/betterquesting/DefaultQuests/QuestLines/717308044.json @@ -3,7 +3,7 @@ "order:3": 5, "properties:10": { "betterquesting:10": { - "desc:8": "数字化网络与自动化", + "desc:8": "数字化网络与自动化，物流，控制，一切高级控制技巧尽在其中。", "icon:10": { "Count:3": 1, "Damage:2": 2, @@ -78,10 +78,10 @@ }, "9:10": { "id:3": 234936908, - "sizeX:3": 120, - "sizeY:3": 108, - "x:3": 708, - "y:3": -204 + "sizeX:3": 60, + "sizeY:3": 60, + "x:3": 756, + "y:3": -180 }, "10:10": { "id:3": 239716163, @@ -274,10 +274,10 @@ }, "37:10": { "id:3": 2084484911, - "sizeX:3": 108, - "sizeY:3": 108, - "x:3": 744, - "y:3": 96 + "sizeX:3": 60, + "sizeY:3": 60, + "x:3": 756, + "y:3": 108 }, "38:10": { "id:3": 2129085776, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/1408641165.json b/config/betterquesting/DefaultQuests/Quests/1052610336/1408641165.json index 47a1aac..a070b60 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/1408641165.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/1408641165.json @@ -29,6 +29,22 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 2, + "Damage:2": 5750, + "id:8": "gregtech:mte" + }, + "1:10": { + "Count:3": 64, + "id:8": "gregtech:ld_fluid_pipe" + } + }, + "taskID:8": "bq_standard:retrieval" } } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/141978247.json b/config/betterquesting/DefaultQuests/Quests/1052610336/141978247.json index c827144..a09e87e 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/141978247.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/141978247.json @@ -7,7 +7,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "把你从制作转子的冗长操作中解放出来，同时制作小型齿轮与齿轮等部件的配方或许也比§6合金炉§r要快。", + "desc:8": "把你从制作转子的冗长操作中解放出来，同时制作小型齿轮与齿轮等部件的配方或许也比§6合金炉§r要快。\n\n§3我们新增了一些新的模具，一些不能被固化的部件现在也可以进行固化了！", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/1660722430.json b/config/betterquesting/DefaultQuests/Quests/1052610336/1660722430.json index 2a6ef88..bc48f1c 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/1660722430.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/1660722430.json @@ -28,6 +28,21 @@ "0:10": { "index:3": 0, "taskID:8": "bq_standard:checkbox" + }, + "1:10": { + "index:3": 1, + "optional:1": 1, + "requiredFluids:9": { + "0:10": { + "Amount:3": 16000, + "FluidName:8": "sodium_persulfate" + }, + "1:10": { + "Amount:3": 16000, + "FluidName:8": "iron_iii_chloride" + } + }, + "taskID:8": "bq_standard:fluid" } } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/1805214138.json b/config/betterquesting/DefaultQuests/Quests/1052610336/1805214138.json index 63ba0c7..122ad3c 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/1805214138.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/1805214138.json @@ -9,7 +9,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "利用电弧放电来进行特殊熔炼，每次运行都需要一些§b氧气§r以供电弧进行燃烧。\n\n§6电弧炉§r还可以用于回收你的机器与方块，被销毁的机器返还除了有机材料以外的所有原材料。\n\n§3在当前阶段它的物品输出槽位只有4个，EV级及以上的电弧炉才有9个。", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, @@ -20,6 +20,25 @@ } }, "questID:3": 1805214138, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 78, + "id:8": "gregtech:meta_item_1", + "tag:10": { + "Fluid:10": { + "Amount:3": 1000, + "FluidName:8": "oxygen" + } + } + } + } + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/264657195.json b/config/betterquesting/DefaultQuests/Quests/1052610336/264657195.json index c239737..26220ab 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/264657195.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/264657195.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§2能源仓§r和§2动力仓§r，是多方块的§6能量输入端§r和§6能量输出端§r。耗电的多方块机器需要安装能源仓，产电的机器需要安装动力仓。\n\n每个标准能源仓/动力仓的吞吐量是2A，因此你目前需要做2个LV级别的能源仓，用来给你的电力高炉双仓升压。", + "desc:8": "§2能源仓§r和§2动力仓§r，是多方块的§6能量输入端§r和§6能量输出端§r。耗电的多方块机器需要安装能源仓，产电的机器需要安装动力仓。\n\n每个标准能源仓/动力仓的吞吐量是§e2A§r，因此你目前需要做2个§7LV§r级别的能源仓，用来给你的§6电力高炉§r双仓升压。", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, @@ -15,6 +15,19 @@ } }, "questID:3": 264657195, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 4, + "Damage:2": 395, + "id:8": "gregtech:meta_stick" + } + } + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/565745207.json b/config/betterquesting/DefaultQuests/Quests/1052610336/565745207.json index 5ec7c4e..e288f00 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/565745207.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/565745207.json @@ -11,7 +11,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "镓是一种重要的电子元件原料，想要获得它需要进行矿物处理，离心§2纯净闪锌矿粉§r，电解§7闪锌矿粉§r或热力离心§e粉碎/纯净闪锌矿矿石§r，都有概率获得镓。", "frame:8": "STAR4", "icon:10": { "Count:3": 1, @@ -22,6 +22,19 @@ } }, "questID:3": 565745207, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 16, + "Damage:2": 39, + "id:8": "gregtech:meta_dust" + } + } + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json b/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json index 0d726dc..f5cff33 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json @@ -7,7 +7,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "将天然§2树脂§r与§e胶水§r粘合后可以得到一种不错的§b电路基板§r，然后对其蚀刻便可以得到更优质的§a电路板§r。", "frame:8": "STAR4", "icon:10": { "Count:3": 1, @@ -21,6 +21,17 @@ "tasks:9": { "0:10": { "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 2, + "Damage:2": 382, + "id:8": "gregtech:meta_item_1" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, "requiredItems:9": { "0:10": { "Count:3": 2, diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/106777031.json b/config/betterquesting/DefaultQuests/Quests/1121539277/106777031.json index a013852..d6467fe 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/106777031.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/106777031.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "将§8硅§r与§7砷化镓§r烧结来制造出的§a单晶硅§r是晶圆的最佳材料人选。\n\n§3在下个阶段，也就是HV阶段中，你可以制作一条名为太阳能级单晶硅的线路来让烧结的过程加速。", "frame:8": "GATE", "icon:10": { "Count:3": 1, @@ -43,7 +43,13 @@ "1:10": { "index:3": 1, "rewardID:8": "bq_standard:item", - "rewards:9": {} + "rewards:9": { + "0:10": { + "Count:3": 16, + "Damage:2": 351, + "id:8": "gregtech:meta_dust_small" + } + } } }, "tasks:9": { diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/1207006283.json b/config/betterquesting/DefaultQuests/Quests/1121539277/1207006283.json index 6d9295f..dfdd118 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/1207006283.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/1207006283.json @@ -15,5 +15,29 @@ } }, "questID:3": 1207006283, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 99, + "id:8": "gregtech:meta_ingot_hot" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 99, + "id:8": "gregtech:meta_ingot" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/1220286723.json b/config/betterquesting/DefaultQuests/Quests/1121539277/1220286723.json index 2c42aa4..ebb7d27 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/1220286723.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/1220286723.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "No Description\n\n§3或许你玩过格雷科技现代版，在未来的格雷科技中，工业熔炉可以运行合金炉配方，但现在需要制作大型电弧炉，请查看“批量生产”一章中的对应内容。", "frame:8": "STAR4_ON_SQUARE", "icon:10": { "Count:3": 1, @@ -15,5 +15,29 @@ } }, "questID:3": 1220286723, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10006, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 8, + "OreDict:8": "casingWireCoil", + "id:8": "gregtech:wire_coil" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/1580032224.json b/config/betterquesting/DefaultQuests/Quests/1121539277/1580032224.json index caa15a0..c95fa5c 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/1580032224.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/1580032224.json @@ -22,5 +22,41 @@ } }, "questID:3": 1580032224, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 3, + "Damage:2": 288, + "id:8": "gregtech:meta_dust" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 288, + "id:8": "gregtech:meta_ingot_hot" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 288, + "id:8": "gregtech:meta_ingot" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/165361007.json b/config/betterquesting/DefaultQuests/Quests/1121539277/165361007.json index f9ab739..266ad8a 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/165361007.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/165361007.json @@ -18,5 +18,29 @@ } }, "questID:3": 165361007, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 9, + "Damage:2": 323, + "id:8": "gregtech:meta_dust" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 2, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 323, + "id:8": "gregtech:meta_ingot" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/1709257046.json b/config/betterquesting/DefaultQuests/Quests/1121539277/1709257046.json index e8100b2..9d66df8 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/1709257046.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/1709257046.json @@ -9,7 +9,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "快速拆掉那些过时的机器，碍眼的方块，亦或者挖掘等级不够而无法挖掘的方块。§6激光拆解器§r利用高能激光来进行镭射，从而实现§a精准拆除§r，其内部可以存储§e一定数量的能源§r来持续使用。\n\n激光拆解器分为两种模式，通过§2潜行右键§r来切换。在§a普通模式§r下，激光拆解器将会瞬间拆除目标方块并掉落对应的物品，而在§b精准模式§r下，激光拆解器在破坏时会掉落方块的§9精准采集§r掉落物，例如挖掘泥土会掉落草方块。在§b精准模式§r下需要消耗更多的电量，但总电量十分宽裕，你只需要偶尔给它充充电就可以了。\n\n§d这是一件贡献者物品，在界面中对物品按住Shift键可以查看它的贡献者！", + "desc:8": "快速拆掉那些过时的机器，碍眼的方块，亦或者挖掘等级不够而无法挖掘的方块。§6激光拆解器§r利用高能激光来进行镭射，从而实现§a精准拆除§r，其内部可以存储§e一定数量的能源§r来持续使用。\n\n激光拆解器分为两种模式，通过§2潜行右键§r来切换。在§a普通模式§r下，激光拆解器将会瞬间拆除目标方块并掉落对应的物品，而在§b精准模式§r下，激光拆解器在破坏时会掉落方块的§9精准采集§r掉落物，例如挖掘草方块会直接掉落草方块而不是泥土。在§b精准模式§r下需要消耗更多的电量，但总电量十分宽裕，你只需要偶尔给它充充电就可以了。\n\n§d这是一件贡献者物品，在界面中对物品按住Shift键可以查看它的贡献者！", "frame:8": "EMPTY", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/63436605.json b/config/betterquesting/DefaultQuests/Quests/1121539277/63436605.json index 693befa..b5547ef 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/63436605.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/63436605.json @@ -53,5 +53,17 @@ "rewards:9": {} } }, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10032, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1121539277/835904145.json b/config/betterquesting/DefaultQuests/Quests/1121539277/835904145.json index f09dc9e..da8cb1f 100644 --- a/config/betterquesting/DefaultQuests/Quests/1121539277/835904145.json +++ b/config/betterquesting/DefaultQuests/Quests/1121539277/835904145.json @@ -15,5 +15,30 @@ } }, "questID:3": 835904145, - "tasks:9": {} + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 518, + "id:8": "gregtech:meta_item_1" + } + } + } + }, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 8, + "Damage:2": 518, + "id:8": "gregtech:meta_item_1" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/1050849724.json b/config/betterquesting/DefaultQuests/Quests/343719817/1050849724.json index e20ef0b..6930862 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/1050849724.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/1050849724.json @@ -37,5 +37,44 @@ } } }, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 20, + "id:8": "gregtech:gt_armor", + "tag:10": { + "Charge:4": 6400000 + } + }, + "1:10": { + "Count:3": 1, + "Damage:2": 21, + "id:8": "gregtech:gt_armor", + "tag:10": { + "Charge:4": 6400000 + } + }, + "2:10": { + "Count:3": 1, + "Damage:2": 22, + "id:8": "gregtech:gt_armor", + "tag:10": { + "Charge:4": 6400000 + } + }, + "3:10": { + "Count:3": 1, + "Damage:2": 23, + "id:8": "gregtech:gt_armor", + "tag:10": { + "Charge:4": 6400000 + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/564553776.json b/config/betterquesting/DefaultQuests/Quests/343719817/564553776.json index 735f2be..877486a 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/564553776.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/564553776.json @@ -48,5 +48,17 @@ "rewards:9": {} } }, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10035, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/1118622834.json b/config/betterquesting/DefaultQuests/Quests/391308061/1118622834.json index 33f095a..59e87cf 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/1118622834.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/1118622834.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "\n§3这台压缩机还解锁了红石计划的诸多内容，你现在可以制作这些复杂的红石逻辑门了，它们可以帮助你设计一些复杂的红石逻辑自动化。", + "desc:8": "压缩各种粉状材料。现在主要的用途是制作§e耐火粘土§r。\n\n§3这台压缩机还解锁了红石计划的诸多内容，你现在可以制作这些复杂的红石逻辑门了，它们可以帮助你设计一些复杂的红石逻辑自动化。", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/1284331992.json b/config/betterquesting/DefaultQuests/Quests/391308061/1284331992.json index 81795d4..0065892 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/1284331992.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/1284331992.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§c提取机§r，一个存在感不强的家伙。相比起§c流体提取机§r，它的作用可太少了。\n目前，它最大的作用应该是帮你提取§d液态玻璃§r。", + "desc:8": "用于提取各种材料，例如玻璃。你甚至可以用它来榨取果汁！", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/1586601745.json b/config/betterquesting/DefaultQuests/Quests/391308061/1586601745.json index 000004a..ed38a74 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/1586601745.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/1586601745.json @@ -9,7 +9,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "如果你觉得普通的§c蒸汽提取机§r速度太慢，不妨试试§c高压版本的蒸汽提取机。§r", + "desc:8": "更好的§6蒸汽提取机§r，尽情享用二倍速吧！", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/25140166.json b/config/betterquesting/DefaultQuests/Quests/391308061/25140166.json index dfb61e5..0a96635 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/25140166.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/25140166.json @@ -22,39 +22,29 @@ "questID:3": 25140166, "rewards:9": { "0:10": { - "index:3": 0, - "rewardID:8": "bq_standard:item", - "rewards:9": { + "choices:9": { "0:10": { - "Count:3": 1, - "id:8": "storagedrawers:basicdrawers", - "tag:10": { - "material:8": "oak", - "tile:10": { - "Cap:3": 32, - "Dir:1": 4, - "Drawers:9": { - "0:10": { - "Count:3": 2048, - "Item:10": { - "Count:3": 1, - "Damage:2": 0, - "id:8": "minecraft:stone" - } - } - }, - "ForgeCaps:10": {}, - "Mat:8": "oak", - "Tape:1": 1, - "Upgrades:9": {}, - "id:8": "storagedrawers:basicdrawers.1", - "x:3": -772, - "y:3": 4, - "z:3": -329 - } - } + "Count:3": 16, + "id:8": "minecraft:stone" + }, + "1:10": { + "Count:3": 16, + "Damage:2": 1, + "id:8": "minecraft:stone" + }, + "2:10": { + "Count:3": 16, + "Damage:2": 3, + "id:8": "minecraft:stone" + }, + "3:10": { + "Count:3": 16, + "Damage:2": 5, + "id:8": "minecraft:stone" } - } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" } }, "tasks:9": { diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/495401956.json b/config/betterquesting/DefaultQuests/Quests/391308061/495401956.json index 76c5220..40a58f1 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/495401956.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/495401956.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "储存量更大的多方块储罐。如果你不喜欢§9储液抽屉§r或者§2金属桶§r的话可以考虑这个大家伙，它真的很大，也很耗费钢。\n\n§3储液抽屉也兼容储物抽屉的相关升级，试试打上升级来获得更大的容量吧。", + "desc:8": "储存量更大的多方块储罐。如果你不喜欢§9流体抽屉§r或者§2金属桶§r的话可以考虑这个大家伙，它真的很大，也很耗费钢。\n\n§3如果你觉得流体抽屉的容量不够大，试试打上升级来获得更大的容量吧。", "icon:10": { "Count:3": 1, "Damage:2": 10044, @@ -16,13 +16,30 @@ "questID:3": 495401956, "rewards:9": { "0:10": { + "choices:9": { + "0:10": { + "Count:3": 4, + "id:8": "functionalstoragelegacy:fluid_1" + }, + "1:10": { + "Count:3": 4, + "id:8": "functionalstoragelegacy:fluid_2" + }, + "2:10": { + "Count:3": 4, + "id:8": "functionalstoragelegacy:fluid_4" + } + }, "index:3": 0, + "rewardID:8": "bq_standard:choice" + }, + "1:10": { + "index:3": 1, "rewardID:8": "bq_standard:item", "rewards:9": { "0:10": { - "Count:3": 5, - "Damage:2": 4, - "id:8": "storagedrawers:upgrade_storage" + "Count:3": 4, + "id:8": "functionalstoragelegacy:diamond_upgrade" } } } diff --git a/config/betterquesting/DefaultQuests/Quests/391308061/987239996.json b/config/betterquesting/DefaultQuests/Quests/391308061/987239996.json index dd7ff89..48af029 100644 --- a/config/betterquesting/DefaultQuests/Quests/391308061/987239996.json +++ b/config/betterquesting/DefaultQuests/Quests/391308061/987239996.json @@ -21,19 +21,31 @@ "rewards:9": { "0:10": { "Count:3": 1, - "id:8": "storagedrawers:basicdrawers", + "id:8": "betterquesting:placeholder", "tag:10": { - "material:8": "oak" + "orig_id:8": "storagedrawers:basicdrawers", + "orig_meta:3": 0, + "orig_tag:10": { + "material:8": "oak" + } } }, "1:10": { "Count:3": 4, "Damage:2": 4, - "id:8": "storagedrawers:upgrade_storage" + "id:8": "betterquesting:placeholder", + "tag:10": { + "orig_id:8": "storagedrawers:upgrade_storage", + "orig_meta:3": 4 + } }, "2:10": { "Count:3": 1, - "id:8": "storagedrawers:upgrade_void" + "id:8": "betterquesting:placeholder", + "tag:10": { + "orig_id:8": "storagedrawers:upgrade_void", + "orig_meta:3": 0 + } } } } diff --git a/config/betterquesting/DefaultQuests/Quests/585069616/1341780904.json b/config/betterquesting/DefaultQuests/Quests/585069616/1341780904.json index 10aaf42..5da9329 100644 --- a/config/betterquesting/DefaultQuests/Quests/585069616/1341780904.json +++ b/config/betterquesting/DefaultQuests/Quests/585069616/1341780904.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "本整合包自早期测试版本至今已有数个版本，在开发工作中多承各位玩家与其他开发者扶助，敬列于此，以申谢忱：\n\n§a整合包所有者/主要开发者§r：Magic_Sweepy，GateGuardian\n§9核心模组/附属模组开发者§r：Magic_Sweepy，GateGuardian，RainyYC，Hirrao\n§c灵感提供/内容设计§r：RainyYC，LoseUFaith，川叶Aurora，Catarrel\n§6美术支持§r：Magic_Sweepy，U.M.T，TXSC\n§e文本翻译§r：Magic_Sweepy\n§2任务贡献者§r：Magic_Sweepy，Ace111，maple，河川River，llama_wei，Camellia\n§d特别感谢§r：Oganesson897，vfyjxf，MCTian-mi，YIYU\n\n还有若干对本整合包开发有所帮助的玩家与开发者，限于篇幅不在此处列举。\n\n§3如果你想知道所有对本整合包有所贡献的开发者，请到仓库中查阅提交记录统计以获得开发者们的信息。", + "desc:8": "本整合包自早期测试版本至今已有数个版本，在开发工作中多承各位玩家与其他开发者扶助，敬列于此，以申谢忱：\n\n§a整合包所有者/主要开发者§r：Magic_Sweepy，GateGuardian\n§9核心/附属模组开发者§r：Magic_Sweepy，GateGuardian，RainyYC，Hirrao, Oganesson897\n§c灵感提供/内容设计§r：RainyYC，LoseUFaith，川叶Aurora，Catarrel\n§6美术支持§r：Magic_Sweepy，U.M.T，TXSC\n§e文本翻译§r：Magic_Sweepy\n§2任务贡献者§r：Magic_Sweepy，Ace111，maple，河川River，llama_wei，Camellia，Catarrel\n§d特别感谢§r：vfyjxf，MCTian-mi，YIYU\n\n还有若干对本整合包开发有所帮助的玩家与开发者，限于篇幅不在此处列举。\n\n§3如果你想知道所有对本整合包有所贡献的开发者，请到仓库中查阅提交记录统计以获得开发者们的信息。", "frame:8": "HEXAGON90", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/585069616/1459921631.json b/config/betterquesting/DefaultQuests/Quests/585069616/1459921631.json index 84342a2..bdebadc 100644 --- a/config/betterquesting/DefaultQuests/Quests/585069616/1459921631.json +++ b/config/betterquesting/DefaultQuests/Quests/585069616/1459921631.json @@ -14,6 +14,18 @@ } }, "questID:3": 1459921631, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 64, + "id:8": "gregtech:ore_diamond_0" + } + } + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/585069616/1640887446.json b/config/betterquesting/DefaultQuests/Quests/585069616/1640887446.json index 765fd23..c8f81e3 100644 --- a/config/betterquesting/DefaultQuests/Quests/585069616/1640887446.json +++ b/config/betterquesting/DefaultQuests/Quests/585069616/1640887446.json @@ -4,13 +4,10 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "最好的大宗物品存储手段之一，§6储物抽屉§r拥有大量存储1种，2种或4种物品的功能（取决于其的尺寸）。\n\n手持物品时§2鼠标右键§r点击抽屉以存入物品，空手时§2鼠标左键§r点击以取出，在潜行状态下点击可以一次性存入或取出一组物品。使用各类§b抽屉升级§r或使用§e钥匙§r点击可以为其附加功能，具体的效果可以查看其的工具提示。\n\n将抽屉合成为§a镶框抽屉§r可以自定义其的材质，抽屉的可自定义材质分为外部与内部两部分，其中的内部材质会决定其显示物品的一面的材质，使用§6成型台§r并放入镶框抽屉与两个方块（用于指定外部与外部的材质）即可自定义。", + "desc:8": "来自高版本的§b功能性存储§r模组现已可用！这种抽屉拥有大量存储1/2/4种物品或流体的功能，具体存储的种类取决于你制作的抽屉尺寸。\n\n手持物品时§2鼠标右键§r点击抽屉以存入物品，双击可以存储背包内的所有物品。空手时§2鼠标左键§r点击以取出，潜行点击可以一次性存入或取出一组物品。\n\n使用各类§a抽屉升级§r或使用§e钥匙§r点击可以为其附加功能，具体的效果可以查看其的§3工具提示§r。模型中正面的边框与侧面可以使用§2鼠标右击§r打开抽屉的界面，其上左下角为抽屉的§e存储升级槽§r，右下角为抽屉的§9功能升级槽§r。\n\n§3抽屉的存储升级在你制作完格雷科技的工具后解锁，流体抽屉则在获得钢后解锁。由于功能性存储的存储升级都是乘算，所以效果比储物抽屉的升级好。", "icon:10": { "Count:3": 1, - "id:8": "storagedrawers:basicdrawers", - "tag:10": { - "material:8": "oak" - } + "id:8": "functionalstoragelegacy:oak_1" }, "name:8": "§a抽屉" } @@ -23,11 +20,11 @@ "rewards:9": { "0:10": { "Count:3": 1, - "id:8": "storagedrawers:drawer_key" + "id:8": "functionalstoragelegacy:configuration_tool" }, "1:10": { "Count:3": 1, - "id:8": "storagedrawers:quantify_key" + "id:8": "functionalstoragelegacy:linking_tool" } } } @@ -39,11 +36,8 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "OreDict:8": "drawerBasic", - "id:8": "storagedrawers:basicdrawers", - "tag:10": { - "material:8": "oak" - } + "OreDict:8": "drawerSingle", + "id:8": "functionalstoragelegacy:oak_1" } }, "taskID:8": "bq_standard:retrieval" @@ -55,23 +49,13 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "id:8": "storagedrawers:framingtable" + "OreDict:8": "drawerDouble", + "id:8": "functionalstoragelegacy:oak_2" }, "1:10": { "Count:3": 1, - "id:8": "storagedrawers:customdrawers" - } - }, - "taskID:8": "bq_standard:retrieval" - }, - "2:10": { - "ignoreNBT:1": 1, - "index:3": 2, - "optional:1": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "storagedrawers:controller" + "OreDict:8": "drawerQuadruple", + "id:8": "functionalstoragelegacy:oak_4" } }, "taskID:8": "bq_standard:retrieval" diff --git a/config/betterquesting/DefaultQuests/Quests/585069616/1793856059.json b/config/betterquesting/DefaultQuests/Quests/585069616/1793856059.json index dd7af8a..4a1c744 100644 --- a/config/betterquesting/DefaultQuests/Quests/585069616/1793856059.json +++ b/config/betterquesting/DefaultQuests/Quests/585069616/1793856059.json @@ -27,7 +27,7 @@ "rewards:9": { "0:10": { "Count:3": 4, - "id:8": "fluiddrawers:tank" + "id:8": "functionalstoragelegacy:fluid_1" } } } diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json b/config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json index 795235f..78c85e5 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json @@ -6,7 +6,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "为了更好的传输与计算效率，AE2的机器需要§2更精细化的处理器§r作为核心。在你获得§6电路组装机§r与§6精密激光蚀刻机§r后，你可以将§a刻蚀好的宝石晶片§r勾勒出电路回路，然后制作成专用于AE2机器的处理器。默认情况下使用§7基础电路板§r，使用更高级的§b优质电路板§r可以§e翻倍产出§r，同时需要将金螺栓替换为琥珀金螺栓。\n\n§3在原本的AE2中，你需要使用金，钻石与赛特斯石英制作晶片，然后与硅板和红石在压印机内制作它们，但我们希望有更高效的配方存在。", + "desc:8": "为了更好的传输与计算效率，AE2的机器需要§2更精细化的处理器§r作为核心。在你获得§6电路组装机§r与§6精密激光蚀刻机§r后，你可以将§a刻蚀好的宝石晶片§r勾勒出电路回路，然后制作成专用于AE2机器的处理器。默认使用§7基础电路板§r，使用更高级的§b优质电路板§r可以§e翻倍产出§r，同时需要将金螺栓替换为琥珀金螺栓。\n\n§3在原本的AE2中，你需要使用金，钻石与赛特斯石英制作晶片，然后与硅板和红石在压印机内制作它们，但我们希望有更高效的配方存在。", "frame:8": "CIRCLE", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/1247483445.json b/config/betterquesting/DefaultQuests/Quests/717308044/1247483445.json index 8aa9d1a..ebe4c1a 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/1247483445.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/1247483445.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "各种终端用于§a可视化操作你的AE系统§r。", "frame:8": "SQUARE", "icon:10": { "Count:3": 1, diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json b/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json index 7ce9f2b..e78a94b 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json @@ -1,16 +1,18 @@ { "preRequisiteTypes:7": [ 2, - 2 + 2, + 0 ], "preRequisites:11": [ 1861030809, - 365293235 + 365293235, + 900357978 ], "properties:10": { "betterquesting:10": { "desc:8": "No Description", - "frame:8": "EMPTY", + "frame:8": "DIAMOND", "icon:10": { "Count:3": 1, "id:8": "appliedenergistics2:crafting_monitor" diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json b/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json index 2f3ecc8..f36c97d 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json @@ -1,14 +1,11 @@ { - "preRequisiteTypes:7": [ - 2 - ], "preRequisites:11": [ 468342799 ], "properties:10": { "betterquesting:10": { "desc:8": "No Description", - "frame:8": "EMPTY", + "frame:8": "DIAGONAL_CROSS_ON_DIAMOND", "icon:10": { "Count:3": 1, "Damage:2": 11525, diff --git a/config/fluiddrawers.cfg b/config/fluiddrawers.cfg deleted file mode 100644 index 2051acb..0000000 --- a/config/fluiddrawers.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration file - -general { - # The base capacity, in millibuckets (mB), of a basic storage tank (without a capacity downgrade). - # Min: 1 - # Max: 2147483647 - I:baseCapacity=64000 - - # The base capacity, in millibuckets (mB), of a basic storage tank with a capacity downgrade installed. - # Min: 1 - # Max: 2147483647 - I:baseCapacityDowngraded=1000 - - # Whether fluid names should be shown or not when drawers have the quantity display enabled via a quantify key. - B:quantifyShowsFluidName=true -} - - diff --git a/config/functionalstoragelegacy.cfg b/config/functionalstoragelegacy.cfg new file mode 100644 index 0000000..483b2a0 --- /dev/null +++ b/config/functionalstoragelegacy.cfg @@ -0,0 +1,174 @@ +# Configuration file + +client { + # Drawer content render range in blocks (default: 16) + # Min: 1 + # Max: 128 + I:drawerRenderRange=16 +} + + +compatibility { + # Enable AE2 Extended Life storage bus compatibility for drawers and controllers + B:enableAE2Compatibility=true + + # Enable The One Probe compatibility integration + B:enableTOPCompatibility=true +} + + +general { + # Armory slot amount + # Min: 1 + # Max: 2147483647 + I:armoryCabinetSize=4096 + + # Linking range radius + # Min: 1 + # Max: 64 + I:drawerControllerLinkingRange=8 + + # How much fluid (in mb) the collector upgrade will try to collect + # Min: 1 + # Max: 10000 + I:upgradeCollectorFluid=500 + + # How many items the collector upgrade will try to pull + # Min: 1 + # Max: 64 + I:upgradeCollectorItems=4 + + # How much fluid (in mb) the pulling upgrade will try to pull + # Min: 1 + # Max: 10000 + I:upgradePullFluid=500 + + # How many items the pulling upgrade will try to pull + # Min: 1 + # Max: 64 + I:upgradePullItems=4 + + # How much fluid (in mb) the pushing upgrade will try to push + # Min: 1 + # Max: 10000 + I:upgradePushFluid=500 + + # How many items the pushing upgrade will try to push + # Min: 1 + # Max: 64 + I:upgradePushItems=4 + + # Every how many ticks the drawer upgrades will work + # Min: 1 + # Max: 200 + I:upgradeTick=4 +} + + +generation { + # Stone Generation Upgrade T1 generation rate + # Min: 1 + # Max: 2147483647 + I:stoneGenerationT1=1 + + # Stone Generation Upgrade T2 generation rate + # Min: 1 + # Max: 2147483647 + I:stoneGenerationT2=2 + + # Stone Generation Upgrade T3 generation rate + # Min: 1 + # Max: 2147483647 + I:stoneGenerationT3=4 + + # Stone Generation Upgrade T4 generation rate + # Min: 1 + # Max: 2147483647 + I:stoneGenerationT4=8 + + # Universal Generator T1 generation rate + # Min: 1 + # Max: 2147483647 + I:universalGeneratorT1=1 + + # Universal Generator T2 generation rate + # Min: 1 + # Max: 2147483647 + I:universalGeneratorT2=2 + + # Universal Generator T3 generation rate + # Min: 1 + # Max: 2147483647 + I:universalGeneratorT3=4 + + # Universal Generator T4 generation rate + # Min: 1 + # Max: 2147483647 + I:universalGeneratorT4=8 + + # Universal Generator Items generation + S:universalItemsGeneration=minecraft:sand + + # Universal Generator Items generation registered + B:universalItemsGenerationRegistered=false + + # Universal Generator Items generation tick + # Min: 1 + # Max: 2147483647 + I:universalItemsGenerationTick=1 + + # Water Generation Upgrade T1 generation rate + # Min: 1 + # Max: 2147483647 + I:waterGenerationT1=1000 + + # Water Generation Upgrade T2 generation rate + # Min: 1 + # Max: 2147483647 + I:waterGenerationT2=2000 + + # Water Generation Upgrade T3 generation rate + # Min: 1 + # Max: 2147483647 + I:waterGenerationT3=4000 + + # Water Generation Upgrade T4 generation rate + # Min: 1 + # Max: 2147483647 + I:waterGenerationT4=8000 +} + + +storage { + # Copper Upgrade storage multiplier + # Min: 1 + # Max: 1024 + I:copperMultiplier=4 + + # Diamond Upgrade storage multiplier + # Min: 1 + # Max: 1024 + I:diamondMultiplier=16 + + # Fluid storage divisor for Storage Upgrades + # Min: 1 + # Max: 64 + I:fluidDivisor=2 + + # Gold Upgrade storage multiplier + # Min: 1 + # Max: 1024 + I:goldMultiplier=8 + + # Netherite Upgrade storage multiplier + # Min: 1 + # Max: 1024 + I:netheriteMultiplier=32 + + # Range divisor for Storage Upgrades + # Min: 1 + # Max: 64 + I:rangeDivisor=4 +} + + diff --git a/groovy/event/TooltipEventHandler.groovy b/groovy/event/TooltipEventHandler.groovy index bff778f..69db613 100644 --- a/groovy/event/TooltipEventHandler.groovy +++ b/groovy/event/TooltipEventHandler.groovy @@ -11,4 +11,10 @@ event_manager.listen { ItemTooltipEvent event -> event.getToolTip() << LocalizationUtils.format('gtlitecore.tooltip.glass_tier', VNF[MV]) if (event.getItemStack() in item('appliedenergistics2:quartz_vibrant_glass')) event.getToolTip() << LocalizationUtils.format('gtlitecore.tooltip.glass_tier', VNF[MV]) + if (event.getItemStack() in item('functionalstoragelegacy:fluid_1')) + event.getToolTip() << LocalizationUtils.format('gregtech.universal.tooltip.fluid_storage_capacity', 32000) + if (event.getItemStack() in item('functionalstoragelegacy:fluid_2')) + event.getToolTip() << LocalizationUtils.format('gregtech.universal.tooltip.fluid_storage_capacity_mult', 2, 16000) + if (event.getItemStack() in item('functionalstoragelegacy:fluid_4')) + event.getToolTip() << LocalizationUtils.format('gregtech.universal.tooltip.fluid_storage_capacity_mult', 4, 8000) } \ No newline at end of file diff --git a/groovy/loader/OreDictionaryLoader.groovy b/groovy/loader/OreDictionaryLoader.groovy index 569e2fc..7693c30 100644 --- a/groovy/loader/OreDictionaryLoader.groovy +++ b/groovy/loader/OreDictionaryLoader.groovy @@ -22,6 +22,19 @@ ore_dict.add('capacitorUltimate', item('enderio:item_capacitor_stellar')) // Ste ore_dict.add('capacitorSuperconductor', item('enderio:item_capacitor_totemic')) // Totemic Capacitor +// Functional Storage Legacy +def woods = [ 'oak', 'spruce', 'birch', 'jungle', 'acacia', 'dark_oak' ] +for (i in 0..5) +{ + ore_dict.add('drawerSingle', item('functionalstoragelegacy:' + woods[i] + '_1')) + ore_dict.add('drawerDouble', item('functionalstoragelegacy:' + woods[i] + '_2')) + ore_dict.add('drawerQuadruple', item('functionalstoragelegacy:' + woods[i] + '_4')) + + ore_dict.add('drawerAny', item('functionalstoragelegacy:' + woods[i] + '_1')) + ore_dict.add('drawerAny', item('functionalstoragelegacy:' + woods[i] + '_2')) + ore_dict.add('drawerAny', item('functionalstoragelegacy:' + woods[i] + '_4')) +} + // GregTech for (i in 0..7) { diff --git a/groovy/loader/recipe/EnderIO.groovy b/groovy/loader/recipe/EnderIO.groovy index ec5516c..302f92e 100644 --- a/groovy/loader/recipe/EnderIO.groovy +++ b/groovy/loader/recipe/EnderIO.groovy @@ -1212,7 +1212,7 @@ crafting.shapelessBuilder() crafting.shapelessBuilder() .name(resource('gtlite:mod_item_filter')) .input([item('enderio:item_basic_item_filter'), - item('storagedrawers:upgrade_template')]) + item('functionalstoragelegacy:copper_upgrade')]) .output(item('enderio:item_mod_item_filter') * 2) .register() diff --git a/groovy/loader/recipe/FluidDrawers.groovy b/groovy/loader/recipe/FluidDrawers.groovy deleted file mode 100644 index dfb19cf..0000000 --- a/groovy/loader/recipe/FluidDrawers.groovy +++ /dev/null @@ -1,25 +0,0 @@ -log.info("Starting to load FluidDrawers Recipes...") - -// Fluid Drawer -crafting.removeByOutput(item('fluiddrawers:tank')) -crafting.shapedBuilder() - .name(resource('gtlite:fluid_drawer_1')) - .shape('PPP', - 'GDG', - 'PPP') - .key('P', ore('plateSteel')) - .key('D', item('gtlitecore:mte', 2001)) // Iron Drum - .key('G', item('minecraft:glass_pane')) - .output(item('fluiddrawers:tank')) - .register() - -crafting.shapedBuilder() - .name(resource('gtlite:fluid_drawer_2')) - .shape('PPP', - 'GDG', - 'PPP') - .key('P', ore('plateSteel')) - .key('D', item('gtlitecore:mte', 2001)) // Iron Drum - .key('G', ore('plateGlass')) - .output(item('fluiddrawers:tank')) - .register() \ No newline at end of file diff --git a/groovy/loader/recipe/FunctionalStorage.groovy b/groovy/loader/recipe/FunctionalStorage.groovy new file mode 100644 index 0000000..bc19414 --- /dev/null +++ b/groovy/loader/recipe/FunctionalStorage.groovy @@ -0,0 +1,195 @@ +log.info("Starting to load functionalstorage recipes...") + +import static gregtech.api.GTValues.* +import static util.GroovyUtil.* + +def assembler = recipemap('assembler') + +// Iron Downgrade +crafting.removeByOutput(item('functionalstoragelegacy:iron_downgrade')) +crafting.shapedBuilder() + .name(resource('gtlite:drawer_iron_downgrade')) + .shape('PdP', + 'PUP', + 'PSP') + .key('U', ore('drawerAny')) + .key('P', ore('plateIron')) + .key('S', ore('screwIron')) + .key('d', ore('toolScrewdriver')) + .output(item('functionalstoragelegacy:iron_downgrade') * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(6) + .inputs(ore('drawerAny')) + .inputs(ore('plateIron') * 6) + .outputs(item('functionalstoragelegacy:iron_downgrade') * 2) + .EUt(VA[LV]) + .duration(4 * SECOND + 16 * TICK) + .buildAndRegister() + +// Copper Upgrade +crafting.removeByOutput(item('functionalstoragelegacy:copper_upgrade')) +crafting.shapedBuilder() + .name(resource('gtlite:drawer_copper_upgrade')) + .shape('PdP', + 'PUP', + 'PSP') + .key('U', ore('drawerAny')) + .key('P', ore('plateCopper')) + .key('S', ore('screwCopper')) + .key('d', ore('toolScrewdriver')) + .output(item('functionalstoragelegacy:copper_upgrade') * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(6) + .inputs(ore('drawerAny')) + .inputs(ore('plateCopper') * 6) + .outputs(item('functionalstoragelegacy:copper_upgrade') * 2) + .EUt(VA[LV]) + .duration(4 * SECOND + 16 * TICK) + .buildAndRegister() + +// Gold Upgrade +crafting.removeByOutput(item('functionalstoragelegacy:gold_upgrade')) +crafting.shapedBuilder() + .name(resource('gtlite:drawer_gold_upgrade')) + .shape('PdP', + 'PUP', + 'PSP') + .key('U', item('functionalstoragelegacy:copper_upgrade')) + .key('P', ore('plateGold')) + .key('S', ore('screwGold')) + .key('d', ore('toolScrewdriver')) + .output(item('functionalstoragelegacy:gold_upgrade') * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(6) + .inputs(item('functionalstoragelegacy:copper_upgrade')) + .inputs(ore('plateGold') * 6) + .outputs(item('functionalstoragelegacy:gold_upgrade') * 2) + .EUt(VA[LV]) + .duration(4 * SECOND + 16 * TICK) + .buildAndRegister() + +// Diamond Upgrade +crafting.removeByOutput(item('functionalstoragelegacy:diamond_upgrade')) +crafting.shapedBuilder() + .name(resource('gtlite:drawer_diamond_upgrade')) + .shape('PdP', + 'PUP', + 'PSP') + .key('U', item('functionalstoragelegacy:gold_upgrade')) + .key('P', ore('plateDiamond')) + .key('S', ore('screwDiamond')) + .key('d', ore('toolScrewdriver')) + .output(item('functionalstoragelegacy:diamond_upgrade') * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(6) + .inputs(item('functionalstoragelegacy:gold_upgrade')) + .inputs(ore('plateDiamond') * 6) + .outputs(item('functionalstoragelegacy:diamond_upgrade') * 2) + .EUt(VA[LV]) + .duration(4 * SECOND + 16 * TICK) + .buildAndRegister() + +// Obsidian Upgrade +crafting.removeByOutput(item('functionalstoragelegacy:netherite_upgrade')) +crafting.shapedBuilder() + .name(resource('gtlite:drawer_netherite_upgrade')) + .shape('PdP', + 'PUP', + 'PSP') + .key('U', item('functionalstoragelegacy:diamond_upgrade')) + .key('P', ore('plateObsidian')) + .key('S', ore('screwObsidian')) + .key('d', ore('toolScrewdriver')) + .output(item('functionalstoragelegacy:netherite_upgrade') * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(6) + .inputs(item('functionalstoragelegacy:diamond_upgrade')) + .inputs(ore('plateObsidian') * 6) + .outputs(item('functionalstoragelegacy:netherite_upgrade') * 2) + .EUt(VA[LV]) + .duration(4 * SECOND + 16 * TICK) + .buildAndRegister() + +// 1x1 Fluid Drawer +crafting.removeByOutput(item('functionalstoragelegacy:fluid_1')) +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_1x1a')) + .shape('PPP', + 'GDG', + 'PPP') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', item('minecraft:glass_pane')) + .output(item('functionalstoragelegacy:fluid_1')) + .register() + +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_1x1b')) + .shape('PPP', + 'GDG', + 'PPP') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', ore('plateGlass')) + .output(item('functionalstoragelegacy:fluid_1')) + .register() + +// 1x2 Fluid Drawer +crafting.removeByOutput(item('functionalstoragelegacy:fluid_2')) +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_1x2a')) + .shape('PPP', + 'DGD', + 'PPP') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', item('minecraft:glass_pane')) + .output(item('functionalstoragelegacy:fluid_2')) + .register() + +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_1x2b')) + .shape('PPP', + 'DGD', + 'PPP') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', ore('plateGlass')) + .output(item('functionalstoragelegacy:fluid_2')) + .register() + +// 2x2 Fluid Drawer +crafting.removeByOutput(item('functionalstoragelegacy:fluid_4')) +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_2x2a')) + .shape('DPD', + 'PGP', + 'DPD') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', item('minecraft:glass_pane')) + .output(item('functionalstoragelegacy:fluid_4')) + .register() + +crafting.shapedBuilder() + .name(resource('gtlite:fluid_drawer_2x2b')) + .shape('DPD', + 'PGP', + 'DPD') + .key('D', metaitem('gtlitecore:drum.iron')) + .key('P', ore('plateSteel')) + .key('G', ore('plateGlass')) + .output(item('functionalstoragelegacy:fluid_4')) + .register() + +log.info("Complete load functionalstorage recipes...") \ No newline at end of file diff --git a/groovy/loader/recipe/SophisticatedBackpacks.groovy b/groovy/loader/recipe/SophisticatedBackpacks.groovy index 84c1bb1..a6c0a54 100644 --- a/groovy/loader/recipe/SophisticatedBackpacks.groovy +++ b/groovy/loader/recipe/SophisticatedBackpacks.groovy @@ -233,7 +233,7 @@ crafting.removeByOutput(item('retro_sophisticated_backpacks:advanced_restock_upg crafting.shapelessBuilder() .name(resource('gtlite:advanced_restock_upgrade')) .input([item('retro_sophisticated_backpacks:restock_upgrade'), - item('storagedrawers:compdrawers')]) + item('functionalstoragelegacy:compacting_drawer')]) .output(item('retro_sophisticated_backpacks:advanced_restock_upgrade')) .register() diff --git a/index.toml b/index.toml index 6ba9ef9..6ee5b80 100644 --- a/index.toml +++ b/index.toml @@ -26,7 +26,7 @@ hash = "522db687b5b9732245bafb2941ee4faf79e7836534ce65c1b37f93207340a597" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1121539277.json" -hash = "fb0873677f8a8f28da6be6c2237ca18c554bd0b1b0a48c95f15e65cc8a6ebcf5" +hash = "cf117b03bddd01415b3c37ed30e28a9088ebb1a88248a750f25111da36a8ecc8" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1298608824.json" @@ -42,7 +42,7 @@ hash = "065d30ef22efcd0b89c9357e0646dbb80554b71a3fb8438ab2d52b5c1bac20a3" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1509941381.json" -hash = "272df97da7ebb3d378112505189520f643292e4d458a7e628cbb87f28a9f5780" +hash = "232b5f0fd7d8ea9b76c97c3a041deb334f8688e42fc5d37f166dbfddf3f2e9bf" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/171786803.json" @@ -54,7 +54,7 @@ hash = "2a210e43c0128c31d5597e3aba5a73c94e59275ba0cca64879cc88ca8eab5a31" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1844759518.json" -hash = "d25537f8dc9bd01693f120b484a251a2f98e54331ae5e2bb8ffb009365266028" +hash = "15e5453c371e237bc207543ac82113500417a8e15bc3de5bc464505849affc3a" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1851152505.json" @@ -62,7 +62,7 @@ hash = "98fd75d732593e48c073dcf63588a10edb20e12523c9103c6b1d96eb3f013a6a" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/1868627010.json" -hash = "c76e8ec85e41d1c7e1b834774a1132b2ef2ae15ecfa7bfcae08469c73786d159" +hash = "8529863794d5bcd590bdbc8bc6ce45ca89c220c5fe3e25f5f52b00bbf62e0b81" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/2031103779.json" @@ -74,11 +74,11 @@ hash = "74bfb8b5b53e295cd2beccb970a93f58860c8f59a12cccc46cca66e9cef48490" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/343719817.json" -hash = "dd2472693c3e1bd7e6daa7743815912bea5c5d5c4c91ed980da3cffcdadf2fa5" +hash = "944f62287c8a65ec62cda1e947a9ffc3af7ed1efe72b713c40eaf2355052405d" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/377583359.json" -hash = "57490ffc5b4dfda9c563f130a4736076ff9aa2fac13d5b33aba17784be184496" +hash = "e78802a89b8b2a55d7f44ad18d305c2b24aed6c3af4882de2bc151dc1db0e551" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/391308061.json" @@ -102,7 +102,7 @@ hash = "709c09ad84242ac54fbb59ee692ba4c6a687e5e6381d98538b8a2a45aabec4c8" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/717308044.json" -hash = "1f664eb781335dbaa8841031479f287aa91f3aa2671691190bd46480e564486b" +hash = "3b83800893603e8c70b67863344d5c20d2c35d681c629487e7004e86afb9e8a1" [[files]] file = "config/betterquesting/DefaultQuests/QuestSettings.json" @@ -150,11 +150,11 @@ hash = "4400776e56c90d7c4e838075db70194fb2ad6d55cdf6c0d1f33a3af08ad9cbd2" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1408641165.json" -hash = "c3256004f5485eaadc1eec9d404b4ad272f51c81b7d829bceb3ee056019f5816" +hash = "fd0eb3bc12f79ecc56836820be628779733330853e9f1807a1caf6bf5f28b865" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/141978247.json" -hash = "451ede1d26e2e44f33c154257870b5ae43c7c8494e8fbbf4e4fd48d090b884a7" +hash = "cdc955511a3486ed69d78690139f4bd80dced52245cc9aa256ec845d46b6a5bd" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1435800964.json" @@ -198,7 +198,7 @@ hash = "8e1143a096d1e2769542925a9cfc60608cc99188be7b02901bfceddd31216dd3" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1660722430.json" -hash = "dcae7a36d15eb3f390d4d218573e66cd811aeb7b6ed194e77117ac19116113e3" +hash = "7345ca2f7e93851adaffdb4a64269afe217df37c463b21a86488563819388e03" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1663596177.json" @@ -222,7 +222,7 @@ hash = "a853dda8543437a2ae5213a86d0e394b7aa84f9d66f85808bf18f544233eeac1" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1805214138.json" -hash = "162208d3c1bb6567abe66bc459de46266c9d93675eea80783b2a3b460cf0942f" +hash = "32ca2ac3a54953992337ef50d8f63644fb47b8eed6d2fad1a1f1d9de083afc90" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/1847604030.json" @@ -302,7 +302,7 @@ hash = "eafb6f76cb08ecc3d0a1b24ac8e1198288d5596934a5f74fd2667287fea09a93" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/264657195.json" -hash = "038270a26f7b71725da4ca048024ea63e4941645c2578ff3dbb22c4d34fc7d5c" +hash = "1407b92556514b5bb2376f612c36a26d93099d88739c3f7566cd90071a8dfc9f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/295559920.json" @@ -370,7 +370,7 @@ hash = "e1ceecfc756f6ef907aaeae5c5230591f6918f1f746bb8201efd2225d054454a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/565745207.json" -hash = "97e9cc640030ba9d98c9b54fc8c4675d8b834e43291c201fffba34c8d6e55b4b" +hash = "01c1c9f87e34e10563a30eb9c81a9dd81ae621470ee7836af2c9cd868b9b1bb3" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/566748230.json" @@ -386,7 +386,7 @@ hash = "99047f789f9fbd52bba0387068c1385d765ea8eab28cd3df0155391fd58f0181" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json" -hash = "9b66c6a2252bc0a7e9a82575238e7768010126ae26684867e9c338dd7c58d432" +hash = "f8a4c9ca1c5a2925a7020116d63f56f01f2a97744edb6fc31c8b26c1024d91be" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/589853967.json" @@ -478,7 +478,7 @@ hash = "3067f97bc9e147145536bddb7542e383cff68243df9c645f2971359c6dc43680" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/106777031.json" -hash = "cf34b4e86871f02b75afa457203e3b8a0d5127046d832d04f4cf4c2febd2ff43" +hash = "4db2b719f132b83ccc7ab2ac0ec4784ba7f3a4f3cfb2d582096470d3fbdade5e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1070102724.json" @@ -498,11 +498,11 @@ hash = "96718cc12c53b49f395925e6510dd0bf7e11428db0449c26884d54442d2d408e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1207006283.json" -hash = "cecfccc4e667d5fdf54fb5518de95398b36eb85182756d5f741fce92073640d8" +hash = "a5658b78bba1d6649a1f90458543a0435830ed7f15e31f4d9eb16a3b8a25e6cb" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1220286723.json" -hash = "96754adeb80cc826554615dc1879daf291d3159ffd71e7c1fd15e29a9693cd3a" +hash = "4397aeac979115afa93f1eab9be48f562222a7a9bb8ee4b747ce663f12ac81e8" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1288498615.json" @@ -522,7 +522,7 @@ hash = "4698bf4dec21233cf12d60e1eb8af585313c9477c61d5736f24c6eeacea571c1" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1580032224.json" -hash = "e7bfa898dcfab39bfadfc8ed3334359e8766633106b12a3e8f902543a8883e2c" +hash = "bc05a634d940f0a279453aebe351204da49966512eda5ac5acdc4d0f81faea0a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/160768669.json" @@ -534,7 +534,7 @@ hash = "59cf501bb607ecaef7671c098dfb77253d6c2e6f75bdc3a99b23daea93a09899" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/165361007.json" -hash = "ed637b8b49da0c1d07e2a735a8be0b431c6e73215520aaaff4e09ec8df28dff7" +hash = "3e3ea0df4d5bc0c05c57deb991e830c43fe5090a733cfec7095c099f968ad845" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/165460843.json" @@ -550,7 +550,7 @@ hash = "355d3f1e608a3a027929a1d111e78451acab2568b8935184f70d2546b4503361" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1709257046.json" -hash = "b8c45bc0ba824ac695a2dae23146fe99ab2e48d59d02f04dc3c6186b3a49779b" +hash = "b954b7c83902ebe71e6bb38a1a27d29e203d6087eec4c3c50eac7d6e9df23552" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/1795666037.json" @@ -650,7 +650,7 @@ hash = "78a5badc67d56c38256636ac6f2d203269841287d5c06b9cef9648f778d8aea0" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/63436605.json" -hash = "a6e17cc8e462c595d00d9fcac8305d7700c512247154cbd498cdee230a6b0d00" +hash = "31fa5e8161fbab94c9a79941300577a5cd108d333781bc3b44374f900c2866de" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/65704285.json" @@ -670,7 +670,7 @@ hash = "e69e66c96f216d999821dd1dd8318586e8f8a2c993e3f1b57df11ce04a145eae" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/835904145.json" -hash = "c0fa08850026276a985b5bfd31c3cd7cf9cf66bb7f97b7074ef9e5553baefbd5" +hash = "3fbdbabfeef7e7d8485f052f571e8db28fe04a76d498960063a0ef13793a1780" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1121539277/892806362.json" @@ -1486,7 +1486,7 @@ hash = "81efd09586d9b622de128d9c1a7a4c494bae9a58bfd8ead2782ece92bbc94e5f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/1050849724.json" -hash = "e22d9a1fe014efbbcf1843e7b21fe9cccf8997949d372c79928d02288a775f77" +hash = "4ee610524b34370c3da9b57e099824bc0811eda4b40c206b31a47e9a00899fb2" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/10628027.json" @@ -1650,7 +1650,7 @@ hash = "7b1cf20dbc419d20b8136acbd3654485a4fb47fa85373dd2ebd096631977c174" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/564553776.json" -hash = "1393338dc2d9eb33150c95aa7138281b97f88b6a8259004fa0ff3076e6171477" +hash = "3491e6288f717291eda792218a5250f1188675065d9bf8953e8467ab3a567b80" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/576167792.json" @@ -1714,7 +1714,7 @@ hash = "54a17cf56344a026cc0f2dbdbbe5b0cd46b4c482ebd4adfd6c3e88ebad2ac28a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1118622834.json" -hash = "a884e384f9b83eaee36f9dfeda0e6950c65e6acb329d0b49596ec01bed3004e5" +hash = "2062730b3e956a1366c9a4dca92c468ebfa94116415f950ab5d725fc65c74ee6" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1126016056.json" @@ -1738,7 +1738,7 @@ hash = "98f7b907924db1f680cf8bb54e7db697d4cdebad730efe873c987be9bb0161b7" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1284331992.json" -hash = "5f1e84240754bbea7dceece922ae65c5c7f600d136a6ecf68de926222ae0ae39" +hash = "dfc81cbb2fc09a256044978cd1d151d4d6e85d4f76b754261b25a60fd273b3e5" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1319595390.json" @@ -1806,7 +1806,7 @@ hash = "3efb693d7f462d7336fb52d7dd40d81d378fe908dd3587769b3f38325b73b329" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1586601745.json" -hash = "5da02538a61151472787434a46b1cec15619bc44b544f913e697e5b524761ab4" +hash = "bce22cfc121243ba412eb5fdd360a87ee5d53d533845e35617c881ddecadab6f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/1598604950.json" @@ -1850,7 +1850,7 @@ hash = "d7af1fc5381f0249b654d5f9150d96f7aa1202b11293b6d5834d39d8fdb3d399" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/25140166.json" -hash = "254e29f79e2691eacbd55ba3350b4c01d06b6615a4b5be1819cd398591dcd1e4" +hash = "a7399ef5e272cfb4731d47a041667aedca4131e5eef4b8305dd64ae921f01d38" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/303587179.json" @@ -1866,7 +1866,7 @@ hash = "87f665e6bbfef13ef12d4c161662b00b652a0fded6386e084a90f6970c9281be" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/495401956.json" -hash = "097d4b63f069e93cdd50ce097409ba67c095e29b4be3a2196bfe4fe48528c68b" +hash = "281159b4024bd8172c1daad2eec6541d4c65c99ce6269569958b6c397ac081e8" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/509107376.json" @@ -1926,7 +1926,7 @@ hash = "083927d95c9273f5de4b9cfe881903ea85c408d263ebe2b1fe0928655929febc" [[files]] file = "config/betterquesting/DefaultQuests/Quests/391308061/987239996.json" -hash = "e8d523e6abe2b719756965d81172f98d6bea0bca8107e24ba78c246bc82e49c4" +hash = "635ecd77b90c1453a9dfde98dad6965f22f3e91d8228dcc03cbc29462567c13f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1027518245.json" @@ -1962,7 +1962,7 @@ hash = "6a5bf00b8217da9436acd985502bc681af452802ae23ab67fb965bdcd4b88416" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1341780904.json" -hash = "edf3ae90c4de07d0f7a310a57bc0e7c7b4658dc54c34cd28c53833fb3714d559" +hash = "760824304d624fef5e7e308ecb856190e01e6da8785c8ea6edb9597caaa17a3e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1360261223.json" @@ -1982,7 +1982,7 @@ hash = "db33236dfadfcfec8a43891e629ac97ddc9ea0bd13254be53ddd4d632e3f4139" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1459921631.json" -hash = "bf6edcf5933d96317ec3bf189380ec14eee205ed85f963601e0894324b4285c3" +hash = "f398a06e11ca71d7bfb8da15c89b2fba0ae37e8c73e10a9d1a8df0be735bee16" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1491751386.json" @@ -2002,7 +2002,7 @@ hash = "a2f42cde182d2500c4490941a90fde7c7885181cc8d7e6cb10b70ca8f749ef97" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1640887446.json" -hash = "5a13d0e2729faf8530d3a7104be6bda47d61549638029126aaed4d7ec55a50e9" +hash = "95df7b60f04366ec0aa5ca3857a7c5bc21ea2b38099eb28c3d05fe43fb655086" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/165029070.json" @@ -2014,7 +2014,7 @@ hash = "bbfd36b699ee0e8a78a287fe29ee7fe22dcffbea445e62c6a028c49c93caa1bf" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1793856059.json" -hash = "6697502fd3e6dfc82510a79fc01174f0f161c466c6299c5466f843aea40ffa33" +hash = "a4fe29bf404d4d192840779ba2feb43ed444b5bd2600fe0952d869b72e36f7fe" [[files]] file = "config/betterquesting/DefaultQuests/Quests/585069616/1793993238.json" @@ -2130,7 +2130,7 @@ hash = "1f64059935e37293f813b0faaf7dfb4bb154a77ebdf8098abc369cb5d61afbcc" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json" -hash = "d07b33e318c0ff3374e96cca1ee4810a15cc1d6863c3e9bd7f9a922946204b18" +hash = "194d52abc66b5c60b2faa56b9327aa4c6eb56d32f7b97929fa979260054cd307" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/114232567.json" @@ -2138,7 +2138,7 @@ hash = "8703144ffff963a801adc7a7da8169bea0925604eebba587fe8cdf6b90b94ab4" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/1247483445.json" -hash = "f0d991d3fd30214e135d1926d4937bcb35daf701fb3df36ce1f5fa2cb92d32e8" +hash = "61d26ada65efbc897675935f817cb5615c62bd1037296cb082a50d337fe775b7" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/1266166650.json" @@ -2194,7 +2194,7 @@ hash = "636aaa77b17507e42f087051cde91562cf080272e09ae1a32e59cb20dfc2407e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json" -hash = "59d5fb16c5479b95c703c161303c766105f7f0bac7544b62af37c24ed09572a4" +hash = "6f341aa11e5d5221680550ea75be932781af2fbeb392543460e6ce1f2ec1aa6f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2129085776.json" @@ -2206,7 +2206,7 @@ hash = "473838eb42d8cfcf7d68f62f4594ee24a1f350d237c74aff181b7d7d90ed2598" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/234936908.json" -hash = "09a1d8c4567fed98eed2a85b3953a5c3291cd0e72f6b753de0664f51e7210054" +hash = "86860b5a80d92d70791f67c69cb91e965a567ca1e93e77c0ddf1ac71f0b4d929" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/239716163.json" @@ -2385,8 +2385,8 @@ file = "config/fancymenu/menu_identifiers.db" hash = "003a1c89846741e0eb9475089d4ed653896fd08e0b994667fae452b4ad894a72" [[files]] -file = "config/fluiddrawers.cfg" -hash = "a9845be03a2b99a5fb389e01d60f71acec618451a73872dd0a6a107c594636d0" +file = "config/functionalstoragelegacy.cfg" +hash = "c49aba5e8cd9f0388a89bd1b4d21896765fa6ede9817cea4fcd7ae5e1504d063" [[files]] file = "config/gregtech/gregtech.cfg" @@ -2774,11 +2774,11 @@ hash = "80476d3d3169ff17dc7f772e62cd9debfb6e2426558aabab7cf892c1d8e051ff" [[files]] file = "groovy/event/TooltipEventHandler.groovy" -hash = "9642f696ebcbcaa089f6cb17207c309ec396e8bb8ea282483f408329a991745a" +hash = "813d0636ddce30744ae8f5312946f7cea1d680e707d319024ce512a9a76295a8" [[files]] file = "groovy/loader/OreDictionaryLoader.groovy" -hash = "1aa4627f120a917823c999e10954a091917c19dc781fd6918cb0b92cff51cf29" +hash = "85e0a99b6bc428f50385f015d0a6b3f07ed071a648d6f368ef60f31b76330d45" [[files]] file = "groovy/loader/hooks/P2PConvertor.groovy" @@ -2810,7 +2810,7 @@ hash = "e97b45c56d6a72bc36cd4a802d63eac1f7207f202e323a255e173bc252869d0a" [[files]] file = "groovy/loader/recipe/EnderIO.groovy" -hash = "96caddca387cd5eebb8cf510c54de732365aa07687bcb3e43772d1ad110d6397" +hash = "2808554b286fd0fdcaea3467c5c896377f4418397d541a61ff66a225fb564f6f" [[files]] file = "groovy/loader/recipe/EnderUtilities.groovy" @@ -2821,8 +2821,8 @@ file = "groovy/loader/recipe/Entangled.groovy" hash = "c533768f773b989013eed563e6d4e74009f61029ab796504dedfb6f6b07adadf" [[files]] -file = "groovy/loader/recipe/FluidDrawers.groovy" -hash = "aaf757179d00247a25894f968f298eefff64f0572efc7d16541f89fb9fb76f22" +file = "groovy/loader/recipe/FunctionalStorage.groovy" +hash = "4d17db38fb3b23ea6d7d2ff9dca197283be315d443bcce1b222d4eaa4a650bfd" [[files]] file = "groovy/loader/recipe/GregTech.groovy" @@ -2850,7 +2850,7 @@ hash = "67f94257f18826514d035e2a81eea4f92aed7a64b011f4c40449e3613e2d3a87" [[files]] file = "groovy/loader/recipe/SophisticatedBackpacks.groovy" -hash = "d73466820e2470831f013bcfa365f9a8fa85ce0efcaf69a0e96e0f2f55f7ef03" +hash = "e719f11a92e05d095712a16fffcb085345eeb5d92be99a69abff340e7b438232" [[files]] file = "groovy/loader/recipe/Translocators.groovy" @@ -2966,11 +2966,6 @@ file = "mods/cb-multipart.pw.toml" hash = "8543599cc981cc25fa739c9efad2ffd6ddcbcd10b681e47875bf5e7f87a9262f" metafile = true -[[files]] -file = "mods/chameleon.pw.toml" -hash = "305815006195c0647af38ea5d8c03cd6c652c77bf975e3e967b754bc3b9ac569" -metafile = true - [[files]] file = "mods/chat-calculator.pw.toml" hash = "5a8ab47af3f0bfb08b5131e595d30e026eef10bca153476402643c37704365b6" @@ -3041,11 +3036,6 @@ file = "mods/fancymenu.pw.toml" hash = "a0b9178824a6998223027dbca140b3652300a9140c7ed908db5508c9f4af1902" metafile = true -[[files]] -file = "mods/fluid-drawers.pw.toml" -hash = "6f59b412881512ae1339649a4c46cb8406a4ca3d6b7b24705819324b6fd039e4" -metafile = true - [[files]] file = "mods/forgelin-continuous.pw.toml" hash = "7f20adcb7c10f9966bea19a174df4196a9539155d764edb7e31edd8ed58e438e" @@ -3076,6 +3066,11 @@ file = "mods/ftb-utilities-forge.pw.toml" hash = "b3bf53323fcae0f8647ce23c60fffc003abcd315ece3772822f3130d7d5cd52f" metafile = true +[[files]] +file = "mods/functionalstoragelegacy.pw.toml" +hash = "5d513f4b8990c8d078ef8c14142b5c3f595322b14dcfea55a80b144ef7b44fab" +metafile = true + [[files]] file = "mods/gnetum.pw.toml" hash = "8b975d442a979a8a07b2438314ca98047e987c13bc4852f9bee119b545467aa8" @@ -3164,11 +3159,6 @@ file = "mods/konkrete.pw.toml" hash = "35d4f2d6f3ee79b918349a01c16e8c7f5c4ffc7c057e1ee1ac2cd5095ee1a8c1" metafile = true -[[files]] -file = "mods/libnine.pw.toml" -hash = "aeeca03fc512fffed87f449bc8b631d59f4b95857dc3818492d6af0afd4e00c6" -metafile = true - [[files]] file = "mods/lolasm.pw.toml" hash = "c1eb5d7ffad071d644c92f8100d60a5d8bc09313c345a7b3df40a803f9538d95" @@ -3303,11 +3293,6 @@ file = "mods/stellarcore.pw.toml" hash = "fa9df380bba4f7a73750b16021099e343e34cdd14cd983d570603718a1c4a501" metafile = true -[[files]] -file = "mods/storage-drawers.pw.toml" -hash = "1976cfb3222e1f141aa56af5824be673771a9db93b49c7e48fa2cca3f58aef02" -metafile = true - [[files]] file = "mods/supermartijn642s-config-lib.pw.toml" hash = "ff5a7d6fe7c70f7db36e33ceefc6936b382a572c35c9f6efc21c4cccbaaea362" @@ -3532,6 +3517,14 @@ hash = "5089865fcf1e622ea35fe808bc3f0508f8b8791f4bbc98f064d6ab6071c73a38" file = "resources/forge/lang/zh_cn.lang" hash = "d73251c0b404017c1b1bf9710680edd9a8035ba6d3adaa6d2d6e3ac058bea4a4" +[[files]] +file = "resources/functionalstoragelegacy/lang/en_us.lang" +hash = "47cb98da32b27197bb4c357a642c4bdf54b0fad8b87bc49cd4e9026f7e96e29b" + +[[files]] +file = "resources/functionalstoragelegacy/lang/zh_cn.lang" +hash = "412e948d06be181a53b16ff175e3247a710273332c8f8c50d5270ddbc5aca700" + [[files]] file = "resources/gregtech/lang/zh_cn.lang" hash = "e3b950265656e16b3c0eaa0e82bb10ff193e7e0d935213963a13851343540a68" diff --git a/mods/chameleon.pw.toml b/mods/chameleon.pw.toml deleted file mode 100644 index 3f89580..0000000 --- a/mods/chameleon.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Chameleon" -filename = "Chameleon-1.12-4.1.3.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "5ed3dd5fd1ebded57bfe525b4ece11232bd14e5e" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 2450900 -project-id = 230497 diff --git a/mods/fluid-drawers.pw.toml b/mods/fluid-drawers.pw.toml deleted file mode 100644 index 16deff8..0000000 --- a/mods/fluid-drawers.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Fluid Drawers" -filename = "fluiddrawers-1.12.2-1.0.7.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "1e61697c5be117ece6e2abb9ee73ab6692758ba5" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 3373954 -project-id = 402338 diff --git a/mods/functionalstoragelegacy.pw.toml b/mods/functionalstoragelegacy.pw.toml new file mode 100644 index 0000000..ee11d8c --- /dev/null +++ b/mods/functionalstoragelegacy.pw.toml @@ -0,0 +1,13 @@ +name = "Functional Storage Legacy" +filename = "FunctionalStorageLegacy-1.0.3-beta.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "1916592c530f5780add753b76f6313c8bac3ad5c" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 8081067 +project-id = 1481727 diff --git a/mods/libnine.pw.toml b/mods/libnine.pw.toml deleted file mode 100644 index 6b0ac5a..0000000 --- a/mods/libnine.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "LibNine" -filename = "libnine-1.12.2-1.2.2.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "c99daa72265e227875eea94897a9041faceec79a" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 6790812 -project-id = 322344 diff --git a/mods/storage-drawers.pw.toml b/mods/storage-drawers.pw.toml deleted file mode 100644 index e8d4126..0000000 --- a/mods/storage-drawers.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Storage Drawers" -filename = "StorageDrawers-1.12.2-5.5.3.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "8be312005dc837372bfbe2dfb8db77822d326062" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 5981297 -project-id = 223852 diff --git a/pack.toml b/pack.toml index bc13ff6..a9dcf6e 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 = "65013b42c6f887c3af56e760f4350d6831743961db0ea7785957de4b68732214" +hash = "c97c056d48a1944ecce1bd7ca9ee4bd419275e69bef587cc674e14836fd4b1cd" [versions] forge = "14.23.5.2860" diff --git a/resources/functionalstoragelegacy/lang/en_us.lang b/resources/functionalstoragelegacy/lang/en_us.lang new file mode 100644 index 0000000..d3d5310 --- /dev/null +++ b/resources/functionalstoragelegacy/lang/en_us.lang @@ -0,0 +1 @@ +item.functionalstoragelegacy.netherite_upgrade.name=Obsidian Upgrade \ No newline at end of file diff --git a/resources/functionalstoragelegacy/lang/zh_cn.lang b/resources/functionalstoragelegacy/lang/zh_cn.lang new file mode 100644 index 0000000..5dfc226 --- /dev/null +++ b/resources/functionalstoragelegacy/lang/zh_cn.lang @@ -0,0 +1 @@ +item.functionalstoragelegacy.netherite_upgrade.name=黑曜石升级 \ No newline at end of file