User: kyle wood Date: 19 Jul 26 21:34 Revision: 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d Summary: Update templates repo TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10576&personal=false Index: templates/bukkit/plugin.yml.ft =================================================================== --- templates/bukkit/plugin.yml.ft (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/bukkit/plugin.yml.ft (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -12,9 +12,9 @@ bootstrapper: ${MAIN_CLASS.packageName}.${MAIN_CLASS.className}Bootstrap #end #if (${INCLUDE_PLUGIN_LOADER} && !${GREMLIN_PLUGIN.enabled} && !${USE_PAPER_MANIFEST}) -paperPluginLoader: ${MAIN_CLASS.packageName}.${MAIN_CLASS.className}Loader +paper-plugin-loader: ${MAIN_CLASS.packageName}.${MAIN_CLASS.className}Loader #elseif (${GREMLIN_PLUGIN.enabled} && !${USE_PAPER_MANIFEST}) -paperPluginLoader: xyz.jpenilla.gremlin.runtime.platformsupport.DefaultsPaperPluginLoader +paper-plugin-loader: xyz.jpenilla.gremlin.runtime.platformsupport.DefaultsPaperPluginLoader #elseif (${INCLUDE_PLUGIN_LOADER} && !${GREMLIN_PLUGIN.enabled} && ${USE_PAPER_MANIFEST}) loader: ${MAIN_CLASS.packageName}.${MAIN_CLASS.className}Loader #elseif (${GREMLIN_PLUGIN.enabled} && ${USE_PAPER_MANIFEST}) Index: templates/fabric/.mcdev.template.json =================================================================== --- templates/fabric/.mcdev.template.json (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/fabric/.mcdev.template.json (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -187,7 +187,7 @@ "template": "../gradle-wrapper.properties.ft", "destination": "gradle/wrapper/gradle-wrapper.properties", "properties": { - "GRADLE_VERSION": "9.2.1" + "GRADLE_VERSION": "9.6.1" } }, { Index: templates/fabric/build.gradle.ft =================================================================== --- templates/fabric/build.gradle.ft (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/fabric/build.gradle.ft (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -1,5 +1,9 @@ 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' } @@ -42,16 +46,24 @@ 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 + #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 + #if (${VERSIONS.useFabricApi}) + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + #end +#end } processResources { Index: templates/fabric/build.gradle.kts.ft =================================================================== --- templates/fabric/build.gradle.kts.ft (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/fabric/build.gradle.kts.ft (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -3,7 +3,11 @@ 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") } @@ -55,17 +59,26 @@ 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 + #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 + #if (${VERSIONS.useFabricApi}) + modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") + #end +#end } tasks.processResources { Index: templates/sponge/.mcdev.template.json =================================================================== --- templates/sponge/.mcdev.template.json (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/sponge/.mcdev.template.json (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -28,8 +28,18 @@ "type": "semantic_version", "forceDropdown": true, "options": [ + "18.0.0-SNAPSHOT", + "17.1.0-SNAPSHOT", + "17.0.0", + "17.0.0-SNAPSHOT", + "16.1.0-SNAPSHOT", + "16.0.0", "16.0.0-SNAPSHOT", + "15.1.0-SNAPSHOT", + "15.0.0", "15.0.0-SNAPSHOT", + "14.1.0-SNAPSHOT", + "14.0.0", "14.0.0-SNAPSHOT", "13.1.0-SNAPSHOT", "13.0.0", Index: templates/sponge/build.gradle.kts.ft =================================================================== --- templates/sponge/build.gradle.kts.ft (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/sponge/build.gradle.kts.ft (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -8,7 +8,7 @@ #else `java-library` #end - id("org.spongepowered.gradle.plugin") version "2.2.0" + id("org.spongepowered.gradle.plugin") version "2.3.0" } group = "${BUILD_COORDS.groupId}" Index: templates/sponge/settings.gradle.kts.ft =================================================================== --- templates/sponge/settings.gradle.kts.ft (revision 72d0a8e593c983b7ede0f74f1f56445eb072b0f4) +++ templates/sponge/settings.gradle.kts.ft (revision 00d9aef9b6b1be70e3c0c5126d32aec70a36c17d) @@ -1,1 +1,8 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://repo.spongepowered.org/repository/maven-public/") + } +} + rootProject.name = "${PROJECT_NAME}"