diff --git a/config/betterquesting/DefaultQuests/QuestLines/717308044.json b/config/betterquesting/DefaultQuests/QuestLines/717308044.json index 1661fb2..6119664 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/717308044.json +++ b/config/betterquesting/DefaultQuests/QuestLines/717308044.json @@ -22,10 +22,10 @@ }, "1:10": { "id:3": 42026173, - "sizeX:3": 72, - "sizeY:3": 72, - "x:3": 228, - "y:3": -228 + "sizeX:3": 120, + "sizeY:3": 96, + "x:3": -36, + "y:3": 84 }, "2:10": { "id:3": 60858605, @@ -56,237 +56,272 @@ "y:3": 228 }, "6:10": { + "id:3": 108430281, + "sizeX:3": 48, + "sizeY:3": 48, + "x:3": 0, + "y:3": -132 + }, + "7:10": { "id:3": 114232567, "sizeX:3": 48, "sizeY:3": 48, "x:3": 420, "y:3": 168 }, - "7:10": { + "8:10": { "id:3": 169088241, "sizeX:3": 84, "sizeY:3": 120, "x:3": 540, "y:3": 120 }, - "8:10": { + "9:10": { "id:3": 207922354, "sizeX:3": 72, "sizeY:3": 72, "x:3": 408, "y:3": -192 }, - "9:10": { + "10:10": { "id:3": 234936908, - "sizeX:3": 60, - "sizeY:3": 60, - "x:3": 756, - "y:3": -180 + "sizeX:3": 72, + "sizeY:3": 72, + "x:3": 696, + "y:3": -156 }, - "10:10": { + "11:10": { "id:3": 239716163, "sizeX:3": 144, "sizeY:3": 72, "x:3": 144, "y:3": 204 }, - "11:10": { + "12:10": { "id:3": 285640197, "sizeX:3": 48, "sizeY:3": 48, "x:3": 624, "y:3": 180 }, - "12:10": { + "13:10": { "id:3": 320549997, "sizeX:3": 60, "sizeY:3": 60, "x:3": 384, "y:3": 228 }, - "13:10": { + "14:10": { "id:3": 365293235, "sizeX:3": 72, "sizeY:3": 72, "x:3": 696, "y:3": -36 }, - "14:10": { + "15:10": { "id:3": 398242673, "sizeX:3": 48, "sizeY:3": 48, "x:3": 576, "y:3": 228 }, - "15:10": { + "16:10": { "id:3": 468342799, "sizeX:3": 72, "sizeY:3": 72, "x:3": 636, "y:3": -72 }, - "16:10": { + "17:10": { "id:3": 503745124, "sizeX:3": 48, "sizeY:3": 48, "x:3": 108, "y:3": -24 }, - "17:10": { + "18:10": { + "id:3": 533323911, + "sizeX:3": 84, + "sizeY:3": 84, + "x:3": 756, + "y:3": 96 + }, + "19:10": { "id:3": 626519854, "sizeX:3": 60, "sizeY:3": 60, "x:3": 384, "y:3": 96 }, - "18:10": { + "20:10": { + "id:3": 634528767, + "sizeX:3": 60, + "sizeY:3": 60, + "x:3": 768, + "y:3": 204 + }, + "21:10": { + "id:3": 685425731, + "sizeX:3": 48, + "sizeY:3": 48, + "x:3": 24, + "y:3": -228 + }, + "22:10": { "id:3": 725420853, "sizeX:3": 72, "sizeY:3": 72, "x:3": 576, "y:3": 36 }, - "19:10": { + "23:10": { "id:3": 833375932, "sizeX:3": 96, "sizeY:3": 96, "x:3": -48, "y:3": -48 }, - "20:10": { + "24:10": { "id:3": 885023259, "sizeX:3": 48, "sizeY:3": 48, "x:3": 108, "y:3": 180 }, - "21:10": { + "25:10": { "id:3": 900357978, "sizeX:3": 72, "sizeY:3": 72, "x:3": 636, "y:3": 0 }, - "22:10": { + "26:10": { "id:3": 977343923, "sizeX:3": 48, "sizeY:3": 48, "x:3": 588, "y:3": -180 }, - "23:10": { + "27:10": { "id:3": 1034306394, "sizeX:3": 96, "sizeY:3": 96, "x:3": 216, "y:3": -48 }, - "24:10": { + "28:10": { "id:3": 1120479252, "sizeX:3": 72, "sizeY:3": 72, "x:3": 96, "y:3": 72 }, - "25:10": { + "29:10": { "id:3": 1247483445, "sizeX:3": 48, "sizeY:3": 48, "x:3": 240, "y:3": 84 }, - "26:10": { + "30:10": { "id:3": 1266166650, "sizeX:3": 60, "sizeY:3": 60, "x:3": 444, "y:3": 96 }, - "27:10": { + "31:10": { "id:3": 1351543628, "sizeX:3": 60, "sizeY:3": 60, "x:3": 444, "y:3": 228 }, - "28:10": { + "32:10": { "id:3": 1352275584, "sizeX:3": 72, "sizeY:3": 72, "x:3": 96, "y:3": -144 }, - "29:10": { + "33:10": { "id:3": 1353176853, "sizeX:3": 48, "sizeY:3": 48, "x:3": 672, "y:3": 180 }, - "30:10": { + "34:10": { "id:3": 1400623169, "sizeX:3": 48, "sizeY:3": 48, "x:3": 624, "y:3": 132 }, - "31:10": { + "35:10": { "id:3": 1401716109, "sizeX:3": 48, "sizeY:3": 48, "x:3": 108, "y:3": -228 }, - "32:10": { + "36:10": { "id:3": 1556708538, "sizeX:3": 72, "sizeY:3": 72, "x:3": 576, "y:3": -108 }, - "33:10": { + "37:10": { "id:3": 1592279111, "sizeX:3": 48, "sizeY:3": 48, "x:3": 672, "y:3": 132 }, - "34:10": { + "38:10": { "id:3": 1694580960, "sizeX:3": 48, "sizeY:3": 48, "x:3": 528, "y:3": 228 }, - "35:10": { + "39:10": { "id:3": 1861030809, "sizeX:3": 72, "sizeY:3": 72, "x:3": 408, "y:3": -36 }, - "36:10": { + "40:10": { + "id:3": 1935689427, + "sizeX:3": 72, + "sizeY:3": 72, + "x:3": 804, + "y:3": -156 + }, + "41:10": { "id:3": 2044505934, "sizeX:3": 72, "sizeY:3": 72, "x:3": 576, "y:3": -36 }, - "37:10": { + "42:10": { "id:3": 2084484911, - "sizeX:3": 60, - "sizeY:3": 60, - "x:3": 756, - "y:3": 108 + "sizeX:3": 72, + "sizeY:3": 84, + "x:3": 228, + "y:3": -240 }, - "38:10": { + "43:10": { "id:3": 2129085776, "sizeX:3": 48, "sizeY:3": 48, "x:3": 504, "y:3": -180 }, - "39:10": { + "44:10": { "id:3": 2144736605, "sizeX:3": 48, "sizeY:3": 48, diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/108430281.json b/config/betterquesting/DefaultQuests/Quests/717308044/108430281.json new file mode 100644 index 0000000..fe6f65e --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/717308044/108430281.json @@ -0,0 +1,54 @@ +{ + "preRequisites:11": [ + 1352275584 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "因为§5ME玻璃线缆§r有些渲染负担，所以给你的基地铺满线缆的最佳选择是§e包层线缆§r。制造足够铺满你的生产线与基地的包层线缆很麻烦，而且你可能已经在各种整合包内体验过这个流程了。\n\n这个任务允许你提交1组包层线缆来获得§a无限包层线缆元件§r，你再也不需要顾虑线缆会用完了。除了这个任务以外，这种无限元件还可以通过§bMV§r级别的§6组装机§r合成，只需要多消耗1个§8存储外壳§r（还有你付出的能量！）。\n\n§3或许你更喜欢多种颜色的包层线缆，请用兑换的无限元件与对应种类的染料合成，即可得到对应颜色的包层线缆的无限元件。", + "icon:10": { + "Count:3": 1, + "Damage:2": 76, + "id:8": "appliedenergistics2:part" + }, + "name:8": "§d我受够了合成线缆！" + } + }, + "questID:3": 108430281, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 1, + "id:8": "extendedae:infinity_cell", + "tag:10": { + "r:10": { + "Cnt:4": 1, + "Count:3": 1, + "Craft:1": 0, + "Damage:2": 36, + "Req:4": 0, + "id:8": "appliedenergistics2:part" + }, + "t:8": "i" + } + } + } + } + }, + "tasks:9": { + "0:10": { + "consume:1": 1, + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 36, + "id:8": "appliedenergistics2:part" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/1935689427.json b/config/betterquesting/DefaultQuests/Quests/717308044/1935689427.json new file mode 100644 index 0000000..1432cbf --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/717308044/1935689427.json @@ -0,0 +1,19 @@ +{ + "preRequisites:11": [ + 234936908 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "No Description", + "frame:8": "DIAGONAL_STAR4_ON_HEXAGON90", + "icon:10": { + "Count:3": 1, + "Damage:2": 11527, + "id:8": "gregtech:mte" + }, + "name:8": "§a§l高阶应用格雷" + } + }, + "questID:3": 1935689427, + "tasks:9": {} +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json b/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json index e78a94b..2468f44 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json @@ -1,25 +1,72 @@ { - "preRequisiteTypes:7": [ - 2, - 2, - 0 - ], "preRequisites:11": [ - 1861030809, - 365293235, - 900357978 + 2144736605 ], "properties:10": { "betterquesting:10": { "desc:8": "No Description", - "frame:8": "DIAMOND", + "frame:8": "EMPTY", "icon:10": { "Count:3": 1, - "id:8": "appliedenergistics2:crafting_monitor" + "id:8": "extendedae:infinity_cell", + "tag:10": { + "r:10": { + "Cnt:4": 1, + "Count:3": 1, + "Craft:1": 0, + "Damage:2": 0, + "Req:4": 0, + "id:8": "minecraft:cobblestone" + }, + "t:8": "i" + } }, - "name:8": "§6合成监控器" + "name:8": "§6无限存储元件", + "tasklogic:8": "OR" } }, "questID:3": 2084484911, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "extendedae:infinity_cell", + "tag:10": { + "r:10": { + "Cnt:4": 1, + "Count:3": 1, + "Craft:1": 0, + "Damage:2": 0, + "Req:4": 0, + "id:8": "minecraft:cobblestone" + }, + "t:8": "i" + } + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "extendedae:infinity_cell", + "tag:10": { + "r:10": { + "Cnt:4": 1, + "Count:1": 0, + "Craft:1": 0, + "FluidName:8": "water", + "Req:4": 0 + }, + "t:8": "f" + } + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/2144736605.json b/config/betterquesting/DefaultQuests/Quests/717308044/2144736605.json index b5fb987..f9476f7 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/2144736605.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/2144736605.json @@ -14,5 +14,40 @@ } }, "questID:3": 2144736605, - "tasks:9": {} + "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": 39, + "id:8": "appliedenergistics2:material" + } + }, + "taskID:8": "bq_standard:retrieval" + }, + "2:10": { + "entryLogic:8": "OR", + "index:3": 2, + "optional:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:storage_cell_64k", + "tag:10": {} + }, + "1:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:fluid_storage_cell_64k", + "tag:10": {} + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/533323911.json b/config/betterquesting/DefaultQuests/Quests/717308044/533323911.json new file mode 100644 index 0000000..e0ec40f --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/717308044/533323911.json @@ -0,0 +1,26 @@ +{ + "properties:10": { + "betterquesting:10": { + "desc:8": "No Description", + "frame:8": "EMPTY", + "icon:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:spatial_pylon" + }, + "name:8": "§d空间魔术" + } + }, + "questID:3": 533323911, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:spatial_pylon" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/634528767.json b/config/betterquesting/DefaultQuests/Quests/717308044/634528767.json new file mode 100644 index 0000000..972cc86 --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/717308044/634528767.json @@ -0,0 +1,33 @@ +{ + "preRequisiteTypes:7": [ + 2, + 2 + ], + "preRequisites:11": [ + 93515505, + 533323911 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "No Description", + "icon:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:spatial_io_port" + }, + "name:8": "§3闪转腾挪" + } + }, + "questID:3": 634528767, + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "appliedenergistics2:spatial_io_port" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/685425731.json b/config/betterquesting/DefaultQuests/Quests/717308044/685425731.json new file mode 100644 index 0000000..7b0ad0e --- /dev/null +++ b/config/betterquesting/DefaultQuests/Quests/717308044/685425731.json @@ -0,0 +1,34 @@ +{ + "preRequisites:11": [ + 1352275584 + ], + "properties:10": { + "betterquesting:10": { + "desc:8": "No Description", + "icon:10": { + "Count:3": 1, + "id:8": "enderio:item_me_conduit" + }, + "name:8": "§3ME导管" + } + }, + "questID:3": 685425731, + "tasks:9": { + "0:10": { + "entryLogic:8": "OR", + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "id:8": "enderio:item_me_conduit" + }, + "1:10": { + "Count:3": 1, + "Damage:2": 1, + "id:8": "enderio:item_me_conduit" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } +} \ No newline at end of file diff --git a/config/extendedae.cfg b/config/extendedae.cfg new file mode 100644 index 0000000..913f4a3 --- /dev/null +++ b/config/extendedae.cfg @@ -0,0 +1,35 @@ +# Configuration file + +general { + # ME Infinity Cell Supported Fluid List + # Use fluid name as id by default, for example: "water" or "soldering_alloy". + S:"Fluid IDs" < + water + > + + # ME Infinity Cell Supported Item List + # Format: "::", where metadata is optional by default. + # For example: "minecraft:cobblestone" or "appliedenergistics2:part:36" (metadata). + S:"Item IDs" < + minecraft:cobblestone + appliedenergistics2:part:20 + appliedenergistics2:part:21 + appliedenergistics2:part:22 + appliedenergistics2:part:23 + appliedenergistics2:part:24 + appliedenergistics2:part:25 + appliedenergistics2:part:26 + appliedenergistics2:part:27 + appliedenergistics2:part:28 + appliedenergistics2:part:29 + appliedenergistics2:part:30 + appliedenergistics2:part:31 + appliedenergistics2:part:32 + appliedenergistics2:part:33 + appliedenergistics2:part:34 + appliedenergistics2:part:35 + appliedenergistics2:part:36 + > +} + + diff --git a/groovy/event/MaterialEventHandler.groovy b/groovy/event/MaterialEventHandler.groovy index 7592441..4688afa 100644 --- a/groovy/event/MaterialEventHandler.groovy +++ b/groovy/event/MaterialEventHandler.groovy @@ -1,5 +1,3 @@ -package event; - import net.minecraftforge.fml.common.eventhandler.EventPriority import gregtech.api.unification.material.event.MaterialEvent @@ -58,6 +56,7 @@ eventManager.listen(EventPriority.LOWEST) { MaterialEvent event -> // stick Obsidian.addFlags(GENERATE_ROD) + CertusQuartz.addFlags(GENERATE_ROD) // stickLong RedAlloy.addFlags(GENERATE_LONG_ROD) diff --git a/groovy/loader/recipe/EnderIO.groovy b/groovy/loader/recipe/EnderIO.groovy index 302f92e..457e6fb 100644 --- a/groovy/loader/recipe/EnderIO.groovy +++ b/groovy/loader/recipe/EnderIO.groovy @@ -749,6 +749,65 @@ assembler.recipeBuilder() .duration(5 * SECOND) .buildAndRegister() +// ME Conduit +crafting.shapedBuilder() + .name(resource('gtlite:me_conduit_1')) + .shape('GGG', + 'BRB', + 'GGG') + .key('G', item('minecraft:glass_pane')) + .key('B', conduit_binder) + .key('R', item('appliedenergistics2:part', 16)) // ME Glass Cable + .output(item('enderio:item_me_conduit') * 4) + .register() + +crafting.shapedBuilder() + .name(resource('gtlite:me_conduit_2')) + .shape('GGG', + 'BRB', + 'GGG') + .key('G', ore('plateGlass')) + .key('B', conduit_binder) + .key('R', item('appliedenergistics2:part', 16)) // ME Glass Cable + .output(item('enderio:item_me_conduit') * 4) + .register() + +assembler.recipeBuilder() + .circuitMeta(1) + .inputs(item('appliedenergistics2:part', 16)) // ME Glass Cable + .inputs(item('minecraft:glass_pane') * 6) + .inputs(conduit_binder * 2) + .outputs(item('enderio:item_me_conduit') * 4) + .EUt(VH[LV]) + .duration(5 * SECOND) + .buildAndRegister() + +assembler.recipeBuilder() + .circuitMeta(1) + .inputs(item('appliedenergistics2:part', 16)) // ME Glass Cable + .inputs(ore('plateGlass') * 6) + .inputs(conduit_binder * 2) + .outputs(item('enderio:item_me_conduit') * 4) + .EUt(VH[LV]) + .duration(5 * SECOND) + .buildAndRegister() + +// ME Dense Conduit +crafting.shapelessBuilder() + .name(resource('gtlite:me_dense_conduit')) + .input([item('enderio:item_me_conduit'), ore('stickCertusQuartz')]) + .output(item('enderio:item_me_conduit', 1) * 2) + .register() + +assembler.recipeBuilder() + .circuitMeta(1) + .inputs(item('enderio:item_me_conduit')) + .inputs(ore('stickCertusQuartz')) + .outputs(item('enderio:item_me_conduit', 1) * 2) + .EUt(VH[LV]) + .duration(5 * SECOND) + .buildAndRegister() + // Glider Wings assembler.recipeBuilder() .inputs(ore('platePlastic') * 2) diff --git a/groovy/loader/recipe/ExtendedAE.groovy b/groovy/loader/recipe/ExtendedAE.groovy new file mode 100644 index 0000000..34a72a2 --- /dev/null +++ b/groovy/loader/recipe/ExtendedAE.groovy @@ -0,0 +1,87 @@ +import static gregtech.api.GTValues.* +import static util.GroovyUtil.* + +log.info("Starting to load extendedae recipes...") + +def assembler = recipemap('assembler') +def packer = recipemap('packer') + +// ME Infinity Cobblestone Cell +crafting.remove('extendedae:cobblestone_cell') +packer.recipeBuilder() + .inputs(item('appliedenergistics2:material', 39)) // Empty Storage Cell + .inputs(item('minecraft:cobblestone')) + .outputs(item('extendedae:infinity_cell') + .withNbt(['r': ['Req': 0l, + 'Cnt': 1l, + 'Damage': (short) 0, + 'Count': 1, + 'id': 'minecraft:cobblestone', + 'Craft': (byte) 0], + 't': 'i'])) + .EUt(VA[ULV]) + .duration(2 * TICK) + .buildAndRegister() + +// ME Infinity Water Cell +crafting.remove('extendedae:water_cell') +packer.recipeBuilder() + .inputs(item('appliedenergistics2:material', 39)) // Empty Storage Cell + .inputs(metaitem('cover.infinite_water')) + .outputs(item('extendedae:infinity_cell') + .withNbt(['r': ['FluidName': 'water', + 'Count': (byte) 0, + 'Cnt': 1l, + 'Req': 0l, + 'Craft': (byte) 0], + 't': 'f'])) + .EUt(VA[ULV]) + .duration(2 * TICK) + .buildAndRegister() + +// ME Infinity Covered Cable Cell +assembler.recipeBuilder() + .circuitMeta(1) + .inputs(item('appliedenergistics2:material', 39)) // Empty Storage Cell + .inputs(item('appliedenergistics2:part', 36) * 64) // Covered Cable - Fluix + .outputs(item('extendedae:infinity_cell') + .withNbt(['r': ['id': 'appliedenergistics2:part', + 'Count': 1, + 'Damage': (short) 36, + 'Cnt': 1l, + 'Req': 0l, + 'Craft': (byte) 0], + 't': 'i'])) + .EUt(VA[MV]) + .duration(10 * SECOND) + .buildAndRegister() + +def dyeColorOres = [ 'dyeWhite', 'dyeOrange', 'dyeMagenta', 'dyeLightBlue', + 'dyeYellow', 'dyeLime', 'dyePink', 'dyeGray', + 'dyeLightGray', 'dyeCyan', 'dyePurple', 'dyeBlue', + 'dyeBrown', 'dyeGreen', 'dyeRed', 'dyeBlack' ] + +for (int i = 0; i < 16; i++) +{ + crafting.shapelessBuilder() + .name(resource('gtlite:infinity_covered_cable_' + dyeColorOres[i] + '_cell')) + .input([item('extendedae:infinity_cell') + .withNbt(['r': ['id': 'appliedenergistics2:part', + 'Count': 1, + 'Damage': (short) 36, + 'Cnt': 1l, + 'Req': 0l, + 'Craft': (byte) 0], + 't': 'i']), ore(dyeColorOres[i])]) + .output(item('extendedae:infinity_cell') + .withNbt(['r': ['id': 'appliedenergistics2:part', + 'Count': 1, + 'Damage': (short) (20 + i), + 'Cnt': 1l, + 'Req': 0l, + 'Craft': (byte) 0], + 't': 'i'])) + .register() +} + +log.info("Complete load extendedae recipes!") \ No newline at end of file diff --git a/index.toml b/index.toml index de22879..35c951e 100644 --- a/index.toml +++ b/index.toml @@ -102,7 +102,7 @@ hash = "709c09ad84242ac54fbb59ee692ba4c6a687e5e6381d98538b8a2a45aabec4c8" [[files]] file = "config/betterquesting/DefaultQuests/QuestLines/717308044.json" -hash = "3b83800893603e8c70b67863344d5c20d2c35d681c629487e7004e86afb9e8a1" +hash = "7e76e2db94f60112bf144123bde419b5cd78f9d0ae75e36f7352bbeb1987ac84" [[files]] file = "config/betterquesting/DefaultQuests/QuestSettings.json" @@ -2128,6 +2128,10 @@ hash = "01a443d217e016ccefe3fe0c238ad1b65a3769e6a7d582457145f5661a0f14e0" file = "config/betterquesting/DefaultQuests/Quests/717308044/1034306394.json" hash = "1f64059935e37293f813b0faaf7dfb4bb154a77ebdf8098abc369cb5d61afbcc" +[[files]] +file = "config/betterquesting/DefaultQuests/Quests/717308044/108430281.json" +hash = "89e8f3d63a6fe6bb54ce036f535876a5a61f0cc944b5f9d34ecb3543917da4b1" + [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/1120479252.json" hash = "194d52abc66b5c60b2faa56b9327aa4c6eb56d32f7b97929fa979260054cd307" @@ -2184,6 +2188,10 @@ hash = "b2d3eb59dde8d1530519f1bbf731c791d971ae1fa63765a013f268e7dc9388f4" file = "config/betterquesting/DefaultQuests/Quests/717308044/1861030809.json" hash = "1ada9518f781e271c2e55cb9e74a7c950997abe48d96911c94cb6b4790dab1f1" +[[files]] +file = "config/betterquesting/DefaultQuests/Quests/717308044/1935689427.json" +hash = "d6eabdf539013ef7433d45301e39dbbd7d2690a2b5e5f081244ad368eaf481ca" + [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2044505934.json" hash = "887f07e0cead7cab829db12fd8b3f422eb2e8cff7ad815bbe4499022552d95e8" @@ -2194,7 +2202,7 @@ hash = "636aaa77b17507e42f087051cde91562cf080272e09ae1a32e59cb20dfc2407e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2084484911.json" -hash = "6f341aa11e5d5221680550ea75be932781af2fbeb392543460e6ce1f2ec1aa6f" +hash = "b44b6e3cd31107efec892c07b466b9088bd934435ba7d84f641cea4357273883" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2129085776.json" @@ -2202,7 +2210,7 @@ hash = "71e7bc9ce1814347d6fbb2bf49bacca9569b80e9d1e73283c7ce7c28cf922857" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/2144736605.json" -hash = "473838eb42d8cfcf7d68f62f4594ee24a1f350d237c74aff181b7d7d90ed2598" +hash = "3f2ea6437055c9752fadc1d63d646ffc344d346760dcff59cbeccca4f789fcde" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/234936908.json" @@ -2244,6 +2252,10 @@ hash = "af55855442ecf226e4ad0a07ccdde8daf246f2c3e4f191fde44f4a9166ef698f" file = "config/betterquesting/DefaultQuests/Quests/717308044/503745124.json" hash = "fcb5b1260d6f8bd938dfc07389ee4cfa21de7306e7b01d0f4a2865d7f52ed0d6" +[[files]] +file = "config/betterquesting/DefaultQuests/Quests/717308044/533323911.json" +hash = "3432c4e2fc04f4412fa198beb00eb8ce95f443abbbbacddc4650d0ee2dfcd530" + [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/60858605.json" hash = "cd963f9c3ee1f3d3b53c1c30b6ecf1c0bf3f2a1f46aa97d09094e6ded34c26c7" @@ -2252,6 +2264,14 @@ hash = "cd963f9c3ee1f3d3b53c1c30b6ecf1c0bf3f2a1f46aa97d09094e6ded34c26c7" file = "config/betterquesting/DefaultQuests/Quests/717308044/626519854.json" hash = "8a49200c3755457db368b57515e7b037d56da80cd8fc3edf62314a637dec69d8" +[[files]] +file = "config/betterquesting/DefaultQuests/Quests/717308044/634528767.json" +hash = "312c64dc48a570f720ced2cee8107a573dae162dce326168f6783d30f6cc12f1" + +[[files]] +file = "config/betterquesting/DefaultQuests/Quests/717308044/685425731.json" +hash = "c168a1568efe378b68911f06f7c5e5d5e930d9e7020c11c7a8ec4edac5586a6b" + [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/725420853.json" hash = "91e2753e38f0ae2283ac339a79270381668b061d52cadf604546b9121427293d" @@ -2368,6 +2388,10 @@ hash = "a347a1090de0ccc6373ba2e476938cabb0574edd70f585605da04c74fb74818e" file = "config/enderio/enderio.cfg" hash = "569b4a65449c2f3d364f06752ed3d1befac3d83cea385173eea06c521d49a0ed" +[[files]] +file = "config/extendedae.cfg" +hash = "74fc17510ab2c9b66124ca3308583d883b674d364179fe8746438686d844c003" + [[files]] file = "config/fancymenu/config.txt" hash = "dec62ee16ed6524524df3007d1397b9b5994342220a92f6139a4cb6bf834346e" @@ -2770,7 +2794,7 @@ hash = "1c5c623f008eabef10c45135a48b01b46311f9369c28857355872cfe05f48dc0" [[files]] file = "groovy/event/MaterialEventHandler.groovy" -hash = "80476d3d3169ff17dc7f772e62cd9debfb6e2426558aabab7cf892c1d8e051ff" +hash = "376d016c7866b70423cee93df5b5912804adda27f08b22a97da951b858743819" [[files]] file = "groovy/event/TooltipEventHandler.groovy" @@ -2810,7 +2834,7 @@ hash = "e97b45c56d6a72bc36cd4a802d63eac1f7207f202e323a255e173bc252869d0a" [[files]] file = "groovy/loader/recipe/EnderIO.groovy" -hash = "2808554b286fd0fdcaea3467c5c896377f4418397d541a61ff66a225fb564f6f" +hash = "28f0f8edae5fa126144d8bbba37babe08034d351c94a4f4a59ee67034ce16f4f" [[files]] file = "groovy/loader/recipe/EnderUtilities.groovy" @@ -2820,6 +2844,10 @@ hash = "4e62fd709bdf9c3042b164289acbadb40fe2fa6e1291c092536a8583c9ef9736" file = "groovy/loader/recipe/Entangled.groovy" hash = "c533768f773b989013eed563e6d4e74009f61029ab796504dedfb6f6b07adadf" +[[files]] +file = "groovy/loader/recipe/ExtendedAE.groovy" +hash = "2e5f4f8ac41bc9ece08dd8a6f3efb2461a478c4d489a05e8925353474efa4129" + [[files]] file = "groovy/loader/recipe/FunctionalStorage.groovy" hash = "4d17db38fb3b23ea6d7d2ff9dca197283be315d443bcce1b222d4eaa4a650bfd" @@ -3026,6 +3054,11 @@ file = "mods/entangled.pw.toml" hash = "6843e8fbb7c7872902ce42daccc1287428caca3b56742b9e6e33048c9a0653f1" metafile = true +[[files]] +file = "mods/ex-pattern-provider.pw.toml" +hash = "119e5a10ebcaacaf15afbac26431332437907cd3f3979d11bb2f19982ee8dc18" +metafile = true + [[files]] file = "mods/fancymenu.pw.toml" hash = "a0b9178824a6998223027dbca140b3652300a9140c7ed908db5508c9f4af1902" @@ -3082,7 +3115,7 @@ metafile = true [[files]] file = "mods/gtlitecore-1.0.0.jar" -hash = "5ae2fe086f29aa16cbc99be8ef81b98cde4af8fde6dd98a65d83bb9ae506bc33" +hash = "29c897dc192822ced33b183d6da1acd0b7a6a2fff1fbd55b8a6b1ac714c79510" [[files]] file = "mods/had-enough-characters.pw.toml" @@ -3464,6 +3497,10 @@ hash = "ec9744db6e6e382b55919f17b0e52b1abd3af7c519bde8cede561df7f35bcb9d" file = "resources/customloadingscreen/image/gtlite/bg9.png" hash = "221b7efc93262c0ac9d5315bdd096560bdf427c9eecd5ec8f413de91a8f147ba" +[[files]] +file = "resources/extendedae/lang/zh_cn.lang" +hash = "b91094de8d411a8483351bf1458f0f1f4c429deb1cd90943d68d17fc65b8989a" + [[files]] file = "resources/fancymenu/textures/mainmenu.button.0.png" hash = "0153ea8d4102e88d56e1f15ffbaaaafaf54a9cd56d33d143418f4a000833e9db" diff --git a/mods/ex-pattern-provider.pw.toml b/mods/ex-pattern-provider.pw.toml new file mode 100644 index 0000000..cdae4a8 --- /dev/null +++ b/mods/ex-pattern-provider.pw.toml @@ -0,0 +1,13 @@ +name = "ExtendedAE" +filename = "ExtendedAE-1.12-0.0.2.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "599eab99fccc04a0d18702bd9e99437ad68a64e3" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 8240830 +project-id = 892005 diff --git a/mods/gtlitecore-1.0.0.jar b/mods/gtlitecore-1.0.0.jar index 7cc979b..c6fc4b1 100644 Binary files a/mods/gtlitecore-1.0.0.jar and b/mods/gtlitecore-1.0.0.jar differ diff --git a/pack.toml b/pack.toml index 18ea050..ad7582b 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 = "03a2e9dcae341b0616f94ab881db6253e291110270e44f8d54dbbb4cfd1942fe" +hash = "44ba6632d3006e5d64b2365b4551310502b969b085ce11969a117d9d2cf877f8" [versions] forge = "14.23.5.2860" diff --git a/resources/extendedae/lang/zh_cn.lang b/resources/extendedae/lang/zh_cn.lang new file mode 100644 index 0000000..b6f76a6 --- /dev/null +++ b/resources/extendedae/lang/zh_cn.lang @@ -0,0 +1,5 @@ +itemGroup.extendedae=Extended AE + +item.extendedae:infinity_cell.name=ME无限%s元件 + +cell.unknown=未知无限元件 \ No newline at end of file