fireproof wood, recipes

Kanzaji · Aug 3, 2022 · e647da8 · e647da8
1 parent 01ee5f4
commit e647da8
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 29 deletions.
diff --git a/kubejs/client_scripts/item_modifiers/tooltips.js b/kubejs/client_scripts/item_modifiers/tooltips.js
@@ -177,7 +177,11 @@ onEvent('item.tooltip', (event) => {
             text: [Text.of('Does not work on spawners.').red()]
         },
         {
-            items: ['kubejs:crystalline_flowering_palo_verde_leaves', 'kubejs:crystalline_oak_leaves'],
+            items: [
+                'kubejs:crystalline_flowering_palo_verde_leaves',
+                'kubejs:crystalline_oak_leaves',
+                'kubejs:crystalline_dark_oak_wood'
+            ],
             text: [Text.of('Fireproof').gold()]
         }
     ];

diff --git a/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json b/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json
@@ -6801,7 +6801,7 @@
         ",": { "block": "botania:livingwood_planks" },
         "-": { "block": "quark:turf" },
         ".": { "block": "botania:vivid_grass" },
-        "/": { "block": "minecraft:grass_path" },
+        "/": { "tag": "rsgauges:soils" },
         "0": { "block": "minecraft:podzol" },
         "1": { "block": "botania:dreamwood_planks" },
         "2": { "block": "botania:mossy_livingrock_bricks" },
@@ -6822,7 +6822,7 @@
         "A": { "block": "botania:livingrock_bricks_stairs" },
         "B": { "block": "minecraft:lapis_block" },
         "D": { "block": "botania:cracked_livingrock_bricks" },
-        "E": { "block": "minecraft:dark_oak_wood" },
+        "E": { "tag": "enigmatica:tree_of_life/dark_oak_wood" },
         "F": { "block": "masterfulmachinery:enigmatic_tree_of_life_fluid_port_fluids_input" },
         "G": { "block": "botania:livingrock_bricks_wall" },
         "H": { "block": "botania:pattern_framed_dreamwood" },

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/blocks/enigmatica/tree_of_life.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/blocks/enigmatica/tree_of_life.js
@@ -3,4 +3,7 @@ onEvent('block.tags', (event) => {
     event
         .get('enigmatica:tree_of_life/palo_verde')
         .add(['kubejs:crystalline_flowering_palo_verde_leaves', 'byg:flowering_palo_verde_leaves']);
+    event
+        .get('enigmatica:tree_of_life/dark_oak_wood')
+        .add(['kubejs:crystalline_dark_oak_wood', 'minecraft:dark_oak_wood']);
 });
