diff --git a/.packwizignore b/.packwizignore index 79753b3..48fe8b7 100644 --- a/.packwizignore +++ b/.packwizignore @@ -6,4 +6,11 @@ # Exclude Git/Hub stuff .github -.gitattributes \ No newline at end of file +.gitattributes + +# VSCode +.vscode + +# ProbeJS +kubejs/probe +kubejs/jsconfig.json \ No newline at end of file diff --git a/index.toml b/index.toml index d7bf330..7ca0e28 100644 --- a/index.toml +++ b/index.toml @@ -3973,7 +3973,7 @@ hash = "172360cba7fb147ba8e61251540e4e8a531a4a95a86c917e0be3c484db2ce8db" [[files]] file = "kubejs/server_scripts/recipes.js" -hash = "d952636995993ae59ace50c76e204ee2117c0d25a6011739166dd15c60917942" +hash = "58ce8a66a6c2cbe06f66adfec03da9dac39a08427684e261221cade3c5582dc2" [[files]] file = "kubejs/startup_scripts/0_globals.js" diff --git a/kubejs/server_scripts/recipes.js b/kubejs/server_scripts/recipes.js index 2292a6f..da7eb9f 100644 --- a/kubejs/server_scripts/recipes.js +++ b/kubejs/server_scripts/recipes.js @@ -65,6 +65,7 @@ onEvent('recipes', event => { andesiteMachine(event) wireless(event) misc(event) + extendedMechanicalCrafting(event) }) onEvent('item.modification', event => { @@ -232,7 +233,7 @@ function extendedCraftingSetup(event) { EC('black_iron_slate'), EC('black_iron_ingot'), EC('luminessence'), - EC('cyrstaltine_ingot'), + EC('crystaltine_ingot'), EC('enhanced_ender_ingot'), EC('ender_ingot'), EC('ender_star'), @@ -541,7 +542,6 @@ function wireless(event) { 'GEEEG', ' SBS ', ], { - D: 'fluxnetworks:flux_dust', E: 'fluxnetworks:herculean_flux_storage', S: F('#plates/steel'), G: F('#glass/colorless'), @@ -628,4 +628,27 @@ function misc(event) { ], { L: MC('#logs') }) +} + +function extendedMechanicalCrafting(event) { + event.forEachRecipe({ type: CR('mechanical_crafting') }, raw_recipe => { + const recipe = Utils.mapOf(raw_recipe.json) + console.log(recipe) + + console.log('preparing recipe key') + let key = {} + for (const [kkey, kvalue] of Object.entries(recipe.key)) { + key[kkey + ''] = Ingredient.of(kvalue) + } + + console.log('adding recipe') + const new_r_id = 'kubejs:mechanical_to_extended/' + `${raw_recipe.getOrCreateId()}`.replace(':', '/') + event.recipes.extendedcrafting.shaped_table(Ingredient.of(recipe.result), + recipe.pattern.map(row => { + return row + '' + }), + key + ).id(new_r_id) + console.log(new_r_id) + }) } \ No newline at end of file diff --git a/pack.toml b/pack.toml index 3077336..6aaee62 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "43abf3c902711991bfed5499bc3c09778fe3ccc3907bd73a86c10cb581b1a3f0" +hash = "4add183054e162f7e9b0aabbe6b3909ebe6eab1a5d64e38a1406c63f2edbc11d" [versions] forge = "40.2.14"