diff --git a/pillar/structures/hardmode_undead_botanist.nbt b/pillar/structures/hardmode_undead_botanist.nbt index 5e106be7..37b31b86 100644 Binary files a/pillar/structures/hardmode_undead_botanist.nbt and b/pillar/structures/hardmode_undead_botanist.nbt differ diff --git a/scripts/AEGating.zs b/scripts/AEGating.zs index e653f8ba..102e9b54 100644 --- a/scripts/AEGating.zs +++ b/scripts/AEGating.zs @@ -1028,9 +1028,35 @@ recipes.addShapeless(, - - - +recipes.removeShaped(); +mods.extendedcrafting.TableCrafting.addShaped(, +[[, null, , null, ], +[null, null, , null, null], +[, , , , ], +[null, null, , null, null], +[, null, , null, ]]); + + +recipes.removeShaped(); +mods.extendedcrafting.TableCrafting.addShaped(, +[[, null, , null, ], +[null, null, , null, null], +[, , , , ], +[null, null, , null, null], +[, null, , null, ]]); + + +recipes.remove(); +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); + +recipes.remove(); +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); diff --git a/scripts/ArbiterMachinery.zs b/scripts/ArbiterMachinery.zs index 1cba1f32..f0843ea6 100644 --- a/scripts/ArbiterMachinery.zs +++ b/scripts/ArbiterMachinery.zs @@ -816,7 +816,7 @@ inffurnaceshardofshadesmar3.build(); val inffurnacefulfillshadesmar = RecipeBuilder.newBuilder("inffurnacefulfillshadesmar","infinity_furnace",40); inffurnacefulfillshadesmar.addFluidInput(*100); inffurnacefulfillshadesmar.addItemInput(*32); -inffurnacefulfillshadesmar.addItemInput(); +inffurnacefulfillshadesmar.addItemInput(); inffurnacefulfillshadesmar.addItemInput(*8); inffurnacefulfillshadesmar.addItemInput(*8); inffurnacefulfillshadesmar.addItemInput(*8); diff --git a/scripts/CustomItems2.zs b/scripts/CustomItems2.zs index 871eec1c..2e563b1f 100644 --- a/scripts/CustomItems2.zs +++ b/scripts/CustomItems2.zs @@ -4935,6 +4935,15 @@ purefluixgeode.maxStackSize = 64; purefluixgeode.beaconPayment = false; purefluixgeode.register(); +var supertranslucentcatalyzer = VanillaFactory.createItem("supertranslucent_catalyzer"); +supertranslucentcatalyzer.maxStackSize = 64; +supertranslucentcatalyzer.beaconPayment = false; +supertranslucentcatalyzer.register(); + +var crysteviageode = VanillaFactory.createItem("crystevia_geode"); +crysteviageode.maxStackSize = 64; +crysteviageode.beaconPayment = false; +crysteviageode.register(); diff --git a/scripts/Fuhai.zs b/scripts/Fuhai.zs index 7a6bef85..ff4e56b5 100644 --- a/scripts/Fuhai.zs +++ b/scripts/Fuhai.zs @@ -162,7 +162,7 @@ forgewyvascendedfluix4.build(); val infinitewishesrecipe = RecipeBuilder.newBuilder("infinitewishesrecipe","orb_of_infinite_wishes",40); infinitewishesrecipe.addEnergyPerTickInput(2000000000); -infinitewishesrecipe.addLifeEssenceInput(1000000, true); +infinitewishesrecipe.addLifeEssenceInput(1000000, false); infinitewishesrecipe.addWillInput("DEFAULT", 30,1,2000000); infinitewishesrecipe.addWillInput("CORROSIVE", 30,1,2000000); infinitewishesrecipe.addWillInput("DESTRUCTIVE", 30,1,2000000); diff --git a/scripts/ModularAstral.zs b/scripts/ModularAstral.zs index 39d71753..35d18443 100644 --- a/scripts/ModularAstral.zs +++ b/scripts/ModularAstral.zs @@ -497,4 +497,25 @@ ast33.addItemOutput(*5); ast33.build(); +val ast34 = RecipeBuilder.newBuilder("ast34","auto_astral_altar",1200); +ast34.addEnergyPerTickInput(1000); +ast34.addItemInput(*1); +ast34.addItemInput(*64); +ast34.addItemOutput(*16); +ast34.build(); + +val ast35 = RecipeBuilder.newBuilder("ast35","auto_astral_altar",1200); +ast35.addEnergyPerTickInput(1000); +ast35.addItemInput(*1); +ast35.addItemInput(*64); +ast35.addItemOutput(*32); +ast35.build(); + +val ast36 = RecipeBuilder.newBuilder("ast36","auto_astral_altar",1200); +ast36.addEnergyPerTickInput(1000); +ast36.addItemInput(*1); +ast36.addItemInput(*64); +ast36.addItemOutput(*64); +ast36.build(); + diff --git a/scripts/ModularBotania.zs b/scripts/ModularBotania.zs index 481d42a9..9b2fddd0 100644 --- a/scripts/ModularBotania.zs +++ b/scripts/ModularBotania.zs @@ -493,7 +493,6 @@ val bot48 = RecipeBuilder.newBuilder("bot48","gaia_altar",60); bot48.addEnergyPerTickInput(40000); bot48.addItemInput(*32); bot48.addItemInput(*1); -bot48.addItemInput(*1); bot48.addItemInput(*16); bot48.addItemOutput(*32); bot48.build(); diff --git a/scripts/ModularInfinityFurnace.zs b/scripts/ModularInfinityFurnace.zs index fe12de5f..aac7a04e 100644 --- a/scripts/ModularInfinityFurnace.zs +++ b/scripts/ModularInfinityFurnace.zs @@ -201,3 +201,11 @@ infinityfurnacedemantoid3.addItemInput(); infinityfurnacedemantoid3.addItemOutput(*4); infinityfurnacedemantoid3.build(); + +val infinityfurnacecursedslate2 = RecipeBuilder.newBuilder("infinityfurnacecursedslate2","infinity_furnace",10); +infinityfurnacecursedslate2.addFluidInput(*1); +infinityfurnacecursedslate2.addItemInput(*128); +infinityfurnacecursedslate2.addItemInput(*64); +infinityfurnacecursedslate2.addItemInput(*16); +infinityfurnacecursedslate2.addItemOutput(*4); +infinityfurnacecursedslate2.build(); \ No newline at end of file diff --git a/scripts/ModularMeteoricBefaller.zs b/scripts/ModularMeteoricBefaller.zs index 0a157c14..eddaebdc 100644 --- a/scripts/ModularMeteoricBefaller.zs +++ b/scripts/ModularMeteoricBefaller.zs @@ -308,6 +308,6 @@ val befaller12 = RecipeBuilder.newBuilder("befaller12","meteoric_befaller",100); befaller12.addBiomeInput("tardis:mountains"); befaller12.addFluidInput(*1000); befaller12.addItemInput(); -befaller12.addItemOutput(*64); +befaller12.addItemOutput(*320); befaller12.build(); diff --git a/scripts/ModularSolidFusion.zs b/scripts/ModularSolidFusion.zs index bfe0a1d3..59594dc8 100644 --- a/scripts/ModularSolidFusion.zs +++ b/scripts/ModularSolidFusion.zs @@ -287,6 +287,14 @@ bettersolidfusion11.addItemOutput(*6); bettersolidfusion11.build(); +val bettersolidfusion12 = RecipeBuilder.newBuilder("bettersolidfusion12","inertial_confinement_reactor",10); +bettersolidfusion12.addEnergyPerTickInput(1000000); +bettersolidfusion12.addItemInput(*4); +bettersolidfusion12.addItemInput(*4); +bettersolidfusion12.addItemOutput(*4); +bettersolidfusion12.build(); + + mods.extendedcrafting.TableCrafting.addShaped(, diff --git a/scripts/ModularVoidBranches.zs b/scripts/ModularVoidBranches.zs index 63b882bd..d0883260 100644 --- a/scripts/ModularVoidBranches.zs +++ b/scripts/ModularVoidBranches.zs @@ -1582,3 +1582,54 @@ moltenchaosentropic1.addItemInput(); moltenchaosentropic1.addFluidInput(*2000); moltenchaosentropic1.addFluidOutput(*250); moltenchaosentropic1.build(); + + + + + +val crystcryst1 = RecipeBuilder.newBuilder("crystcryst1","essentia_crystallizer",2); +crystcryst1.addItemInput(); +crystcryst1.addItemInput(); +crystcryst1.addItemOutput(*9); +crystcryst1.build(); + +val crystcryst2 = RecipeBuilder.newBuilder("crystcryst2","essentia_crystallizer",2); +crystcryst2.addItemInput(); +crystcryst2.addItemInput(); +crystcryst2.addItemOutput(*9); +crystcryst2.build(); + +val crystcryst3 = RecipeBuilder.newBuilder("crystcryst3","essentia_crystallizer",2); +crystcryst3.addItemInput(); +crystcryst3.addItemInput(); +crystcryst3.addItemOutput(*9); +crystcryst3.build(); + +val crystcryst4 = RecipeBuilder.newBuilder("crystcryst4","essentia_crystallizer",2); +crystcryst4.addItemInput(); +crystcryst4.addItemInput(); +crystcryst4.addItemOutput(*9); +crystcryst4.build(); + +val crystcryst5 = RecipeBuilder.newBuilder("crystcryst5","essentia_crystallizer",2); +crystcryst5.addItemInput(); +crystcryst5.addItemInput(); +crystcryst5.addItemOutput(*9); +crystcryst5.build(); + +val crystcryst6 = RecipeBuilder.newBuilder("crystcryst6","essentia_crystallizer",2); +crystcryst6.addItemInput(); +crystcryst6.addItemInput(); +crystcryst6.addItemOutput(*9); +crystcryst6.build(); + + + + +mods.nuclearcraft.dissolver.addRecipe([*4, *8000, *8000]); + +mods.nuclearcraft.dissolver.addRecipe([*4, *8000, *8000]); + +mods.nuclearcraft.dissolver.addRecipe([*4, *8000, *8000]); + +mods.nuclearcraft.dissolver.addRecipe([*16, *8000, *8000]); \ No newline at end of file diff --git a/scripts/ModularVoidMythical.zs b/scripts/ModularVoidMythical.zs index a9374f05..c7d6e121 100644 --- a/scripts/ModularVoidMythical.zs +++ b/scripts/ModularVoidMythical.zs @@ -1350,18 +1350,18 @@ mith16.addItemOutput(*50); mith16.setChance(0.8); mith16.addItemOutput(*50); mith16.setChance(0.8); -mith16.addItemOutput(*20); -mith16.setChance(0.3); -mith16.addItemOutput(*20); -mith16.setChance(0.3); -mith16.addItemOutput(*20); -mith16.setChance(0.3); -mith16.addItemOutput(*20); -mith16.setChance(0.3); -mith16.addItemOutput(*20); -mith16.setChance(0.3); -mith16.addItemOutput(*20); -mith16.setChance(0.3); +mith16.addItemOutput(*60); +mith16.setChance(0.9); +mith16.addItemOutput(*60); +mith16.setChance(0.9); +mith16.addItemOutput(*60); +mith16.setChance(0.9); +mith16.addItemOutput(*60); +mith16.setChance(0.9); +mith16.addItemOutput(*60); +mith16.setChance(0.9); +mith16.addItemOutput(*60); +mith16.setChance(0.9); mith16.addItemOutput(*60); mith16.setChance(0.9); mith16.addItemOutput(*60); @@ -1376,6 +1376,8 @@ mith16.addItemOutput(*60); mith16.setChance(0.9); mith16.addItemOutput(*10); mith16.setChance(0.3); +mith16.addItemOutput(*360); +mith16.setChance(0.9); mith16.addItemOutput(*3); mith16.setChance(0.2); mith16.addItemOutput(); diff --git a/scripts/MythicProcessorArkencrusher.zs b/scripts/MythicProcessorArkencrusher.zs index 25f60245..a7f03463 100644 --- a/scripts/MythicProcessorArkencrusher.zs +++ b/scripts/MythicProcessorArkencrusher.zs @@ -353,3 +353,27 @@ mytharken33.addItemInput(*64); mytharken33.addItemOutput(*4096); mytharken33.build(); + + +val mytharken34 = RecipeBuilder.newBuilder("mytharken34","mythic_processor_arkencrusher",2); +mytharken34.addEnergyPerTickInput(1000000); +mytharken34.addFluidInput(*50); +mytharken34.addItemInput(); +mytharken34.addItemOutput(*16); +mytharken34.addItemOutput(*16); +mytharken34.addItemOutput(*16); +mytharken34.addItemOutput(*16); +mytharken34.addFluidOutput(*50); +mytharken34.build(); + + +val mytharken35 = RecipeBuilder.newBuilder("mytharken35","mythic_processor_arkencrusher",2); +mytharken35.addEnergyPerTickInput(1000000); +mytharken35.addFluidInput(*10); +mytharken35.addItemInput(); +mytharken35.addItemOutput(*32); +mytharken35.addItemOutput(*32); +mytharken35.addItemOutput(*32); +mytharken35.addItemOutput(*32); +mytharken35.addFluidOutput(*100); +mytharken35.build(); \ No newline at end of file diff --git a/scripts/MythicProcessorFurnace.zs b/scripts/MythicProcessorFurnace.zs index e427391d..dc316b90 100644 --- a/scripts/MythicProcessorFurnace.zs +++ b/scripts/MythicProcessorFurnace.zs @@ -16,7 +16,7 @@ mythfurn2.addItemInput(); mythfurn2.addItemInput(*3); mythfurn2.addItemInput(); mythfurn2.addItemInput(); -mythfurn2.addItemInput(*6); +mythfurn2.addItemInput(*6); mythfurn2.addItemOutput(*12); mythfurn2.build(); @@ -51,4 +51,3 @@ mythfurn7.addItemOutput(); mythfurn7.build(); - diff --git a/scripts/MythicProcessorTransfuser.zs b/scripts/MythicProcessorTransfuser.zs index eb194610..487a1384 100644 --- a/scripts/MythicProcessorTransfuser.zs +++ b/scripts/MythicProcessorTransfuser.zs @@ -2107,7 +2107,7 @@ mythenrich22.build(); val mythenrich23 = RecipeBuilder.newBuilder("mythenrich23","mythic_processor_infuser",2); mythenrich23.addEnergyPerTickInput(1000000); -mythenrich23.addItemInput(*1); +mythenrich23.addItemInput(*4); mythenrich23.addFluidInput(*2000); mythenrich23.addFluidOutput(*2000); mythenrich23.build(); @@ -2214,3 +2214,9 @@ mythenrich59.addFluidOutput(*10000); mythenrich59.build(); +val mythenrich60 = RecipeBuilder.newBuilder("mythenrich60","mythic_processor_infuser",2); +mythenrich60.addEnergyPerTickInput(1000000); +mythenrich60.addItemInput(); +mythenrich60.addFluidInput(*144); +mythenrich60.addFluidOutput(*144); +mythenrich60.build(); \ No newline at end of file diff --git a/scripts/ToolTips.zs b/scripts/ToolTips.zs index 500ebcb4..84d36323 100644 --- a/scripts/ToolTips.zs +++ b/scripts/ToolTips.zs @@ -2478,7 +2478,6 @@ .addTooltip(format.red("站在一个塞德娜金属稳定器上")); -.addTooltip(format.red("通过完全生长的塔迪斯珊瑚获得")); .addTooltip(format.red("预览中只显示了4个方块,但实际上有19个")); diff --git a/scripts/ToolTips2.zs b/scripts/ToolTips2.zs index 87366a74..ff738cbe 100644 --- a/scripts/ToolTips2.zs +++ b/scripts/ToolTips2.zs @@ -1975,10 +1975,6 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("Paronity和Kherune非常喜欢自动合成")); -.addTooltip(format.red("警告:放置该物品将导致卡顿,离基地远点")); -.addTooltip(format.red("推荐在第一次进入塔迪斯之后,立即转用其他传送手段")); - -.addTooltip(format.red("放置在草方块上,等待一些MC日以让其生长")); .addTooltip(format.red("可施加超限附魔")); diff --git a/scripts/ToolTips3.zs b/scripts/ToolTips3.zs index 69bcb4be..7359d4d7 100644 --- a/scripts/ToolTips3.zs +++ b/scripts/ToolTips3.zs @@ -81,6 +81,7 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("Morph & Shinko (团队)")); .addTooltip(format.red("Origami10004 & _TheOrangeJuice_ (团队)")); .addTooltip(format.red("alltheanova & Randomism (团队)")); +.addTooltip(format.red("Ariel_Shigure (单人)")); .addTooltip(format.red("达成永恒荣耀的玩家:")); diff --git a/scripts/ToolTipsRevamped1.zs b/scripts/ToolTipsRevamped1.zs index b21af087..23cd8262 100644 --- a/scripts/ToolTipsRevamped1.zs +++ b/scripts/ToolTipsRevamped1.zs @@ -28,6 +28,24 @@ .addTooltip(format.green("致谢和梗")); +.addTooltip(format.gold("使用:")); +.addTooltip(format.yellow(" 放置在草方块上,等待一些MC日以让其生长(可用时间之瓶加速)")); +.addTooltip(format.darkRed("警告:")); +.addTooltip(format.red(" 放置该物品将导致掉帧,离基地远点")); +.addTooltip(format.white("------------------")); +.addTooltip(format.green("达成永恒荣耀的玩家:")); +.addTooltip(format.green("< ᛊᚢᛉᛗᛞ > (单人)")); + + +.addTooltip(format.darkAqua("获取:")); +.addTooltip(format.aqua(" 通过完全生长的塔迪斯珊瑚获得")); +.addTooltip(format.white("------------------")); +.addTooltip(format.green("致那些意志足够坚定——或者说疯得足够彻底——到达此处的人们:恭喜,你们做到了!这一刻属于你们。不过话说回来,再见,谢谢所有的……平衡外壳?")); +.addTooltip(format.green(" - < ᛊᚢᛉᛗᛞ >")); + + + + .addTooltip(format.darkAqua("谜题:")); .addTooltip(format.aqua(" 有巨大黑曜石的地方,……脸"));