User: joe Date: 10 Nov 26 01:25 Revision: be88573252089e2dc5a2e392ef0ea8ccbb44404f Summary: Update templates submodule TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10692&personal=false Index: templates/architectury/.mcdev.template.json =================================================================== --- templates/architectury/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/architectury/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "mod", "properties": [ { Index: templates/bukkit/paper.mcdev.template.json =================================================================== --- templates/bukkit/paper.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/bukkit/paper.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "plugin", "properties": [ { Index: templates/bukkit/spigot.mcdev.template.json =================================================================== --- templates/bukkit/spigot.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/bukkit/spigot.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "plugin", "properties": [ { Index: templates/bungeecord/.mcdev.template.json =================================================================== --- templates/bungeecord/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/bungeecord/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "proxy", "properties": [ { Index: templates/fabric/.mcdev.template.json =================================================================== --- templates/fabric/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,13 +1,8 @@ { - "version": 3, + "version": 4, "group": "mod", "properties": [ { - "name": "BUILD_COORDS", - "type": "build_system_coordinates", - "order": 10 - }, - { "name": "LANGUAGE", "type": "string", "options": [ @@ -17,44 +12,33 @@ "default": 0 }, { - "name": "VERSIONS", - "type": "fabric_versions" + "name": "MC_VERSION", + "type": "fabric_game_version", + "remember": false }, { - "name": "KOTLIN_LOADER_VERSION", - "type": "maven_artifact_version", - "parameters": { - "sourceUrl": "https://maven.fabricmc.net/net/fabricmc/fabric-language-kotlin/maven-metadata.xml", - "rawVersionFilter": "$version.contains('+kotlin.')" + "name": "USE_GRADLE_KOTLIN_DSL", + "type": "boolean", + "remember": "fabric.USE_GRADLE_KOTLIN_DSL", + "default": false - }, + }, + { + "name": "USE_MOJANG_MAPPINGS", + "type": "boolean", + "remember": "fabric.USE_MOJANG_MAPPINGS", + "default": true, "visible": { - "dependsOn": "LANGUAGE", - "condition": "$LANGUAGE == 'Kotlin'" + "dependsOn": ["MC_VERSION"], + "condition": "$MC_VERSION.compareTo($mcver.MC26_1) < 0" } }, { - "name": "MOD_ENVIRONMENT", - "type": "string", - "options": [ - "*", - "client", - "server" - ], - "default": "*" - }, - { - "name": "USE_MIXINS", - "type": "boolean", - "remember": "fabric.USE_MIXINS", - "default": true - }, - { "name": "USE_DATAGEN", "type": "boolean", - "default": true, + "default": false, "visible": { - "dependsOn": ["VERSIONS"], - "condition": "$VERSIONS.useFabricApi" + "dependsOn": ["MC_VERSION"], + "condition": "$MC_VERSION.compareTo($mcver.MC1_17) >= 0" } }, { @@ -62,26 +46,11 @@ "type": "boolean", "default": true, "visible": { - "dependsOn": ["VERSIONS"], - "condition": "$VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0" + "dependsOn": ["MC_VERSION"], + "condition": "$MC_VERSION.compareTo($mcver.MC1_19) >= 0" } }, { - "name": "CLIENT_SOURCE_SET", - "type": "string", - "visible": false, - "derives": { - "parents": ["VERSIONS", "SPLIT_SOURCES"], - "select": [ - { - "condition": "$SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0", - "value": "client" - } - ], - "default": "main" - } - }, - { "name": "MOD_ID", "type": "string", "validator": "[a-z][a-z0-9-_]{1,63}", @@ -102,14 +71,32 @@ "inheritFrom": "PROJECT_NAME" }, { - "name": "MAIN_CLASS", - "type": "class_fqn", + "name": "MOD_ID_PACKAGE_SEGMENT", + "type": "string", + "visible": false, "derives": { - "parents": ["BUILD_COORDS", "MOD_ID"], - "method": "suggestClassName" + "parents": ["MOD_ID"], + "method": "replace", + "parameters": { + "regex": "-", + "replacement": "_" - } + } + } }, { + "name": "PACKAGE_NAME", + "type": "string", + "validator": "[a-z_][a-z0-9_]*(\\.[a-z_][a-z0-9_]*)*", + "derives": { + "parents": ["MOD_ID_PACKAGE_SEGMENT"], + "method": "replace", + "parameters": { + "regex": "^", + "replacement": "com.example." + } + } + }, + { "name": "LICENSE", "type": "license" }, @@ -118,19 +105,9 @@ "collapsible": true, "groupProperties": [ { - "name": "DESCRIPTION", - "type": "string", - "default": "" - }, - { "name": "AUTHORS", "type": "inline_string_list", "default": "" - }, - { - "name": "WEBSITE", - "type": "string", - "default": "" } ] }, @@ -138,12 +115,12 @@ "name": "JAVA_VERSION", "type": "integer", "order": 20, - "default": 17, + "default": 21, "visible": false, "derives": { - "parents": ["VERSIONS"], + "parents": ["MC_VERSION"], "method": "recommendJavaVersionForMcVersion", - "default": 17 + "default": 21 } }, { @@ -153,107 +130,44 @@ "default": "JAVA_VERSION" } ], - "files": [ + "finalizers": [ { - "template": "../Gradle.gitignore.ft", - "destination": ".gitignore", - "condition": "$USE_GIT" + "type": "run_npm_package", + "package": "@fabricmc/cli", + "command": "fabric", + "args": [ + "init", + "--defaultOptions", + "--allow-non-empty-dir", + "--name=$MOD_NAME", + "--modid=$MOD_ID", + "--packageName=$PACKAGE_NAME", + "--version=$MC_VERSION", + "--option=kotlin=$LANGUAGE.equals('Kotlin')", + "--option=gradleKotlin=$USE_GRADLE_KOTLIN_DSL", + "--option=mojangMappings=$USE_MOJANG_MAPPINGS", + "--option=datagen=#if ($USE_DATAGEN && $MC_VERSION.compareTo($mcver.MC1_17) >= 0)true#{else}false#end", + "--option=splitSources=#if ($SPLIT_SOURCES && $MC_VERSION.compareTo($mcver.MC1_19) >= 0)true#{else}false#end", + "." + ] }, { - "template": "build.gradle.ft", - "destination": "build.gradle", - "condition": "$LANGUAGE == 'Java'" - }, + "type": "generate_files", + "files": [ - { + { - "template": "settings.gradle.ft", - "destination": "settings.gradle", - "condition": "$LANGUAGE == 'Java'" - }, - { - "template": "build.gradle.kts.ft", - "destination": "build.gradle.kts", - "condition": "$LANGUAGE == 'Kotlin'" - }, - { - "template": "settings.gradle.kts.ft", - "destination": "settings.gradle.kts", - "condition": "$LANGUAGE == 'Kotlin'" - }, - { - "template": "gradle.properties.ft", - "destination": "gradle.properties" - }, - { - "template": "../gradle-wrapper.properties.ft", - "destination": "gradle/wrapper/gradle-wrapper.properties", - "properties": { - "GRADLE_VERSION": "9.6.1" + "template": "../licenses/${LICENSE.id}.txt.ft", + "destination": "LICENSE" - } + } + ] }, { - "template": "fabric.mod.json.ft", - "destination": "src/main/resources/fabric.mod.json" + "type": "replace_in_file", + "file": "src/main/resources/fabric.mod.json", + "find": "\"license\"\\s*:\\s*\"[^\"]*\"", + "regex": true, + "replace": "\"license\": \"${LICENSE.id}\"" }, { - "template": "mixins.json.ft", - "destination": "src/main/resources/${MOD_ID}.mixins.json", - "condition": "$USE_MIXINS" - }, - { - "template": "mixins.json.ft", - "destination": "src/client/resources/${MOD_ID}.client.mixins.json", - "condition": "$USE_MIXINS && $SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0", - "properties": { - "CLIENT": true - } - }, - { - "template": "Initializer.java.ft", - "destination": "src/main/java/${MAIN_CLASS.path}.java", - "condition": "$LANGUAGE == 'Java'", - "openInEditor": true - }, - { - "template": "ClientInitializer.java.ft", - "destination": "src/${CLIENT_SOURCE_SET}/java/${MAIN_CLASS.packagePath}/client/${MAIN_CLASS.className}Client.java", - "condition": "$LANGUAGE == 'Java' && $MOD_ENVIRONMENT != 'server'", - "openInEditor": true - }, - { - "template": "Initializer.kt.ft", - "destination": "src/main/kotlin/${MAIN_CLASS.path}.kt", - "condition": "$LANGUAGE == 'Kotlin'", - "openInEditor": true - }, - { - "template": "ClientInitializer.kt.ft", - "destination": "src/${CLIENT_SOURCE_SET}/kotlin/${MAIN_CLASS.packagePath}/client/${MAIN_CLASS.className}Client.kt", - "condition": "$LANGUAGE == 'Kotlin' && $MOD_ENVIRONMENT != 'server'", - "openInEditor": true - }, - { - "template": "DataGenerator.java.ft", - "destination": "src/${CLIENT_SOURCE_SET}/java/${MAIN_CLASS.packagePath}/client/${MAIN_CLASS.className}DataGenerator.java", - "condition": "$LANGUAGE == 'Java' && $USE_DATAGEN", - "openInEditor": true - }, - { - "template": "DataGenerator.kt.ft", - "destination": "src/${CLIENT_SOURCE_SET}/kotlin/${MAIN_CLASS.packagePath}/client/${MAIN_CLASS.className}DataGenerator.kt", - "condition": "$LANGUAGE == 'Kotlin' && $USE_DATAGEN", - "openInEditor": true - }, - { - "template": "../licenses/${LICENSE.id}.txt.ft", - "destination": "LICENSE.txt" - } - ], - "finalizers": [ - { - "type": "run_gradle_tasks", - "tasks": ["wrapper"] - }, - { "type": "import_gradle_project" }, { Index: templates/fabric/ClientInitializer.java.ft =================================================================== --- templates/fabric/ClientInitializer.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/ClientInitializer.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,10 +0,0 @@ -package ${MAIN_CLASS.packageName}.client; - -import net.fabricmc.api.ClientModInitializer; - -public class ${MAIN_CLASS.className}Client implements ClientModInitializer { - - @Override - public void onInitializeClient() { - } -} Index: templates/fabric/ClientInitializer.kt.ft =================================================================== --- templates/fabric/ClientInitializer.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/ClientInitializer.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,9 +0,0 @@ -package ${MAIN_CLASS.packageName}.client - -import net.fabricmc.api.ClientModInitializer - -class ${MAIN_CLASS.className}Client : ClientModInitializer { - - override fun onInitializeClient() { - } -} Index: templates/fabric/DataGenerator.java.ft =================================================================== --- templates/fabric/DataGenerator.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/DataGenerator.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,12 +0,0 @@ -package ${MAIN_CLASS.packageName}.client; - -import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; - -public class ${MAIN_CLASS.className}DataGenerator implements DataGeneratorEntrypoint { - - @Override - public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { - FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); - } -} Index: templates/fabric/DataGenerator.kt.ft =================================================================== --- templates/fabric/DataGenerator.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/DataGenerator.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,11 +0,0 @@ -package ${MAIN_CLASS.packageName}.client - -import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator - -class ${MAIN_CLASS.className}DataGenerator : DataGeneratorEntrypoint { - - override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) { - val pack = fabricDataGenerator.createPack() - } -} Index: templates/fabric/Initializer.java.ft =================================================================== --- templates/fabric/Initializer.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/Initializer.java.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,10 +0,0 @@ -package ${MAIN_CLASS.packageName}; - -import net.fabricmc.api.ModInitializer; - -public class ${MAIN_CLASS.className} implements ModInitializer { - - @Override - public void onInitialize() { - } -} Index: templates/fabric/Initializer.kt.ft =================================================================== --- templates/fabric/Initializer.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/Initializer.kt.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,9 +0,0 @@ -package ${MAIN_CLASS.packageName} - -import net.fabricmc.api.ModInitializer - -class ${MAIN_CLASS.className} : ModInitializer { - - override fun onInitialize() { - } -} Index: templates/fabric/build.gradle.ft =================================================================== --- templates/fabric/build.gradle.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/build.gradle.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,127 +0,0 @@ -plugins { -#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) - id 'net.fabricmc.fabric-loom' version '${VERSIONS.loom}' -#else - id 'fabric-loom' version '${VERSIONS.loom}' -#end - id 'maven-publish' -} - -version = project.mod_version -group = project.maven_group - -base { - archivesName = project.archives_base_name -} - -#if ($SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0) -loom { - splitEnvironmentSourceSets() - - mods { - "${MOD_ID}" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } -} -#end - -#if ($USE_DATAGEN) -fabricApi { - configureDataGeneration { - client = true - } -} -#end - -repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} - -dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" -#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) - implementation "net.fabricmc:fabric-loader:${project.loader_version}" - - #if (${VERSIONS.useFabricApi}) - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - #end -#else - #if (${VERSIONS.useOfficialMappings}) - mappings loom.officialMojangMappings() - #else - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - #end - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - #if (${VERSIONS.useFabricApi}) - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - #end -#end -} - -processResources { - inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version - inputs.property "loader_version", project.loader_version - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minecraft_version, - "loader_version": project.loader_version - } -} - -def targetJavaVersion = ${JAVA_VERSION} -tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release.set(targetJavaVersion) - } -} - -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archives_base_name}"} - } -} - -// configure the maven publication -publishing { - publications { - create("mavenJava", MavenPublication) { - artifactId = project.archives_base_name - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} Index: templates/fabric/build.gradle.kts.ft =================================================================== --- templates/fabric/build.gradle.kts.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/build.gradle.kts.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,133 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - kotlin("jvm") version "${KOTLIN_LOADER_VERSION.toString().split("kotlin.")[1]}" -#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) - id("net.fabricmc.fabric-loom") version "${VERSIONS.loom}" -#else - id("fabric-loom") version "${VERSIONS.loom}" -#end - id("maven-publish") -} - -version = project.property("mod_version") as String -group = project.property("maven_group") as String - -base { - archivesName.set(project.property("archives_base_name") as String) -} - -val targetJavaVersion = ${JAVA_VERSION} -java { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -#if ($SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0) -loom { - splitEnvironmentSourceSets() - - mods { - register("${MOD_ID}") { - sourceSet("main") - sourceSet("client") - } - } -} -#end - -#if ($USE_DATAGEN) -fabricApi { - configureDataGeneration { - client = true - } -} -#end - -repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} - -dependencies { - // To change the versions see the gradle.properties file - minecraft("com.mojang:minecraft:${project.property("minecraft_version")}") -#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) - implementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") - implementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") - - #if (${VERSIONS.useFabricApi}) - implementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") - #end -#else - #if (${VERSIONS.useOfficialMappings}) - mappings(loom.officialMojangMappings()) - #else - mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") - #end - modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") - modImplementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") - - #if (${VERSIONS.useFabricApi}) - modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") - #end -#end -} - -tasks.processResources { - inputs.property("version", project.version) - inputs.property("minecraft_version", project.property("minecraft_version")) - inputs.property("loader_version", project.property("loader_version")) - filteringCharset = "UTF-8" - - filesMatching("fabric.mod.json") { - expand("version" to project.version, - "minecraft_version" to project.property("minecraft_version"), - "loader_version" to project.property("loader_version"), - "kotlin_loader_version" to project.property("kotlin_loader_version")) - } -} - -tasks.withType().configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - options.encoding = "UTF-8" - options.release.set(targetJavaVersion) -} - -tasks.withType().configureEach { - compilerOptions.jvmTarget.set(JvmTarget.fromTarget(targetJavaVersion.toString())) -} - -tasks.jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}" } - } -} - -// configure the maven publication -publishing { - publications { - create("mavenJava") { - artifactId = project.property("archives_base_name") as String - from(components["java"]) - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} Index: templates/fabric/fabric.mod.json.ft =================================================================== --- templates/fabric/fabric.mod.json.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/fabric.mod.json.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,48 +0,0 @@ -#set ( $d = "$" ) -{ - "schemaVersion": 1, - "id": "${MOD_ID}", - "version": "${d}{version}", - - "name": "${MOD_NAME}", - "description": "${DESCRIPTION}", - "authors": [], - "contact": {}, - - "license": "${LICENSE.id}", - "icon": "assets/${MOD_ID}/icon.png", - - "environment": "${MOD_ENVIRONMENT}", - "entrypoints": { -#if ($USE_DATAGEN) - "fabric-datagen": ["${MAIN_CLASS.packageName}.client.${MAIN_CLASS.className}DataGenerator"], -#end -#if (${MOD_ENVIRONMENT} != 'server') - "client": ["${MAIN_CLASS.packageName}.client.${MAIN_CLASS.className}Client"], -#end - "main": ["${MAIN_CLASS}"] - }, - -#if (${USE_MIXINS}) - "mixins": [ - "${MOD_ID}.mixins.json" -#if ($SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0) - ,{ - "config": "${MOD_ID}.client.mixins.json", - "environment": "client" - } -#end - ], -#end - - "depends": { - "fabricloader": ">=${d}{loader_version}", -#if (${LANGUAGE} == 'Kotlin') - "fabric-language-kotlin": ">=${d}{kotlin_loader_version}", -#end -#if (${VERSIONS.useFabricApi}) - "fabric-api": "*", -#end - "minecraft": "${d}{minecraft_version}" - } -} Index: templates/fabric/gradle.properties.ft =================================================================== --- templates/fabric/gradle.properties.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/gradle.properties.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,24 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties - # check these on https://modmuss50.me/fabric.html - minecraft_version=${VERSIONS.minecraftVersion} -#if (!${VERSIONS.useOfficialMappings}) - yarn_mappings=${VERSIONS.yarn} -#end - loader_version=${VERSIONS.loader} -#if (${LANGUAGE} == 'Kotlin') - kotlin_loader_version=${KOTLIN_LOADER_VERSION} -#end - -# Mod Properties - mod_version = ${BUILD_COORDS.version} - maven_group = ${BUILD_COORDS.groupId} - archives_base_name = ${BUILD_COORDS.artifactId} - -#if (${VERSIONS.useFabricApi}) -# Dependencies - # check this on https://modmuss50.me/fabric.html - fabric_version=${VERSIONS.fabricApi} -#end Index: templates/fabric/mixins.json.ft =================================================================== --- templates/fabric/mixins.json.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/mixins.json.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,24 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", -#if (!$CLIENT) - "package": "${MAIN_CLASS.packageName}.mixin", -#else - "package": "${MAIN_CLASS.packageName}.mixin.client", -#end - "compatibilityLevel": "JAVA_${JAVA_VERSION}", -#if (!($SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0) || !$CLIENT) - "mixins": [ - ], -#end -#if (!($SPLIT_SOURCES && $VERSIONS.minecraftVersion.compareTo($mcver.MC1_18) >= 0) || $CLIENT) - "client": [ - ], -#end - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} Index: templates/fabric/settings.gradle.ft =================================================================== --- templates/fabric/settings.gradle.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/settings.gradle.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,9 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} Index: templates/fabric/settings.gradle.kts.ft =================================================================== --- templates/fabric/settings.gradle.kts.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/settings.gradle.kts.ft (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,8 +0,0 @@ -pluginManagement { - repositories { - maven("https://maven.fabricmc.net/") { - name = "Fabric" - } - gradlePluginPortal() - } -} Index: templates/fabric/velocity_implicit.vm =================================================================== --- templates/fabric/velocity_implicit.vm (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/fabric/velocity_implicit.vm (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) @@ -1,23 +0,0 @@ -#* @implicitly included *# - -#* @vtlvariable name="semver" type="com.demonwav.mcdev.util.SemanticVersion.Companion" *# -#* @vtlvariable name="mcver" type="com.demonwav.mcdev.util.MinecraftVersions" *# - -#* @vtlvariable name="BUILD_COORDS" type="com.demonwav.mcdev.creator.custom.model.BuildSystemCoordinates" *# -#* @vtlvariable name="LANGUAGE" type="java.lang.String" *# -#* @vtlvariable name="VERSIONS" type="com.demonwav.mcdev.creator.custom.model.FabricVersionsModel" *# -#* @vtlvariable name="KOTLIN_LOADER_VERSION" type="com.demonwav.mcdev.util.SemanticVersion" *# -#* @vtlvariable name="MOD_ENVIRONMENT" type="java.lang.String" *# -#* @vtlvariable name="USE_MIXINS" type="boolean" *# -#* @vtlvariable name="USE_DATAGEN" type="boolean" *# -#* @vtlvariable name="SPLIT_SOURCES" type="boolean" *# -#* @vtlvariable name="CLIENT_SOURCE_SET" type="java.lang.String" *# -#* @vtlvariable name="MOD_ID" type="java.lang.String" *# -#* @vtlvariable name="MOD_NAME" type="java.lang.String" *# -#* @vtlvariable name="MAIN_CLASS" type="com.demonwav.mcdev.creator.custom.model.ClassFqn" *# -#* @vtlvariable name="LICENSE" type="com.demonwav.mcdev.creator.custom.model.LicenseData" *# -#* @vtlvariable name="DESCRIPTION" type="java.lang.String" *# -#* @vtlvariable name="AUTHORS" type="com.demonwav.mcdev.creator.custom.model.StringList" *# -#* @vtlvariable name="WEBSITE" type="java.lang.String" *# -#* @vtlvariable name="JAVA_VERSION" type="int" *# -#* @vtlvariable name="JDK" type="com.demonwav.mcdev.creator.custom.model.CreatorJdk" *# Index: templates/forge/.mcdev.template.json =================================================================== --- templates/forge/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/forge/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "mod", "properties": [ { Index: templates/messages.properties =================================================================== --- templates/messages.properties (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/messages.properties (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -32,6 +32,9 @@ creator.ui.gradle_plugins.label=Gradle Plugins creator.ui.use_datagen.label=Use Datagen: +creator.ui.use_mojang_mappings.label=Use Mojang Mappings: +creator.ui.use_gradle_kotlin_dsl.label=Use Gradle Kotlin DSL: +creator.ui.package_name.label=Package Name: creator.ui.use_paper_manifest.label=Use Paper Manifest: creator.ui.use_paper_manifest.warning=Paper plugins are still experimental, their usage is discouraged for general purpose development. creator.ui.use_annotation_processor.label=Use velocity-plugin.json annotation processor: Index: templates/multiloader/.mcdev.template.json =================================================================== --- templates/multiloader/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/multiloader/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "mod", "properties": [ { Index: templates/neoforge/.mcdev.template.json =================================================================== --- templates/neoforge/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/neoforge/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "mod", "properties": [ { Index: templates/sponge/.mcdev.template.json =================================================================== --- templates/sponge/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/sponge/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "plugin", "properties": [ { Index: templates/velocity/.mcdev.template.json =================================================================== --- templates/velocity/.mcdev.template.json (revision ac29973c3640d6f6b0ea57bdcc44e60e8f11d2dc) +++ templates/velocity/.mcdev.template.json (revision be88573252089e2dc5a2e392ef0ea8ccbb44404f) @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "group": "proxy", "properties": [ {