From 79b40286c3c33ce29128f12e01c1aaaf1875fa71 Mon Sep 17 00:00:00 2001 From: ZHAY10086 Date: Sun, 22 Mar 2026 09:08:35 +0800 Subject: [PATCH] hotfix6 --- .../DefaultQuests/QuestLines/0.json | 35 +-- .../DefaultQuests/QuestLines/12.json | 14 - .../DefaultQuests/QuestLines/1886516785.json | 66 ++--- .../DefaultQuests/Quests/0/2044693951.json | 61 ---- .../DefaultQuests/Quests/0/39.json | 4 + .../DefaultQuests/Quests/12/1000674322.json | 45 --- .../DefaultQuests/Quests/12/46903672.json | 45 --- .../Quests/1886516785/1507248303.json | 28 -- .../Quests/1886516785/647581435.json | 28 -- .../Quests/1886516785/669243475.json | 6 +- .../DefaultQuests/Quests/8/1426917301.json | 9 +- config/defaultoptions/keybindings.txt | 3 +- .../machinery/tree_of_life.json | 8 +- config/randomthings.cfg | 238 +--------------- oresources/contenttweaker/lang/en_us.lang | 14 +- oresources/contenttweaker/lang/zh_cn.lang | 14 + .../blockstates/kami_essence_block.json | 16 ++ resources/contenttweaker/lang/en_us.lang | 14 +- .../models/item/birch_soul_bottle.json | 6 + .../models/item/droplet_of_wisdom_bottle.json | 6 + .../models/item/ebb_of_death_bottle.json | 6 + .../models/item/ender_terran_cluster.json | 6 + .../item/essence_of_vitality_bottle.json | 6 + .../models/item/kami_cloth.json | 6 + .../models/item/kamium_essence.json | 6 + .../models/item/kamium_ingot.json | 6 + .../models/item/nether_terran_cluster.json | 6 + .../models/item/oak_spirit_bottle.json | 6 + .../models/item/oil_of_vitriol_bottle.json | 6 + .../models/item/spruce_heart_bottle.json | 6 + .../textures/blocks/kami_essence_block.png | Bin 0 -> 314 bytes .../textures/items/birch_soul_bottle.png | Bin 0 -> 546 bytes .../items/droplet_of_wisdom_bottle.png | Bin 0 -> 543 bytes .../textures/items/ebb_of_death_bottle.png | Bin 0 -> 525 bytes .../textures/items/ender_terran_cluster.png | Bin 0 -> 288 bytes .../items/essence_of_vitality_bottle.png | Bin 0 -> 531 bytes .../textures/items/kami_cloth.png | Bin 0 -> 669 bytes .../textures/items/kami_essence_block.png | Bin 0 -> 314 bytes .../textures/items/kamium_essence.png | Bin 0 -> 327 bytes .../textures/items/kamium_ingot.png | Bin 0 -> 287 bytes .../textures/items/nether_terran_cluster.png | Bin 0 -> 353 bytes .../textures/items/oak_spirit_bottle.png | Bin 0 -> 552 bytes .../textures/items/oil_of_vitriol_bottle.png | Bin 847 -> 498 bytes .../textures/items/spruce_heart_bottle.png | Bin 0 -> 528 bytes scripts/ArbiterMachinery.zs | 8 +- scripts/BackpackOpener.zs | 1 - scripts/CallstoneTooltips.zs | 2 +- scripts/Callstones.zs | 4 +- scripts/Cuendillar.zs | 4 +- scripts/CustomAOALevelling.zs | 40 +-- scripts/CustomBlocks.zs | 6 + scripts/CustomItems2.zs | 75 +++++ scripts/CustomLoot.zs | 5 +- scripts/DimensionalAscension.zs | 2 +- scripts/Gallifrey.zs | 2 +- scripts/GameStagesItems.zs | 8 +- scripts/JEIdescriptions.zs | 9 - scripts/ModularBewitchmentCauldron.zs | 29 ++ scripts/ModularCasting.zs | 2 +- scripts/ModularGating.zs | 4 +- scripts/ModularImpetusHard.zs | 2 +- scripts/ModularInfusion.zs | 22 +- scripts/ModularSpinningWheel.zs | 11 + scripts/ModularStillPot.zs | 15 +- scripts/ModularThaumcraft.zs | 8 +- scripts/ModularWitchesOven.zs | 185 +++++++++++- scripts/MythicPowerful.zs | 10 +- scripts/MythicProcessorChemicalRector.zs | 14 + scripts/MythicProcessorTransfuser.zs | 94 +++++++ scripts/PeriodicTable.zs | 265 +++++++++--------- scripts/RPKeletu.txt | 91 ++++++ scripts/RecipeConflicts.zs | 16 +- scripts/ThaumcraftGating.zs | 45 ++- scripts/TheGreatOreCleanse.zs | 18 +- scripts/ToolTips.zs | 2 +- scripts/ToolTips3.zs | 25 +- scripts/TrueTongue.zs | 4 +- .../infusion/LateInfusionRecipes.zs | 74 +---- scripts/thaumicattempts.cfg | 10 + 79 files changed, 999 insertions(+), 833 deletions(-) delete mode 100644 config/betterquesting/DefaultQuests/Quests/0/2044693951.json delete mode 100644 config/betterquesting/DefaultQuests/Quests/12/1000674322.json delete mode 100644 config/betterquesting/DefaultQuests/Quests/12/46903672.json delete mode 100644 config/betterquesting/DefaultQuests/Quests/1886516785/1507248303.json delete mode 100644 config/betterquesting/DefaultQuests/Quests/1886516785/647581435.json create mode 100644 resources/contenttweaker/blockstates/kami_essence_block.json create mode 100644 resources/contenttweaker/models/item/birch_soul_bottle.json create mode 100644 resources/contenttweaker/models/item/droplet_of_wisdom_bottle.json create mode 100644 resources/contenttweaker/models/item/ebb_of_death_bottle.json create mode 100644 resources/contenttweaker/models/item/ender_terran_cluster.json create mode 100644 resources/contenttweaker/models/item/essence_of_vitality_bottle.json create mode 100644 resources/contenttweaker/models/item/kami_cloth.json create mode 100644 resources/contenttweaker/models/item/kamium_essence.json create mode 100644 resources/contenttweaker/models/item/kamium_ingot.json create mode 100644 resources/contenttweaker/models/item/nether_terran_cluster.json create mode 100644 resources/contenttweaker/models/item/oak_spirit_bottle.json create mode 100644 resources/contenttweaker/models/item/oil_of_vitriol_bottle.json create mode 100644 resources/contenttweaker/models/item/spruce_heart_bottle.json create mode 100644 resources/contenttweaker/textures/blocks/kami_essence_block.png create mode 100644 resources/contenttweaker/textures/items/birch_soul_bottle.png create mode 100644 resources/contenttweaker/textures/items/droplet_of_wisdom_bottle.png create mode 100644 resources/contenttweaker/textures/items/ebb_of_death_bottle.png create mode 100644 resources/contenttweaker/textures/items/ender_terran_cluster.png create mode 100644 resources/contenttweaker/textures/items/essence_of_vitality_bottle.png create mode 100644 resources/contenttweaker/textures/items/kami_cloth.png create mode 100644 resources/contenttweaker/textures/items/kami_essence_block.png create mode 100644 resources/contenttweaker/textures/items/kamium_essence.png create mode 100644 resources/contenttweaker/textures/items/kamium_ingot.png create mode 100644 resources/contenttweaker/textures/items/nether_terran_cluster.png create mode 100644 resources/contenttweaker/textures/items/oak_spirit_bottle.png create mode 100644 resources/contenttweaker/textures/items/spruce_heart_bottle.png create mode 100644 scripts/RPKeletu.txt create mode 100644 scripts/thaumicattempts.cfg diff --git a/config/betterquesting/DefaultQuests/QuestLines/0.json b/config/betterquesting/DefaultQuests/QuestLines/0.json index 85bfa696..bc5e05ed 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/0.json +++ b/config/betterquesting/DefaultQuests/QuestLines/0.json @@ -5956,111 +5956,104 @@ "y:3": 132 }, "849:10": { - "id:3": 2044693951, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": 720, - "y:3": -372 - }, - "850:10": { "id:3": 2052397510, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1836, "y:3": -228 }, - "851:10": { + "850:10": { "id:3": 2053473508, "sizeX:3": 24, "sizeY:3": 24, "x:3": 1548, "y:3": -192 }, - "852:10": { + "851:10": { "id:3": 2066003189, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3384, "y:3": -120 }, - "853:10": { + "852:10": { "id:3": 2070436398, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 60 }, - "854:10": { + "853:10": { "id:3": 2074294565, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3456, "y:3": 96 }, - "855:10": { + "854:10": { "id:3": 2077930840, "sizeX:3": 24, "sizeY:3": 24, "x:3": 2016, "y:3": -156 }, - "856:10": { + "855:10": { "id:3": 2078654107, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3240, "y:3": 24 }, - "857:10": { + "856:10": { "id:3": 2087721005, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3672, "y:3": -84 }, - "858:10": { + "857:10": { "id:3": 2088399499, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3708, "y:3": -12 }, - "859:10": { + "858:10": { "id:3": 2106186542, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3348, "y:3": -84 }, - "860:10": { + "859:10": { "id:3": 2117123475, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3492, "y:3": -84 }, - "861:10": { + "860:10": { "id:3": 2125675950, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3420, "y:3": -84 }, - "862:10": { + "861:10": { "id:3": 2129359610, "sizeX:3": 24, "sizeY:3": 24, "x:3": 864, "y:3": 60 }, - "863:10": { + "862:10": { "id:3": 2133694398, "sizeX:3": 24, "sizeY:3": 24, "x:3": 3420, "y:3": 24 }, - "864:10": { + "863:10": { "id:3": 2143131475, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/QuestLines/12.json b/config/betterquesting/DefaultQuests/QuestLines/12.json index a4c7926b..87426cf8 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/12.json +++ b/config/betterquesting/DefaultQuests/QuestLines/12.json @@ -2757,20 +2757,6 @@ "y:3": 12 }, "392:10": { - "id:3": 46903672, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": 228, - "y:3": 252 - }, - "393:10": { - "id:3": 1000674322, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": 180, - "y:3": 36 - }, - "394:10": { "id:3": 1865694956, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/QuestLines/1886516785.json b/config/betterquesting/DefaultQuests/QuestLines/1886516785.json index c83d2995..3fbb2ced 100644 --- a/config/betterquesting/DefaultQuests/QuestLines/1886516785.json +++ b/config/betterquesting/DefaultQuests/QuestLines/1886516785.json @@ -16,7 +16,7 @@ "id:3": 102277207, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -300, + "x:3": -228, "y:3": -144 }, "1:10": { @@ -69,167 +69,153 @@ "y:3": -60 }, "8:10": { - "id:3": 647581435, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -120, - "y:3": -144 - }, - "9:10": { "id:3": 669243475, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": -12 }, - "10:10": { + "9:10": { "id:3": 741689700, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -264, + "x:3": -192, "y:3": -144 }, - "11:10": { + "10:10": { "id:3": 841015364, "sizeX:3": 24, "sizeY:3": 24, "x:3": -300, "y:3": -180 }, - "12:10": { + "11:10": { "id:3": 899727100, "sizeX:3": 24, "sizeY:3": 24, "x:3": -192, "y:3": -180 }, - "13:10": { + "12:10": { "id:3": 960775455, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": -180 }, - "14:10": { + "13:10": { "id:3": 964384366, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -336, + "x:3": -264, "y:3": -144 }, - "15:10": { + "14:10": { "id:3": 1045015237, "sizeX:3": 24, "sizeY:3": 24, "x:3": -84, "y:3": -108 }, - "16:10": { + "15:10": { "id:3": 1065699365, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": -108 }, - "17:10": { + "16:10": { "id:3": 1251720866, "sizeX:3": 24, "sizeY:3": 24, "x:3": -300, "y:3": -108 }, - "18:10": { + "17:10": { "id:3": 1304090843, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -192, + "x:3": -120, "y:3": -144 }, - "19:10": { + "18:10": { "id:3": 1382348754, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": 132 }, - "20:10": { + "19:10": { "id:3": 1473097143, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -180 }, - "21:10": { - "id:3": 1507248303, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -156, - "y:3": -144 - }, - "22:10": { + "20:10": { "id:3": 1527904378, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": -108 }, - "23:10": { + "21:10": { "id:3": 1584886200, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": -108 }, - "24:10": { + "22:10": { "id:3": 1644895584, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": -60 }, - "25:10": { + "23:10": { "id:3": 1661567937, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": 36 }, - "26:10": { + "24:10": { "id:3": 1768833290, "sizeX:3": 24, "sizeY:3": 24, "x:3": -120, "y:3": -108 }, - "27:10": { + "25:10": { "id:3": 1797790861, "sizeX:3": 24, "sizeY:3": 24, "x:3": -12, "y:3": 12 }, - "28:10": { + "26:10": { "id:3": 1815328418, "sizeX:3": 24, "sizeY:3": 24, "x:3": -84, "y:3": -12 }, - "29:10": { + "27:10": { "id:3": 1845829466, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -228, + "x:3": -156, "y:3": -144 }, - "30:10": { + "28:10": { "id:3": 2013126993, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -108 }, - "31:10": { + "29:10": { "id:3": 2095158296, "sizeX:3": 24, "sizeY:3": 24, diff --git a/config/betterquesting/DefaultQuests/Quests/0/2044693951.json b/config/betterquesting/DefaultQuests/Quests/0/2044693951.json deleted file mode 100644 index 1f04c883..00000000 --- a/config/betterquesting/DefaultQuests/Quests/0/2044693951.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "preRequisites:11": [ - 200 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "§7§o使用这把镐子左键点击主世界底部的基岩以生成前往基岩维度的传送门。\n\n那里的基岩只能用神灵素镐破坏。\n\n§f在探索神秘学的旅程中，这把能生成虫洞的镐子完全出乎我的想象。\n神灵素这种奇特强大的材质，既非充盈魔力也非浸透灵气，似乎蕴含着另一种力量，这种力量听起来耳熟，却又完全陌生。\n由它开启的虫洞相当单调，仅由坚硬基岩构成并蕴含丰富矿脉。我想对于那些比我更需要资源的人来说，或许能派上用场。", - "icon:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick_adv", - "tag:10": { - "awaken:3": 0 - } - }, - "name:8": "基岩世界" - } - }, - "questID:3": 2044693951, - "rewards:9": { - "0:10": { - "index:3": 0, - "rewardID:8": "bq_standard:item", - "rewards:9": { - "0:10": { - "Count:3": 1, - "id:8": "simple_trophies:trophy", - "tag:10": { - "TrophyColorBlue:3": 0, - "TrophyColorGreen:3": 0, - "TrophyColorRed:3": 0, - "TrophyEarnedAt:4": 1727129438, - "TrophyItem:10": { - "Count:1": 1, - "Damage:2": 0, - "id:8": "thaumictinkerer:ichorium_pick_adv" - }, - "TrophyName:8": "神灵素矿业公司", - "TrophyShowsTooltip:1": 1, - "TrophyVariant:8": "classic" - } - } - } - } - }, - "tasks:9": { - "0:10": { - "ignoreNBT:1": 1, - "index:3": 0, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick_adv", - "tag:10": { - "awaken:3": 0 - } - } - }, - "taskID:8": "bq_standard:retrieval" - } - } -} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/0/39.json b/config/betterquesting/DefaultQuests/Quests/0/39.json index 293265b4..025ff320 100644 --- a/config/betterquesting/DefaultQuests/Quests/0/39.json +++ b/config/betterquesting/DefaultQuests/Quests/0/39.json @@ -21,6 +21,10 @@ "0:10": { "Count:3": 12, "id:8": "aoa3:raw_charger_shank" + }, + "1:10": { + "Count:3": 1, + "id:8": "randomthings:universaldiviningrod" } } } diff --git a/config/betterquesting/DefaultQuests/Quests/12/1000674322.json b/config/betterquesting/DefaultQuests/Quests/12/1000674322.json deleted file mode 100644 index c2ac7350..00000000 --- a/config/betterquesting/DefaultQuests/Quests/12/1000674322.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "preRequisiteTypes:7": [ - 1, - 1 - ], - "preRequisites:11": [ - 1595, - 1592 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "", - "icon:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:kami_chest" - }, - "name:8": "觉醒神布" - } - }, - "questID:3": 1000674322, - "tasks:9": { - "0:10": { - "index:3": 0, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:kami_helm" - }, - "1:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:kami_chest" - }, - "2:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:kami_legs" - }, - "3:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:kami_boots" - } - }, - "taskID:8": "bq_standard:retrieval" - } - } -} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/12/46903672.json b/config/betterquesting/DefaultQuests/Quests/12/46903672.json deleted file mode 100644 index dbe47eda..00000000 --- a/config/betterquesting/DefaultQuests/Quests/12/46903672.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "preRequisiteTypes:7": [ - 1, - 1 - ], - "preRequisites:11": [ - 1595, - 1597 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "", - "icon:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichor_chest" - }, - "name:8": "神布" - } - }, - "questID:3": 46903672, - "tasks:9": { - "0:10": { - "index:3": 0, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichor_helm" - }, - "1:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichor_chest" - }, - "2:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichor_legs" - }, - "3:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichor_boots" - } - }, - "taskID:8": "bq_standard:retrieval" - } - } -} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1886516785/1507248303.json b/config/betterquesting/DefaultQuests/Quests/1886516785/1507248303.json deleted file mode 100644 index fce8c1f2..00000000 --- a/config/betterquesting/DefaultQuests/Quests/1886516785/1507248303.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "preRequisites:11": [ - 1045015237 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "", - "icon:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick_adv" - }, - "name:8": "升级加成：觉醒神灵素镐" - } - }, - "questID:3": 1507248303, - "tasks:9": { - "0:10": { - "index:3": 0, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick_adv" - } - }, - "taskID:8": "bq_standard:retrieval" - } - } -} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1886516785/647581435.json b/config/betterquesting/DefaultQuests/Quests/1886516785/647581435.json deleted file mode 100644 index 571d42ef..00000000 --- a/config/betterquesting/DefaultQuests/Quests/1886516785/647581435.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "preRequisites:11": [ - 1045015237 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "", - "icon:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick" - }, - "name:8": "升级加成：神灵素镐" - } - }, - "questID:3": 647581435, - "tasks:9": { - "0:10": { - "index:3": 0, - "requiredItems:9": { - "0:10": { - "Count:3": 1, - "id:8": "thaumictinkerer:ichorium_pick" - } - }, - "taskID:8": "bq_standard:retrieval" - } - } -} \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/1886516785/669243475.json b/config/betterquesting/DefaultQuests/Quests/1886516785/669243475.json index 6390f3ff..87fc6041 100644 --- a/config/betterquesting/DefaultQuests/Quests/1886516785/669243475.json +++ b/config/betterquesting/DefaultQuests/Quests/1886516785/669243475.json @@ -7,7 +7,11 @@ "desc:8": "§7§o造成大额伤害会增加暴击率并增加战斗怒火。\n\n战斗高塔中发现的嗜血硬币也可提升该技能等级！\n\n§f我本以为这是单一的魔法形式，但实际上这是个多面系统。\n尽管这些力量有着共同的起源，但其独特性也是不争的事实。给我的感觉十分近似于精华，但又不同，非常不同。", "icon:10": { "Count:3": 1, - "id:8": "randomthings:rezstone" + "id:8": "betterquesting:placeholder", + "tag:10": { + "orig_id:8": "randomthings:rezstone", + "orig_meta:3": 0 + } }, "name:8": "嗜血" } diff --git a/config/betterquesting/DefaultQuests/Quests/8/1426917301.json b/config/betterquesting/DefaultQuests/Quests/8/1426917301.json index 53c9255f..63d25afe 100644 --- a/config/betterquesting/DefaultQuests/Quests/8/1426917301.json +++ b/config/betterquesting/DefaultQuests/Quests/8/1426917301.json @@ -4,10 +4,10 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "§7§o使用觉醒神灵素镐左键点击主世界底部的基岩", + "desc:8": "§7§o#抱歉keletu\n\n这个维度是过往时代的遗迹，但它或许会再度归来……", "icon:10": { "Count:3": 1, - "id:8": "thaumictinkerer:ichor_block" + "id:8": "contenttweaker:kami_essence_block" }, "name:8": "基岩维度" } @@ -15,9 +15,8 @@ "questID:3": 1426917301, "tasks:9": { "0:10": { - "dimension:3": 19, "index:3": 0, - "name:8": "基岩维度", + "name:8": "基岩维度（虽已移除，但未被遗忘）", "taskID:8": "bq_standard:location" }, "1:10": { @@ -25,7 +24,7 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "id:8": "thaumictinkerer:ichor_block" + "id:8": "contenttweaker:kami_essence_block" } }, "taskID:8": "bq_standard:optional_retrieval" diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index 9eaaf914..a9d970fb 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -66,6 +66,7 @@ key_key.cellterminal.quick_partition_auto.desc:0:NONE key_key.cellterminal.quick_partition_item.desc:0:NONE key_key.cellterminal.quick_partition_fluid.desc:0:NONE key_key.cellterminal.quick_partition_essentia.desc:0:NONE +key_key.cellterminal.quick_partition_gas.desc:0:NONE key_key.cellterminal.add_to_storage_bus.desc:0:NONE key_key.cells.memory_card_include_filters.desc:29:NONE key_key.cells.quick_add_to_filter.desc:0:NONE @@ -103,7 +104,7 @@ key_openblocks.keybind.vario_vol_down:0:NONE key_key.sfm.more_info:42:NONE key_key.sfm.toggle_label_view_key:56:NONE key_key.sfm.toggle_network_tool_overlay:56:NONE -key_key.sfm.container_inspector.activation_key:53:NONE +key_key.sfm.container_inspector.activation_key:0:NONE key_key.sfm.item_inspector.activation_key:0:NONE key_key.sfm.label_gun.pick_block_modifier:56:NONE key_key.sfm.label_gun.contiguous_modifier:29:NONE diff --git a/config/modularmachinery/machinery/tree_of_life.json b/config/modularmachinery/machinery/tree_of_life.json index a1992e88..26ca937f 100644 --- a/config/modularmachinery/machinery/tree_of_life.json +++ b/config/modularmachinery/machinery/tree_of_life.json @@ -952,7 +952,7 @@ "y": 0, "z": 16, "elements": [ - "modularmachinery:blockoutputbus@6" + "generalized_output_item" ] }, { @@ -5256,7 +5256,7 @@ "y": 0, "z": 13, "elements": [ - "modularmachinery:blockoutputbus@6" + "generalized_output_item" ] }, { @@ -10592,7 +10592,7 @@ "y": 0, "z": 5, "elements": [ - "modularmachinery:blockoutputbus@6" + "generalized_output_item" ] }, { @@ -11480,7 +11480,7 @@ "y": 0, "z": 2, "elements": [ - "modularmachinery:blockoutputbus@6" + "generalized_output_item" ] }, { diff --git a/config/randomthings.cfg b/config/randomthings.cfg index 266de711..98505b07 100644 --- a/config/randomthings.cfg +++ b/config/randomthings.cfg @@ -147,240 +147,6 @@ features { - # Whether the player can create an artificial End Portal with an Evil Tear. - B:ArtificialEndPortal=true - - # Whether the Spectre Sapling should be enabled. If disabled, the sapling will not grow and cannot be created from regular saplings. - B:EnableSpectreSapling=true - - # Should Ender Anchors keep the Chunk they are in loaded - B:EnderAnchorChunkloading=true - - # Should the Golden Chicken produce Golden Ingots automatically, or only when fed? - B:GoldenChickenProduction=false - - # Should there be an Golden Egg in every Bean Pod? - B:GoldenEgg=true - - # Whether the magnetic enchantment should be available. - B:MagneticEnchantment=true - B:RemoveUnderwaterTexture=false - - # Whether the Spectre Dimension should be enabled. If disabled, you will not be able to enter the dimension. - B:SpectreDimension=true - - # List of entity resource locations that cannot be captured by the Summoning Pendulum. Format: modid:entityname. Example: minecraft:villager, randomthings:spirit. [default: ] - S:SummoningPendulumBlacklist < - > -} - - -internals { - # Dimension ID for the Spectre Dimension - I:SpectreID=-343800852 -} - - -lotus { - # Whether bonemeal can be used on lotus plants to grow them - B:CanBonemeal=false - - # Average amount of XP given when eating a lotus blossom (Default = 8 - I:XpAmount=8 -} - - -"nature core" { - # Chance for animal spawning (Default = 400, lower is more common) - I:AnimalChance=400 - - # Maximum number of animals allowed within AnimalRange/2 (Default = 2) - I:AnimalMax=2 - I:AnimalRange=11 - - # Chance for bonemealing (Default = 100, lower is more common) - I:BonemealChance=100 - I:BonemealRange=11 - - # Chance for sand replacement (Default = 40, lower is more common) - I:SandChance=40 - I:SandRange=11 - - # Chance for the shell to regenerate (Default = 600, lower is more common) - I:ShellRegenerationChance=600 - - # Chance for tree spawning (Default = 600, lower is more common). - I:TreeChance=600 - I:TreeRadiusRange=20 -} - - -numbers { - # The maximum radius an advanced item collector can be configured to have - I:AdvancedItemCollectorMaxRange=10 - - # How many blocks an Ancient Furnace can transform before stopping - I:AncientFurnaceLimit=10000 - - # How many blocks the Block Destabilizer can destabilize at once (0 = Unlimited) - I:BlockDestabilizerLimit=50 - - # The radius of a normal item collector - I:ItemCollectorRange=3 - - # The maximum capacity of a Biome Capsule - I:MaxBiomeCapsuleCapacity=256 - I:NumberedSpectreCoilEnergy=128 - - # The maximum number of blocks a Potion Vaporizer can affect - I:PotionVaporizerMaxBlocks=100 - - # How far does the effect of a Rain Shield work? (In Blocks) - I:RainShieldRange=80 - - # How much does the chance of a spirit spawning increase after the ender dragon is defeated? (0.07 = 7%) - D:SpiritChanceEndIncrease=0.07 - - # How much does the moon increase the chance of a spirit spawning? (2 = 2% on full moon) - D:SpiritChanceMoonMult=2.0 - - # The base chance of a spirit spawning when an entity dies (0.01 = 1%) - D:SpiritChanceNormal=0.01 - - # How long a Spirit stays in the world after spawning (20=1 second) - I:SpiritLifeTime=400 - - # How many ticks have to pass for a Time in a Bottle to gain 1 second (20 = 1 Second) - I:TimeInABottlePerSecond=20 -} - - -"spectre coils and chargers" { - # Multiplier for max energy transfer rate of Spectre Coils and Chargers (1.0 = default rates: Normal=1024, Redstone=4096, Ender=20480) - D:EnergyTransferMultiplier=1.0 - - # Whether the Genesis Spectre Coil generates energy, or just transfers energy from the player's Injector with no transfer limit - B:GenesisSpectreGeneratesEnergy=true - - # How much Energy a Numbered Spectre Coil produces per Tick - I:NumberedSpectreCoilEnergy=128 - - # The maximum energy the Spectre Energy Injector can hold - I:SpectreEnergyInjectorMaxEnergy=1000000 -} - - -visual { - # When set to true, will scale the player models transparency based on the amount of Spectre Armor pieces they are wearing. Else, it will be a flat 50% trnaparency when wearing the full set. - B:FancySpectreArmorTransparency=true - - # Replaces the noisy default rune texture with a flat version - B:FlatRunes=false - - # When set to true the coordinates a position filter / portkey point to won't be displayed in its tooltip. - B:HideCoordinates=false - - # TRIES to remove the weird water texture showing around ALL non full blocks. This might look weird when you, for example, are on a ladder underwater. - B:RemoveUnderwaterTexture=false -} - - -"voxel projector" { - # Should the client save models received by the server to disk so that they don't have to be requested again later? - B:ClientModelSaving=true - - # The amount of bytes that can be used to transfer models to clients per tick (The default 1000 Byte equal 20 kbyte/sec) - I:ModelTransferBandwidth=1000 -} - - -voxelprojector { - B:ClientModelSaving=true - I:ModelTransferBandwidth=1000 -} - - -worldgen { - B:AncientFurnace=true - B:Beans=true - B:BiomeCrystal=true - B:GlowingMushrooms=true - B:LavaCharm=true - B:Lotus=true - B:MagicHood=true - B:Nature-Core=true - B:NumberedSpectreCoils=true - B:PeaceCandle=true - B:PitcherPlants=true - B:Sakanade=true - B:SlimeCube=true - B:SummoningPendulum=true - B:WaterChest=true -} - - -"worldgen features" { - # Enable ancient furnace generation. Chance: (Default = 2000, lower is more common) - B:AncientFurnace=true - I:AncientFurnaceChance=2000 - - # Enable nature core generation. Chance: (Default = 18, lower is more common) - B:NatureCore=true - I:NatureCoreChance=18 - - # Enable peace candle generation. Chance: (Default = 3, lower is more common) - B:PeaceCandle=true - I:PeaceCandleChance=3 - - # Enable water chest generation. Chance: (Default = 1, lower is more common) - B:WaterChest=true - I:WaterChestChance=1 -} - - -"worldgen loot" { - # Enable biome crystal loot generation. Chance: (Default = 20, lower is more common) - B:BiomeCrystal=true - I:BiomeCrystalChance=20 - - # Enable lava charm loot generation. Chance: (Default = 5, lower is more common) - B:LavaCharm=true - I:LavaCharmChance=5 - - # Enable magic hood loot generation. Chance: (Default = 5, lower is more common) - B:MagicHood=true - I:MagicHoodChance=5 - - # Enable numbered spectre coils loot generation. Chance: (Default = -1, lower is more common) - B:NumberedSpectreCoils=true - I:NumberedSpectreCoilsChance=10 - - # Enable slime cube loot generation. Chance: (Default = 10, lower is more common) - B:SlimeCube=true - I:SlimeCubeChance=10 - - # Enable summoning pendulum loot generation. Chance: (Default = -1, lower is more common) - B:SummoningPendulum=true - I:SummoningPendulumChance=10 -} - - -"worldgen plants" { - # Enable beans generation. Chance: (Default = 2, lower is more common) - B:Beans=true - I:BeansChance=2 - - # Enable glowing mushrooms generation. Chance: (Default = 4, lower is more common) - B:GlowingMushrooms=true - I:GlowingMushroomsChance=4 - - # Enable lotus generation. Chance: (Default = 10, lower is more common) - B:Lotus=true - I:LotusChance=10 - - # Enable pitcher plants generation. Chance: (Default = 10, lower is more common) - B:PitcherPlants=true - I:PitcherPlantsChance=10 -} - + # Whether Ancient Brick blocks can be broken and will drop their item forms. + B:AncientBrickDropItems=false diff --git a/oresources/contenttweaker/lang/en_us.lang b/oresources/contenttweaker/lang/en_us.lang index 9ee7034f..8b32e7f7 100644 --- a/oresources/contenttweaker/lang/en_us.lang +++ b/oresources/contenttweaker/lang/en_us.lang @@ -4156,4 +4156,16 @@ fluid.blood_infused_glowstone=Blood Infused Glowstone fluid.tangible_aqua=Tangible Aqua fluid.distillate_of_levity=Distillate of Levity - +item.contenttweaker.essence_of_vitality_bottle.name=Essence of Vitality Bottle +item.contenttweaker.ebb_of_death_bottle.name=Ebb of Death Bottle +item.contenttweaker.droplet_of_wisdom_bottle.name=Droplet of Wisdom Bottle +item.contenttweaker.oak_spirit_bottle.name=Oak Spirit Bottle +item.contenttweaker.spruce_heart_bottle.name=Spruce Heart Bottle +item.contenttweaker.birch_soul_bottle.name=Birch Soul Bottle +item.contenttweaker.oil_of_vitriol_bottle.name=Oil of Vitriol Bottle +item.contenttweaker.kamium_essence.name=kamium Essence +item.contenttweaker.kami_cloth.name=Kami Cloth +item.contenttweaker.kamium_ingot.name=Kamium Ingot +tile.contenttweaker.kami_essence_block.name=Kamium Essence Block +item.contenttweaker.nether_terran_cluster.name=Nether Terran Cluster +item.contenttweaker.ender_terran_cluster.name=Ender Terran Cluster diff --git a/oresources/contenttweaker/lang/zh_cn.lang b/oresources/contenttweaker/lang/zh_cn.lang index cb192ef8..40293939 100644 --- a/oresources/contenttweaker/lang/zh_cn.lang +++ b/oresources/contenttweaker/lang/zh_cn.lang @@ -4156,6 +4156,20 @@ fluid.blood_infused_glowstone=注血荧石 fluid.tangible_aqua=实形Aqua fluid.distillate_of_levity=轻盈之精粹 +item.contenttweaker.essence_of_vitality_bottle.name=瓶装生命精髓 +item.contenttweaker.ebb_of_death_bottle.name=瓶装死亡低潮 +item.contenttweaker.droplet_of_wisdom_bottle.name=瓶装智慧液滴 +item.contenttweaker.oak_spirit_bottle.name=瓶装橡木之精 +item.contenttweaker.spruce_heart_bottle.name=瓶装云杉之心 +item.contenttweaker.birch_soul_bottle.name=瓶装白桦之灵 +item.contenttweaker.oil_of_vitriol_bottle.name=瓶装浓硫酸 +item.contenttweaker.kamium_essence.name=神灵精华 +item.contenttweaker.kami_cloth.name=神布 +item.contenttweaker.kamium_ingot.name=神灵素锭 +tile.contenttweaker.kami_essence_block.name=神灵精华块 +item.contenttweaker.nether_terran_cluster.name=下界大地晶簇 +item.contenttweaker.ender_terran_cluster.name=末影大地晶簇 + # Custom Materials diff --git a/resources/contenttweaker/blockstates/kami_essence_block.json b/resources/contenttweaker/blockstates/kami_essence_block.json new file mode 100644 index 00000000..823ac17b --- /dev/null +++ b/resources/contenttweaker/blockstates/kami_essence_block.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "texture": "contenttweaker:blocks/kami_essence_block", + "particle": "contenttweaker:blocks/kami_essence_block" + }, + "model": "base:storage", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index 9ee7034f..8b32e7f7 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -4156,4 +4156,16 @@ fluid.blood_infused_glowstone=Blood Infused Glowstone fluid.tangible_aqua=Tangible Aqua fluid.distillate_of_levity=Distillate of Levity - +item.contenttweaker.essence_of_vitality_bottle.name=Essence of Vitality Bottle +item.contenttweaker.ebb_of_death_bottle.name=Ebb of Death Bottle +item.contenttweaker.droplet_of_wisdom_bottle.name=Droplet of Wisdom Bottle +item.contenttweaker.oak_spirit_bottle.name=Oak Spirit Bottle +item.contenttweaker.spruce_heart_bottle.name=Spruce Heart Bottle +item.contenttweaker.birch_soul_bottle.name=Birch Soul Bottle +item.contenttweaker.oil_of_vitriol_bottle.name=Oil of Vitriol Bottle +item.contenttweaker.kamium_essence.name=kamium Essence +item.contenttweaker.kami_cloth.name=Kami Cloth +item.contenttweaker.kamium_ingot.name=Kamium Ingot +tile.contenttweaker.kami_essence_block.name=Kamium Essence Block +item.contenttweaker.nether_terran_cluster.name=Nether Terran Cluster +item.contenttweaker.ender_terran_cluster.name=Ender Terran Cluster diff --git a/resources/contenttweaker/models/item/birch_soul_bottle.json b/resources/contenttweaker/models/item/birch_soul_bottle.json new file mode 100644 index 00000000..52e2b7da --- /dev/null +++ b/resources/contenttweaker/models/item/birch_soul_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/birch_soul_bottle" + } +} diff --git a/resources/contenttweaker/models/item/droplet_of_wisdom_bottle.json b/resources/contenttweaker/models/item/droplet_of_wisdom_bottle.json new file mode 100644 index 00000000..f1d4b6f4 --- /dev/null +++ b/resources/contenttweaker/models/item/droplet_of_wisdom_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/droplet_of_wisdom_bottle" + } +} diff --git a/resources/contenttweaker/models/item/ebb_of_death_bottle.json b/resources/contenttweaker/models/item/ebb_of_death_bottle.json new file mode 100644 index 00000000..83e1c60c --- /dev/null +++ b/resources/contenttweaker/models/item/ebb_of_death_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/ebb_of_death_bottle" + } +} diff --git a/resources/contenttweaker/models/item/ender_terran_cluster.json b/resources/contenttweaker/models/item/ender_terran_cluster.json new file mode 100644 index 00000000..70a656e9 --- /dev/null +++ b/resources/contenttweaker/models/item/ender_terran_cluster.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/ender_terran_cluster" + } +} diff --git a/resources/contenttweaker/models/item/essence_of_vitality_bottle.json b/resources/contenttweaker/models/item/essence_of_vitality_bottle.json new file mode 100644 index 00000000..0bdd1fd1 --- /dev/null +++ b/resources/contenttweaker/models/item/essence_of_vitality_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/essence_of_vitality_bottle" + } +} diff --git a/resources/contenttweaker/models/item/kami_cloth.json b/resources/contenttweaker/models/item/kami_cloth.json new file mode 100644 index 00000000..016dfa37 --- /dev/null +++ b/resources/contenttweaker/models/item/kami_cloth.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/kami_cloth" + } +} diff --git a/resources/contenttweaker/models/item/kamium_essence.json b/resources/contenttweaker/models/item/kamium_essence.json new file mode 100644 index 00000000..d1aeda86 --- /dev/null +++ b/resources/contenttweaker/models/item/kamium_essence.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/kamium_essence" + } +} diff --git a/resources/contenttweaker/models/item/kamium_ingot.json b/resources/contenttweaker/models/item/kamium_ingot.json new file mode 100644 index 00000000..d176245e --- /dev/null +++ b/resources/contenttweaker/models/item/kamium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/kamium_ingot" + } +} diff --git a/resources/contenttweaker/models/item/nether_terran_cluster.json b/resources/contenttweaker/models/item/nether_terran_cluster.json new file mode 100644 index 00000000..64a4e542 --- /dev/null +++ b/resources/contenttweaker/models/item/nether_terran_cluster.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/nether_terran_cluster" + } +} diff --git a/resources/contenttweaker/models/item/oak_spirit_bottle.json b/resources/contenttweaker/models/item/oak_spirit_bottle.json new file mode 100644 index 00000000..a8510f6e --- /dev/null +++ b/resources/contenttweaker/models/item/oak_spirit_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/oak_spirit_bottle" + } +} diff --git a/resources/contenttweaker/models/item/oil_of_vitriol_bottle.json b/resources/contenttweaker/models/item/oil_of_vitriol_bottle.json new file mode 100644 index 00000000..7a6f64fc --- /dev/null +++ b/resources/contenttweaker/models/item/oil_of_vitriol_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/oil_of_vitriol_bottle" + } +} diff --git a/resources/contenttweaker/models/item/spruce_heart_bottle.json b/resources/contenttweaker/models/item/spruce_heart_bottle.json new file mode 100644 index 00000000..069f8ced --- /dev/null +++ b/resources/contenttweaker/models/item/spruce_heart_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/spruce_heart_bottle" + } +} diff --git a/resources/contenttweaker/textures/blocks/kami_essence_block.png b/resources/contenttweaker/textures/blocks/kami_essence_block.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef9d19a6b97aa718e55e3ba30a5fce6fd4f294d GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&!0^S> z#WBR9cj;tXu0sw2t@f%MVqKG*1dg2Jj;K^#|5$TRqx*$Z*A9hou<%4CDRwM4YW4a} z&YC%ClkZl(ubn*qT-Ld6doAW0`Pbhrzbg1?X?)}Jy~{LYuf9F_^U{W!wLFW`c82{v zU;Xy-ujB(uSv)NgmygliIbV-+HrnhkGjuS& zY4}1ZOPHN`_PX?Wer^njYxDR&IqJ(D+`XJrD*9f%)9SmWqD#9sxX$6PnmAFZR%mT6L4DFXq4L@|W9Md%$cFfcH9y85}Sb4q9e0O~P;nE(I) literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/birch_soul_bottle.png b/resources/contenttweaker/textures/items/birch_soul_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..a6879481fb1bfd4563b16edb27baa0f7938aeecb GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>o<%%g!-P~HmtCkxV-g#o_)Ui-#`((=(oJ9qD*E2l(^Eu#` zGt*_0tM^{&9X+nZFny->tF2Z$ou=JB%GK%O^w)~XVci7Pc|FV*%&Zx%WPhD6%%K?a z>5;(uLsy>XPG$u;BJ)2#Y>~>sy vQ9-IVtFLMOA_s+r`|sH|h`+r5TGsXYbk~HFub3Ga7#KWV{an^LB{Ts5(gN2r literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/droplet_of_wisdom_bottle.png b/resources/contenttweaker/textures/items/droplet_of_wisdom_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..ec356c11181e6c3c864936ad930b1b9f710ee6a0 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>-+ivV*S@=1 zPFtwz!nZ|_jfAQs7z(~{6|C2(sp~Iou-pCM>a$Hb=fwH-Oc-LXn^pu##$K0|{(vsY#%FPUL+(`E*wMX;Ej2SzC75`~nM|-9{d1$xn(o87_4SE_>EJ<@D11ygrwwTz|=XOf4(x z^IoGR3Jm8iZjKk@n&7qc)`_(W4Kq(J?PJR=zrDnt&F{qXIj0Up{5|kbP0l+XkK#`V>P literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/ebb_of_death_bottle.png b/resources/contenttweaker/textures/items/ebb_of_death_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..382c9bbe72d6075769a954ebd7042ee00cee65d3 GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>or0_j9r}?Q77>$)4$!_$x<8$%$#@n@gKU3P#QaV&DLv5!UAUfIgbxMZDyDdG|QrIWr!AwW5Z*MC(~w54N{Xj%h2Iw zJSB*2!TtB#4GJ6)Yfd)pxfeI{$Q}*NrFVrRpS?~#f9)x^{Q1w*zU8H;TGU^=7QpuT zd3c!D%x5PTuDs@TEoAM~p7+1g*0S8TW)k44ofy`glX=O&z;Mgc z#WBR9H#uQ}Xu`&=zs@IRf1N+UO08zn%V;wL0V9^xj5^!G{=epbtA1#%1<#F&7YcLM z&Ysh7T~vZC=kNdD`^A~Ln+2JL5AVIb-Lu>=pg`cTS(`o2ZM(hc2?+@a6E0jl_L^%= zoW=1E{R_@k@FpZAG+6(?JKLNmN9d6SZ^A*fACE4(?|3FIZDzdT(?`P>YU&0tX$e36 zKmTCp*2Jce{qN@|QD$alX20-+uZLznJ|1ZDnAsxsz^UWyQ+=l}?vLA(B2c#JxWHjH tiH)3_*ncJ+`Fa0(zT^ew30e#c-}L)Y;p%D}+D;OXk;vd$@?2>=#jca;DD literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/essence_of_vitality_bottle.png b/resources/contenttweaker/textures/items/essence_of_vitality_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..dba2452fa97488dc571f296dfcad0658a10ef15f GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>&q=>ZetOg=prEEVlFD=*xlvL;>dgHk-!#{ zo#v(-TU(q3BIF#CXFE^#P;jx@GKb@%V5>}tuT#s;pQe>rcU^DZmb?G^|GocvzaL~U zoFzH&@$Tdzg@-S{w%nTidrud)^=iNN8=i5DGj`1g`!4o6_rS?e^Nj*d*Q9hAvUTm`jU08Kl$@b`*V6mYA{pAWGR~+*T2RtjLJ2oqnBzOyYw45qG7_rIt5-1|2vGDe{?-?}y}oS0>s@ztM7qy>Z^stb%*Uee z{Cr*ULk6GAZP3}>(1{`SJx0k44ofy`glX=O&z!dK3 z;uvDldvvm|$K^ta=ys~I_&h*5TB2&JlY{u${UQBUIr`-i4brp;d&Dgpkc^A z*Q(UWCgOpolF|vKB`aFuVvNIPOJ!Y|W|@2L?DVr||Nq<1C)^wnYxQNXU5!2e`R|o- zKki@pv$Ei8Oz(;F_dCKuFL+oU+5aohmudTT*YlsB%+gn$yK`xr&|2}^8zSFqSmbbq zht1Z2Gb?>M%MPu%Tg59aXP=TJ7cEH zZ|!Wc<9ctqVCqhDxkR%?u9L#9S3KR}H|Ngk<5?S<>^Z_(nSTjwiA;U7>R$gMwjb}J zc~>j>z3*jR_By(q>KaM12U9p!-}a7) zQWNsM+sOA|rf_>!$jOcDCuWB^1Rl7-(xxF-ZtvIM{kmLjhxLkposRC;4{$wnwW_mE z-MBZT{py;f%MQ6+UZ~vQb-j7{o)TZfZ@G@l9h=)1?tVXA|E@mAZpmxWx(qck^MAiS d|7UX@lV$oNMs_2kdk44ofy`glX=O&!0^S> z#WBR9cj;tXu0sw2t@f%MVqKG*1dg2Jj;K^#|5$TRqx*$Z*A9hou<%4CDRwM4YW4a} z&YC%ClkZl(ubn*qT-Ld6doAW0`Pbhrzbg1?X?)}Jy~{LYuf9F_^U{W!wLFW`c82{v zU;Xy-ujB(uSv)NgmygliIbV-+HrnhkGjuS& zY4}1ZOPHN`_PX?Wer^njYxDR&IqJ(D+`XJrD*9f%)9SmWqD#9sxX$6PnmAFZR%mT6L4DFXq4L@|W9Md%$cFfcH9y85}Sb4q9e0O~P;nE(I) literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/kamium_essence.png b/resources/contenttweaker/textures/items/kamium_essence.png new file mode 100644 index 0000000000000000000000000000000000000000..60468ae88ea66cd7c08f39a711fad42d33d007f1 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z{u$7 z;uvDlo1CJ+ko8ycUwl1V;(E)o2Rii5J9!j$b#olPeSW`0p6$OQ2M!$gAb(dt%}Gyz zrNhj@cUr&Vk(S1TL9Gw%1KF$i^WInJ;D)c)wBMXNZorV{(ZRY(Lhoz@Z$d&s0*7JilJCpkE1t9aC$QU! djg5_sA<8!+cGcD1Nem1O44$rjF6*2UngHmMhCcuR literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/kamium_ingot.png b/resources/contenttweaker/textures/items/kamium_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..69ef5572fb1f5746b683cacef560dbb4e7d0764f GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z;M&k z#WBR9_v%DjK1N50w)uB;7KLeQsA&D2*Py(Hdq=~pdxA0!CmmI!c%_sa7YcQ574+_D z%0GMThi2vO@3U>rPoLSizw7y}Q^mPU&#&=sxVO7kh~etB8TTF}NwQk0G(3@!VRxAPU-^^oGy7^9l_+G@Cv?b%)LZ;t$85kHCJYD@<);T3K0RSr4dhq}N literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/nether_terran_cluster.png b/resources/contenttweaker/textures/items/nether_terran_cluster.png new file mode 100644 index 0000000000000000000000000000000000000000..98fb57126358c27986b8d09d49d55dbc76a0ad46 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z$oqM z;uvDlyL7T)-XRA8*ZJWSWlm0eddSU)cS;@u=c+r5fip}jS$H3@b@V;q+sPor?#bG! z?ebhnFJqfS*B;G95oWJlH-1`uasJKypVP}8&fnnEx%B<&=yz|6F20gxowjfNFGq(b z7OK-dPgmQrg&be*?zs+Xs_z#IF3c6aWp>*l?NQ~IW{2B-X^G(?V#_CY$+YLnOs@$Map_yk zyQz?E_o59JG9t~4!PiZ<gqrCGN61kcE0?+Q2`8?NtmU3+ZDu~$0F)^Q(K zX1G=rTisc|>BEhe3v1B0il KpUXO@geCw}HJQTz literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/oak_spirit_bottle.png b/resources/contenttweaker/textures/items/oak_spirit_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ffdbb642f7204c19d35306492c71dc8eb178f7 GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>REnE>ClaS>me0abLtkMAyGClQXNJnB$hr zAN7`~N4$;-KVIY)yigSKnCN|4SW!>!(*ku~rxwo%-?x;^kK7kvb=mgL=fCgD&+X*l zc3C5_bl=A_Nk=sbPwspYw8@nrFnQ|7Jcm^=YR9}C_doh|(r#t(w@t?w96D{q?;fz8 zuPWvgkZ!=lP{O9nq4?tU(FIwqjWy8%P5~QgyZf)`O**L(>@-uN_#Usv)25%Dt1IuG zHeRk)5<5TgwRQ8S=Es~y3}>J=f>*l2)0V_OgWSIZO<>zRYsz z*L`yrUd#yimBsx%znr0A`7G}3&ktoqS=`oG9HMnGhHuTX*4Nuu86wuX8=Tp9=fq}u()z4*}Q$iB}C1cU2 literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/oil_of_vitriol_bottle.png b/resources/contenttweaker/textures/items/oil_of_vitriol_bottle.png index fcf691391926ea0a755a433e8e02bf417cfce028..54068c4329799879082e8c8476b685f3c42f60ed 100644 GIT binary patch delta 429 zcmX@l_KA6dvO5D~age(c!lvNA9*C?tCX`7$t6sWC7# zv@kIIVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi{yjG8)vsVip$AR*esxwVQ!~(ah7u zF~s8Z+R29AM+_v|?oYAS_{F|u!qtu4|C(0oDcx~Y-=5dr9JK2f^B-P4sXMOh+b8+n ziQ$T5x)-FeqF`>-+oB_mLbq;xv-r?_spVVkzIJ`xgWr~BWp65-5#;sidz_Pvz42VX zym*h*))%u^YwIixsZWYzVmPv?Wy+?tYc-Z$Td;ackgnYO5bZU(Us?m>fBd^+Tzzim zC!78f-n=X61)t~567Qcq`MBHHpGQ~DI;W;)GS^omd5!R;>3aoS5R8nYvL=&!gz4me$VEZ m>#R#f7y^Dz__w`|Ve;Rm*vFoS*%%lY7(8A5T-G@yGywp}N3>M{ delta 780 zcmeywe4cHBay?^9rn7T^r?ay{K~a8MW=<*tgT}<#iMAex9b}HiM=uSFa=GPrMA5l) zQ+JoeG%c}%PMO+UUL_R06gSEA2#S$mz24L;-yO;>o*pY3!|M2f`N++Ko)=xc{=^4m z2tGboXn*f+^_{)Ud)7(?_w2J+uwvOfPqmhs#Ly4>l^O)v1nb=#Qrf1S(tGy6YTvtu z4`0Xjr0<;nySU}aqJs?m4l?Pp@`UmQ&gadNdS3g8V|9noN6U{({KQr2p6q(^LHhZo zvvKnzFBZ?Ne8jOa;9cU%_DI+8j`WVjn-&G_Gk?F~Ol9}xpzICjY=3e$yOye+E}fO^ zk;JLFMA5;CIrK_`lG|#p`mRQvx9Tx}7H_ln)$5E2H7L?qz{k4iE&KoG`*)?5zSLCL zoWbxbUgveP%!l_(ZN8GmT;!skGkn~Kn`d!0$FkeAT&P(AIN0Pc`%K|aClQTv1;)E>!hs?{E z?3Ajj;w^Np+j05Lxi>5G@9j%{*uQY=xF*c#!^5}rpO5Lcoj()j$=#pQ qboHpGmOk^1ZN5qqFZ_7_gGo-iGqa)~@(BY21B0ilpUXO@geCwWcV5B( diff --git a/resources/contenttweaker/textures/items/spruce_heart_bottle.png b/resources/contenttweaker/textures/items/spruce_heart_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..e020ba7d5d8782669e70c075d8110089ea329134 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofvPP)Tw7+U|>mi z^mSxl*x1kgCy|wbfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a z>-{TqPJe1W!`is$nAF{xa7Gt1%oI9)cy!@}%OpC-0 zX@0kuDp|C1&a6|7!S6l><})mabGXeK$n99t#C&?wm5VFVdQ&MBb@0Jj9o%>V!Z literal 0 HcmV?d00001 diff --git a/scripts/ArbiterMachinery.zs b/scripts/ArbiterMachinery.zs index f25d0e8f..ae061a45 100644 --- a/scripts/ArbiterMachinery.zs +++ b/scripts/ArbiterMachinery.zs @@ -813,14 +813,14 @@ mods.nuclearcraft.dissolver.addRecipe([ mods.nuclearcraft.dissolver.addRecipe([*16, *12, *16000]); recipes.addShaped(.withTag({FluidName: "essence_of_sane_thoughts", Amount: 1000}), -[[, .withTag({display: {Name: "ᚽᛠᛇᛒᚽᛃᛒᚶᚣᚽᚤᛠᚽᚥᛊ",Lore:["§d§o真名§r"]}}), ], +[[, .withTag({display: {Name: "ᚽᛠᛇᛒᚽᛃᛒᚶᚣᚽᚤᛠᚽᚥᛊ",Lore:["§d§o真名§r"]}}), ], [makeVisCrystal( * 1), .withTag({FluidName: "vapor_of_levity", Amount: 1000}), makeVisCrystal( * 1)], -[, .withTag({brewKey: "warpWard"}), ]]); +[, .withTag({brewKey: "warpWard"}), ]]); recipes.addShaped(.withTag({tank: {FluidName: "essence_of_sane_thoughts", Amount: 16000}}), -[[, .withTag({display: {Name: "ᚽᛠᛇᛒᚽᛃᛒᚶᚣᚽᚤᛠᚽᚥᛊ",Lore:["§d§o真名§r"]}}), ], +[[, .withTag({display: {Name: "ᚽᛠᛇᛒᚽᛃᛒᚶᚣᚽᚤᛠᚽᚥᛊ",Lore:["§d§o真名§r"]}}), ], [makeVisCrystal( * 1), .withTag({tank: {FluidName: "distillate_of_levity", Amount: 16000}}), makeVisCrystal( * 1)], -[, .withTag({brewKey: "warpWard"}), ]]); +[, .withTag({brewKey: "warpWard"}), ]]); diff --git a/scripts/BackpackOpener.zs b/scripts/BackpackOpener.zs index f879cd18..f9401cd9 100644 --- a/scripts/BackpackOpener.zs +++ b/scripts/BackpackOpener.zs @@ -50,7 +50,6 @@ var Opened as IItemStack[] = [ , , , - , , , , diff --git a/scripts/CallstoneTooltips.zs b/scripts/CallstoneTooltips.zs index 5cb8eadc..b34d30e0 100644 --- a/scripts/CallstoneTooltips.zs +++ b/scripts/CallstoneTooltips.zs @@ -87,7 +87,7 @@ .addTooltip(format.red("需在指定维度使用：主世界")); .addTooltip(format.red("需在指定维度使用：主世界")); .addTooltip(format.red("需在指定维度使用：主世界")); -.addTooltip(format.red("需在指定维度使用：基岩维度")); +.addTooltip(format.red("需在指定维度使用：虚域")); .addTooltip(format.red("需在指定维度使用：卡尚")); .addTooltip(format.red("需在指定维度使用：叁壹界")); .addTooltip(format.red("需在指定维度使用：衰腐界")); diff --git a/scripts/Callstones.zs b/scripts/Callstones.zs index f6c860a6..56f13581 100644 --- a/scripts/Callstones.zs +++ b/scripts/Callstones.zs @@ -4744,8 +4744,8 @@ dreadcleansingcallstone.itemRightClick = function(stack, world, player, hand) { return "FAIL"; } - if(player.getDimension() != 19) { - player.sendChat("需位于基岩维度"); + if(player.getDimension() != 14676) { + player.sendChat("需位于虚域"); return "FAIL"; } diff --git a/scripts/Cuendillar.zs b/scripts/Cuendillar.zs index 3b53954c..7cf329a0 100644 --- a/scripts/Cuendillar.zs +++ b/scripts/Cuendillar.zs @@ -4,9 +4,9 @@ import mods.thaumcraft.Infusion; recipes.addShaped(, -[[, , ], +[[, , ], [, , ], -[, , ]]); +[, , ]]); mods.tconstruct.Casting.addTableRecipe(, .withTag({Material: "infinity_avaritia_plustic"}), , 720, true, 10); diff --git a/scripts/CustomAOALevelling.zs b/scripts/CustomAOALevelling.zs index bba05806..68133292 100644 --- a/scripts/CustomAOALevelling.zs +++ b/scripts/CustomAOALevelling.zs @@ -81,27 +81,27 @@ events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { } }); -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if (event.world.isRemote()) { - return; - } - if(!isNull(event.player) && !isNull(event.player.currentItem)){ - if (event.player.currentItem.definition.id.matches(.definition.id)) { - Commands.call("/aoaskill addxp foraging @p 100", event.player, event.world, false, true); - } - } -}); +// events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { +// if (event.world.isRemote()) { +// return; +// } +// if(!isNull(event.player) && !isNull(event.player.currentItem)){ +// if (event.player.currentItem.definition.id.matches(.definition.id)) { +// Commands.call("/aoaskill addxp foraging @p 100", event.player, event.world, false, true); +// } +// } +// }); -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if (event.world.isRemote()) { - return; - } - if(!isNull(event.player) && !isNull(event.player.currentItem)){ - if (event.player.currentItem.definition.id.matches(.definition.id)) { - Commands.call("/aoaskill addxp foraging @p 200", event.player, event.world, false, true); - } - } -}); +// events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { +// if (event.world.isRemote()) { +// return; +// } +// if(!isNull(event.player) && !isNull(event.player.currentItem)){ +// if (event.player.currentItem.definition.id.matches(.definition.id)) { +// Commands.call("/aoaskill addxp foraging @p 200", event.player, event.world, false, true); +// } +// } +// }); events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { if (event.world.isRemote()) { diff --git a/scripts/CustomBlocks.zs b/scripts/CustomBlocks.zs index 1357055a..256f841a 100644 --- a/scripts/CustomBlocks.zs +++ b/scripts/CustomBlocks.zs @@ -3308,6 +3308,12 @@ protodermiscasing.setToolClass("pickaxe"); protodermiscasing.setToolLevel(3); protodermiscasing.register(); +var kamiessenceblock = VanillaFactory.createBlock("kami_essence_block", ); +kamiessenceblock.setBlockHardness(1.0); +kamiessenceblock.setBlockResistance(2.5); +kamiessenceblock.setToolClass("pickaxe"); +kamiessenceblock.setToolLevel(3); +kamiessenceblock.register(); diff --git a/scripts/CustomItems2.zs b/scripts/CustomItems2.zs index 3349583d..5b27934d 100644 --- a/scripts/CustomItems2.zs +++ b/scripts/CustomItems2.zs @@ -4633,5 +4633,80 @@ bionicmortumstar.maxStackSize = 64; bionicmortumstar.beaconPayment = false; bionicmortumstar.register(); +var ebbofdeathbottle = VanillaFactory.createItem("ebb_of_death_bottle"); +ebbofdeathbottle.maxStackSize = 64; +ebbofdeathbottle.beaconPayment = false; +ebbofdeathbottle.register(); + +var dropletofwisdombottle = VanillaFactory.createItem("droplet_of_wisdom_bottle"); +dropletofwisdombottle.maxStackSize = 64; +dropletofwisdombottle.beaconPayment = false; +dropletofwisdombottle.register(); + +var essenceofvitalitybottle = VanillaFactory.createItem("essence_of_vitality_bottle"); +essenceofvitalitybottle.maxStackSize = 64; +essenceofvitalitybottle.beaconPayment = false; +essenceofvitalitybottle.register(); + +var oakspiritbottle = VanillaFactory.createItem("oak_spirit_bottle"); +oakspiritbottle.maxStackSize = 64; +oakspiritbottle.beaconPayment = false; +oakspiritbottle.register(); + +var spruceheartbottle = VanillaFactory.createItem("spruce_heart_bottle"); +spruceheartbottle.maxStackSize = 64; +spruceheartbottle.beaconPayment = false; +spruceheartbottle.register(); + +var oilofvitriolbottle = VanillaFactory.createItem("oil_of_vitriol_bottle"); +oilofvitriolbottle.maxStackSize = 64; +oilofvitriolbottle.beaconPayment = false; +oilofvitriolbottle.register(); + +var birchsoulbottle = VanillaFactory.createItem("birch_soul_bottle"); +birchsoulbottle.maxStackSize = 64; +birchsoulbottle.beaconPayment = false; +birchsoulbottle.register(); + +var kamicloth = VanillaFactory.createItem("kami_cloth"); +kamicloth.maxStackSize = 64; +kamicloth.beaconPayment = false; +kamicloth.register(); + +var kamiumessence = VanillaFactory.createItem("kamium_essence"); +kamiumessence.maxStackSize = 64; +kamiumessence.beaconPayment = false; +kamiumessence.register(); + +var kamiumingot = VanillaFactory.createItem("kamium_ingot"); +kamiumingot.maxStackSize = 64; +kamiumingot.beaconPayment = false; +kamiumingot.register(); + +var enderterrancluster = VanillaFactory.createItem("ender_terran_cluster"); +enderterrancluster.maxStackSize = 64; +enderterrancluster.beaconPayment = false; +enderterrancluster.register(); + +var netherterrancluster = VanillaFactory.createItem("nether_terran_cluster"); +netherterrancluster.maxStackSize = 64; +netherterrancluster.beaconPayment = false; +netherterrancluster.register(); + + + + + + + + + + + + + + + + diff --git a/scripts/CustomLoot.zs b/scripts/CustomLoot.zs index 5f9b437f..60f4eb6e 100644 --- a/scripts/CustomLoot.zs +++ b/scripts/CustomLoot.zs @@ -89,7 +89,7 @@ bonecreatureroll.addItemEntry(, 5); val witherwizard = LootTweaker.getTable("aoa3:entities/mobs/nether/wither_wizard"); val witherwizardmoretokes = witherwizard.addPool("witherwizardmoretokes", 1, 1, 0, 0); witherwizardmoretokes.addItemEntry(, 5); -witherwizardmoretokes.addItemEntry(, 5); +witherwizardmoretokes.addItemEntry(, 5); val chimera = LootTweaker.getTable("aoa3:entities/mobs/overworld/chimera"); val chimeraroll = chimera.addPool("chimeraroll", 1, 1, 0, 0); @@ -678,7 +678,7 @@ pinkslimeextraroll.addItemEntry(, 3); val endertriplet = LootTweaker.getTable("divinerpg:entities/end/ender_triplets"); val endertripletshard = endertriplet.addPool("endertripletshard", 1, 1, 0, 0); -endertripletshard.addItemEntry(, 5); +endertripletshard.addItemEntry(, 5); val lostcitiesloot = LootTweaker.getTable("lostcities:chests/lostcitychest"); val lostcitieslootmeatball = lostcitiesloot.addPool("lostcitieslootmeatball", 2, 3, 0, 0); @@ -855,4 +855,3 @@ val ieepicshaderpool3 = ieepicshader3.getPool("immersiveengineering:shaders"); ieepicshaderpool3.removeEntry("immersiveengineering:shader_bag"); - diff --git a/scripts/DimensionalAscension.zs b/scripts/DimensionalAscension.zs index a6b7cfc7..90053993 100644 --- a/scripts/DimensionalAscension.zs +++ b/scripts/DimensionalAscension.zs @@ -151,7 +151,7 @@ stoneofdimensionalascension.itemRightClick = function(stack, world, player, hand return "FAIL"; } - if (getBlockMatchAtPosition("thaumictinkerer:ichor_block", playerPos, [4,0,20], world) == 0) { + if (getBlockMatchAtPosition("contenttweaker:kami_essence_block", playerPos, [4,0,20], world) == 0) { player.sendChat("在腐化虚空石壤的南侧，间隔一格放置一个神灵精华块 [4,0,20]"); return "FAIL"; } diff --git a/scripts/Gallifrey.zs b/scripts/Gallifrey.zs index ee12dccd..dfd4dd61 100644 --- a/scripts/Gallifrey.zs +++ b/scripts/Gallifrey.zs @@ -918,7 +918,7 @@ mods.astralsorcery.Altar.addTraitAltarRecipe("MeatballCraft:shaped/internal/alta scripts.PuzzleUtil.addPuzzleShaped("truetongue", , [[.withTag({display: {Name: "ᚠᚣ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᛔᚣᛕᛛᛂᚡᛁᛁ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᛒᛟᛟᛦ᛫ᛒᛟᛟᛦ",Lore:["§d§o真名§r"]}})], [.withTag({display: {Name: "ᛡᛒ",Lore:["§d§o真名§r"]}}), , .withTag({display: {Name: "ᛈᚺᚽᚥᛕᚽᚤ",Lore:["§d§o真名§r"]}})], -[.withTag({display: {Name: "ᛑᛂᚠᛁᚿᛂᛑ᛫ᚧ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᚵᛊᛠᛔᛟᚤᛕᛊᚧ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᚥᚱᚣᛠᚻ",Lore:["§d§o真名§r"]}})]]); +[.withTag({display: {Name: "ᛑᛂᚠᛁᚿᛂᛑ᛫ᚧ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᚵᛊᛠᛔᛟᚤᛕᛊᚧ",Lore:["§d§o真名§r"]}}), .withTag({display: {Name: "ᚥᚱᚣᛠᚻ",Lore:["§d§o真名§r"]}})]]); recipes.addShaped(, diff --git a/scripts/GameStagesItems.zs b/scripts/GameStagesItems.zs index dc997a3b..2eb839bf 100644 --- a/scripts/GameStagesItems.zs +++ b/scripts/GameStagesItems.zs @@ -1,7 +1,7 @@ import mods.recipestages.Recipes; mods.ItemStages.stageEnchant("draconicstage", ); -mods.ItemStages.stageEnchant("draconicstage", ); +//mods.ItemStages.stageEnchant("draconicstage", ); mods.ItemStages.stageEnchant("divinestage", ); @@ -11,9 +11,9 @@ mods.ItemStages.stageEnchant("bloodmasterstage", ); -mods.ItemStages.stageEnchant("brightsteelforging", ); +//mods.ItemStages.stageEnchant("brightsteelforging", ); -mods.ItemStages.stageEnchant("camerastage", ); +//mods.ItemStages.stageEnchant("camerastage", ); mods.ItemStages.addItemStage("camerastage", ); mods.ItemStages.addItemStage("camerastage", ); @@ -29,4 +29,4 @@ mods.ItemStages.addItemStage("astralmastery", .withT mods.ItemStages.addItemStage("astralmastery", .withTag({mode:7})); mods.ItemStages.addItemStage("astralmastery", .withTag({mode:8})); mods.ItemStages.addItemStage("astralmastery", .withTag({mode:9})); -mods.ItemStages.addItemStage("astralmastery", .withTag({mode:10})); +mods.ItemStages.addItemStage("astralmastery", .withTag({mode:10})); \ No newline at end of file diff --git a/scripts/JEIdescriptions.zs b/scripts/JEIdescriptions.zs index 1cbfa541..1f8cf418 100644 --- a/scripts/JEIdescriptions.zs +++ b/scripts/JEIdescriptions.zs @@ -4921,15 +4921,6 @@ mods.jei.JEI.addDescription([ "另外，如果你花时间读了这条说明，那么告诉你：时间蜜蜂对神秘时代注魔同样有效 ;)" ]); -mods.jei.JEI.addDescription([ - ], -[ - "将注魔爪这种方块放置在符文矩阵上方时，可实现神秘时代注魔配方的自动化。", - "", - "若供应有正确的源质与物品原料，向注魔爪发送红石信号即可启动注魔，效果等同于用法师护手点击符文矩阵。", - "", - "注意：注魔过程仍遵循不稳定度规则，若缺少正确的源质，注魔依然会失败。" -]); mods.jei.JEI.addDescription([ diff --git a/scripts/ModularBewitchmentCauldron.zs b/scripts/ModularBewitchmentCauldron.zs index aa9614ed..bfc927ba 100644 --- a/scripts/ModularBewitchmentCauldron.zs +++ b/scripts/ModularBewitchmentCauldron.zs @@ -267,6 +267,35 @@ autocauldronup16.addItemOutput(); autocauldronup16.build(); +val autocauldronup17 = RecipeBuilder.newBuilder("autocauldronup17","terrestrial_cauldron",4); +autocauldronup17.addFluidInput(*10); +autocauldronup17.addFluidInput(*10); +autocauldronup17.addItemInput(); +autocauldronup17.addItemInput(*4); +autocauldronup17.addItemOutput(*4); +autocauldronup17.build(); +val autocauldronup18 = RecipeBuilder.newBuilder("autocauldronup18","terrestrial_cauldron",4); +autocauldronup18.addFluidInput(*20); +autocauldronup18.addFluidInput(*20); +autocauldronup18.addItemInput(); +autocauldronup18.addItemInput(*8); +autocauldronup18.addItemOutput(*8); +autocauldronup18.build(); +val autocauldronup19 = RecipeBuilder.newBuilder("autocauldronup19","terrestrial_cauldron",4); +autocauldronup19.addFluidInput(*30); +autocauldronup19.addFluidInput(*30); +autocauldronup19.addItemInput(); +autocauldronup19.addItemInput(*16); +autocauldronup19.addItemOutput(*16); +autocauldronup19.build(); + +val autocauldronup20 = RecipeBuilder.newBuilder("autocauldronup20","terrestrial_cauldron",4); +autocauldronup20.addFluidInput(*40); +autocauldronup20.addFluidInput(*40); +autocauldronup20.addItemInput(); +autocauldronup20.addItemInput(*64); +autocauldronup20.addItemOutput(*64); +autocauldronup20.build(); diff --git a/scripts/ModularCasting.zs b/scripts/ModularCasting.zs index 25f85cfa..be530979 100644 --- a/scripts/ModularCasting.zs +++ b/scripts/ModularCasting.zs @@ -417,7 +417,7 @@ castcouch45.addItemOutput(.withTag({Material: "baronyte" castcouch45.build(); val castcouch46 = RecipeBuilder.newBuilder("castcouch46","seared_caster",20); -castcouch46.addFluidInput(*432); +castcouch46.addFluidInput(*432); castcouch46.addItemInput(.withTag({PartType: "tconstruct:sign_head"})); castcouch46.setChance(0.0); castcouch46.addItemOutput(.withTag({Material: "skeletal"})); diff --git a/scripts/ModularGating.zs b/scripts/ModularGating.zs index 9ab91c6d..6ee86afb 100644 --- a/scripts/ModularGating.zs +++ b/scripts/ModularGating.zs @@ -14,7 +14,9 @@ mods.extendedcrafting.TableCrafting.addShaped(, [, , , , ], [, , , , ]]); -recipes.addShapeless(,[, ]); + + + val fieryrhenium = RecipeBuilder.newBuilder("fieryrhenium","dragonfire_crucible",100); fieryrhenium.addFluidInput(*100); diff --git a/scripts/ModularImpetusHard.zs b/scripts/ModularImpetusHard.zs index 147699b6..c3a8df74 100644 --- a/scripts/ModularImpetusHard.zs +++ b/scripts/ModularImpetusHard.zs @@ -8,7 +8,7 @@ mods.thaumcraft.Infusion.registerRecipe("infcatalyzerimp", "", , [, , , , - , , + , , , ]); diff --git a/scripts/ModularInfusion.zs b/scripts/ModularInfusion.zs index 6e688203..4aef9c9d 100644 --- a/scripts/ModularInfusion.zs +++ b/scripts/ModularInfusion.zs @@ -441,9 +441,9 @@ reci41.addItemInput(makeVisCrystal( * 1)*125); reci41.addItemInput(); reci41.addItemInput(); reci41.addItemInput(); -reci41.addItemInput(); -reci41.addItemInput(); -reci41.addItemOutput(); +reci41.addItemInput(); +reci41.addItemInput(); +reci41.addItemOutput(); reci41.build(); val reci42 = RecipeBuilder.newBuilder("inf42","arcane_autoinfuser",120); @@ -503,7 +503,7 @@ reci47.build(); val reci48 = RecipeBuilder.newBuilder("inf48","arcane_autoinfuser",120); reci48.addEnergyPerTickInput(100); reci48.addItemInput(); -reci48.addItemInput(); +reci48.addItemInput(); reci48.addItemInput(); reci48.addItemInput(); reci48.addItemOutput(); @@ -743,4 +743,16 @@ inf69.addItemInput(); inf69.addItemInput(); inf69.addItemInput(); inf69.addItemOutput(); -inf69.build(); \ No newline at end of file +inf69.build(); + + +val inf70 = RecipeBuilder.newBuilder("inf70","arcane_autoinfuser",120); +inf70.addEnergyPerTickInput(100); +inf70.addItemInput(makeVisCrystal( * 1)*32); +inf70.addItemInput(makeVisCrystal( * 1)*30); +inf70.addItemInput(makeVisCrystal( * 1)*30); +inf70.addItemInput(); +inf70.addItemInput(); +inf70.addItemInput(); +inf70.addItemOutput(); +inf70.build(); \ No newline at end of file diff --git a/scripts/ModularSpinningWheel.zs b/scripts/ModularSpinningWheel.zs index 366f29d5..e6488886 100644 --- a/scripts/ModularSpinningWheel.zs +++ b/scripts/ModularSpinningWheel.zs @@ -14,6 +14,17 @@ recipes.addShapeless(, [, ]); + +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); +recipes.addShapeless(,[, ]); + + val spinnyboi1 = RecipeBuilder.newBuilder("spinnyboi1","sparkled_spinning_wheel",100); spinnyboi1.addFluidInput(*1000); spinnyboi1.addFluidInput(*100); diff --git a/scripts/ModularStillPot.zs b/scripts/ModularStillPot.zs index 9cccd449..55efe7a2 100644 --- a/scripts/ModularStillPot.zs +++ b/scripts/ModularStillPot.zs @@ -366,6 +366,11 @@ mods.nuclearcraft.extractor.addRecipe([ mods.nuclearcraft.extractor.addRecipe([, , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); @@ -402,6 +407,15 @@ mods.nuclearcraft.infuser.addRecipe([, , *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); + + mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); @@ -647,4 +661,3 @@ pulsestillimmersive.build(); - diff --git a/scripts/ModularThaumcraft.zs b/scripts/ModularThaumcraft.zs index a284e4c1..0fedd4d9 100644 --- a/scripts/ModularThaumcraft.zs +++ b/scripts/ModularThaumcraft.zs @@ -1193,9 +1193,9 @@ thaum113.addItemInput(makeVisCrystal( * 1)*10); thaum113.addItemInput(makeVisCrystal( * 1)*10); thaum113.addItemInput(makeVisCrystal( * 1)*10); thaum113.addItemInput(*3); -thaum113.addItemInput(*3); +thaum113.addItemInput(*3); thaum113.addItemInput(*3); -thaum113.addItemOutput(*3); +thaum113.addItemOutput(*3); thaum113.build(); val thaum114 = RecipeBuilder.newBuilder("thaum114","arcane_autoworkbench",120); @@ -1207,9 +1207,9 @@ thaum114.addItemInput(makeVisCrystal( * 1)*5); thaum114.addItemInput(makeVisCrystal( * 1)*5); thaum114.addItemInput(makeVisCrystal( * 1)*5); thaum114.addItemInput(); -thaum114.addItemInput(*3); +thaum114.addItemInput(*3); thaum114.addItemInput(*1); -thaum114.addItemOutput(); +thaum114.addItemOutput(); thaum114.build(); diff --git a/scripts/ModularWitchesOven.zs b/scripts/ModularWitchesOven.zs index b300f2c6..ee2c9366 100644 --- a/scripts/ModularWitchesOven.zs +++ b/scripts/ModularWitchesOven.zs @@ -47,6 +47,14 @@ honeysmelt1.addItemOutput(*4); honeysmelt1.addItemOutput(*4); honeysmelt1.build(); +val honeysmelt1a = RecipeBuilder.newBuilder("honeysmelt1a","honeysmelter_oven",5); +honeysmelt1a.addFluidInput(*100); +honeysmelt1a.addItemInput(*4); +honeysmelt1a.addItemInput(*4); +honeysmelt1a.addItemOutput(*4); +honeysmelt1a.addItemOutput(*4); +honeysmelt1a.build(); + val honeysmelt2 = RecipeBuilder.newBuilder("honeysmelt2","honeysmelter_oven",5); honeysmelt2.addFluidInput(*100); honeysmelt2.addItemInput(*4); @@ -55,6 +63,14 @@ honeysmelt2.addItemOutput(*4); honeysmelt2.addItemOutput(*4); honeysmelt2.build(); +val honeysmelt2s = RecipeBuilder.newBuilder("honeysmelt2s","honeysmelter_oven",5); +honeysmelt2s.addFluidInput(*100); +honeysmelt2s.addItemInput(*4); +honeysmelt2s.addItemInput(*4); +honeysmelt2s.addItemOutput(*4); +honeysmelt2s.addItemOutput(*4); +honeysmelt2s.build(); + val honeysmelt3 = RecipeBuilder.newBuilder("honeysmelt3","honeysmelter_oven",5); honeysmelt3.addFluidInput(*100); honeysmelt3.addItemInput(*4); @@ -63,6 +79,14 @@ honeysmelt3.addItemOutput(*4); honeysmelt3.addItemOutput(*4); honeysmelt3.build(); +val honeysmelt3a = RecipeBuilder.newBuilder("honeysmelt3a","honeysmelter_oven",5); +honeysmelt3a.addFluidInput(*100); +honeysmelt3a.addItemInput(*4); +honeysmelt3a.addItemInput(*4); +honeysmelt3a.addItemOutput(*4); +honeysmelt3a.addItemOutput(*4); +honeysmelt3a.build(); + val honeysmelt4 = RecipeBuilder.newBuilder("honeysmelt4","honeysmelter_oven",5); honeysmelt4.addFluidInput(*100); honeysmelt4.addItemInput(*4); @@ -71,6 +95,14 @@ honeysmelt4.addItemOutput(*4); honeysmelt4.addItemOutput(*4); honeysmelt4.build(); +val honeysmelt4a = RecipeBuilder.newBuilder("honeysmelt4a","honeysmelter_oven",5); +honeysmelt4a.addFluidInput(*100); +honeysmelt4a.addItemInput(*4); +honeysmelt4a.addItemInput(*4); +honeysmelt4a.addItemOutput(*4); +honeysmelt4a.addItemOutput(*4); +honeysmelt4a.build(); + val honeysmelt5 = RecipeBuilder.newBuilder("honeysmelt5","honeysmelter_oven",5); honeysmelt5.addFluidInput(*100); honeysmelt5.addItemInput(*4); @@ -79,6 +111,14 @@ honeysmelt5.addItemOutput(*4); honeysmelt5.addItemOutput(*4); honeysmelt5.build(); +val honeysmelt5a = RecipeBuilder.newBuilder("honeysmelt5a","honeysmelter_oven",5); +honeysmelt5a.addFluidInput(*100); +honeysmelt5a.addItemInput(*4); +honeysmelt5a.addItemInput(*4); +honeysmelt5a.addItemOutput(*4); +honeysmelt5a.addItemOutput(*4); +honeysmelt5a.build(); + val honeysmelt6 = RecipeBuilder.newBuilder("honeysmelt6","honeysmelter_oven",5); honeysmelt6.addFluidInput(*100); honeysmelt6.addItemInput(*4); @@ -87,6 +127,14 @@ honeysmelt6.addItemOutput(*4); honeysmelt6.addItemOutput(*4); honeysmelt6.build(); +val honeysmelt6a = RecipeBuilder.newBuilder("honeysmelt6a","honeysmelter_oven",5); +honeysmelt6a.addFluidInput(*100); +honeysmelt6a.addItemInput(*4); +honeysmelt6a.addItemInput(*4); +honeysmelt6a.addItemOutput(*4); +honeysmelt6a.addItemOutput(*4); +honeysmelt6a.build(); + val honeysmelt7 = RecipeBuilder.newBuilder("honeysmelt7","honeysmelter_oven",5); honeysmelt7.addFluidInput(*100); honeysmelt7.addItemInput(*4); @@ -95,6 +143,14 @@ honeysmelt7.addItemOutput(*4); honeysmelt7.addItemOutput(*4); honeysmelt7.build(); +val honeysmelt7a = RecipeBuilder.newBuilder("honeysmelt7a","honeysmelter_oven",5); +honeysmelt7a.addFluidInput(*100); +honeysmelt7a.addItemInput(*4); +honeysmelt7a.addItemInput(*4); +honeysmelt7a.addItemOutput(*4); +honeysmelt7a.addItemOutput(*4); +honeysmelt7a.build(); + val honeysmelt8 = RecipeBuilder.newBuilder("honeysmelt8","honeysmelter_oven",5); honeysmelt8.addFluidInput(*100); honeysmelt8.addItemInput(*4); @@ -111,6 +167,14 @@ honeysmelt9.addItemOutput(*4); honeysmelt9.addItemOutput(*4); honeysmelt9.build(); +val honeysmelt9a = RecipeBuilder.newBuilder("honeysmelt9a","honeysmelter_oven",5); +honeysmelt9a.addFluidInput(*100); +honeysmelt9a.addItemInput(*4); +honeysmelt9a.addItemInput(*4); +honeysmelt9a.addItemOutput(*4); +honeysmelt9a.addItemOutput(*4); +honeysmelt9a.build(); + val honeysmelt10 = RecipeBuilder.newBuilder("honeysmelt10","honeysmelter_oven",5); honeysmelt10.addFluidInput(*100); honeysmelt10.addItemInput(*4); @@ -119,6 +183,14 @@ honeysmelt10.addItemOutput(*4); honeysmelt10.addItemOutput(*4); honeysmelt10.build(); +val honeysmelt10a = RecipeBuilder.newBuilder("honeysmelt10a","honeysmelter_oven",5); +honeysmelt10a.addFluidInput(*100); +honeysmelt10a.addItemInput(*4); +honeysmelt10a.addItemInput(*4); +honeysmelt10a.addItemOutput(*4); +honeysmelt10a.addItemOutput(*4); +honeysmelt10a.build(); + val honeysmelt11 = RecipeBuilder.newBuilder("honeysmelt11","honeysmelter_oven",5); honeysmelt11.addFluidInput(*100); honeysmelt11.addItemInput(*4); @@ -127,6 +199,14 @@ honeysmelt11.addItemOutput(*4); honeysmelt11.addItemOutput(*4); honeysmelt11.build(); +val honeysmelt11a = RecipeBuilder.newBuilder("honeysmelt11a","honeysmelter_oven",5); +honeysmelt11a.addFluidInput(*100); +honeysmelt11a.addItemInput(*4); +honeysmelt11a.addItemInput(*4); +honeysmelt11a.addItemOutput(*4); +honeysmelt11a.addItemOutput(*4); +honeysmelt11a.build(); + val honeysmelt12 = RecipeBuilder.newBuilder("honeysmelt12","honeysmelter_oven",5); honeysmelt12.addFluidInput(*100); honeysmelt12.addItemInput(*4); @@ -198,6 +278,14 @@ honeysmelt21.addItemOutput(*4); honeysmelt21.addItemOutput(*4); honeysmelt21.build(); +val honeysmelt21a = RecipeBuilder.newBuilder("honeysmelt21a","honeysmelter_oven",5); +honeysmelt21a.addFluidInput(*100); +honeysmelt21a.addItemInput(*4); +honeysmelt21a.addItemInput(*4); +honeysmelt21a.addItemOutput(*4); +honeysmelt21a.addItemOutput(*4); +honeysmelt21a.build(); + val honeysmelt22 = RecipeBuilder.newBuilder("honeysmelt22","honeysmelter_oven",5); honeysmelt22.addFluidInput(*100); honeysmelt22.addItemInput(*4); @@ -206,6 +294,14 @@ honeysmelt22.addItemOutput(*4); honeysmelt22.addItemOutput(*4); honeysmelt22.build(); +val honeysmelt22a = RecipeBuilder.newBuilder("honeysmelt22a","honeysmelter_oven",5); +honeysmelt22a.addFluidInput(*100); +honeysmelt22a.addItemInput(*4); +honeysmelt22a.addItemInput(*4); +honeysmelt22a.addItemOutput(*4); +honeysmelt22a.addItemOutput(*4); +honeysmelt22a.build(); + val honeysmelt23 = RecipeBuilder.newBuilder("honeysmelt23","honeysmelter_oven",5); honeysmelt23.addFluidInput(*100); honeysmelt23.addItemInput(*4); @@ -221,6 +317,14 @@ honeysmelt24.addItemOutput(*4); honeysmelt24.addItemOutput(*4); honeysmelt24.build(); +val honeysmelt24a = RecipeBuilder.newBuilder("honeysmelt24a","honeysmelter_oven",5); +honeysmelt24a.addFluidInput(*100); +honeysmelt24a.addItemInput(*4); +honeysmelt24a.addItemInput(*4); +honeysmelt24a.addItemOutput(*4); +honeysmelt24a.addItemOutput(*4); +honeysmelt24a.build(); + val honeysmelt25 = RecipeBuilder.newBuilder("honeysmelt25","honeysmelter_oven",5); honeysmelt25.addFluidInput(*100); honeysmelt25.addItemInput(*4); @@ -229,6 +333,14 @@ honeysmelt25.addItemOutput(*4); honeysmelt25.addItemOutput(*4); honeysmelt25.build(); +val honeysmelt25a = RecipeBuilder.newBuilder("honeysmelt25a","honeysmelter_oven",5); +honeysmelt25a.addFluidInput(*100); +honeysmelt25a.addItemInput(*4); +honeysmelt25a.addItemInput(*4); +honeysmelt25a.addItemOutput(*4); +honeysmelt25a.addItemOutput(*4); +honeysmelt25a.build(); + val honeysmelt26 = RecipeBuilder.newBuilder("honeysmelt26","honeysmelter_oven",5); honeysmelt26.addFluidInput(*5); honeysmelt26.addItemInput(); @@ -248,6 +360,14 @@ honeysmelt27.addItemOutput(*16); honeysmelt27.addItemOutput(*16); honeysmelt27.build(); +val honeysmelt27a = RecipeBuilder.newBuilder("honeysmelt27a","honeysmelter_oven",5); +honeysmelt27a.addFluidInput(*100); +honeysmelt27a.addItemInput(*16); +honeysmelt27a.addItemInput(*16); +honeysmelt27a.addItemOutput(*16); +honeysmelt27a.addItemOutput(*16); +honeysmelt27a.build(); + val honeysmelt28 = RecipeBuilder.newBuilder("honeysmelt28","honeysmelter_oven",5); honeysmelt28.addFluidInput(*100); @@ -257,6 +377,14 @@ honeysmelt28.addItemOutput(*16); honeysmelt28.addItemOutput(*16); honeysmelt28.build(); +val honeysmelt28a = RecipeBuilder.newBuilder("honeysmelt28a","honeysmelter_oven",5); +honeysmelt28a.addFluidInput(*100); +honeysmelt28a.addItemInput(*16); +honeysmelt28a.addItemInput(*16); +honeysmelt28a.addItemOutput(*16); +honeysmelt28a.addItemOutput(*16); +honeysmelt28a.build(); + val honeysmelt29 = RecipeBuilder.newBuilder("honeysmelt29","honeysmelter_oven",5); honeysmelt29.addFluidInput(*100); @@ -266,6 +394,14 @@ honeysmelt29.addItemOutput(*16); honeysmelt29.addItemOutput(*16); honeysmelt29.build(); +val honeysmelt29a = RecipeBuilder.newBuilder("honeysmelt29a","honeysmelter_oven",5); +honeysmelt29a.addFluidInput(*100); +honeysmelt29a.addItemInput(*16); +honeysmelt29a.addItemInput(*16); +honeysmelt29a.addItemOutput(*16); +honeysmelt29a.addItemOutput(*16); +honeysmelt29a.build(); + val honeysmelt30 = RecipeBuilder.newBuilder("honeysmelt30","honeysmelter_oven",5); honeysmelt30.addFluidInput(*100); honeysmelt30.addItemInput(*16); @@ -274,6 +410,14 @@ honeysmelt30.addItemOutput(*16); honeysmelt30.addItemOutput(*16); honeysmelt30.build(); +val honeysmelt30a = RecipeBuilder.newBuilder("honeysmelt30a","honeysmelter_oven",5); +honeysmelt30a.addFluidInput(*100); +honeysmelt30a.addItemInput(*16); +honeysmelt30a.addItemInput(*16); +honeysmelt30a.addItemOutput(*16); +honeysmelt30a.addItemOutput(*16); +honeysmelt30a.build(); + val honeysmelt31 = RecipeBuilder.newBuilder("honeysmelt31","honeysmelter_oven",5); honeysmelt31.addFluidInput(*100); honeysmelt31.addItemInput(*16); @@ -282,6 +426,14 @@ honeysmelt31.addItemOutput(*16); honeysmelt31.addItemOutput(*16); honeysmelt31.build(); +val honeysmelt31a = RecipeBuilder.newBuilder("honeysmelt31a","honeysmelter_oven",5); +honeysmelt31a.addFluidInput(*100); +honeysmelt31a.addItemInput(*16); +honeysmelt31a.addItemInput(*16); +honeysmelt31a.addItemOutput(*16); +honeysmelt31a.addItemOutput(*16); +honeysmelt31a.build(); + val honeysmelt32 = RecipeBuilder.newBuilder("honeysmelt32","honeysmelter_oven",5); honeysmelt32.addFluidInput(*100); honeysmelt32.addItemInput(*16); @@ -290,6 +442,14 @@ honeysmelt32.addItemOutput(*16); honeysmelt32.addItemOutput(*16); honeysmelt32.build(); +val honeysmelt32a = RecipeBuilder.newBuilder("honeysmelt32a","honeysmelter_oven",5); +honeysmelt32a.addFluidInput(*100); +honeysmelt32a.addItemInput(*16); +honeysmelt32a.addItemInput(*16); +honeysmelt32a.addItemOutput(*16); +honeysmelt32a.addItemOutput(*16); +honeysmelt32a.build(); + val honeysmelt33 = RecipeBuilder.newBuilder("honeysmelt33","honeysmelter_oven",5); honeysmelt33.addFluidInput(*100); honeysmelt33.addItemInput(*16); @@ -298,6 +458,14 @@ honeysmelt33.addItemOutput(*16); honeysmelt33.addItemOutput(*16); honeysmelt33.build(); +val honeysmelt33a = RecipeBuilder.newBuilder("honeysmelt33a","honeysmelter_oven",5); +honeysmelt33a.addFluidInput(*100); +honeysmelt33a.addItemInput(*16); +honeysmelt33a.addItemInput(*16); +honeysmelt33a.addItemOutput(*16); +honeysmelt33a.addItemOutput(*16); +honeysmelt33a.build(); + val honeysmelt34 = RecipeBuilder.newBuilder("honeysmelt34","honeysmelter_oven",5); honeysmelt34.addFluidInput(*100); honeysmelt34.addItemInput(*16); @@ -306,6 +474,14 @@ honeysmelt34.addItemOutput(*16); honeysmelt34.addItemOutput(*16); honeysmelt34.build(); +val honeysmelt34a = RecipeBuilder.newBuilder("honeysmelt34a","honeysmelter_oven",5); +honeysmelt34a.addFluidInput(*100); +honeysmelt34a.addItemInput(*16); +honeysmelt34a.addItemInput(*16); +honeysmelt34a.addItemOutput(*16); +honeysmelt34a.addItemOutput(*16); +honeysmelt34a.build(); + val honeysmelt35 = RecipeBuilder.newBuilder("honeysmelt35","honeysmelter_oven",5); honeysmelt35.addFluidInput(*100); honeysmelt35.addItemInput(*16); @@ -314,6 +490,14 @@ honeysmelt35.addItemOutput(*16); honeysmelt35.addItemOutput(*16); honeysmelt35.build(); +val honeysmelt35a = RecipeBuilder.newBuilder("honeysmelt35a","honeysmelter_oven",5); +honeysmelt35a.addFluidInput(*100); +honeysmelt35a.addItemInput(*16); +honeysmelt35a.addItemInput(*16); +honeysmelt35a.addItemOutput(*16); +honeysmelt35a.addItemOutput(*16); +honeysmelt35a.build(); + val honeysmelt36 = RecipeBuilder.newBuilder("honeysmelt36","honeysmelter_oven",5); honeysmelt36.addFluidInput(*100); honeysmelt36.addItemInput(*16); @@ -325,4 +509,3 @@ honeysmelt36.build(); - diff --git a/scripts/MythicPowerful.zs b/scripts/MythicPowerful.zs index 47c5839b..9963cc20 100644 --- a/scripts/MythicPowerful.zs +++ b/scripts/MythicPowerful.zs @@ -1394,8 +1394,7 @@ import crafttweaker.enchantments.IEnchantmentDefinition; { val enchlistChoedanKal as EnchantMap = EnchantMap() - .add("thaumictinkerer:finalstrike",20000) - .add("thaumictinkerer:valiance",20000); + .add("cofhcore:vorpal",30000); @@ -1457,7 +1456,6 @@ import crafttweaker.enchantments.IEnchantmentDefinition; { val enchlistAnduril as EnchantMap = EnchantMap() - .add("thaumictinkerer:valiance",30) .add("minecraft:smite",100); @@ -1476,7 +1474,7 @@ import crafttweaker.enchantments.IEnchantmentDefinition; { val enchlistScarlet as EnchantMap = EnchantMap() - .add("thaumictinkerer:valiance",20); + .add("cofhcore:vorpal",12); mods.extendedcrafting.TableCrafting.addShaped(SuperEnchantedItem(.withTag({display: {Name:"§6§o猩红§r",Lore:["§d§o超限附魔§r"]}}), enchlistScarlet).getItem(), @@ -1508,7 +1506,7 @@ import crafttweaker.enchantments.IEnchantmentDefinition; { val enchlistFirstKing as EnchantMap = EnchantMap() - .add("thaumictinkerer:finalstrike",20); + .add("cofhcore:vorpal",31); @@ -1834,7 +1832,7 @@ import crafttweaker.enchantments.IEnchantmentDefinition; [, , , , ], [, , , , ], [, , , , ], - [, , , , ]]); + [, , , , ]]); } diff --git a/scripts/MythicProcessorChemicalRector.zs b/scripts/MythicProcessorChemicalRector.zs index 152b7040..a779a443 100644 --- a/scripts/MythicProcessorChemicalRector.zs +++ b/scripts/MythicProcessorChemicalRector.zs @@ -725,3 +725,17 @@ mithchemreac97.addFluidInput(*1000); mithchemreac97.addFluidInput(*12); mithchemreac97.addFluidOutput(*1000); mithchemreac97.build(); + +val mithchemreac98 = RecipeBuilder.newBuilder("mithchemreac98","mythic_processor_chemical_reactor",2); +mithchemreac98.addEnergyPerTickInput(200000); +mithchemreac98.addFluidInput(*288); +mithchemreac98.addFluidInput(*72); +mithchemreac98.addFluidOutput(*144); +mithchemreac98.build(); + +val mithchemreac99 = RecipeBuilder.newBuilder("mithchemreac99","mythic_processor_chemical_reactor",2); +mithchemreac99.addEnergyPerTickInput(200000); +mithchemreac99.addFluidInput(*144); +mithchemreac99.addFluidInput(*10); +mithchemreac99.addFluidOutput(*144); +mithchemreac99.build(); diff --git a/scripts/MythicProcessorTransfuser.zs b/scripts/MythicProcessorTransfuser.zs index 884e6505..9b5b9016 100644 --- a/scripts/MythicProcessorTransfuser.zs +++ b/scripts/MythicProcessorTransfuser.zs @@ -1210,8 +1210,54 @@ mythinfus148.addItemInput(*1); mythinfus148.addItemOutput(.withTag({Fluid: {FluidName: "aerotheum", Amount: 1000}})); mythinfus148.build(); +val mythinfus149 = RecipeBuilder.newBuilder("mythinfus149","mythic_processor_infuser",2); +mythinfus149.addEnergyPerTickInput(1000000); +mythinfus149.addFluidInput(*1000); +mythinfus149.addItemInput(*1); +mythinfus149.addItemOutput(); +mythinfus149.build(); +val mythinfus150 = RecipeBuilder.newBuilder("mythinfus150","mythic_processor_infuser",2); +mythinfus150.addEnergyPerTickInput(1000000); +mythinfus150.addFluidInput(*1000); +mythinfus150.addItemInput(*1); +mythinfus150.addItemOutput(); +mythinfus150.build(); +val mythinfus151 = RecipeBuilder.newBuilder("mythinfus151","mythic_processor_infuser",2); +mythinfus151.addEnergyPerTickInput(1000000); +mythinfus151.addFluidInput(*1000); +mythinfus151.addItemInput(*1); +mythinfus151.addItemOutput(); +mythinfus151.build(); + +val mythinfus152 = RecipeBuilder.newBuilder("mythinfus152","mythic_processor_infuser",2); +mythinfus152.addEnergyPerTickInput(1000000); +mythinfus152.addFluidInput(*1000); +mythinfus152.addItemInput(*1); +mythinfus152.addItemOutput(); +mythinfus152.build(); + +val mythinfus153 = RecipeBuilder.newBuilder("mythinfus153","mythic_processor_infuser",2); +mythinfus153.addEnergyPerTickInput(1000000); +mythinfus153.addFluidInput(*1000); +mythinfus153.addItemInput(*1); +mythinfus153.addItemOutput(); +mythinfus153.build(); + +val mythinfus154 = RecipeBuilder.newBuilder("mythinfus154","mythic_processor_infuser",2); +mythinfus154.addEnergyPerTickInput(1000000); +mythinfus154.addFluidInput(*1000); +mythinfus154.addItemInput(*1); +mythinfus154.addItemOutput(); +mythinfus154.build(); + +val mythinfus155 = RecipeBuilder.newBuilder("mythinfus155","mythic_processor_infuser",2); +mythinfus155.addEnergyPerTickInput(1000000); +mythinfus155.addFluidInput(*1000); +mythinfus155.addItemInput(*1); +mythinfus155.addItemOutput(); +mythinfus155.build(); @@ -1703,6 +1749,54 @@ mythextrac68.addItemOutput(); mythextrac68.addFluidOutput(*1000); mythextrac68.build(); +val mythextrac69 = RecipeBuilder.newBuilder("mythextrac69","mythic_processor_infuser",2); +mythextrac69.addEnergyPerTickInput(1000000); +mythextrac69.addItemInput(); +mythextrac69.addItemOutput(); +mythextrac69.addFluidOutput(*1000); +mythextrac69.build(); + +val mythextrac70 = RecipeBuilder.newBuilder("mythextrac70","mythic_processor_infuser",2); +mythextrac70.addEnergyPerTickInput(1000000); +mythextrac70.addItemInput(); +mythextrac70.addItemOutput(); +mythextrac70.addFluidOutput(*1000); +mythextrac70.build(); + +val mythextrac71 = RecipeBuilder.newBuilder("mythextrac71","mythic_processor_infuser",2); +mythextrac71.addEnergyPerTickInput(1000000); +mythextrac71.addItemInput(); +mythextrac71.addItemOutput(); +mythextrac71.addFluidOutput(*1000); +mythextrac71.build(); + +val mythextrac72 = RecipeBuilder.newBuilder("mythextrac72","mythic_processor_infuser",2); +mythextrac72.addEnergyPerTickInput(1000000); +mythextrac72.addItemInput(); +mythextrac72.addItemOutput(); +mythextrac72.addFluidOutput(*1000); +mythextrac72.build(); + +val mythextrac73 = RecipeBuilder.newBuilder("mythextrac73","mythic_processor_infuser",2); +mythextrac73.addEnergyPerTickInput(1000000); +mythextrac73.addItemInput(); +mythextrac73.addItemOutput(); +mythextrac73.addFluidOutput(*1000); +mythextrac73.build(); + +val mythextrac74 = RecipeBuilder.newBuilder("mythextrac74","mythic_processor_infuser",2); +mythextrac74.addEnergyPerTickInput(1000000); +mythextrac74.addItemInput(); +mythextrac74.addItemOutput(); +mythextrac74.addFluidOutput(*1000); +mythextrac74.build(); + +val mythextrac75 = RecipeBuilder.newBuilder("mythextrac75","mythic_processor_infuser",2); +mythextrac75.addEnergyPerTickInput(1000000); +mythextrac75.addItemInput(); +mythextrac75.addItemOutput(); +mythextrac75.addFluidOutput(*1000); +mythextrac75.build(); diff --git a/scripts/PeriodicTable.zs b/scripts/PeriodicTable.zs index ce0a13c1..c63a830e 100644 --- a/scripts/PeriodicTable.zs +++ b/scripts/PeriodicTable.zs @@ -3,35 +3,35 @@ import mods.modularmachinery.RecipeBuilder; import mods.astralsorcery.Utils; import mods.buildcraft.AssemblyTable; -mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 4000, * 1000, null]); -mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 4000, * 1000, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 4000, * 1000, null,0.4]); +mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 4000, * 1000, null,0.4]); -mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 1000, * 1000, null]); -mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 1000, * 1000, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 1000, * 1000, null,0.4]); +mods.nuclearcraft.chemical_reactor.addRecipe([ * 1000, * 1000, * 1000, null,0.4]); mods.nuclearcraft.melter.addRecipe([, * 250]); // making krypton, neon, argon, and xenon -mods.nuclearcraft.centrifuge.addRecipe([*100, *70, *20, *10, *10]); +mods.nuclearcraft.centrifuge.addRecipe([*100, *70, *20, *10, *10,0.1]); -mods.nuclearcraft.chemical_reactor.addRecipe([*10, *50, *10, *10]); +mods.nuclearcraft.chemical_reactor.addRecipe([*10, *50, *10, *10,0.1]); -mods.nuclearcraft.centrifuge.addRecipe([*100, *50, *50, null, null]); +mods.nuclearcraft.centrifuge.addRecipe([*100, *50, *50, null, null,0.1]); -mods.nuclearcraft.rock_crusher.addRecipe([, *4, null, null]); +mods.nuclearcraft.rock_crusher.addRecipe([, *4, null, null,0.1]); -mods.nuclearcraft.infuser.addRecipe([, *72, *4]); +mods.nuclearcraft.infuser.addRecipe([, *72, *4,0.1]); -mods.nuclearcraft.infuser.addRecipe([, *10, ]); +mods.nuclearcraft.infuser.addRecipe([, *10, ,0.1]); -mods.nuclearcraft.extractor.addRecipe([, , *100]); +mods.nuclearcraft.extractor.addRecipe([, , *100,0.1]); -mods.nuclearcraft.extractor.addRecipe([, , *100]); +mods.nuclearcraft.extractor.addRecipe([, , *100,0.1]); // making silicon -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making phosphorus @@ -40,54 +40,54 @@ recipes.addShaped(, [, , ], [null, , null]]); -mods.nuclearcraft.alloy_furnace.addRecipe([, , ]); +mods.nuclearcraft.alloy_furnace.addRecipe([, , ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making chlorine, francium, and bromine -mods.nuclearcraft.dissolver.addRecipe([, *100, *100]); +mods.nuclearcraft.dissolver.addRecipe([, *100, *100,0.1]); -mods.nuclearcraft.electrolyser.addRecipe([*2000, *400, *400, *1200, null]); +mods.nuclearcraft.electrolyser.addRecipe([*2000, *400, *400, *1200, null,0.1]); -mods.nuclearcraft.electrolyser.addRecipe([*200, *40, *40, *120, null]); +mods.nuclearcraft.electrolyser.addRecipe([*200, *40, *40, *120, null,0.1]); -mods.nuclearcraft.electrolyser.addRecipe([*100, *50, *50, null, null]); +mods.nuclearcraft.electrolyser.addRecipe([*100, *50, *50, null, null,0.1]); mods.nuclearcraft.melter.removeRecipeWithOutput([]); -mods.nuclearcraft.crystallizer.addRecipe([*16000, ]); +mods.nuclearcraft.crystallizer.addRecipe([*16000, ,0.1]); // making calcium -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); -mods.nuclearcraft.melter.addRecipe([*2, *100]); +mods.nuclearcraft.melter.addRecipe([*2, *100,0.3]); -mods.nuclearcraft.electrolyser.addRecipe([*100, *100, *10, *40, null]); +mods.nuclearcraft.electrolyser.addRecipe([*100, *100, *10, *40, null,0.3]); // making scandium -mods.nuclearcraft.electrolyser.addRecipe([*100, *30, *20, *40, *1]); +mods.nuclearcraft.electrolyser.addRecipe([*100, *30, *20, *40, *1,0.3]); // making vanadium mods.techreborn.industrialGrinder.addRecipe(, *2, null, null, , null, *10, 30, 50); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making gallium -mods.nuclearcraft.rock_crusher.addRecipe([*4, *2, , null]); +mods.nuclearcraft.rock_crusher.addRecipe([*4, *2, , null,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making germanium -mods.nuclearcraft.rock_crusher.addRecipe([*4, *2, , null]); +mods.nuclearcraft.rock_crusher.addRecipe([*4, *2, , null,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making selenium @@ -95,32 +95,32 @@ mods.techreborn.industrialGrinder.addRecipe(, % 100, % 100, % 100], *32, null, 1000); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making yttrium and barium mods.nuclearcraft.chemical_reactor.removeRecipeWithInput([, ]); -mods.nuclearcraft.chemical_reactor.addRecipe([*500, *1000, *100, *1000]); +mods.nuclearcraft.chemical_reactor.addRecipe([*500, *1000, *100, *1000,0.1]); -mods.nuclearcraft.chemical_reactor.addRecipe([*10, *10, *10, *10]); +mods.nuclearcraft.chemical_reactor.addRecipe([*10, *10, *10, *10,0.1]); -mods.nuclearcraft.rock_crusher.addRecipe([, , , null]); +mods.nuclearcraft.rock_crusher.addRecipe([, , , null,0.1]); -mods.nuclearcraft.melter.addRecipe([, *50]); +mods.nuclearcraft.melter.addRecipe([, *50,0.1]); -mods.nuclearcraft.chemical_reactor.addRecipe([*10, *2, *10, *5]); +mods.nuclearcraft.chemical_reactor.addRecipe([*10, *2, *10, *5,0.1]); -mods.nuclearcraft.chemical_reactor.addRecipe([*10, *10, *20, *5]); +mods.nuclearcraft.chemical_reactor.addRecipe([*10, *10, *20, *5,0.1]); mods.techreborn.industrialElectrolyzer.addRecipe(, , null, null, null, , 30, 40); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.1]); // making zirconium -mods.nuclearcraft.melter.addRecipe([, *144]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making niobium @@ -142,9 +142,9 @@ mods.bloodmagic.TartaricForge.addRecipe(, , , null, , null, 30, 25); -mods.nuclearcraft.dissolver.addRecipe([, *144, *144]); +mods.nuclearcraft.dissolver.addRecipe([, *144, *144,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*144, *50, *72, *72]); +mods.nuclearcraft.chemical_reactor.addRecipe([*144, *50, *72, *72,0.3]); // making einstenium @@ -164,17 +164,17 @@ mods.nuclearcraft.salt_fission.addRecipe([, , 5, 10, 20, 30); -mods.nuclearcraft.dissolver.addRecipe([, *144, *40]); +mods.nuclearcraft.dissolver.addRecipe([, *144, *40,0.3]); // making meitnerium -mods.nuclearcraft.supercooler.addRecipe([*1000, *10]); +mods.nuclearcraft.supercooler.addRecipe([*1000, *10,0.3]); -mods.nuclearcraft.irradiator.addRecipe([*10, *50, *50, *100]); +mods.nuclearcraft.irradiator.addRecipe([*10, *50, *50, *100,0.3]); // making ruthenium -mods.nuclearcraft.crystallizer.addRecipe([*500, ]); +mods.nuclearcraft.crystallizer.addRecipe([*500, ,0.1]); recipes.addShaped(, [[, , ], @@ -246,17 +246,17 @@ recipes.addShaped(*3, mods.techreborn.fusionReactor.addRecipe(, , , 1000000, 100, 120); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making rhodium mods.techreborn.industrialElectrolyzer.addRecipe(, , null, null, null, , 30, 40); -mods.nuclearcraft.dissolver.addRecipe([, *500, *100]); +mods.nuclearcraft.dissolver.addRecipe([, *500, *100,0.3]); // making cadmium -mods.nuclearcraft.centrifuge.addRecipe([*100, *20, *50, *30, null]); +mods.nuclearcraft.centrifuge.addRecipe([*100, *20, *50, *30, null,0.3]); // making seaborgion @@ -292,26 +292,26 @@ recipes.addShaped(, mods.tconstruct.Melting.addRecipe( * 250,); -mods.nuclearcraft.melter.addRecipe([, *250]); +mods.nuclearcraft.melter.addRecipe([, *250,0.3]); // making indium -mods.nuclearcraft.infuser.addRecipe([*12, *200, ]); +mods.nuclearcraft.infuser.addRecipe([*12, *200, ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making antimony mods.thaumcraft.Crucible.registerRecipe("makeantimony", "", , , [*15]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making tellurium mods.thaumcraft.Crucible.registerRecipe("maketellurium", "", , , [*15]); mods.thaumcraft.Crucible.registerRecipe("maketelluriumcompact", "", *4, , [*30]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making iodine @@ -319,34 +319,34 @@ mods.thermalexpansion.Transposer.addExtractRecipe( * 1000, , *1000]); +mods.nuclearcraft.melter.addRecipe([, *1000,0.3]); -mods.nuclearcraft.infuser.addRecipe([, * 100, ]); +mods.nuclearcraft.infuser.addRecipe([, * 100, ,0.3]); -mods.nuclearcraft.infuser.addRecipe([, * 100, *3]); +mods.nuclearcraft.infuser.addRecipe([, * 100, *3,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making osmium -mods.nuclearcraft.alloy_furnace.addRecipe([, , ]); +mods.nuclearcraft.alloy_furnace.addRecipe([, , ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *16]); +mods.nuclearcraft.melter.addRecipe([, *16,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making mercury -mods.nuclearcraft.melter.addRecipe([, *1000]); +mods.nuclearcraft.melter.addRecipe([, *1000,0.3]); // making thallium -mods.nuclearcraft.dissolver.addRecipe([, *1000, *1000]); -mods.nuclearcraft.dissolver.addRecipe([, *1000, *1000]); +mods.nuclearcraft.dissolver.addRecipe([, *1000, *1000,0.3]); +mods.nuclearcraft.dissolver.addRecipe([, *1000, *1000,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*200, *200, *1000, *500]); +mods.nuclearcraft.chemical_reactor.addRecipe([*200, *200, *1000, *500,0.3]); // making bismuth @@ -355,27 +355,27 @@ recipes.addShapeless(, , makeVisCrystal( * 1)]); -mods.nuclearcraft.dissolver.addRecipe([, *10, *144]); +mods.nuclearcraft.dissolver.addRecipe([, *10, *144,0.3]); // making radon and radium -mods.nuclearcraft.dissolver.addRecipe([, *10, *10]); +mods.nuclearcraft.dissolver.addRecipe([, *10, *10,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*12, *1000, *800, *100]); +mods.nuclearcraft.chemical_reactor.addRecipe([*12, *1000, *800, *100,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*100, *1000, *800, *100]); +mods.nuclearcraft.chemical_reactor.addRecipe([*100, *1000, *800, *100,0.3]); // making actinium -mods.nuclearcraft.irradiator.addRecipe([*50, *10, *200, *100]); +mods.nuclearcraft.irradiator.addRecipe([*50, *10, *200, *100,0.3]); // making rutherfordium -mods.nuclearcraft.dissolver.addRecipe([, *10, *10]); +mods.nuclearcraft.dissolver.addRecipe([, *10, *10,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*10, *40, *100, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([*10, *40, *100, null,0.3]); -mods.nuclearcraft.electrolyser.addRecipe([*50, *10, *40, null, null]); +mods.nuclearcraft.electrolyser.addRecipe([*50, *10, *40, null, null,0.3]); // making dubnium @@ -383,11 +383,11 @@ mods.nuclearcraft.fusion.addRecipe([*10, *10, < // making bohrium -mods.nuclearcraft.irradiator.addRecipe([*1000, *1000, *200, null]); +mods.nuclearcraft.irradiator.addRecipe([*1000, *1000, *200, null,0.3]); -mods.nuclearcraft.irradiator.addRecipe([*25, *1000, *200, null]); +mods.nuclearcraft.irradiator.addRecipe([*25, *1000, *200, null,0.3]); -mods.nuclearcraft.dissolver.addRecipe([, *50, *40]); +mods.nuclearcraft.dissolver.addRecipe([, *50, *40,0.3]); // making cerium @@ -398,11 +398,11 @@ recipes.addShaped(, [, crystalboth, ], [, , ]]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making praseodymium -mods.nuclearcraft.dissolver.addRecipe([, *144, *144]); +mods.nuclearcraft.dissolver.addRecipe([, *144, *144,0.3]); // making neodymium @@ -416,58 +416,58 @@ recipes.addShaped(*4, [, , ], [, , ]]); -mods.nuclearcraft.alloy_furnace.addRecipe([, , ]); +mods.nuclearcraft.alloy_furnace.addRecipe([, , ,0.3]); -mods.nuclearcraft.dissolver.addRecipe([, *5, *144]); +mods.nuclearcraft.dissolver.addRecipe([, *5, *144,0.3]); // making samarium -mods.nuclearcraft.infuser.addRecipe([, *144, ]); +mods.nuclearcraft.infuser.addRecipe([, *144, ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making europium -mods.nuclearcraft.dissolver.addRecipe([, *50, *100]); +mods.nuclearcraft.dissolver.addRecipe([, *50, *100,0.3]); // making gadolinium -mods.nuclearcraft.manufactory.addRecipe([, ]); +mods.nuclearcraft.manufactory.addRecipe([, ,0.3]); -mods.nuclearcraft.dissolver.addRecipe([, *5, *20]); +mods.nuclearcraft.dissolver.addRecipe([, *5, *20,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*50, *50, *100, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([*50, *50, *100, null,0.3]); -mods.nuclearcraft.crystallizer.addRecipe([*200, ]); +mods.nuclearcraft.crystallizer.addRecipe([*200, ,0.3]); recipes.addShapeless(, [.reuse(), ]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making terbium -mods.nuclearcraft.chemical_reactor.addRecipe([*100, *200, *300, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([*100, *200, *300, null,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*50, *50, *100, *50]); +mods.nuclearcraft.chemical_reactor.addRecipe([*50, *50, *100, *50,0.3]); -mods.nuclearcraft.crystallizer.addRecipe([*200, ]); +mods.nuclearcraft.crystallizer.addRecipe([*200, ,0.3]); // AssemblyTable.addRecipe("maketerbiumfrommix", , 10, []); mods.actuallyadditions.AtomicReconstructor.addRecipe(, , 1000); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making fermium -mods.nuclearcraft.centrifuge.addRecipe([*100, *50, *50, null, null]); +mods.nuclearcraft.centrifuge.addRecipe([*100, *50, *50, null, null,0.3]); -mods.nuclearcraft.crystallizer.addRecipe([*50, ]); +mods.nuclearcraft.crystallizer.addRecipe([*50, ,0.3]); -mods.nuclearcraft.crystallizer.addRecipe([*50, ]); +mods.nuclearcraft.crystallizer.addRecipe([*50, ,0.3]); recipes.addShapeless(, [, , @@ -475,9 +475,9 @@ recipes.addShapeless(, mods.nuclearcraft.fission.addRecipe([, , 32000.0, 400.0, 70.0, "fissioneinstenium", 0.8]); -mods.nuclearcraft.fuel_reprocessor.addRecipe([, *5, *5, *5, *15]); +mods.nuclearcraft.fuel_reprocessor.addRecipe([, *5, *5, *5, *15,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); recipes.addShapeless(, [, , @@ -489,11 +489,11 @@ recipes.addShapeless(, mods.techreborn.industrialGrinder.addRecipe(, *3, null, null, , null, *100, 30, 50); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making mendelevium -mods.nuclearcraft.irradiator.addRecipe([*10, *50, *100, null]); +mods.nuclearcraft.irradiator.addRecipe([*10, *50, *100, null,0.3]); // making oganesson @@ -520,14 +520,14 @@ recipes.addShapeless(, , ]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making nobelium mods.nuclearcraft.fission.addRecipe([, , 32000.0, 100.0, 101.0, "fissionfermium", 1.8]); -mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null]); +mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null,0.3]); recipes.addShapeless(, [, @@ -536,13 +536,13 @@ recipes.addShapeless(, mods.nuclearcraft.fission.addRecipe([, , 52000.0, 10.0, 10.0, "fissionfermiumamericium", 0.1]); -mods.nuclearcraft.fuel_reprocessor.addRecipe([, *2, *3, null, null]); +mods.nuclearcraft.fuel_reprocessor.addRecipe([, *2, *3, null, null,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making lawrencium -mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null]); +mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null,0.3]); recipes.addShapeless(, [, @@ -552,15 +552,15 @@ recipes.addShapeless(, mods.nuclearcraft.fission.addRecipe([, , 52000.0, 10.0, 999.0, "fissionlawrencium", 5.5]); -mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null]); +mods.nuclearcraft.fuel_reprocessor.addRecipe([, *4, null, null, null,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making dysprosium mods.thermalexpansion.Centrifuge.addRecipe([() % 70], , null, 2000); -mods.nuclearcraft.melter.addRecipe([, *50]); +mods.nuclearcraft.melter.addRecipe([, *50,0.3]); // making holmium @@ -569,7 +569,7 @@ recipes.addShaped(, [, , ], [, , ]]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making erbium @@ -578,21 +578,21 @@ recipes.addShaped(, [, , ], [, , ]]); -mods.nuclearcraft.manufactory.addRecipe([, ]); +mods.nuclearcraft.manufactory.addRecipe([, ,0.3]); -mods.nuclearcraft.manufactory.addRecipe([, ]); +mods.nuclearcraft.manufactory.addRecipe([, ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making thulium -mods.nuclearcraft.dissolver.addRecipe([, *69, *100]); +mods.nuclearcraft.dissolver.addRecipe([, *69, *100,0.3]); // making ytterbium mods.botania.ManaInfusion.addAlchemy(, , 5000); -mods.nuclearcraft.melter.addRecipe([, *72]); +mods.nuclearcraft.melter.addRecipe([, *72,0.3]); // making lutetium @@ -601,17 +601,17 @@ recipes.addShapeless(, , ]); -mods.nuclearcraft.melter.addRecipe([, *250]); +mods.nuclearcraft.melter.addRecipe([, *250,0.3]); // making darmstadtium -mods.nuclearcraft.isotope_separator.addRecipe([, , ]); +mods.nuclearcraft.isotope_separator.addRecipe([, , ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making roentgenium -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); mods.tconstruct.Melting.addRecipe( * 144,, 500); val roentgeniumaccelerator = RecipeBuilder.newBuilder("roentgeniumaccelerator","mythic_accelerator",40); @@ -622,9 +622,9 @@ roentgeniumaccelerator.build(); // making copernicium -mods.nuclearcraft.centrifuge.addRecipe([*144, *72, *72, null, null]); +mods.nuclearcraft.centrifuge.addRecipe([*144, *72, *72, null, null,0.3]); -mods.nuclearcraft.dissolver.addRecipe([, *50, *50]); +mods.nuclearcraft.dissolver.addRecipe([, *50, *50,0.3]); // making nihonium @@ -633,13 +633,13 @@ recipes.addShaped(, [, , ], [, , ]]); -mods.nuclearcraft.melter.addRecipe([, *50]); +mods.nuclearcraft.melter.addRecipe([, *50,0.3]); // making flerovium // see draconic infusion -mods.nuclearcraft.melter.addRecipe([, *250]); +mods.nuclearcraft.melter.addRecipe([, *250,0.3]); // making moscovium @@ -651,11 +651,11 @@ mods.extendedcrafting.TableCrafting.addShaped(, [, null, null, null, ], [, , , , ]]); -mods.nuclearcraft.alloy_furnace.addRecipe([, , ]); +mods.nuclearcraft.alloy_furnace.addRecipe([, , ,0.3]); mods.thermalexpansion.Centrifuge.addRecipe([ % 90, % 90, % 40, % 50], , null, 1000); -mods.nuclearcraft.melter.addRecipe([, *100]); +mods.nuclearcraft.melter.addRecipe([, *100,0.3]); // making livermorium @@ -663,19 +663,19 @@ recipes.addShapeless(, [.reuse(), ]); -mods.nuclearcraft.melter.addRecipe([, *40]); +mods.nuclearcraft.melter.addRecipe([, *40,0.3]); // making technetium -mods.nuclearcraft.melter.addRecipe([, *40]); +mods.nuclearcraft.melter.addRecipe([, *40,0.3]); -mods.nuclearcraft.alloy_furnace.addRecipe([, *2, ]); +mods.nuclearcraft.alloy_furnace.addRecipe([, *2, ,0.3]); -mods.nuclearcraft.melter.addRecipe([, *100]); +mods.nuclearcraft.melter.addRecipe([, *100,0.3]); -mods.nuclearcraft.chemical_reactor.addRecipe([*100, *100, *200, null]); +mods.nuclearcraft.chemical_reactor.addRecipe([*100, *100, *200, null,0.3]); -mods.nuclearcraft.crystallizer.addRecipe([*10, ]); +mods.nuclearcraft.crystallizer.addRecipe([*10, ,0.3]); // making tennessine @@ -706,17 +706,16 @@ furnace.addRecipe(, , 1.0); mods.thaumcraft.SmeltingBonus.addSmeltingBonus(, % 90); furnace.addRecipe(, , 1.0); -mods.nuclearcraft.melter.addRecipe([, *400]); +mods.nuclearcraft.melter.addRecipe([, *400,0.3]); // making meatballium -mods.nuclearcraft.melter.addRecipe([, *144]); +mods.nuclearcraft.melter.addRecipe([, *144,0.3]); // making hassium -mods.nuclearcraft.melter.addRecipe([, * 144]); +mods.nuclearcraft.melter.addRecipe([, * 144,0.3]); // making californium - diff --git a/scripts/RPKeletu.txt b/scripts/RPKeletu.txt new file mode 100644 index 00000000..0eda915f --- /dev/null +++ b/scripts/RPKeletu.txt @@ -0,0 +1,91 @@ + +mods.jei.JEI.addDescription([ + ], +[ + "将注魔爪这种方块放置在符文矩阵上方时，可实现神秘时代注魔配方的自动化。", + "", + "若供应有正确的源质与物品原料，向注魔爪发送红石信号即可启动注魔，效果等同于用法师护手点击符文矩阵。", + "", + "注意：注魔过程仍遵循不稳定度规则，若缺少正确的源质，注魔依然会失败。" +]); + + + + + + + + +# infusion claw +registerInfusionRecipeFromAddon(`${tcGado}:infusion_claw`, "INFUSION_CLAW", + , 32, + [ + * 120, * 70, * 70, + * 60, * 40 + ], + , + [ + , , + , , + , , + , + ] +); +# KAMI armor +registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_helm`, "TT_KAMIHELM", + , 32, + [ + * 150, * 125, * 125, + * 60, * 250, * 125 + ], + , + [ + , , , + , , , + .withTag({Potion: "minecraft:night_vision"}), , , + , , + ] +); +registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_chest`, "TT_KAMICHEST", + , 32, + [ + * 150, * 125, * 125, + * 125, * 250, * 60 + ], + , + [ + , , , + , , , + , , , + , , + ] +); +registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_legs`, "TT_KAMILEGS", + , 32, + [ + * 150, * 125, * 125, + * 125, * 250, * 60 + ], + , + [ + , , , + , , , + .withTag({Potion: "minecraft:fire_resistance"}), , , + , , + ] +); +registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_boots`, "TT_KAMIBOOTS", + , 32, + [ + * 150, * 125, * 125, + * 125, * 250, * 60, + * 60 + ], + , + [ + , , , + , , , + , , , + , , + ] +); \ No newline at end of file diff --git a/scripts/RecipeConflicts.zs b/scripts/RecipeConflicts.zs index 012a7ab3..59d38810 100644 --- a/scripts/RecipeConflicts.zs +++ b/scripts/RecipeConflicts.zs @@ -2533,25 +2533,25 @@ recipes.addShapeless(, recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShapeless(, -[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +[, , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShaped(*64, @@ -2727,4 +2727,4 @@ recipes.remove(); recipes.addShaped(*16, [[, , ], [, , ], -[, , ]]); +[, , ]]); \ No newline at end of file diff --git a/scripts/ThaumcraftGating.zs b/scripts/ThaumcraftGating.zs index 612eaa4f..f5c81f9f 100644 --- a/scripts/ThaumcraftGating.zs +++ b/scripts/ThaumcraftGating.zs @@ -1,6 +1,7 @@ import mods.modularmachinery.RecipeBuilder; import mods.thaumcraft.Infusion; import mods.thaumcraft.Crucible; +import mods.thaumcraft.ArcaneWorkbench; mods.thaumcraft.Crucible.registerRecipe("crucibledupeimpetus", "", *7, , [*10, *20, *5]); mods.thaumcraft.Crucible.registerRecipe("crucibledupeimpetus2", "", *15, , [*10, *20, *5]); @@ -118,22 +119,22 @@ mods.thaumcraft.Infusion.registerRecipe("infuseshimmerleaf", "", , [, , , ]); -recipes.addShaped(, +recipes.addShaped(, [[null, , null], -[, , ], +[, , ], [null, , null]]); -recipes.addShaped(, +recipes.addShaped(, [[null, , null], -[, , ], +[, , ], [null, , null]]); -recipes.addShaped(*2, +recipes.addShaped(*2, [[, , ], [, , ], [, , ]]); -recipes.addShaped(*2, +recipes.addShaped(*2, [[, , ], [, , ], [, , ]]); @@ -151,3 +152,35 @@ makefluxcontrolled.addFluxOutput(10.0); makefluxcontrolled.build(); +mods.thaumcraft.Infusion.registerRecipe("makekamiumblockinf", "", +, 6, +[*250, *125, *125], +, +[, , , ]); + + +mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe("makekamicloth", "", 20, +[*10, *10, *10, *10, *10, *10], +*3, +[[, , ], +[, , ], +[, , ]]); + + +recipes.addShapeless(*8, +[]); + +recipes.addShaped(, +[[, , ], +[, null, ], +[, , ]]); + +mods.storagedrawers.Compaction.add(, , 8); + + +mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe("makekamiingot", "", 5, +[*5, *5, *5, *5, *5, *5], +, +[[null, , null], +[, , ], +[null, , null]]); \ No newline at end of file diff --git a/scripts/TheGreatOreCleanse.zs b/scripts/TheGreatOreCleanse.zs index 5b67ec3e..8d11687b 100644 --- a/scripts/TheGreatOreCleanse.zs +++ b/scripts/TheGreatOreCleanse.zs @@ -899,20 +899,20 @@ recipes.addShapeless(, //================================================================== -// magnesium +// ichorium -val ichoriumingot = ; -ichoriumingot.remove(); +// val ichoriumingot = ; +// ichoriumingot.remove(); -val ichoriumnugget = ; -ichoriumnugget.remove(); +// val ichoriumnugget = ; +// ichoriumnugget.remove(); -mods.nuclearcraft.manufactory.removeRecipeWithInput([]); +// mods.nuclearcraft.manufactory.removeRecipeWithInput([]); -mods.nuclearcraft.melter.removeRecipeWithInput([]); -mods.nuclearcraft.melter.removeRecipeWithInput([]); +// mods.nuclearcraft.melter.removeRecipeWithInput([]); +// mods.nuclearcraft.melter.removeRecipeWithInput([]); -mods.nuclearcraft.pressurizer.removeRecipeWithInput([]); +// mods.nuclearcraft.pressurizer.removeRecipeWithInput([]); diff --git a/scripts/ToolTips.zs b/scripts/ToolTips.zs index 84855be2..5c68ca7a 100644 --- a/scripts/ToolTips.zs +++ b/scripts/ToolTips.zs @@ -1828,7 +1828,7 @@ .addTooltip(format.red("感谢Lashmak，智能输出端速度已被增强！")); -.addTooltip(format.red("在主世界底部左击基岩来进入基岩维度")); +// .addTooltip(format.red("在主世界底部左击基岩来进入基岩维度")); .addTooltip(format.red("树龙界的飞龙掉落")); .addTooltip(format.red("小概率自然生成，可在特定结构中发现 ;)")); diff --git a/scripts/ToolTips3.zs b/scripts/ToolTips3.zs index 020c1bee..dfabfcbb 100644 --- a/scripts/ToolTips3.zs +++ b/scripts/ToolTips3.zs @@ -191,9 +191,9 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("每破坏一个方块，获得10点采掘经验")); -.addTooltip(format.red("每破坏一个方块，获得100点采掘经验")); +// .addTooltip(format.red("每破坏一个方块，获得100点采掘经验")); -.addTooltip(format.red("每破坏一个方块，获得200点采掘经验")); +// .addTooltip(format.red("每破坏一个方块，获得200点采掘经验")); .addTooltip(format.red("每破坏一个方块，获得150点采掘经验")); @@ -267,6 +267,9 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("感谢NerdySpider绘制的纹理！")); .addTooltip(format.red("感谢NerdySpider绘制的纹理！")); .addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理！")); .addTooltip(format.red("感谢GalacticSilver绘制的纹理！")); .addTooltip(format.red("感谢GalacticSilver绘制的纹理！")); @@ -289,6 +292,24 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("首个物品通过英玫之门获得")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); +.addTooltip(format.red("注意：以该物品作为输入的多方块结构配方可能无法正常工作，你可以改用其瓶装版本")); + diff --git a/scripts/TrueTongue.zs b/scripts/TrueTongue.zs index fb9be6ee..9fc17b2b 100644 --- a/scripts/TrueTongue.zs +++ b/scripts/TrueTongue.zs @@ -80,9 +80,9 @@ recipes.addShapeless(.withTag({display: {Name: "ᚤᛟᛟᛠ [.reuse(), ]); -recipes.addShapeless(.withTag({display: {Name: "ᚵᛊᛠᛔᛟᚤᛕᛊᚧ",Lore:["§d§o真名§r"]}}), +recipes.addShapeless(.withTag({display: {Name: "ᚵᛊᛠᛔᛟᚤᛕᛊᚧ",Lore:["§d§o真名§r"]}}), [.reuse(), -]); +]); recipes.addShapeless(.withTag({display: {Name: "ᚵᛟᚣᚵᚣᚤᛊ",Lore:["§d§o真名§r"]}}), [.reuse(), diff --git a/scripts/thaumcraft/infusion/LateInfusionRecipes.zs b/scripts/thaumcraft/infusion/LateInfusionRecipes.zs index e61bfbf2..851b34d0 100644 --- a/scripts/thaumcraft/infusion/LateInfusionRecipes.zs +++ b/scripts/thaumcraft/infusion/LateInfusionRecipes.zs @@ -18,79 +18,7 @@ This is to keep the recipe available in the research page. var tcAdditions = "thaumadditions"; var tcTinkerer = "thaumictinkerer"; var tcGado = "gadothaumy"; -# infusion claw -registerInfusionRecipeFromAddon(`${tcGado}:infusion_claw`, "INFUSION_CLAW", - , 32, - [ - * 120, * 70, * 70, - * 60, * 40 - ], - , - [ - , , - , , - , , - , - ] -); -# KAMI armor -registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_helm`, "TT_KAMIHELM", - , 32, - [ - * 150, * 125, * 125, - * 60, * 250, * 125 - ], - , - [ - , , , - , , , - .withTag({Potion: "minecraft:night_vision"}), , , - , , - ] -); -registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_chest`, "TT_KAMICHEST", - , 32, - [ - * 150, * 125, * 125, - * 125, * 250, * 60 - ], - , - [ - , , , - , , , - , , , - , , - ] -); -registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_legs`, "TT_KAMILEGS", - , 32, - [ - * 150, * 125, * 125, - * 125, * 250, * 60 - ], - , - [ - , , , - , , , - .withTag({Potion: "minecraft:fire_resistance"}), , , - , , - ] -); -registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_boots`, "TT_KAMIBOOTS", - , 32, - [ - * 150, * 125, * 125, - * 125, * 250, * 60, - * 60 - ], - , - [ - , , , - , , , - , , , - , , - ] -); + # Fix crystal crusher in JEI registerInfusionRecipeFromAddon(`${tcAdditions}:crystal_crusher`, "TAR_CRYSTAL_CRUSHER", diff --git a/scripts/thaumicattempts.cfg b/scripts/thaumicattempts.cfg new file mode 100644 index 00000000..4868caa2 --- /dev/null +++ b/scripts/thaumicattempts.cfg @@ -0,0 +1,10 @@ +# Configuration file + +general { + # Enable custom model replacement for Thaumcraft Pillars. + B:"Enable Custom Pillar Model Replacement"=false + + # Should enable eldritch stone crafting recipe? + B:"Enable Eldritch Stone Recipe"=true +} +