diff --git a/templateer.js b/templateer.js index f8ed012..9967a0c 100644 --- a/templateer.js +++ b/templateer.js @@ -214,11 +214,11 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_36(arg0, arg1) { - wasm.wasm_bindgen__convert__closures__invoke0_mut__h842aadb716c6d4e4(arg0, arg1); + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1e916184d15ddf3f(arg0, arg1); } function __wbg_adapter_39(arg0, arg1, arg2) { - wasm.wasm_bindgen__convert__closures__invoke1_mut__h57cdb7396be6814e(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h4b5e9c9d407b7c45(arg0, arg1, addHeapObject(arg2)); } /** @@ -350,7 +350,7 @@ function handleError(f, args) { } } function __wbg_adapter_172(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen__convert__closures__invoke2_mut__h92f1cba55a07d933(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); + wasm.wasm_bindgen__convert__closures__invoke2_mut__h030aca38fa9dc1a6(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); } async function __wbg_load(module, imports) { @@ -406,9 +406,9 @@ function __wbg_get_imports() { getInt32Memory0()[arg0 / 4 + 1] = len1; getInt32Memory0()[arg0 / 4 + 0] = ptr1; }; - imports.wbg.__wbindgen_is_string = function(arg0) { - const ret = typeof(getObject(arg0)) === 'string'; - return ret; + imports.wbg.__wbindgen_error_new = function(arg0, arg1) { + const ret = new Error(getStringFromWasm0(arg0, arg1)); + return addHeapObject(ret); }; imports.wbg.__wbindgen_is_object = function(arg0) { const val = getObject(arg0); @@ -423,6 +423,10 @@ function __wbg_get_imports() { const ret = getObject(arg0) in getObject(arg1); return ret; }; + imports.wbg.__wbindgen_is_string = function(arg0) { + const ret = typeof(getObject(arg0)) === 'string'; + return ret; + }; imports.wbg.__wbindgen_boolean_get = function(arg0) { const v = getObject(arg0); const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; @@ -437,10 +441,6 @@ function __wbg_get_imports() { const ret = false; return ret; }; - imports.wbg.__wbindgen_error_new = function(arg0, arg1) { - const ret = new Error(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }; imports.wbg.__wbindgen_jsval_loose_eq = function(arg0, arg1) { const ret = getObject(arg0) == getObject(arg1); return ret; @@ -462,6 +462,23 @@ function __wbg_get_imports() { const ret = fetch(getObject(arg0)); return addHeapObject(ret); }; + imports.wbg.__wbg_instanceof_Window_9029196b662bc42a = function(arg0) { + let result; + try { + result = getObject(arg0) instanceof Window; + } catch { + result = false; + } + const ret = result; + return ret; + }; + imports.wbg.__wbg_document_f7ace2b956f30a4f = function(arg0) { + const ret = getObject(arg0).document; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_alert_8c9ebcc791f5eaa8 = function() { return handleError(function (arg0, arg1, arg2) { + getObject(arg0).alert(getStringFromWasm0(arg1, arg2)); + }, arguments) }; imports.wbg.__wbg_instanceof_Element_4622f5da1249a3eb = function(arg0) { let result; try { @@ -514,23 +531,6 @@ function __wbg_get_imports() { const ret = getObject(arg0).getElementsByTagName(getStringFromWasm0(arg1, arg2)); return addHeapObject(ret); }; - imports.wbg.__wbg_instanceof_Window_9029196b662bc42a = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Window; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_document_f7ace2b956f30a4f = function(arg0) { - const ret = getObject(arg0).document; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_alert_8c9ebcc791f5eaa8 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).alert(getStringFromWasm0(arg1, arg2)); - }, arguments) }; imports.wbg.__wbg_instanceof_HtmlElement_6f4725d4677c7968 = function(arg0) { let result; try { @@ -551,40 +551,55 @@ function __wbg_get_imports() { const ret = getObject(arg0).fetch(getObject(arg1)); return addHeapObject(ret); }; - imports.wbg.__wbg_instanceof_HtmlInputElement_31b50e0cf542c524 = function(arg0) { + imports.wbg.__wbg_instanceof_HtmlAnchorElement_a293f072b6174b83 = function(arg0) { let result; try { - result = getObject(arg0) instanceof HTMLInputElement; + result = getObject(arg0) instanceof HTMLAnchorElement; } catch { result = false; } const ret = result; return ret; }; - imports.wbg.__wbg_setaccept_c88dd3ef66a1bc96 = function(arg0, arg1, arg2) { - getObject(arg0).accept = getStringFromWasm0(arg1, arg2); + imports.wbg.__wbg_setdownload_0d874703cef6b180 = function(arg0, arg1, arg2) { + getObject(arg0).download = getStringFromWasm0(arg1, arg2); }; - imports.wbg.__wbg_settype_ed9a0cf484870612 = function(arg0, arg1, arg2) { - getObject(arg0).type = getStringFromWasm0(arg1, arg2); + imports.wbg.__wbg_sethref_a3fde9630423d8ed = function(arg0, arg1, arg2) { + getObject(arg0).href = getStringFromWasm0(arg1, arg2); }; - imports.wbg.__wbg_instanceof_HtmlAnchorElement_a293f072b6174b83 = function(arg0) { + imports.wbg.__wbg_instanceof_HtmlInputElement_31b50e0cf542c524 = function(arg0) { let result; try { - result = getObject(arg0) instanceof HTMLAnchorElement; + result = getObject(arg0) instanceof HTMLInputElement; } catch { result = false; } const ret = result; return ret; }; - imports.wbg.__wbg_setdownload_0d874703cef6b180 = function(arg0, arg1, arg2) { - getObject(arg0).download = getStringFromWasm0(arg1, arg2); + imports.wbg.__wbg_setaccept_c88dd3ef66a1bc96 = function(arg0, arg1, arg2) { + getObject(arg0).accept = getStringFromWasm0(arg1, arg2); }; - imports.wbg.__wbg_sethref_a3fde9630423d8ed = function(arg0, arg1, arg2) { - getObject(arg0).href = getStringFromWasm0(arg1, arg2); + imports.wbg.__wbg_settype_ed9a0cf484870612 = function(arg0, arg1, arg2) { + getObject(arg0).type = getStringFromWasm0(arg1, arg2); }; - imports.wbg.__wbg_newwithstrandinit_cad5cd6038c7ff5d = function() { return handleError(function (arg0, arg1, arg2) { - const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); + imports.wbg.__wbg_new_f648bc7adcace0bc = function() { return handleError(function () { + const ret = new DOMParser(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_parseFromString_3d7be3de8b4c264e = function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg0).parseFromString(getStringFromWasm0(arg1, arg2), takeObject(arg3)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_textContent_c5d9e21ee03c63d4 = function(arg0, arg1) { + const ret = getObject(arg1).textContent; + var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len1; + getInt32Memory0()[arg0 / 4 + 0] = ptr1; + }; + imports.wbg.__wbg_appendChild_51339d4cde00ee22 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).appendChild(getObject(arg1)); return addHeapObject(ret); }, arguments) }; imports.wbg.__wbg_instanceof_HtmlButtonElement_6bd3bcb5370764a5 = function(arg0) { @@ -597,10 +612,25 @@ function __wbg_get_imports() { const ret = result; return ret; }; + imports.wbg.__wbg_createObjectURL_d82f2880bada6a1d = function() { return handleError(function (arg0, arg1) { + const ret = URL.createObjectURL(getObject(arg1)); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len1; + getInt32Memory0()[arg0 / 4 + 0] = ptr1; + }, arguments) }; imports.wbg.__wbg_newwithu8arraysequenceandoptions_854056d2c35b489c = function() { return handleError(function (arg0, arg1) { const ret = new Blob(getObject(arg0), getObject(arg1)); return addHeapObject(ret); }, arguments) }; + imports.wbg.__wbg_length_b37ae9be90ea7cf5 = function(arg0) { + const ret = getObject(arg0).length; + return ret; + }; + imports.wbg.__wbg_item_3364fbfadbf2cf08 = function(arg0, arg1) { + const ret = getObject(arg0).item(arg1 >>> 0); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; imports.wbg.__wbg_instanceof_Response_fc4327dbfcdf5ced = function(arg0) { let result; try { @@ -634,28 +664,6 @@ function __wbg_get_imports() { const ret = getObject(arg0).text(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_new_1eead62f64ca15ce = function() { return handleError(function () { - const ret = new Headers(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_append_fda9e3432e3e88da = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_new_f648bc7adcace0bc = function() { return handleError(function () { - const ret = new DOMParser(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_parseFromString_3d7be3de8b4c264e = function() { return handleError(function (arg0, arg1, arg2, arg3) { - const ret = getObject(arg0).parseFromString(getStringFromWasm0(arg1, arg2), takeObject(arg3)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createObjectURL_d82f2880bada6a1d = function() { return handleError(function (arg0, arg1) { - const ret = URL.createObjectURL(getObject(arg1)); - const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len1 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len1; - getInt32Memory0()[arg0 / 4 + 0] = ptr1; - }, arguments) }; imports.wbg.__wbg_signal_4bd18fb489af2d4c = function(arg0) { const ret = getObject(arg0).signal; return addHeapObject(ret); @@ -667,23 +675,15 @@ function __wbg_get_imports() { imports.wbg.__wbg_abort_654b796176d117aa = function(arg0) { getObject(arg0).abort(); }; - imports.wbg.__wbg_length_b37ae9be90ea7cf5 = function(arg0) { - const ret = getObject(arg0).length; - return ret; - }; - imports.wbg.__wbg_item_3364fbfadbf2cf08 = function(arg0, arg1) { - const ret = getObject(arg0).item(arg1 >>> 0); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_textContent_c5d9e21ee03c63d4 = function(arg0, arg1) { - const ret = getObject(arg1).textContent; - var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len1 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len1; - getInt32Memory0()[arg0 / 4 + 0] = ptr1; - }; - imports.wbg.__wbg_appendChild_51339d4cde00ee22 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).appendChild(getObject(arg1)); + imports.wbg.__wbg_new_1eead62f64ca15ce = function() { return handleError(function () { + const ret = new Headers(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_append_fda9e3432e3e88da = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + }, arguments) }; + imports.wbg.__wbg_newwithstrandinit_cad5cd6038c7ff5d = function() { return handleError(function (arg0, arg1, arg2) { + const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); return addHeapObject(ret); }, arguments) }; imports.wbg.__wbg_get_44be0491f933a435 = function(arg0, arg1) { @@ -839,10 +839,6 @@ function __wbg_get_imports() { const ret = getObject(arg0).buffer; return addHeapObject(ret); }; - imports.wbg.__wbg_stringify_e25465938f3f611f = function() { return handleError(function (arg0) { - const ret = JSON.stringify(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; imports.wbg.__wbg_has_c5fcd020291e56b8 = function() { return handleError(function (arg0, arg1) { const ret = Reflect.has(getObject(arg0), getObject(arg1)); return ret; @@ -851,6 +847,10 @@ function __wbg_get_imports() { const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2)); return ret; }, arguments) }; + imports.wbg.__wbg_stringify_e25465938f3f611f = function() { return handleError(function (arg0) { + const ret = JSON.stringify(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { const ret = debugString(getObject(arg1)); const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); @@ -865,12 +865,12 @@ function __wbg_get_imports() { const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper378 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 226, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper550 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 202, __wbg_adapter_36); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper947 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 470, __wbg_adapter_39); + imports.wbg.__wbindgen_closure_wrapper955 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 462, __wbg_adapter_39); return addHeapObject(ret); }; diff --git a/templateer_bg.wasm b/templateer_bg.wasm index f001d09..606914e 100644 Binary files a/templateer_bg.wasm and b/templateer_bg.wasm differ diff --git a/templates/fabric/src/main/resources/fabric.mod.json b/templates/fabric/src/main/resources/fabric.mod.json index 57290f9..b8a08df 100644 --- a/templates/fabric/src/main/resources/fabric.mod.json +++ b/templates/fabric/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ //% if architectury_api "architectury": ">=%ARCHITECTURY_API_VERSION%", //% end - "fabric-api": "*" + "%FABRIC_API_MOD_ID%": "*" }, "suggests": { "another-mod": "*" diff --git a/templates/forge_only/build.gradle b/templates/forge_only/build.gradle index 4a6c45a..c2cd33e 100644 --- a/templates/forge_only/build.gradle +++ b/templates/forge_only/build.gradle @@ -11,6 +11,10 @@ base { } loom { +//% if mojang_mappings + silentMojangMappingsLicense() + +//% end forge { mixinConfig '%MOD_ID%.mixins.json' } diff --git a/templates/multiplatform/build.gradle b/templates/multiplatform/build.gradle index 95d703d..023179b 100644 --- a/templates/multiplatform/build.gradle +++ b/templates/multiplatform/build.gradle @@ -31,6 +31,12 @@ subprojects { // for more information about repositories. } +//% if mojang_mappings + loom { + silentMojangMappingsLicense() + } + +//% end dependencies { minecraft "net.minecraft:minecraft:$rootProject.minecraft_version" //% if yarn diff --git a/templates/neoforge_only/build.gradle b/templates/neoforge_only/build.gradle index 11b2ca9..755e555 100644 --- a/templates/neoforge_only/build.gradle +++ b/templates/neoforge_only/build.gradle @@ -24,6 +24,12 @@ repositories { // for more information about repositories. } +//% if mojang_mappings +loom { + silentMojangMappingsLicense() +} + +//% end dependencies { minecraft "net.minecraft:minecraft:$project.minecraft_version" //% if yarn diff --git a/templates/shared/gradle/wrapper/gradle-wrapper.jar b/templates/shared/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/templates/shared/gradle/wrapper/gradle-wrapper.jar and b/templates/shared/gradle/wrapper/gradle-wrapper.jar differ diff --git a/templates/shared/gradle/wrapper/gradle-wrapper.properties b/templates/shared/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/templates/shared/gradle/wrapper/gradle-wrapper.properties +++ b/templates/shared/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/templates/shared/gradlew.bat b/templates/shared/gradlew.bat index 6689b85..7101f8e 100644 --- a/templates/shared/gradlew.bat +++ b/templates/shared/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/version_index.json b/version_index.json index 9d34723..34b2f82 100644 --- a/version_index.json +++ b/version_index.json @@ -31,7 +31,7 @@ }, "1.19.2": { "architectury_api": "6.6.92", - "forge": "1.19.2-43.3.13", + "forge": "1.19.2-43.4.0", "neoforge": null }, "1.19.3": { @@ -41,12 +41,12 @@ }, "1.19.4": { "architectury_api": "8.2.91", - "forge": "1.19.4-45.2.15", + "forge": "1.19.4-45.3.0", "neoforge": null }, "1.20.1": { "architectury_api": "9.2.14", - "forge": "1.20.1-47.2.32", + "forge": "1.20.1-47.3.3", "neoforge": null }, "1.20.2": { @@ -56,19 +56,25 @@ }, "1.20.4": { "architectury_api": "11.1.17", - "forge": "1.20.4-49.0.50", - "neoforge": "20.4.234" + "forge": "1.20.4-49.1.2", + "neoforge": "20.4.237" }, "1.20.5": { - "architectury_api": "12.1.2", + "architectury_api": "12.0.28", "forge": null, "neoforge": "20.5.21-beta", "neoforge_yarn_patch": "1.20.5+build.3" }, "1.20.6": { - "architectury_api": "12.1.2", + "architectury_api": "12.1.3", "forge": null, - "neoforge": "20.6.75-beta", - "neoforge_yarn_patch": "1.20.5+build.3" + "neoforge": "20.6.119", + "neoforge_yarn_patch": "1.20.6+build.4" + }, + "1.21": { + "architectury_api": "13.0.2", + "forge": null, + "neoforge": "21.0.42-beta", + "neoforge_yarn_patch": "1.21+build.4" } } \ No newline at end of file