mods: add wormhole_artifact, rebalance functionalstorage, and rebalance create ore line

index.toml

@@ -677,6 +677,10 @@ hash = "d635d9125b6a04148ddf506e45c45e88b8c255c4fdfa5a3af1d441931a15bcd0"
 file = "kubejs/server_scripts/mods/farmersdelight.js"
 hash = "fd8f6de5bb56d08a181e625e450b91c3ea687b33ebf378daf0381e7873515f85"
 
+[[files]]
+file = "kubejs/server_scripts/mods/functionalstorage.js"
+hash = "d6584e7462342622752a0da95fb624bedc9e49185c30c94875806de439b751e3"
+
 [[files]]
 file = "kubejs/server_scripts/mods/herbalbrews.js"
 hash = "fac25cd8f3980e68315928e4cbfd0a86e5282d511a62a278b9f88f098380f5fd"
@@ -749,9 +753,13 @@ hash = "208d9d49c612c84f57ee509ec02d4c44145b673caaa06fe451340dc30b8da5aa"
 file = "kubejs/server_scripts/mods/waystones.js"
 hash = "a43a56736738975b6189dfa09863db43f9cbefb37c215f78fadc053c21a31305"
 
+[[files]]
+file = "kubejs/server_scripts/mods/wormhole_artifact.js"
+hash = "5e9fd5b26b5fda03041d8b8a983e607b177dc80ba54cb5b78f1234319289ccbc"
+
 [[files]]
 file = "kubejs/server_scripts/ore-processing.js"
-hash = "6251775a7906079009c103dbb6c823a583fd4d002d78316552213e519b36cf7f"
+hash = "d7d3df2550770a682bf55b8d98df2b6562a4434256beaa435a632fc63a61e6fb"
 
 [[files]]
 file = "kubejs/server_scripts/progression/report.js"
@@ -1687,7 +1695,7 @@ metafile = true
 
 [[files]]
 file = "mods/packmenu.pw.toml"
-hash = "055c3536f83ada17dd53effd46617ddcc7fe03b7165f47ff594e46311470641e"
+hash = "2f8246fb91d5c6082f12f4a5e7540b0fb82be86cdd6809efa0cd3e67ee0bc7be"
 metafile = true
 
 [[files]]
@@ -2060,6 +2068,11 @@ file = "mods/when-dungeons-arise.pw.toml"
 hash = "0cb70caa22009a495a64a4332480b5ae80cb7fc7ba34c0a48ab8aff7df20b4f7"
 metafile = true
 
+[[files]]
+file = "mods/wormhole-artifact.pw.toml"
+hash = "82c3e06e170b004a916a5ea0cf6d59d32690d72109110ee8c7a9e71342b49eab"
+metafile = true
+
 [[files]]
 file = "mods/yungs-api.pw.toml"
 hash = "d0d14c38427cf19c6f1244d4a6a0d05ad1a3d22d9f8b4f0eb083cef7f2ad407d"

kubejs/server_scripts/mods/functionalstorage.js

@@ -0,0 +1,25 @@
+ServerEvents.recipes(event => {
+    event.replaceInput({output: 'functionalstorage:storage_controller'},
+        'minecraft:comparator',
+        'minecraft:redstone'
+    );
+    event.replaceInput({output: 'functionalstorage:storage_controller'},
+        'minecraft:quartz_block',
+        'minecraft:andesite'
+    );
+
+    event.replaceInput({output: 'functionalstorage:linking_tool'},
+        'minecraft:diamond',
+        '#kubejs:grist/intelligent/basic'
+    );
+
+    event.replaceInput({mod: 'functionalstorage'},
+        'minecraft:piston',
+        '#kubejs:grist/build/basic'
+    );
+
+    event.replaceInput({mod: 'functionalstorage'},
+        'minecraft:netherite_ingot',
+        '#kubejs:grist/intelligent/improved'
+    );
+});

kubejs/server_scripts/mods/wormhole_artifact.js

@@ -0,0 +1,6 @@
+ServerEvents.recipes(event => {
+    events.replaceInput({mod: 'wormhole_artifact'},
+        'minecraft:ender_pearl',
+        '#kubejs:grist/intelligent/basic'
+    );
+});

kubejs/server_scripts/ore-processing.js

