Merge branch 'develop' into e9e-tweakers-delight

EnigmaticaModpacks · Jul 18, 2023 · 3a79198 · 3a79198
2 parents d3615f4 + 27383e2
commit 3a79198
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 20 deletions.
diff --git a/kubejs/server_scripts/base/recipes/create/milling.js b/kubejs/server_scripts/base/recipes/create/milling.js
@@ -34,7 +34,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'create:milling';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.results = recipe.outputs;
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/base/recipes/create/pressing.js b/kubejs/server_scripts/base/recipes/create/pressing.js
@@ -11,7 +11,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'create:pressing';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.results = recipe.outputs.map((output) => Item.of(output).toJson());
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/base/recipes/farmersdelight/cooking_pot.js b/kubejs/server_scripts/base/recipes/farmersdelight/cooking_pot.js
@@ -12,7 +12,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'farmersdelight:cooking';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.result = { item: recipe.output, count: recipe.count };
         if (recipe.container) {
             recipe.container = { item: recipe.container };

diff --git a/kubejs/server_scripts/base/recipes/hexerei/mixingcauldron.js b/kubejs/server_scripts/base/recipes/hexerei/mixingcauldron.js
@@ -114,7 +114,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'hexerei:mixingcauldron';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.output = Item.of(recipe.output).toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/base/recipes/hexerei/pestle_and_mortar.js b/kubejs/server_scripts/base/recipes/hexerei/pestle_and_mortar.js
@@ -84,7 +84,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'hexerei:pestle_and_mortar';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.output = Item.of(recipe.output).toJson();
 
         event.custom(recipe).id(recipe.id);

diff --git a/kubejs/server_scripts/base/recipes/mekanism/enriching.js b/kubejs/server_scripts/base/recipes/mekanism/enriching.js
@@ -41,7 +41,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'mekanism:enriching';
-        recipe.input = { ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input } };
+        recipe.input = {
+            ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }
+        };
         recipe.output = Item.of(recipe.output).toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/base/recipes/mekanism/item_to_infuse.js b/kubejs/server_scripts/base/recipes/mekanism/item_to_infuse.js
@@ -14,7 +14,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'mekanism:infusion_conversion';
-        recipe.input = { ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input } };
+        recipe.input = {
+            ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }
+        };
         event.custom(recipe).id(recipe.id);
     });
 });
diff --git a/kubejs/server_scripts/base/recipes/powah/energizing.js b/kubejs/server_scripts/base/recipes/powah/energizing.js
@@ -18,7 +18,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'powah:energizing';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.result = recipe.output.toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/expert/recipes/ae2/transform.js b/kubejs/server_scripts/expert/recipes/ae2/transform.js
@@ -16,7 +16,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'ae2:transform';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.result = Item.of(recipe.output).toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/expert/recipes/create/crushing.js b/kubejs/server_scripts/expert/recipes/create/crushing.js
@@ -20,7 +20,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'create:crushing';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.results = recipe.outputs;
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/crushing_tiers.js b/kubejs/server_scripts/expert/recipes/enigmatica/crushing_tiers.js
@@ -134,7 +134,9 @@ ServerEvents.recipes((event) => {
             event
                 .custom({
                     type: 'create:milling',
-                    ingredients: [recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }],
+                    ingredients: [
+                        recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }
+                    ],
                     results: outputs,
                     processingTime: duration
                 })
@@ -170,7 +172,9 @@ ServerEvents.recipes((event) => {
             event
                 .custom({
                     type: 'create:crushing',
-                    ingredients: [recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }],
+                    ingredients: [
+                        recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }
+                    ],
                     results: outputs,
                     processingTime: duration
                 })

diff --git a/kubejs/server_scripts/expert/recipes/hexerei/drying_rack.js b/kubejs/server_scripts/expert/recipes/hexerei/drying_rack.js
@@ -16,7 +16,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'hexerei:drying_rack';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.output = Item.of(recipe.output).toJson();
 
         event.custom(recipe).id(recipe.id);

diff --git a/kubejs/server_scripts/expert/recipes/immersiveengineering/sawmill.js b/kubejs/server_scripts/expert/recipes/immersiveengineering/sawmill.js
@@ -23,7 +23,7 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'immersiveengineering:sawmill';
-        recipe.input = recipe.input.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.input = recipe.input.map((input) => (input.startsWith('#') ? { tag: input.slice(1) } : { item: input }));
         recipe.result = Item.of(recipe.output).toJson();
         recipe.secondaries = recipe.secondaries.map((secondary) => ({
             output: { item: secondary.output },

diff --git a/kubejs/server_scripts/expert/recipes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/expert/recipes/industrialforegoing/dissolution_chamber.js
@@ -354,7 +354,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'industrialforegoing:dissolution_chamber';
-        recipe.input = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.input = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.output = Item.of(recipe.output).toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/expert/recipes/naturesaura/tree_ritual.js b/kubejs/server_scripts/expert/recipes/naturesaura/tree_ritual.js
@@ -532,7 +532,9 @@ ServerEvents.recipes((event) => {
     ];
     recipes.forEach((recipe) => {
         recipe.type = 'naturesaura:tree_ritual';
-        recipe.ingredients = recipe.ingredients.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.ingredients.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.sapling = Item.of(recipe.sapling).toJson();
         recipe.output = Item.of(recipe.output).toJson();
         recipe.time = recipe.time * time_multiplier;

diff --git a/kubejs/server_scripts/normal/recipes/ae2/transform.js b/kubejs/server_scripts/normal/recipes/ae2/transform.js
@@ -16,7 +16,9 @@ ServerEvents.recipes((event) => {
     recipes.forEach((recipe) => {
         recipe.type = 'ae2:transform';
         // ingredients:  [{ item: 'minecraft:oak_log' }],
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         // result: { count: 2, item: 'ae2:fluix_crystal' }
         recipe.result = recipe.output.toJson();
         event.custom(recipe).id(recipe.id);

diff --git a/kubejs/server_scripts/normal/recipes/create/pressing.js b/kubejs/server_scripts/normal/recipes/create/pressing.js
@@ -34,7 +34,9 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'create:pressing';
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.results = recipe.outputs.map((output) => Item.of(output).toJson());
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/normal/recipes/occultism/ritual.js b/kubejs/server_scripts/normal/recipes/occultism/ritual.js
@@ -366,7 +366,9 @@ ServerEvents.recipes((event) => {
                 : { item: recipe.item_to_use };
 
         recipe.ritual_dummy = Item.of(recipe.ritual_dummy).toJson();
-        recipe.ingredients = recipe.inputs.map((input) => input.startsWith('#') ? { tag: input.slice(1) } : { item: input });
+        recipe.ingredients = recipe.inputs.map((input) =>
+            input.startsWith('#') ? { tag: input.slice(1) } : { item: input }
+        );
         recipe.result = Item.of(recipe.output).toJson();
         event.custom(recipe).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/normal/unification/unify_dust_processing.js b/kubejs/server_scripts/normal/unification/unify_dust_processing.js
@@ -232,7 +232,9 @@ function recipetypes_crushing(event, material, exceptions, item, tag) {
         event
             .custom({
                 type: 'mekanism:crushing',
-                input: { ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input } },
+                input: {
+                    ingredient: recipe.input.startsWith('#') ? { tag: recipe.input.slice(1) } : { item: recipe.input }
+                },
                 output: Item.of(recipe.outputs.primary.item, recipe.outputs.primary.count).toJson()
             })
             .id(`${id_prefix}mekanism_crushing/${recipe.id_suffix}`);