diff --git a/...js/server_scripts/enigmatica/kubejs/expert/recipetypes/interactio/item_fluid_transform.js b/...js/server_scripts/enigmatica/kubejs/expert/recipetypes/interactio/item_fluid_transform.js
@@ -2,15 +2,10 @@ onEvent('recipes', (event) => {
     if (global.isExpertMode == false) {
         return;
     }
-
+    const id_prefix = 'enigmatica:expert/interactio/item_fluid_transform/';
     const recipes = [
         {
-            inputs: [
-                { item: 'eidolon:enchanted_ash', count: 2 },
-                { tag: 'forge:clay', count: 1 },
-                { tag: 'forge:dusts/mana', count: 1 },
-                { tag: 'forge:dusts/lapis', count: 1 }
-            ],
+            inputs: ['2x eidolon:enchanted_ash', '#forge:clay', '#forge:dusts/mana', '#forge:dusts/lapis'],
             fluid: { fluid: 'water' },
             output: {
                 entries: [{ result: { item: 'ars_nouveau:magic_clay', count: 2 }, weight: 1 }],
@@ -22,11 +17,11 @@ onEvent('recipes', (event) => {
         },
         {
             inputs: [
-                { item: 'eidolon:enchanted_ash', count: 1 },
-                { item: 'atum:coin_gold', count: 6 },
-                { item: 'meetyourfight:phantoplasm', count: 1 },
-                { tag: 'forge:dusts/mana', count: 1 },
-                { tag: 'forge:dusts/lapis', count: 1 }
+                'eidolon:enchanted_ash',
+                '6x atum:coin_gold',
+                'meetyourfight:phantoplasm',
+                '#forge:dusts/mana',
+                '#forge:dusts/lapis'
             ],
             fluid: { fluid: 'water' },
             output: {
@@ -38,39 +33,33 @@ onEvent('recipes', (event) => {
             id: 'meetyourfight:spectres_eye'
         },
         {
-            inputs: [{ item: 'kubejs:hot_compressed_iron_ingot', count: 1 }],
+            inputs: ['kubejs:hot_compressed_iron_ingot'],
             fluid: { fluid: 'water' },
             output: {
                 entries: [{ result: { item: 'pneumaticcraft:ingot_iron_compressed', count: 1 }, weight: 1 }],
                 empty_weight: 0,
                 rolls: 1
             },
             consume_fluid: 0.0,
-            id: 'enigmatica:expert/interactio/ingot_iron_compressed'
+            id: `${id_prefix}ingot_iron_compressed`
         },
         {
-            inputs: [{ item: 'kubejs:hot_compressed_iron_block', count: 1 }],
+            inputs: ['kubejs:hot_compressed_iron_block'],
             fluid: { fluid: 'water' },
             output: {
                 entries: [{ result: { item: 'pneumaticcraft:compressed_iron_block', count: 1 }, weight: 1 }],
                 empty_weight: 0,
                 rolls: 1
             },
             consume_fluid: 0.0,
-            id: 'enigmatica:expert/interactio/compressed_iron_block'
+            id: `${id_prefix}compressed_iron_block`
         }
     ];
 
     recipes.forEach((recipe) => {
-        const re = event.custom({
-            type: 'interactio:item_fluid_transform',
-            inputs: recipe.inputs,
-            output: recipe.output,
-            fluid: recipe.fluid,
-            consume_fluid: recipe.consume_fluid
-        });
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        recipe.type = 'interactio:item_fluid_transform';
+        recipe.inputs = recipe.inputs.map((input) => Ingredient.of(input).toJson());
+
+        event.custom(recipe).id(recipe.id);
     });
 });
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/interactio/item_lightning.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/interactio/item_lightning.js
@@ -185,6 +185,33 @@ onEvent('recipes', (event) => {
                 rolls: 1
             },
             id: `${id_prefix}teleposer`
+        },
+        {
+            inputs: ['64x minecraft:oak_leaves', '#forge:dusts/starmetal', 'quark:green_crystal'],
+            output: {
+                entries: [{ result: { item: 'kubejs:crystalline_oak_leaves', count: 64 }, weight: 1 }],
+                empty_weight: 0,
+                rolls: 1
+            },
+            id: `${id_prefix}crystalline_oak_leaves`
+        },
+        {
+            inputs: ['64x byg:flowering_palo_verde_leaves', '#forge:dusts/starmetal', 'quark:yellow_crystal'],
+            output: {
+                entries: [{ result: { item: 'kubejs:crystalline_flowering_palo_verde_leaves', count: 64 }, weight: 1 }],
+                empty_weight: 0,
+                rolls: 1
+            },
+            id: `${id_prefix}crystalline_flowering_palo_verde_leaves`
+        },
+        {
+            inputs: ['64x minecraft:dark_oak_wood', '#forge:dusts/starmetal', 'quark:orange_crystal'],
+            output: {
+                entries: [{ result: { item: 'kubejs:crystalline_dark_oak_wood', count: 64 }, weight: 1 }],
+                empty_weight: 0,
+                rolls: 1
+            },
+            id: `${id_prefix}crystalline_dark_oak_wood`
         }
     ];