diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index ce9c980..5b4086a 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -3620,7 +3620,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "The §2Cleanroom§r is a hollow multiblock free of contaminants. Going forward, most new circuit-related recipes, as well as some unique things like §3Fusion Casings§r, will need to be run in machines inside a Cleanroom. This is another ported §5GT5u§r feature, but just like with Maintenance, it won\u0027t be as harsh.\n\nOnce built, it must be well-maintained and powered for a while to clean the inside. The Cleanroom\u0027s power draw will decrease once it fully cleans itself. Recipes requiring the Cleanroom will §conly§r run when inside a §cfully-cleaned§r Cleanroom; if not, the recipe will not start, or recipe progress might be lost. (Recipe inputs will §enever be voided§r.)\n\nTo build it, place the Cleanroom controller on the top face and select a planned size in its GUI, between 5x5x5 and 15x15x15. The edges must be §3Plascrete§r or §3Cleanroom Glass§r, and the rest of the top face must be §3Filter Casings§r.\n\nFor transfer between the clean environment and the outside world:\n- Items and fluids through §3Passthrough Hatches§r. They automatically input from one side and output from the opposite side.\n- Energy through §3Hulls§r or §3Diodes§r (of any tier).\n- AE2 channels through §3Hulls§r.\n- Players through regular §3Doors§r. The room remains clean when doors are opened.\n\nApart from the \"official\" solutions, non-physical methods of transfer such as §3Ender Chests§r might be effective.\n\nYou will also need an §3Energy §rand §3Maintenance Hatch §rfor cleaning. The rest of the wall space is filled with §3Plascrete§r or §3Cleanroom Glass§r.\n\nOther notes:\n- The wall space must be at least 75% §3Plascrete§r or §3Cleanroom Glass§r.\n- GT generators and Muffler Hatches are §cnot allowed§r in Cleanrooms.", + "desc:8": "The §2Cleanroom§r is a hollow multiblock free of contaminants. Going forward, most new circuit-related recipes, as well as some unique things like §3Fusion Casings§r, will need to be run in machines inside a Cleanroom. This is another ported §5GT5u§r feature, but just like with Maintenance, it won\u0027t be as harsh.\n\nOnce built, it must be well-maintained and powered for a while to clean the inside. The Cleanroom\u0027s power draw will decrease once it fully cleans itself. Recipes requiring the Cleanroom will §conly§r run when inside a §cfully-cleaned§r Cleanroom; if not, the recipe will not start, or recipe progress might be lost. (Recipe inputs will §enever be voided§r.)\n\nThe Cleanroom can be built in any size between 5x5x5 and 15x15x15. The Controller is placed in the center of the top face, the edges must be §3Plascrete§r or §3Cleanroom Glass§r, and the rest of the top face is built from §3Filter Casings§r.\n\nFor transfer between the clean environment and the outside world:\n- Items and fluids through §3Passthrough Hatches§r. They automatically input from one side and output from the opposite side.\n- Energy through §3Hulls§r or §3Diodes§r (of any tier).\n- AE2 channels through §3Hulls§r.\n- Players through regular §3Doors§r. The room remains clean when doors are opened.\n\nApart from the \"official\" solutions, non-physical methods of transfer such as §3Ender Chests§r might be effective.\n\nYou will also need an §3Energy §rand §3Maintenance Hatch §rfor cleaning. The rest of the wall space is filled with §3Plascrete§r or §3Cleanroom Glass§r.\n\nOther notes:\n- The wall space must be at least 75% §3Plascrete§r or §3Cleanroom Glass§r.\n- GT generators and Muffler Hatches are §cnot allowed§r in Cleanrooms.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -21842,7 +21842,8 @@ "327:10": { "preRequisites:11": [ 279, - 537 + 537, + 914 ], "properties:10": { "betterquesting:10": { @@ -55008,7 +55009,8 @@ }, "904:10": { "preRequisites:11": [ - 339 + 339, + 914 ], "properties:10": { "betterquesting:10": { @@ -55571,6 +55573,70 @@ "taskID:8": "bq_standard:checkbox" } } + }, + "914:10": { + "preRequisites:11": [ + 255 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "Wetware-related processes require some stronger sterilisation. You will need to build another §3Cleanroom§r to run these recipes inside. Instead of §3Filter Casings§r, use §3Sterilizing Filter Casings§r in the top face.\n\nNote that a Sterile Cleanroom cannot handle recipes which require regular Cleanrooms.", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + }, + "ismain:1": 1, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "Cleaner Room", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "NORMAL" + } + }, + "questID:3": 914, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "contenttweaker:omnicoin5" + } + } + } + }, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 8, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } }, "questLines:9": { @@ -59463,6 +59529,13 @@ "sizeY:3": 24, "x:3": -576, "y:3": 264 + }, + "123:10": { + "id:3": 914, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -312, + "y:3": 156 } } }, @@ -61485,9 +61558,9 @@ "desc:8": "Convert between matter and energy with §bApplied Energistics§r§r.\n\nAutomate ALL the things! o/", "icon:10": { "Count:3": 1, - "Damage:2": 2, + "Damage:2": 0, "OreDict:8": "", - "id:8": "chisel:futura" + "id:8": "appliedenergistics2:controller" }, "name:8": "Matter-Energy", "visibility:8": "ALWAYS" @@ -61765,7 +61838,7 @@ }, "questSettings:10": { "betterquesting:10": { - "editmode:1": 0, + "editmode:1": 1, "hardcore:1": 0, "home_anchor_x:5": 0.5, "home_anchor_y:5": 0.0, diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index dd1c649..cb2c661 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -359,6 +359,7 @@ chemical_reactor.recipeBuilder() .fluidInputs( * 500, * 500) .outputs([ * 64, * 64]) .fluidOutputs( * 500) + .property("cleanroom", "sterile_cleanroom") .duration(6000) .EUt(30720) .buildAndRegister(); diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index cc539a3..c1bb01a 100644 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -433,6 +433,7 @@ circuit_assembler.recipeBuilder() .inputs( * 16, , , , , * 16) .fluidInputs( * 4000) .outputs( * 16) + .property("cleanroom", "sterile_cleanroom") .duration(1200).EUt(30720).buildAndRegister(); chemical_reactor.recipeBuilder() @@ -514,6 +515,7 @@ brewery.recipeBuilder() .inputs() .fluidInputs( * 1000) .fluidOutputs( * 1000) + .property("cleanroom", "sterile_cleanroom") .duration(128).EUt(4).buildAndRegister(); // Taranium in UV Fieldgen diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index c20e0d6..acffe65 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -626,6 +626,20 @@ recipes.addShaped(, [ [, , ] ]); +// Sterilizing Filter +recipes.removeByRecipeName("gregtech:blacklight"); +recipes.addShaped(, [ + [, , ], + [null, , null], + [, , ] +]); +recipes.removeByRecipeName("gregtech:filter_casing_sterile"); +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + // Removals // GT mods.jei.JEI.removeAndHide();