@@ -40,6 +40,7 @@ ServerEvents.recipes(event => {
 		let ingotType = metalForm(metal, 'ingots', 'ingot');
 		let rawType = metalForm(metal, 'raw_materials', 'ore');
 		let blockType = metalForm(`raw_${metal}`, 'storage_blocks', 'block');
+		let crushedType = Item.of(`create:crushed_raw_${metal}`);
 
 		event.remove({output: gearType});
 		event.remove({output: plateType});
@@ -51,6 +52,17 @@ ServerEvents.recipes(event => {
 		event.remove({output: dustType, type: 'minecraft:crafting'});
 		event.remove({output: ingotType, input: 'minecraft:fire_charge'});
 
+		// Remove the default conversion of ingot to nuggets from create
+		event.remove({input: ingotType, type: 'create:crushing'});
+
+		// And completely eliminate the default refining line with create crushed ores
+		if (crushedType.id != 'minecraft:air') {
+			event.remove({input: crushedType});
+			event.remove({output: crushedType});
+		} else {
+			console.log(`metals: Missing create:crushed_raw_${metal}`);
+		}
+
 		event.remove({id: `alltheores:${metal}_dust_from_alloy_blending`});
 
 		console.log(`crushing ${rawType.toJson()} ${dustType.toJson()}`);
@@ -67,19 +79,21 @@ ServerEvents.recipes(event => {
 				experience: 0.5
 			});
 
+			if (crushedType.id != 'minecraft:air') {
 				event.custom({
 					type: "create:crushing",
 					ingredients: [
 						{tag: `forge:raw_materials/${metal}`}
 					],
 					results: [
-					{item: dustType.id, chance: 1.05},
-					{item: dustType.id, chance: 0.25},
-					{item: 'create:experience_nugget', count: 9, chance: 0.75}
+						{item: crushedType.id, chance: 1},
+						{item: crushedType.id, chance: 0.25},
+						{item: dustType.id, chance: 0.05},
+						{item: 'create:experience_nugget', count: 2, chance: 0.75}
 					],
-				experience: 0.5
 				});
 			}
+		}
 
 		if (blockType.id != "minecraft:air") {
 			event.custom({
@@ -88,23 +102,52 @@ ServerEvents.recipes(event => {
 					{tag: `forge:storage_blocks/raw_${metal}`}
 				],
 				result: [
-					{item: dustType.id, chance: 1.05 * 9},
-					{item: dustType.id, chance: 0.25 * 9}
+					{item: dustType.id, count: 9, chance: 1},
+					{item: dustType.id, count: 9, chance: 0.25}
 				],
 				experience: 0.5
 			});
 
+			if (crushedType.id != 'minecraft:air') {
 				event.custom({
 					type: "create:crushing",
 					ingredients: [
-					{tag: `forge:storage_blocks/${metal}`}
+						{tag: `forge:storage_blocks/raw_${metal}`}
 					],
 					results: [
-					{item: dustType.id, count: 9, chance: 1.05},
-					{item: dustType.id, count: 9, chance: 0.25},
-					{item: 'create:experience_nugget', count: 9 * 9, chance: 0.75}
+						{item: crushedType.id, count: 9, chance: 1},
+						{item: crushedType.id, count: 9, chance: 0.25},
+						{item: dustType.id, count: 9, chance: 0.05},
+						{item: 'create:experience_nugget', count: 2 * 9, chance: 0.75}
+					],
+				});
+			}
+		}
+
+		// Set up the parallel create-based ore washing line
+		if (crushedType.id != 'minecraft:air') {
+			event.custom({
+				type: "create:splashing",
+				ingredients: [
+					{item: crushedType.id }
+				],
+				results: [
+					{item: dustType.id, count: 2, chance: 1},
+					{item: dustType.id, chance: 0.25},
+					{item: dustType.id, chance: 0.05},
+				],
+			});
+
+			event.custom({
+				type: "thermal:centrifuge",
+				ingredients: [
+					{item: crushedType.id }
+				],
+				result: [
+					{item: dustType.id, count: 3, chance: 3.0},
+					{item: dustType.id, chance: 0.75},
+					{item: "twigs:pebble", chance: 0.05}
 				],
-				experience: 0.5
 			});
 		}
 

mods/wormhole-artifact.pw.toml

@@ -0,0 +1,13 @@
+name = "Wormhole Artifact"
+filename = "wormhole_artifact-1.2.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/VvbPfXJ9/versions/7yrfRnS9/wormhole_artifact-1.2.0.jar"
+hash-format = "sha512"
+hash = "d3c58d70e746223aa69fc193006d1e4561cff387e64b38af84b1068e246df0a4bfd459ecfdf0c1c0ba6a5fac355e9a9009666fe7eca783a9addd9731de317c69"
+
+[update]
+[update.modrinth]
+mod-id = "VvbPfXJ9"
+version = "7yrfRnS9"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "d294e07dbfbd031a7677a318426fed4fded2511d50df45cafdbae8daa79383d5"
+hash = "5edfdb2f03f51dfec211b81b6cf4ca78778a0ee473133dca39b7975910c40edc"
 
 [versions]
 forge = "47.4.0"