From 3caebc5053588064cf7751f2d2d7a361029dbb52 Mon Sep 17 00:00:00 2001 From: MBCollector672 Date: Thu, 1 Dec 2022 06:49:08 -0500 Subject: [PATCH] fix: Twilight Forest Maniacal Dendrologist advancement Thorn Rose, Thorn Leaves and Liveroot are now craftable fix: Malasis Doors trapdoors and Twilight Forest trapdoors no longer conflict feat: Rustic fluid crafting made easier to automate --- src/config/jei/itemBlacklist.cfg | 1 - src/config/mystcraft/balance.cfg | 6 + src/config/mystcraft/symbols.cfg | 1 + .../blockstates/sugarwater.json | 12 ++ src/resources/contenttweaker/lang/en_us.lang | 1 + src/resources/contenttweaker/lang/zh_cn.lang | 1 + src/scripts/contenttweaker/fluids.zs | 5 +- .../modIntegrations/integratedDynamics.zs | 7 + .../crafttweaker/modIntegrations/mekanism.zs | 1 + .../modIntegrations/nuclearcraft.zs | 11 ++ .../crafttweaker/modIntegrations/tinkers.zs | 5 + src/scripts/crafttweaker/postInit.zs | 1 + src/scripts/crafttweaker/recipes/furnace.zs | 4 +- .../crafttweaker/recipes/mods/malisisdoors.zs | 139 ++++++++++++++++++ .../crafttweaker/recipes/mods/minecraft.zs | 6 +- .../crafttweaker/recipes/mods/nuclearcraft.zs | 3 + .../crafttweaker/recipes/mods/rustic.zs | 3 + .../recipes/mods/twilightForest.zs | 9 ++ 18 files changed, 212 insertions(+), 4 deletions(-) create mode 100644 src/resources/contenttweaker/blockstates/sugarwater.json create mode 100644 src/scripts/crafttweaker/recipes/mods/malisisdoors.zs diff --git a/src/config/jei/itemBlacklist.cfg b/src/config/jei/itemBlacklist.cfg index 62f2f285..fca48c15 100644 --- a/src/config/jei/itemBlacklist.cfg +++ b/src/config/jei/itemBlacklist.cfg @@ -1494,7 +1494,6 @@ advanced { ceramics:clay_bucket:fuel_hecm_247_fluoride_flibe;m=0 ceramics:clay_bucket:gold_nak;m=0 tcomplement:chisel - forge:bucketfilled:alewort; forge:bucketfilled:diborane; horsepower:chopping_block:{textureBlock:{id:"integrateddynamics:menril_log",Count:1b,Damage:0s}} ceramics:clay_bucket:uranium_fluoride_flibe;m=0 diff --git a/src/config/mystcraft/balance.cfg b/src/config/mystcraft/balance.cfg index 42e0d103..390f4d09 100644 --- a/src/config/mystcraft/balance.cfg +++ b/src/config/mystcraft/balance.cfg @@ -9,6 +9,7 @@ baselining { I:"contenttweaker:mud_0"=0 I:"contenttweaker:osmium_molten_0"=0 I:"contenttweaker:reinforced_obsidian_molten_0"=0 + I:"contenttweaker:sugarwater_0"=0 I:"cyclicmagic:amber_0"=0 I:"cyclicmagic:biomass_0"=0 I:"cyclicmagic:crystal_0"=0 @@ -756,6 +757,11 @@ fluids { S:fluid.sugar.instability.factor_accessibility= S:fluid.sugar.instability.factor_flat= S:fluid.sugar.seabanned= + S:fluid.sugarwater.cardrank= + S:fluid.sugarwater.grammar= + S:fluid.sugarwater.instability.factor_accessibility= + S:fluid.sugarwater.instability.factor_flat= + S:fluid.sugarwater.seabanned= S:fluid.sulfur.cardrank= S:fluid.sulfur.grammar= S:fluid.sulfur.instability.factor_accessibility= diff --git a/src/config/mystcraft/symbols.cfg b/src/config/mystcraft/symbols.cfg index 5380f51d..c27efb45 100644 --- a/src/config/mystcraft/symbols.cfg +++ b/src/config/mystcraft/symbols.cfg @@ -282,6 +282,7 @@ symbol { B:modmat_mud_0.enabled=false B:modmat_osmium_molten_0.enabled=true B:modmat_reinforced_obsidian_molten_0.enabled=true + B:modmat_sugarwater_0.enabled=true } cyclicmagic { diff --git a/src/resources/contenttweaker/blockstates/sugarwater.json b/src/resources/contenttweaker/blockstates/sugarwater.json new file mode 100644 index 00000000..cd495c4f --- /dev/null +++ b/src/resources/contenttweaker/blockstates/sugarwater.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:fluid", + "custom": { + "fluid": "sugarwater" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/resources/contenttweaker/lang/en_us.lang b/src/resources/contenttweaker/lang/en_us.lang index e13ec1d0..3f47b330 100644 --- a/src/resources/contenttweaker/lang/en_us.lang +++ b/src/resources/contenttweaker/lang/en_us.lang @@ -2,6 +2,7 @@ fluid.mud=Mud fluid.cookie_dough=Liquid Cookie Dough fluid.bacon=Liquid Bacon fluid.donut=Liquid Donut +fluid.sugarwater=Sugar Water item.contenttweaker.cobblestone_circuit_mold.name=Cobblestone Circuit Mold diff --git a/src/resources/contenttweaker/lang/zh_cn.lang b/src/resources/contenttweaker/lang/zh_cn.lang index a378590e..ab418eb9 100644 --- a/src/resources/contenttweaker/lang/zh_cn.lang +++ b/src/resources/contenttweaker/lang/zh_cn.lang @@ -3,6 +3,7 @@ fluid.mud=\u6c61\u6ce5 fluid.cookie_dough=\u6db2\u6001\u66f2\u5947\u9762\u56e2 fluid.bacon=\u6db2\u6001\u57f9\u6839 fluid.donut=\u6db2\u6001\u751c\u751c\u5708 +fluid.sugarwater=\u7cd6\u6c34 item.contenttweaker.cobblestone_circuit_mold.name=\u5706\u77f3\u7535\u8def\u677f diff --git a/src/scripts/contenttweaker/fluids.zs b/src/scripts/contenttweaker/fluids.zs index 0f0af410..38f4c948 100644 --- a/src/scripts/contenttweaker/fluids.zs +++ b/src/scripts/contenttweaker/fluids.zs @@ -21,4 +21,7 @@ liquidBacon.register(); var liquidDonut as Fluid = VanillaFactory.createFluid("donut", Color.fromHex("FCC35F")); liquidDonut.viscosity = 7500; liquidDonut.density = 10000; -liquidDonut.register(); \ No newline at end of file +liquidDonut.register(); + +var sugarWater as Fluid = VanillaFactory.createFluid("sugarwater", Color.fromHex("60A0EE")); +sugarWater.register(); \ No newline at end of file diff --git a/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs b/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs index b62e93fe..af6c4155 100644 --- a/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs +++ b/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs @@ -16,6 +16,13 @@ function init() { integratedDynamics.addSqueezerBoth(, , 1.0); integratedDynamics.addSqueezerBoth(, , 1.0); integratedDynamics.addSqueezerBoth(, , 1.0); + + //Add method of processing Rustic fluids that is easier to automate + integratedDynamics.addSqueezerBoth(, null, * 250); + integratedDynamics.addSqueezerBoth(, null, * 250); + integratedDynamics.addSqueezerBoth(, null, * 250); + integratedDynamics.addSqueezerBoth(, null, * 250); + integratedDynamics.addSqueezerBoth(, , * 250); } /* diff --git a/src/scripts/crafttweaker/modIntegrations/mekanism.zs b/src/scripts/crafttweaker/modIntegrations/mekanism.zs index b322d8b8..94c92e3f 100644 --- a/src/scripts/crafttweaker/modIntegrations/mekanism.zs +++ b/src/scripts/crafttweaker/modIntegrations/mekanism.zs @@ -86,6 +86,7 @@ function init() { mekanism.addCombiner(, , ); mekanism.addCombiner(, , ); mekanism.addCombiner(, , ); + mekanism.addCombiner(, , ); // ================================== // Metallurgic Infuser diff --git a/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs b/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs index 9056af09..5e082a20 100644 --- a/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs +++ b/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs @@ -51,6 +51,14 @@ mods.nuclearcraft.ingot_former.addRecipe([ * 250, , * 1000]); mods.nuclearcraft.ingot_former.addRecipe([ * 250, ]); +//Rustic Fluid Processing +mods.nuclearcraft.extractor.addRecipe([, , * 250]); +mods.nuclearcraft.extractor.addRecipe([, , * 250]); +mods.nuclearcraft.extractor.addRecipe([, , * 250]); +mods.nuclearcraft.dissolver.addRecipe([, * 1000, * 1000]); +mods.nuclearcraft.salt_mixer.addRecipe([ * 250, * 1000, * 1000]); +mods.nuclearcraft.dissolver.addRecipe([, * 1000, * 1000]); +mods.nuclearcraft.ingot_former.addRecipe([ * 500, , 0.11125]); //Add in missing lapis melter recipe mods.nuclearcraft.melter.addRecipe([, * 666]); @@ -86,3 +94,6 @@ mods.nuclearcraft.melter.addRecipe([, , * 1, ]); //Setup to add more efficient method (slightly better than mek with compressed redstone) mods.nuclearcraft.infuser.addRecipe([, * 10, ]); + +//Rustic Tiny Pile of Iron Dust +mods.nuclearcraft.melter.addRecipe([, * 16, 0.11125]); diff --git a/src/scripts/crafttweaker/modIntegrations/tinkers.zs b/src/scripts/crafttweaker/modIntegrations/tinkers.zs index bd3f3f4f..a4257167 100644 --- a/src/scripts/crafttweaker/modIntegrations/tinkers.zs +++ b/src/scripts/crafttweaker/modIntegrations/tinkers.zs @@ -10,6 +10,11 @@ function init() { // ================================== // Melting // ================================== + // ================================== + // Tiny Dust Melting + tinkers.addMelting( * 16, ); + tinkers.addMelting( * 16, ); + // ================================== // Destabilized Redstone tinkers.addMelting( * 100, ); diff --git a/src/scripts/crafttweaker/postInit.zs b/src/scripts/crafttweaker/postInit.zs index c476312e..f033714c 100644 --- a/src/scripts/crafttweaker/postInit.zs +++ b/src/scripts/crafttweaker/postInit.zs @@ -43,6 +43,7 @@ function initRecipes() { scripts.crafttweaker.recipes.mods.industrialForegoing.init(); scripts.crafttweaker.recipes.mods.inspirations.init(); scripts.crafttweaker.recipes.mods.ironJetpacks.init(); + scripts.crafttweaker.recipes.mods.malisisdoors.init(); scripts.crafttweaker.recipes.mods.matterOverdrive.init(); scripts.crafttweaker.recipes.mods.mekanism.init(); scripts.crafttweaker.recipes.mods.microblockcbe.init(); diff --git a/src/scripts/crafttweaker/recipes/furnace.zs b/src/scripts/crafttweaker/recipes/furnace.zs index efc6a9b8..2c6dc321 100644 --- a/src/scripts/crafttweaker/recipes/furnace.zs +++ b/src/scripts/crafttweaker/recipes/furnace.zs @@ -50,7 +50,9 @@ var recipesToAdd as IIngredient[][IItemStack] = { : [], : [], : [], - : [] + : [], + : [], + : [] }; for output, inputs in recipesToAdd { diff --git a/src/scripts/crafttweaker/recipes/mods/malisisdoors.zs b/src/scripts/crafttweaker/recipes/mods/malisisdoors.zs new file mode 100644 index 00000000..4b128899 --- /dev/null +++ b/src/scripts/crafttweaker/recipes/mods/malisisdoors.zs @@ -0,0 +1,139 @@ +import crafttweaker.item.IItemStack; +import crafttweaker.item.IIngredient; + +import mods.zenstages.Utils; + +static oakLikePlanks as IIngredient = + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + ; + +static allNonTFPlanks as IIngredient = + oakLikePlanks | + | + | + | + | + | + | + | + | + | + ; + +static sprucePlanks as IIngredient = | ; +static birchPlanks as IIngredient = | ; +static junglePlanks as IIngredient = | ; +static acaciaPlanks as IIngredient = | ; +static darkOakPlanks as IIngredient = | ; + +/* + Recipe Removals +*/ +static removeRecipes as IItemStack[] = [ + , + , + , + , + +]; + +/* + Shaped Recipes +*/ +static shapedRecipes as IIngredient[][][][IItemStack] = { + * 2: [ + [ + [sprucePlanks, sprucePlanks, sprucePlanks], + [sprucePlanks, sprucePlanks, sprucePlanks] + ] + ], + * 2: [ + [ + [birchPlanks, birchPlanks, birchPlanks], + [birchPlanks, birchPlanks, birchPlanks] + ] + ], + * 2: [ + [ + [junglePlanks, junglePlanks, junglePlanks], + [junglePlanks, junglePlanks, junglePlanks] + ] + ], + * 2: [ + [ + [acaciaPlanks, acaciaPlanks, acaciaPlanks], + [acaciaPlanks, acaciaPlanks, acaciaPlanks] + ] + ], + * 2: [ + [ + [darkOakPlanks, darkOakPlanks, darkOakPlanks], + [darkOakPlanks, darkOakPlanks, darkOakPlanks] + ] + ], + * 2: [ + [ + [oakLikePlanks, oakLikePlanks, oakLikePlanks], + [oakLikePlanks, oakLikePlanks, oakLikePlanks] + ] + ], + : [ + [ + [allNonTFPlanks, allNonTFPlanks] + ] + ] +}; + +static namedShapedRecipes as IIngredient[][][][string][IItemStack] = { +}; + +/* + Mirrored Recipes +*/ +static mirroredRecipes as IIngredient[][][][IItemStack] = { +}; + +static namedMirroredRecipes as IIngredient[][][][string][IItemStack] = { +}; + +/* + Shapeless Recipes +*/ +static shapelessRecipes as IIngredient[][][IItemStack] = { + : [[allNonTFPlanks]] +}; + +static namedShapelessRecipes as IIngredient[][][string][IItemStack] = { +}; + +function init() { + // Un-named recipes + recipeUtil.process(shapedRecipes, false); + recipeUtil.process(mirroredRecipes, true); + recipeUtil.process(shapelessRecipes); + + // Named recipes + recipeUtil.processNamed(namedShapedRecipes, false); + recipeUtil.processNamed(namedMirroredRecipes, true); + recipeUtil.processNamed(namedShapelessRecipes); + + recipeUtil.removeRecipes(removeRecipes); +} \ No newline at end of file diff --git a/src/scripts/crafttweaker/recipes/mods/minecraft.zs b/src/scripts/crafttweaker/recipes/mods/minecraft.zs index 2f395332..5024e3a7 100644 --- a/src/scripts/crafttweaker/recipes/mods/minecraft.zs +++ b/src/scripts/crafttweaker/recipes/mods/minecraft.zs @@ -203,8 +203,12 @@ static namedShapelessRecipes as IIngredient[][][string][IItemStack] = { /* Recipe Removals */ +// removed some recipes here as a part of fixing unique trapdoor/button/plate recipes static removeRecipes as IItemStack[] = [ - + , + , + , + ]; function init() { diff --git a/src/scripts/crafttweaker/recipes/mods/nuclearcraft.zs b/src/scripts/crafttweaker/recipes/mods/nuclearcraft.zs index 57290d14..f44f27f4 100644 --- a/src/scripts/crafttweaker/recipes/mods/nuclearcraft.zs +++ b/src/scripts/crafttweaker/recipes/mods/nuclearcraft.zs @@ -40,6 +40,9 @@ static namedMirroredRecipes as IIngredient[][][][string][IItemStack] = { Shapeless Recipes */ static shapelessRecipes as IIngredient[][][IItemStack] = { +: [ + [, , , , , , , , ] + ] }; static namedShapelessRecipes as IIngredient[][][string][IItemStack] = { diff --git a/src/scripts/crafttweaker/recipes/mods/rustic.zs b/src/scripts/crafttweaker/recipes/mods/rustic.zs index e234dd32..47a0ab0c 100644 --- a/src/scripts/crafttweaker/recipes/mods/rustic.zs +++ b/src/scripts/crafttweaker/recipes/mods/rustic.zs @@ -34,6 +34,9 @@ static namedMirroredRecipes as IIngredient[][][][string][IItemStack] = { Shapeless Recipes */ static shapelessRecipes as IIngredient[][][IItemStack] = { +: [ + [, , , , , , , , ] + ] }; static namedShapelessRecipes as IIngredient[][][string][IItemStack] = { diff --git a/src/scripts/crafttweaker/recipes/mods/twilightForest.zs b/src/scripts/crafttweaker/recipes/mods/twilightForest.zs index ec7c0814..786d9ccb 100644 --- a/src/scripts/crafttweaker/recipes/mods/twilightForest.zs +++ b/src/scripts/crafttweaker/recipes/mods/twilightForest.zs @@ -34,6 +34,15 @@ static namedMirroredRecipes as IIngredient[][][][string][IItemStack] = { Shapeless Recipes */ static shapelessRecipes as IIngredient[][][IItemStack] = { + * 4: [ + [, , ] + ], + * 32: [ + [, , ] + ], + : [ + [, , ] + ] }; static namedShapelessRecipes as IIngredient[][][string][IItemStack] = {