From 9d084d5cf6ef89fa18a0b633c36bc3f4f45b17c0 Mon Sep 17 00:00:00 2001 From: ZHAY10086 Date: Tue, 17 Mar 2026 09:38:29 +0800 Subject: [PATCH] hotfix4 --- config/betterquesting.cfg | 2 +- config/defaultoptions/keybindings.txt | 2 +- .../mythic_processor_chemical_reactor.json | 4 +- config/teamreborn/configData.nbt | Bin 42432 -> 42432 bytes scripts/AEGating.zs | 15 ++ scripts/AOAGating.zs | 4 + scripts/ArbiterMachinery.zs | 7 + scripts/Gallifrey.zs | 7 +- scripts/MythicProcessorCentrifuge.zs | 2 +- scripts/MythicProcessorChemicalRector.zs | 6 + scripts/MythicProcessorTransfuser.zs | 227 ++---------------- scripts/ToolTips2.zs | 2 +- scripts/Trinitas.zs | 24 +- scripts/mixin/ApiaryBonkHand.zs | 36 --- scripts/mixin/ApiaryBonkHandTooltip.zs | 5 - 15 files changed, 76 insertions(+), 267 deletions(-) delete mode 100644 scripts/mixin/ApiaryBonkHand.zs delete mode 100644 scripts/mixin/ApiaryBonkHandTooltip.zs diff --git a/config/betterquesting.cfg b/config/betterquesting.cfg index 7780a234..fd8fbca1 100644 --- a/config/betterquesting.cfg +++ b/config/betterquesting.cfg @@ -29,7 +29,7 @@ general { S:"Scroll Speed Multiplier"=1.0 # If true, skip the home GUI and open quests at startup. This property will be changed by the mod itself. [default: false] - B:"Skip Home"=true + B:"Skip Home"=false # If true, then the player will spawn with a Quest Book when they first join the world [default: true] B:"Spawn with Quest Book"=true diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index 164d8ca3..9eaaf914 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -121,7 +121,7 @@ key_key.dankstorage.void:0:NONE key_key.dankstorage.construction:0:NONE key_key.xtones.scroll:42:NONE key_smoothfont.key.guiOpen:199:NONE -key_key.jei.toggleOverlay:24:CONTROL +key_key.jei.toggleOverlay:0:NONE key_key.jei.focusSearch:33:NONE key_key.jei.toggleCheatMode:0:NONE key_key.jei.toggleEditMode:0:NONE diff --git a/config/modularmachinery/machinery/mythic_processor_chemical_reactor.json b/config/modularmachinery/machinery/mythic_processor_chemical_reactor.json index 1c935173..9ff63c65 100644 --- a/config/modularmachinery/machinery/mythic_processor_chemical_reactor.json +++ b/config/modularmachinery/machinery/mythic_processor_chemical_reactor.json @@ -733,7 +733,7 @@ "y": 0, "z": 4, "elements": [ - "modularmachinery:blockenergyinputhatch@3" + "modularmachinery:blockenergyinputhatch" ] }, { @@ -789,7 +789,7 @@ "y": 4, "z": 0, "elements": [ - "nuclearcraft:chemical_reactor_idle@5" + "nuclearcraft:chemical_reactor_idle" ] }, { diff --git a/config/teamreborn/configData.nbt b/config/teamreborn/configData.nbt index 7f25833203ffefe1031b2e330d4f754a80604ce1..22296f3fe8f59494e8b249be18e54bb667d0b8b4 100644 GIT binary patch delta 7312 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, [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.removeShaped(); +mods.extendedcrafting.TableCrafting.addShaped(, +[[, null, , null, ], +[null, null, , null, null], +[, , , , ], +[null, null, , null, null], +[, null, , null, ]]); val divcombinacceptor1 = RecipeBuilder.newBuilder("divcombinacceptor1","divine_combiner",2); diff --git a/scripts/AOAGating.zs b/scripts/AOAGating.zs index 65ea4c5d..b26ac1d0 100644 --- a/scripts/AOAGating.zs +++ b/scripts/AOAGating.zs @@ -240,3 +240,7 @@ recipes.addShaped(, [, , ], [, , ]]); +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); \ No newline at end of file diff --git a/scripts/ArbiterMachinery.zs b/scripts/ArbiterMachinery.zs index 5587c6f7..f25d0e8f 100644 --- a/scripts/ArbiterMachinery.zs +++ b/scripts/ArbiterMachinery.zs @@ -725,6 +725,13 @@ inffurnaceshardofshadesmar.addItemInput(); inffurnaceshardofshadesmar.build(); + + + +mods.nuclearcraft.dissolver.addRecipe([, *1000, *1000]); + + + val inffurnaceshardofshadesmar2 = RecipeBuilder.newBuilder("inffurnaceshardofshadesmar2","infinity_furnace",40); inffurnaceshardofshadesmar2.addFluidInput(*100); inffurnaceshardofshadesmar2.addItemInput(); diff --git a/scripts/Gallifrey.zs b/scripts/Gallifrey.zs index 251992f3..ee12dccd 100644 --- a/scripts/Gallifrey.zs +++ b/scripts/Gallifrey.zs @@ -228,12 +228,7 @@ fractallitefurnacehyperuranion.addItemInput(); fractallitefurnacehyperuranion.build(); -val fractallitefurnacehyperuranion2 = RecipeBuilder.newBuilder("fractallitefurnacehyperuranion2","fractallite_furnace",2); -fractallitefurnacehyperuranion2.addFluidInput(*10); -fractallitefurnacehyperuranion2.addItemInput(); -fractallitefurnacehyperuranion2.addItemInput(); -fractallitefurnacehyperuranion2.addItemOutput(); -fractallitefurnacehyperuranion2.build(); + val fractallitefurnacehyperuranion3 = RecipeBuilder.newBuilder("fractallitefurnacehyperuranion3","fractallite_furnace",2); fractallitefurnacehyperuranion3.addFluidInput(*10); diff --git a/scripts/MythicProcessorCentrifuge.zs b/scripts/MythicProcessorCentrifuge.zs index 6fdfd36d..e220a203 100644 --- a/scripts/MythicProcessorCentrifuge.zs +++ b/scripts/MythicProcessorCentrifuge.zs @@ -36,7 +36,7 @@ val mythproccentsep34 = RecipeBuilder.newBuilder("mythproccentsep34","mythic_pro val mythproccentsep35 = RecipeBuilder.newBuilder("mythproccentsep35","mythic_processor_centrifuge",2); mythproccentsep35.addEnergyPerTickInput(70000); mythproccentsep35.addItemInput(); mythproccentsep35.addItemOutput(); mythproccentsep35.addItemOutput(); mythproccentsep35.addItemOutput(); mythproccentsep35.addItemOutput(); mythproccentsep35.build(); val mythproccentsep37 = RecipeBuilder.newBuilder("mythproccentsep37","mythic_processor_centrifuge",2); mythproccentsep37.addEnergyPerTickInput(70000); mythproccentsep37.addItemInput(); mythproccentsep37.addItemOutput(); mythproccentsep37.addItemOutput(); mythproccentsep37.addItemOutput(); mythproccentsep37.addItemOutput(); mythproccentsep37.build(); val mythproccentsep38 = RecipeBuilder.newBuilder("mythproccentsep38","mythic_processor_centrifuge",2); mythproccentsep38.addEnergyPerTickInput(70000); mythproccentsep38.addItemInput(); mythproccentsep38.addItemOutput(*20); mythproccentsep38.addItemOutput(*20); mythproccentsep38.addItemOutput(*64); mythproccentsep38.addItemOutput(); mythproccentsep38.build(); -val mythproccentsep39 = RecipeBuilder.newBuilder("mythproccentsep39","mythic_processor_centrifuge",2); mythproccentsep39.addEnergyPerTickInput(70000); mythproccentsep39.addItemInput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.build(); +val mythproccentsep39 = RecipeBuilder.newBuilder("mythproccentsep39","mythic_processor_centrifuge",2); mythproccentsep39.addEnergyPerTickInput(70000); mythproccentsep39.addItemInput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.addItemOutput(); mythproccentsep39.build(); val mythproccentsep40 = RecipeBuilder.newBuilder("mythproccentsep40","mythic_processor_centrifuge",2); mythproccentsep40.addEnergyPerTickInput(70000); mythproccentsep40.addItemInput(); mythproccentsep40.addItemOutput(); mythproccentsep40.addItemOutput(); mythproccentsep40.addItemOutput(); mythproccentsep40.addItemOutput(); mythproccentsep40.build(); val mythproccentsep41 = RecipeBuilder.newBuilder("mythproccentsep41","mythic_processor_centrifuge",2); mythproccentsep41.addEnergyPerTickInput(70000); mythproccentsep41.addItemInput(); mythproccentsep41.addItemOutput(); mythproccentsep41.addItemOutput(); mythproccentsep41.addItemOutput(); mythproccentsep41.addItemOutput(); mythproccentsep41.build(); val mythproccentsep42 = RecipeBuilder.newBuilder("mythproccentsep42","mythic_processor_centrifuge",2); mythproccentsep42.addEnergyPerTickInput(70000); mythproccentsep42.addItemInput(); mythproccentsep42.addItemOutput(); mythproccentsep42.addItemOutput(); mythproccentsep42.addItemOutput(); mythproccentsep42.addItemOutput(); mythproccentsep42.build(); diff --git a/scripts/MythicProcessorChemicalRector.zs b/scripts/MythicProcessorChemicalRector.zs index c5b325c0..152b7040 100644 --- a/scripts/MythicProcessorChemicalRector.zs +++ b/scripts/MythicProcessorChemicalRector.zs @@ -719,3 +719,9 @@ mithchemreac96.addFluidInput(*1000); mithchemreac96.addFluidOutput(*1000); mithchemreac96.build(); +val mithchemreac97 = RecipeBuilder.newBuilder("mithchemreac97","mythic_processor_chemical_reactor",2); +mithchemreac97.addEnergyPerTickInput(200000); +mithchemreac97.addFluidInput(*1000); +mithchemreac97.addFluidInput(*12); +mithchemreac97.addFluidOutput(*1000); +mithchemreac97.build(); diff --git a/scripts/MythicProcessorTransfuser.zs b/scripts/MythicProcessorTransfuser.zs index a2da5a55..8da4534c 100644 --- a/scripts/MythicProcessorTransfuser.zs +++ b/scripts/MythicProcessorTransfuser.zs @@ -443,7 +443,7 @@ mythinfus61.build(); val mythinfus62 = RecipeBuilder.newBuilder("mythinfus62","mythic_processor_infuser",2); mythinfus62.addEnergyPerTickInput(1000000); mythinfus62.addFluidInput(*10000); -mythinfus62.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus62.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus62.setChance(0.0); mythinfus62.addItemInput(*10); mythinfus62.addItemOutput(*20); @@ -452,7 +452,7 @@ mythinfus62.build(); val mythinfus62a = RecipeBuilder.newBuilder("mythinfus62a","mythic_processor_infuser",2); mythinfus62a.addEnergyPerTickInput(1000000); mythinfus62a.addFluidInput(*50000); -mythinfus62a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus62a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus62a.setChance(0.0); mythinfus62a.addItemInput(*100); mythinfus62a.addItemOutput(*200); @@ -461,7 +461,7 @@ mythinfus62a.build(); val mythinfus62b = RecipeBuilder.newBuilder("mythinfus62b","mythic_processor_infuser",2); mythinfus62b.addEnergyPerTickInput(1000000); mythinfus62b.addFluidInput(*100000); -mythinfus62b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus62b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus62b.setChance(0.0); mythinfus62b.addItemInput(*1000); mythinfus62b.addItemOutput(*2000); @@ -470,7 +470,7 @@ mythinfus62b.build(); val mythinfus63 = RecipeBuilder.newBuilder("mythinfus63","mythic_processor_infuser",2); mythinfus63.addEnergyPerTickInput(1000000); mythinfus63.addFluidInput(*10000); -mythinfus63.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus63.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus63.setChance(0.0); mythinfus63.addItemInput(*10); mythinfus63.addItemOutput(*30); @@ -479,7 +479,7 @@ mythinfus63.build(); val mythinfus63a = RecipeBuilder.newBuilder("mythinfus63a","mythic_processor_infuser",2); mythinfus63a.addEnergyPerTickInput(1000000); mythinfus63a.addFluidInput(*50000); -mythinfus63a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus63a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus63a.setChance(0.0); mythinfus63a.addItemInput(*100); mythinfus63a.addItemOutput(*300); @@ -488,7 +488,7 @@ mythinfus63a.build(); val mythinfus63b = RecipeBuilder.newBuilder("mythinfus63b","mythic_processor_infuser",2); mythinfus63b.addEnergyPerTickInput(1000000); mythinfus63b.addFluidInput(*100000); -mythinfus63b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus63b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus63b.setChance(0.0); mythinfus63b.addItemInput(*1000); mythinfus63b.addItemOutput(*3000); @@ -497,7 +497,7 @@ mythinfus63b.build(); val mythinfus64 = RecipeBuilder.newBuilder("mythinfus64","mythic_processor_infuser",2); mythinfus64.addEnergyPerTickInput(1000000); mythinfus64.addFluidInput(*10000); -mythinfus64.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus64.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus64.setChance(0.0); mythinfus64.addItemInput(*10); mythinfus64.addItemOutput(*40); @@ -506,7 +506,7 @@ mythinfus64.build(); val mythinfus64a = RecipeBuilder.newBuilder("mythinfus64a","mythic_processor_infuser",2); mythinfus64a.addEnergyPerTickInput(1000000); mythinfus64a.addFluidInput(*50000); -mythinfus64a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus64a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus64a.setChance(0.0); mythinfus64a.addItemInput(*100); mythinfus64a.addItemOutput(*400); @@ -515,7 +515,7 @@ mythinfus64a.build(); val mythinfus64b = RecipeBuilder.newBuilder("mythinfus64b","mythic_processor_infuser",2); mythinfus64b.addEnergyPerTickInput(1000000); mythinfus64b.addFluidInput(*100000); -mythinfus64b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus64b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus64b.setChance(0.0); mythinfus64b.addItemInput(*1000); mythinfus64b.addItemOutput(*4000); @@ -524,7 +524,7 @@ mythinfus64b.build(); val mythinfus65 = RecipeBuilder.newBuilder("mythinfus65","mythic_processor_infuser",2); mythinfus65.addEnergyPerTickInput(1000000); mythinfus65.addFluidInput(*10000); -mythinfus65.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus65.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus65.setChance(0.0); mythinfus65.addItemInput(*10); mythinfus65.addItemOutput(*50); @@ -533,7 +533,7 @@ mythinfus65.build(); val mythinfus65a = RecipeBuilder.newBuilder("mythinfus65a","mythic_processor_infuser",2); mythinfus65a.addEnergyPerTickInput(1000000); mythinfus65a.addFluidInput(*50000); -mythinfus65a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus65a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus65a.setChance(0.0); mythinfus65a.addItemInput(*100); mythinfus65a.addItemOutput(*500); @@ -542,7 +542,7 @@ mythinfus65a.build(); val mythinfus65b = RecipeBuilder.newBuilder("mythinfus65b","mythic_processor_infuser",2); mythinfus65b.addEnergyPerTickInput(1000000); mythinfus65b.addFluidInput(*100000); -mythinfus65b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus65b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus65b.setChance(0.0); mythinfus65b.addItemInput(*1000); mythinfus65b.addItemOutput(*5000); @@ -551,7 +551,7 @@ mythinfus65b.build(); val mythinfus66 = RecipeBuilder.newBuilder("mythinfus66","mythic_processor_infuser",2); mythinfus66.addEnergyPerTickInput(1000000); mythinfus66.addFluidInput(*10000); -mythinfus66.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus66.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus66.setChance(0.0); mythinfus66.addItemInput(*10); mythinfus66.addItemOutput(*60); @@ -560,7 +560,7 @@ mythinfus66.build(); val mythinfus66a = RecipeBuilder.newBuilder("mythinfus66a","mythic_processor_infuser",2); mythinfus66a.addEnergyPerTickInput(1000000); mythinfus66a.addFluidInput(*50000); -mythinfus66a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus66a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus66a.setChance(0.0); mythinfus66a.addItemInput(*100); mythinfus66a.addItemOutput(*600); @@ -569,7 +569,7 @@ mythinfus66a.build(); val mythinfus66b = RecipeBuilder.newBuilder("mythinfus66b","mythic_processor_infuser",2); mythinfus66b.addEnergyPerTickInput(1000000); mythinfus66b.addFluidInput(*100000); -mythinfus66b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus66b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus66b.setChance(0.0); mythinfus66b.addItemInput(*1000); mythinfus66b.addItemOutput(*6000); @@ -578,7 +578,7 @@ mythinfus66b.build(); val mythinfus67 = RecipeBuilder.newBuilder("mythinfus67","mythic_processor_infuser",2); mythinfus67.addEnergyPerTickInput(1000000); mythinfus67.addFluidInput(*10000); -mythinfus67.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus67.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus67.setChance(0.0); mythinfus67.addItemInput(*10); mythinfus67.addItemOutput(*70); @@ -587,7 +587,7 @@ mythinfus67.build(); val mythinfus67a = RecipeBuilder.newBuilder("mythinfus67a","mythic_processor_infuser",2); mythinfus67a.addEnergyPerTickInput(1000000); mythinfus67a.addFluidInput(*50000); -mythinfus67a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus67a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus67a.setChance(0.0); mythinfus67a.addItemInput(*100); mythinfus67a.addItemOutput(*700); @@ -596,7 +596,7 @@ mythinfus67a.build(); val mythinfus67b = RecipeBuilder.newBuilder("mythinfus67b","mythic_processor_infuser",2); mythinfus67b.addEnergyPerTickInput(1000000); mythinfus67b.addFluidInput(*100000); -mythinfus67b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus67b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus67b.setChance(0.0); mythinfus67b.addItemInput(*1000); mythinfus67b.addItemOutput(*7000); @@ -605,7 +605,7 @@ mythinfus67b.build(); val mythinfus68 = RecipeBuilder.newBuilder("mythinfus68","mythic_processor_infuser",2); mythinfus68.addEnergyPerTickInput(1000000); mythinfus68.addFluidInput(*10000); -mythinfus68.addItemInput(.withTag({display: {Lore: ["§d§M模式 1§r"]}})); +mythinfus68.addItemInput(.withTag({display: {Lore: ["§d§MMode 1§r"]}})); mythinfus68.setChance(0.0); mythinfus68.addItemInput(*10); mythinfus68.addItemOutput(*80); @@ -614,7 +614,7 @@ mythinfus68.build(); val mythinfus68a = RecipeBuilder.newBuilder("mythinfus68a","mythic_processor_infuser",2); mythinfus68a.addEnergyPerTickInput(1000000); mythinfus68a.addFluidInput(*50000); -mythinfus68a.addItemInput(.withTag({display: {Lore: ["§d§M模式 2§r"]}})); +mythinfus68a.addItemInput(.withTag({display: {Lore: ["§d§MMode 2§r"]}})); mythinfus68a.setChance(0.0); mythinfus68a.addItemInput(*100); mythinfus68a.addItemOutput(*800); @@ -623,7 +623,7 @@ mythinfus68a.build(); val mythinfus68b = RecipeBuilder.newBuilder("mythinfus68b","mythic_processor_infuser",2); mythinfus68b.addEnergyPerTickInput(1000000); mythinfus68b.addFluidInput(*100000); -mythinfus68b.addItemInput(.withTag({display: {Lore: ["§d§M模式 3§r"]}})); +mythinfus68b.addItemInput(.withTag({display: {Lore: ["§d§MMode 3§r"]}})); mythinfus68b.setChance(0.0); mythinfus68b.addItemInput(*1000); mythinfus68b.addItemOutput(*8000); @@ -632,7 +632,7 @@ mythinfus68b.build(); val mythinfus68c = RecipeBuilder.newBuilder("mythinfus68c","mythic_processor_infuser",2); mythinfus68c.addEnergyPerTickInput(1000000); mythinfus68c.addFluidInput(*200000); -mythinfus68c.addItemInput(.withTag({display: {Lore: ["§d§M模式 4§r"]}})); +mythinfus68c.addItemInput(.withTag({display: {Lore: ["§d§MMode 4§r"]}})); mythinfus68c.setChance(0.0); mythinfus68c.addItemInput(*10000); mythinfus68c.addItemOutput(*80000); @@ -641,7 +641,7 @@ mythinfus68c.build(); val mythinfus68d = RecipeBuilder.newBuilder("mythinfus68d","mythic_processor_infuser",2); mythinfus68d.addEnergyPerTickInput(1000000); mythinfus68d.addFluidInput(*400000); -mythinfus68d.addItemInput(.withTag({display: {Lore: ["§d§M模式 5§r"]}})); +mythinfus68d.addItemInput(.withTag({display: {Lore: ["§d§MMode 5§r"]}})); mythinfus68d.setChance(0.0); mythinfus68d.addItemInput(*100000); mythinfus68d.addItemOutput(*800000); @@ -1863,8 +1863,8 @@ val mythenrich25 = RecipeBuilder.newBuilder("mythenrich25","mythic_processor_inf mythenrich25.addEnergyPerTickInput(1000000); mythenrich25.addItemInput(*1); mythenrich25.addItemInput(*1); -mythenrich25.addFluidInput(*100000); -mythenrich25.addFluidOutput(*100000); +mythenrich25.addFluidInput(*400000); +mythenrich25.addFluidOutput(*400000); mythenrich25.build(); val mythenrich26 = RecipeBuilder.newBuilder("mythenrich26","mythic_processor_infuser",2); @@ -1931,159 +1931,6 @@ mythenrich34.addFluidInput(*1000); mythenrich34.addFluidOutput(*1000); mythenrich34.build(); -val mythenrich35 = RecipeBuilder.newBuilder("mythenrich35","mythic_processor_infuser",2); -mythenrich35.addEnergyPerTickInput(1000000); -mythenrich35.addItemInput(); -mythenrich35.addFluidInput(*1000); -mythenrich35.addFluidOutput(*1000); -mythenrich35.build(); - -val mythenrich36 = RecipeBuilder.newBuilder("mythenrich36","mythic_processor_infuser",2); -mythenrich36.addEnergyPerTickInput(1000000); -mythenrich36.addItemInput(); -mythenrich36.addFluidInput(*1000); -mythenrich36.addFluidOutput(*1000); -mythenrich36.build(); - -val mythenrich37 = RecipeBuilder.newBuilder("mythenrich37","mythic_processor_infuser",2); -mythenrich37.addEnergyPerTickInput(1000000); -mythenrich37.addItemInput(); -mythenrich37.addFluidInput(*1000); -mythenrich37.addFluidOutput(*1000); -mythenrich37.build(); - -val mythenrich38 = RecipeBuilder.newBuilder("mythenrich38","mythic_processor_infuser",2); -mythenrich38.addEnergyPerTickInput(1000000); -mythenrich38.addItemInput(); -mythenrich38.addFluidInput(*1000); -mythenrich38.addFluidOutput(*1000); -mythenrich38.build(); - -val mythenrich39 = RecipeBuilder.newBuilder("mythenrich39","mythic_processor_infuser",2); -mythenrich39.addEnergyPerTickInput(1000000); -mythenrich39.addItemInput(); -mythenrich39.addFluidInput(*1000); -mythenrich39.addFluidOutput(*1000); -mythenrich39.build(); - -val mythenrich40 = RecipeBuilder.newBuilder("mythenrich40","mythic_processor_infuser",2); -mythenrich40.addEnergyPerTickInput(1000000); -mythenrich40.addItemInput(); -mythenrich40.addFluidInput(*1000); -mythenrich40.addFluidOutput(*1000); -mythenrich40.build(); - -val mythenrich41 = RecipeBuilder.newBuilder("mythenrich41","mythic_processor_infuser",2); -mythenrich41.addEnergyPerTickInput(1000000); -mythenrich41.addItemInput(); -mythenrich41.addFluidInput(*1000); -mythenrich41.addFluidOutput(*1000); -mythenrich41.build(); - -val mythenrich42 = RecipeBuilder.newBuilder("mythenrich42","mythic_processor_infuser",2); -mythenrich42.addEnergyPerTickInput(1000000); -mythenrich42.addItemInput(); -mythenrich42.addFluidInput(*1000); -mythenrich42.addFluidOutput(*1000); -mythenrich42.build(); - -val mythenrich43 = RecipeBuilder.newBuilder("mythenrich43","mythic_processor_infuser",2); -mythenrich43.addEnergyPerTickInput(1000000); -mythenrich43.addItemInput(); -mythenrich43.addFluidInput(*1000); -mythenrich43.addFluidOutput(*1000); -mythenrich43.build(); - -val mythenrich44 = RecipeBuilder.newBuilder("mythenrich44","mythic_processor_infuser",2); -mythenrich44.addEnergyPerTickInput(1000000); -mythenrich44.addItemInput(); -mythenrich44.addFluidInput(*1000); -mythenrich44.addFluidOutput(*1000); -mythenrich44.build(); - -val mythenrich45 = RecipeBuilder.newBuilder("mythenrich45","mythic_processor_infuser",2); -mythenrich45.addEnergyPerTickInput(1000000); -mythenrich45.addItemInput(); -mythenrich45.addFluidInput(*1000); -mythenrich45.addFluidOutput(*1000); -mythenrich45.build(); - -val mythenrich46 = RecipeBuilder.newBuilder("mythenrich46","mythic_processor_infuser",2); -mythenrich46.addEnergyPerTickInput(1000000); -mythenrich46.addItemInput(); -mythenrich46.addFluidInput(*1000); -mythenrich46.addFluidOutput(*1000); -mythenrich46.build(); - -val mythenrich47 = RecipeBuilder.newBuilder("mythenrich47","mythic_processor_infuser",2); -mythenrich47.addEnergyPerTickInput(1000000); -mythenrich47.addItemInput(); -mythenrich47.addFluidInput(*1000); -mythenrich47.addFluidOutput(*1000); -mythenrich47.build(); - -val mythenrich48 = RecipeBuilder.newBuilder("mythenrich48","mythic_processor_infuser",2); -mythenrich48.addEnergyPerTickInput(1000000); -mythenrich48.addItemInput(); -mythenrich48.addFluidInput(*1000); -mythenrich48.addFluidOutput(*1000); -mythenrich48.build(); - -val mythenrich49 = RecipeBuilder.newBuilder("mythenrich49","mythic_processor_infuser",2); -mythenrich49.addEnergyPerTickInput(1000000); -mythenrich49.addItemInput(); -mythenrich49.addFluidInput(*1000); -mythenrich49.addFluidOutput(*1000); -mythenrich49.build(); - -val mythenrich50 = RecipeBuilder.newBuilder("mythenrich50","mythic_processor_infuser",2); -mythenrich50.addEnergyPerTickInput(1000000); -mythenrich50.addItemInput(); -mythenrich50.addFluidInput(*1000); -mythenrich50.addFluidOutput(*1000); -mythenrich50.build(); - -val mythenrich51 = RecipeBuilder.newBuilder("mythenrich51","mythic_processor_infuser",2); -mythenrich51.addEnergyPerTickInput(1000000); -mythenrich51.addItemInput(); -mythenrich51.addFluidInput(*1000); -mythenrich51.addFluidOutput(*1000); -mythenrich51.build(); - -val mythenrich52 = RecipeBuilder.newBuilder("mythenrich52","mythic_processor_infuser",2); -mythenrich52.addEnergyPerTickInput(1000000); -mythenrich52.addItemInput(); -mythenrich52.addFluidInput(*1000); -mythenrich52.addFluidOutput(*1000); -mythenrich52.build(); - -val mythenrich53 = RecipeBuilder.newBuilder("mythenrich53","mythic_processor_infuser",2); -mythenrich53.addEnergyPerTickInput(1000000); -mythenrich53.addItemInput(*10); -mythenrich53.addFluidInput(*720); -mythenrich53.addFluidOutput(*1440); -mythenrich53.build(); - -val mythenrich54 = RecipeBuilder.newBuilder("mythenrich54","mythic_processor_infuser",2); -mythenrich54.addEnergyPerTickInput(1000000); -mythenrich54.addItemInput(*10); -mythenrich54.addFluidInput(*720); -mythenrich54.addFluidOutput(*1440); -mythenrich54.build(); - -val mythenrich55 = RecipeBuilder.newBuilder("mythenrich55","mythic_processor_infuser",2); -mythenrich55.addEnergyPerTickInput(1000000); -mythenrich55.addItemInput(*10); -mythenrich55.addFluidInput(*720); -mythenrich55.addFluidOutput(*1440); -mythenrich55.build(); - -val mythenrich56 = RecipeBuilder.newBuilder("mythenrich56","mythic_processor_infuser",2); -mythenrich56.addEnergyPerTickInput(1000000); -mythenrich56.addItemInput(*10); -mythenrich56.addFluidInput(*720); -mythenrich56.addFluidOutput(*1440); -mythenrich56.build(); val mythenrich57 = RecipeBuilder.newBuilder("mythenrich57","mythic_processor_infuser",2); mythenrich57.addEnergyPerTickInput(1000000); @@ -2099,28 +1946,4 @@ mythenrich58.addFluidInput(*1000); mythenrich58.addFluidOutput(*1000); mythenrich58.build(); -val mythenrich59 = RecipeBuilder.newBuilder("mythenrich59","mythic_processor_infuser",2); -mythenrich59.addEnergyPerTickInput(1000000); -mythenrich59.addItemInput(*10); -mythenrich59.addFluidInput(*20000); -mythenrich59.addFluidOutput(*40000); -mythenrich59.build(); - - -val mythenrich60 = RecipeBuilder.newBuilder("mythenrich60","mythic_processor_infuser",2); -mythenrich60.addEnergyPerTickInput(1000000); -mythenrich60.addItemInput(); -mythenrich60.addFluidInput(*144); -mythenrich60.addFluidOutput(*144); -mythenrich60.build(); - - -val mythenrich61 = RecipeBuilder.newBuilder("mythenrich61","mythic_processor_infuser",2); -mythenrich61.addEnergyPerTickInput(1000000); -mythenrich61.addItemInput(); -mythenrich61.addFluidInput(*1000); -mythenrich61.addFluidOutput(*1000); -mythenrich61.build(); - - diff --git a/scripts/ToolTips2.zs b/scripts/ToolTips2.zs index 916bc518..dbe1f842 100644 --- a/scripts/ToolTips2.zs +++ b/scripts/ToolTips2.zs @@ -312,7 +312,7 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.green("可重复使用")); -.addTooltip(format.red("使用末地种神话虚空资源采掘机来获取第一个，聚合配方实际无用（random51试过了）")); +.addTooltip(format.red("使用末地种神话虚空资源采掘机来获取第一个")); .addTooltip(format.red("在城堡内部使用冰晶雪原之杖以打开大门")); .addTooltip(format.green("可重复使用")); diff --git a/scripts/Trinitas.zs b/scripts/Trinitas.zs index 41dce9e4..95ed1a59 100644 --- a/scripts/Trinitas.zs +++ b/scripts/Trinitas.zs @@ -478,7 +478,7 @@ trinityingot4b.build(); val trinityingot5 = RecipeBuilder.newBuilder("trinityingot5","presbytery_of_the_threefold_love",3); trinityingot5.addFluidInput(*2000); -trinityingot5.addFluidInput(*5000); +trinityingot5.addFluidInput(*20000); trinityingot5.addItemInput(); trinityingot5.setChance(0.1); trinityingot5.addItemInput(); @@ -496,7 +496,7 @@ trinityingot5.build(); val trinityingot5a = RecipeBuilder.newBuilder("trinityingot5a","presbytery_of_the_threefold_love",3); trinityingot5a.addFluidInput(*2000); -trinityingot5a.addFluidInput(*5000); +trinityingot5a.addFluidInput(*20000); trinityingot5a.addItemInput(); trinityingot5a.setChance(0.1); trinityingot5a.addItemInput(*4); @@ -514,7 +514,7 @@ trinityingot5a.build(); val trinityingot5b = RecipeBuilder.newBuilder("trinityingot5b","presbytery_of_the_threefold_love",3); trinityingot5b.addFluidInput(*2000); -trinityingot5b.addFluidInput(*5000); +trinityingot5b.addFluidInput(*20000); trinityingot5b.addItemInput(); trinityingot5b.setChance(0.1); trinityingot5b.addItemInput(*16); @@ -533,7 +533,7 @@ trinityingot5b.build(); val trinityingot6 = RecipeBuilder.newBuilder("trinityingot6","presbytery_of_the_threefold_love",3); trinityingot6.addFluidInput(*1000); -trinityingot6.addFluidInput(*5000); +trinityingot6.addFluidInput(*20000); trinityingot6.addItemInput(); trinityingot6.setChance(0.05); trinityingot6.addItemInput(); @@ -551,7 +551,7 @@ trinityingot6.build(); val trinityingot6a = RecipeBuilder.newBuilder("trinityingot6a","presbytery_of_the_threefold_love",3); trinityingot6a.addFluidInput(*1000); -trinityingot6a.addFluidInput(*5000); +trinityingot6a.addFluidInput(*20000); trinityingot6a.addItemInput(); trinityingot6a.setChance(0.05); trinityingot6a.addItemInput(*4); @@ -569,7 +569,7 @@ trinityingot6a.build(); val trinityingot6b = RecipeBuilder.newBuilder("trinityingot6b","presbytery_of_the_threefold_love",3); trinityingot6b.addFluidInput(*1000); -trinityingot6b.addFluidInput(*5000); +trinityingot6b.addFluidInput(*20000); trinityingot6b.addItemInput(); trinityingot6b.setChance(0.05); trinityingot6b.addItemInput(*16); @@ -587,7 +587,7 @@ trinityingot6b.build(); val trinityingot7 = RecipeBuilder.newBuilder("trinityingot7","presbytery_of_the_threefold_love",3); trinityingot7.addFluidInput(*1000); -trinityingot7.addFluidInput(*5000); +trinityingot7.addFluidInput(*20000); trinityingot7.addItemInput(); trinityingot7.setChance(0.01); trinityingot7.addItemInput(); @@ -605,7 +605,7 @@ trinityingot7.build(); val trinityingot7a = RecipeBuilder.newBuilder("trinityingot7a","presbytery_of_the_threefold_love",3); trinityingot7a.addFluidInput(*1000); -trinityingot7a.addFluidInput(*5000); +trinityingot7a.addFluidInput(*20000); trinityingot7a.addItemInput(); trinityingot7a.setChance(0.01); trinityingot7a.addItemInput(*4); @@ -623,7 +623,7 @@ trinityingot7a.build(); val trinityingot7b = RecipeBuilder.newBuilder("trinityingot7b","presbytery_of_the_threefold_love",3); trinityingot7b.addFluidInput(*1000); -trinityingot7b.addFluidInput(*5000); +trinityingot7b.addFluidInput(*20000); trinityingot7b.addItemInput(); trinityingot7b.setChance(0.01); trinityingot7b.addItemInput(*16); @@ -643,7 +643,7 @@ trinityingot7b.build(); val trinityingot8 = RecipeBuilder.newBuilder("trinityingot9","presbytery_of_the_threefold_love",3); trinityingot8.addFluidInput(*1000); -trinityingot8.addFluidInput(*5000); +trinityingot8.addFluidInput(*20000); trinityingot8.addItemInput(); trinityingot8.setChance(0.001); trinityingot8.addItemInput(); @@ -661,7 +661,7 @@ trinityingot8.build(); val trinityingot8a = RecipeBuilder.newBuilder("trinityingot9a","presbytery_of_the_threefold_love",3); trinityingot8a.addFluidInput(*1000); -trinityingot8a.addFluidInput(*5000); +trinityingot8a.addFluidInput(*20000); trinityingot8a.addItemInput(); trinityingot8a.setChance(0.001); trinityingot8a.addItemInput(*4); @@ -680,7 +680,7 @@ trinityingot8a.build(); val trinityingot8b = RecipeBuilder.newBuilder("trinityingot9b","presbytery_of_the_threefold_love",3); trinityingot8b.addFluidInput(*1000); -trinityingot8b.addFluidInput(*5000); +trinityingot8b.addFluidInput(*20000); trinityingot8b.addItemInput(); trinityingot8b.setChance(0.001); trinityingot8b.addItemInput(*16); diff --git a/scripts/mixin/ApiaryBonkHand.zs b/scripts/mixin/ApiaryBonkHand.zs deleted file mode 100644 index adc3e7d1..00000000 --- a/scripts/mixin/ApiaryBonkHand.zs +++ /dev/null @@ -1,36 +0,0 @@ -#modloaded gendustry -#loader mixin - -import native.net.bdew.gendustry.machines.apiary.BlockApiary; -import native.net.bdew.gendustry.machines.apiary.TileApiary; -import native.forestry.api.apiculture.IBeekeepingLogic; - -import native.net.minecraft.entity.player.EntityPlayer; -import native.net.minecraft.item.ItemStack; -import native.net.minecraft.util.EnumHand; -import native.net.minecraft.util.text.TextComponentString; -import native.net.minecraft.util.math.BlockPos; -import native.net.minecraft.world.World; - - -// I hate Scala jars - -#mixin {targets: "net.bdew.gendustry.machines.apiary.BlockApiary$"} -zenClass ApiaryBonkMixin { - // SRG HEAD: Block#onBlockClicked -> func_180649_a (not mixin, as inherited) - function func_180649_a(worldIn as World, pos as BlockPos, playerIn as EntityPlayer) as void { - - val heldItem as ItemStack = playerIn.getHeldItem(EnumHand.MAIN_HAND); - if (!worldIn.isRemote && heldItem.isEmpty()) { - // Bonk action: refresh apiary - val tile as TileApiary = worldIn.getTileEntity(pos) as TileApiary; - val logic as IBeekeepingLogic = tile.getBeekeepingLogic(); - logic.clearCachedValues(); - - // Chat message - val message as TextComponentString = TextComponentString("§a铛！蜂箱鲜花已更新。"); - playerIn.sendStatusMessage(message, true); - } - } -} - diff --git a/scripts/mixin/ApiaryBonkHandTooltip.zs b/scripts/mixin/ApiaryBonkHandTooltip.zs deleted file mode 100644 index e19e29cf..00000000 --- a/scripts/mixin/ApiaryBonkHandTooltip.zs +++ /dev/null @@ -1,5 +0,0 @@ -#modloaded gendustry crafttweaker -#loader crafttweaker - -// we were supposed to use mixin List getTooltip(ItemStack, World, ITooltipFlag), but Scala is just cursed -.addTooltip("§3空手敲击蜂箱来更新鲜花！");