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
DarkPacks · Dec 1, 2022 · 3caebc5 · 3caebc5
1 parent 3eb4772
commit 3caebc5
Show file tree

Hide file tree

Showing 18 changed files with 212 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "sugarwater"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
diff --git 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
@@ -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
@@ -21,4 +21,7 @@ liquidBacon.register();
 var liquidDonut as Fluid = VanillaFactory.createFluid("donut", Color.fromHex("FCC35F"));
 liquidDonut.viscosity = 7500;
 liquidDonut.density = 10000;
-liquidDonut.register();
+liquidDonut.register();
+
+var sugarWater as Fluid = VanillaFactory.createFluid("sugarwater", Color.fromHex("60A0EE"));
+sugarWater.register();
diff --git a/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs b/src/scripts/crafttweaker/modIntegrations/integratedDynamics.zs
@@ -16,6 +16,13 @@ function init() {
 	integratedDynamics.addSqueezerBoth(<minecraft:ender_pearl>, <appliedenergistics2:material:46>, 1.0);
 	integratedDynamics.addSqueezerBoth(<thermalfoundation:material:895>, <appliedenergistics2:material:46>, 1.0);
 	integratedDynamics.addSqueezerBoth(<appliedenergistics2:material:7>, <appliedenergistics2:material:8>, 1.0);
+
+	//Add method of processing Rustic fluids that is easier to automate
+	integratedDynamics.addSqueezerBoth(<rustic:ironberries>, null, <liquid:ironberryjuice> * 250);
+	integratedDynamics.addSqueezerBoth(<rustic:grapes>, null, <liquid:grapejuice> * 250);
+	integratedDynamics.addSqueezerBoth(<rustic:wildberries>, null, <liquid:wildberryjuice> * 250);
+	integratedDynamics.addSqueezerBoth(<rustic:honeycomb>, null, <liquid:honey> * 250);
+	integratedDynamics.addSqueezerBoth(<minecraft:apple>, <rustic:apple_seeds>, <liquid:applejuice> * 250);
 }
 
 /*

diff --git a/src/scripts/crafttweaker/modIntegrations/mekanism.zs b/src/scripts/crafttweaker/modIntegrations/mekanism.zs
@@ -86,6 +86,7 @@ function init() {
 	mekanism.addCombiner(<cyclicmagic:horse_upgrade_speed>, <nuclearcraft:dust:6>, <matteroverdrive:android_pill>);
 	mekanism.addCombiner(<cyclicmagic:horse_upgrade_variant>, <nuclearcraft:dust:6>, <matteroverdrive:android_pill:1>);
 	mekanism.addCombiner(<minecraft:golden_apple:1>, <nuclearcraft:dust:6>, <matteroverdrive:android_pill:2>);
+	mekanism.addCombiner(<twilightforest:root>, <twilightforest:liveroot>, <twilightforest:root:1>);
 
 	// ==================================
 	// Metallurgic Infuser

diff --git a/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs b/src/scripts/crafttweaker/modIntegrations/nuclearcraft.zs
@@ -51,6 +51,14 @@ mods.nuclearcraft.ingot_former.addRecipe([<liquid:bacon> * 250, <tconstruct:edib
 //Donut Processing
 mods.nuclearcraft.melter.addRecipe([<sky_orchards:amber_donut>, <liquid:donut> * 1000]);
 mods.nuclearcraft.ingot_former.addRecipe([<liquid:donut> * 250, <xlfoodmod:donut>]);
+//Rustic Fluid Processing
+mods.nuclearcraft.extractor.addRecipe([<rustic:ironberries>, <pickletweaks:dye_powder:8>, <liquid:ironberryjuice> * 250]);
+mods.nuclearcraft.extractor.addRecipe([<rustic:grapes>, <pickletweaks:dye_powder:10>, <liquid:grapejuice> * 250]);
+mods.nuclearcraft.extractor.addRecipe([<rustic:wildberries>, <pickletweaks:dye_powder:14>, <liquid:wildberryjuice> * 250]);
+mods.nuclearcraft.dissolver.addRecipe([<minecraft:sugar>, <liquid:water> * 1000, <liquid:sugarwater> * 1000]);
+mods.nuclearcraft.salt_mixer.addRecipe([<liquid:sugar> * 250, <liquid:water> * 1000, <liquid:sugarwater> * 1000]);
+mods.nuclearcraft.dissolver.addRecipe([<minecraft:bread>, <liquid:sugarwater> * 1000, <liquid:alewort> * 1000]);
+mods.nuclearcraft.ingot_former.addRecipe([<liquid:ironberryjuice> * 500, <rustic:dust_tiny_iron>, 0.11125]);
 
 //Add in missing lapis melter recipe
 mods.nuclearcraft.melter.addRecipe([<minecraft:dye:4>, <liquid:lapis> * 666]);
@@ -86,3 +94,6 @@ mods.nuclearcraft.melter.addRecipe([<sky_orchards:amber_glowstone>, <liquid:glow
 mods.nuclearcraft.alloy_furnace.addRecipe([<integrateddynamics:crystalized_menril_chunk>, <minecraft:redstone> * 1, <appliedenergistics2:material:7>]);
 //Setup to add more efficient method (slightly better than mek with compressed redstone)
 mods.nuclearcraft.infuser.addRecipe([<integrateddynamics:crystalized_menril_chunk>, <liquid:redstone> * 10, <appliedenergistics2:material:7>]);
+
+//Rustic Tiny Pile of Iron Dust
+mods.nuclearcraft.melter.addRecipe([<rustic:dust_tiny_iron>, <liquid:iron> * 16, 0.11125]);
diff --git 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(<liquid:iron> * 16, <rustic:dust_tiny_iron>);
+	tinkers.addMelting(<liquid:lead> * 16, <nuclearcraft:tiny_dust_lead>);
+
 	// ==================================
 	// Destabilized Redstone
 	tinkers.addMelting(<liquid:redstone> * 100, <ore:dustRedstone>);

diff --git 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
@@ -50,7 +50,9 @@ var recipesToAdd as IIngredient[][IItemStack] = {
 	<tconstruct:ingots:1>: [<contenttweaker:ardite_dust>],
 	<tconstruct:ingots>: [<contenttweaker:cobalt_dust>],
 	<nuclearcraft:roasted_cocoa_beans>: [<minecraft:dye:3>],
-	<fluxnetworks:flux>: [<minecraft:redstone>]
+	<fluxnetworks:flux>: [<minecraft:redstone>],
+	<minecraft:iron_nugget>: [<rustic:dust_tiny_iron>],
+	<thermalfoundation:material:195>: [<nuclearcraft:tiny_dust_lead>]
 };
 
 for output, inputs in recipesToAdd {

diff --git a/src/scripts/crafttweaker/recipes/mods/malisisdoors.zs 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 =
+	<minecraft:planks:0> |
+	<chisel:planks-oak:*> |
+	<integrateddynamics:menril_planks> |
+	<rustic:planks:*> |
+	<rustic:painted_wood_white> |
+	<rustic:painted_wood_orange> |
+	<rustic:painted_wood_magenta> |
+	<rustic:painted_wood_light_blue> |
+	<rustic:painted_wood_yellow> |
+	<rustic:painted_wood_lime> |
+	<rustic:painted_wood_pink> |
+	<rustic:painted_wood_gray> |
+	<rustic:painted_wood_silver> |
+	<rustic:painted_wood_cyan> |
+	<rustic:painted_wood_purple> |
+	<rustic:painted_wood_blue> |
+	<rustic:painted_wood_brown> |
+	<rustic:painted_wood_green> |
+	<rustic:painted_wood_red> |
+	<rustic:painted_wood_black>;
+
+static allNonTFPlanks as IIngredient = 
+	oakLikePlanks |
+	<minecraft:planks:1> |
+	<minecraft:planks:2> |
+	<minecraft:planks:3> |
+	<minecraft:planks:4> |
+	<minecraft:planks:5> |
+	<chisel:planks-spruce:*> |
+	<chisel:planks-birch:*> |
+	<chisel:planks-jungle:*> |
+	<chisel:planks-dark-oak:*> |
+	<chisel:planks-acacia:*>;
+
+static sprucePlanks as IIngredient = <minecraft:planks:1> | <chisel:planks-spruce:*>;
+static birchPlanks as IIngredient = <minecraft:planks:2> | <chisel:planks-birch:*>;
+static junglePlanks as IIngredient = <minecraft:planks:3> | <chisel:planks-jungle:*>;
+static acaciaPlanks as IIngredient = <minecraft:planks:4> | <chisel:planks-acacia:*>;
+static darkOakPlanks as IIngredient = <minecraft:planks:5> | <chisel:planks-dark-oak:*>;
+
+/*
+    Recipe Removals
+*/
+static removeRecipes as IItemStack[] = [
+	<malisisdoors:trapdoor_spruce>,
+	<malisisdoors:trapdoor_birch>,
+	<malisisdoors:trapdoor_jungle>,
+	<malisisdoors:trapdoor_acacia>,
+	<malisisdoors:trapdoor_dark_oak>
+];
+
+/*
+    Shaped Recipes
+*/
+static shapedRecipes as IIngredient[][][][IItemStack] = {
+	<malisisdoors:trapdoor_spruce> * 2: [
+		[
+			[sprucePlanks, sprucePlanks, sprucePlanks],
+			[sprucePlanks, sprucePlanks, sprucePlanks]
+		]
+	],
+	<malisisdoors:trapdoor_birch> * 2: [
+		[
+			[birchPlanks, birchPlanks, birchPlanks],
+			[birchPlanks, birchPlanks, birchPlanks]
+		]
+	],
+	<malisisdoors:trapdoor_jungle> * 2: [
+		[
+			[junglePlanks, junglePlanks, junglePlanks],
+			[junglePlanks, junglePlanks, junglePlanks]
+		]
+	],
+	<malisisdoors:trapdoor_acacia> * 2: [
+		[
+			[acaciaPlanks, acaciaPlanks, acaciaPlanks],
+			[acaciaPlanks, acaciaPlanks, acaciaPlanks]
+		]
+	],
+	<malisisdoors:trapdoor_dark_oak> * 2: [
+		[
+			[darkOakPlanks, darkOakPlanks, darkOakPlanks],
+			[darkOakPlanks, darkOakPlanks, darkOakPlanks]
+		]
+	],
+	<minecraft:trapdoor> * 2: [
+		[
+			[oakLikePlanks, oakLikePlanks, oakLikePlanks],
+			[oakLikePlanks, oakLikePlanks, oakLikePlanks]
+		]
+	],
+	<minecraft:wooden_pressure_plate>: [
+		[
+			[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] = {
+	<minecraft:wooden_button>: [[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);
+}
diff --git 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[] = [
-	<parabox:parabox>
+	<parabox:parabox>,
+	<minecraft:trapdoor>,
+	<minecraft:wooden_pressure_plate>,
+	<minecraft:wooden_button>
 ];
 
 function init() {

diff --git 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] = {
+<thermalfoundation:material:67>: [
+		[<nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>, <nuclearcraft:tiny_dust_lead>]
+	]
 };
 
 static namedShapelessRecipes as IIngredient[][][string][IItemStack] = {

diff --git 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] = {
+<thermalfoundation:material:0>: [
+		[<rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>, <rustic:dust_tiny_iron>]
+	]
 };
 
 static namedShapelessRecipes as IIngredient[][][string][IItemStack] = {

diff --git 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] = {
+	<twilightforest:thorn_rose> * 4: [
+		[<deepmoblearning:living_matter_twilight>, <minecraft:cactus>, <inspirations:flower>]
+	],
+	<twilightforest:twilight_leaves_3> * 32: [
+		[<deepmoblearning:living_matter_twilight>, <minecraft:cactus>, <minecraft:leaves>]
+	],
+	<twilightforest:liveroot>: [
+		[<thermalfoundation:fertilizer:1>, <minecraft:water_bucket>, <twilightforest:twilight_plant:8>]
+	]
 };
 
 static namedShapelessRecipes as IIngredient[][][string][IItemStack] = {