Compare commits
4 commits
mainCapabi
...
main
Author | SHA1 | Date | |
---|---|---|---|
49e471e0f8 | |||
95585adea7 | |||
671d4ff2b2 | |||
ecb210d3ef |
150 changed files with 33 additions and 23 deletions
|
@ -35,7 +35,7 @@ fun ShadowJar.configureStandard() {
|
|||
|
||||
val sourcesJar by tasks.existing(AbstractArchiveTask::class) {
|
||||
from(
|
||||
zipTree(project(":paperweight-lib").tasks
|
||||
zipTree(project(":nugget-lib").tasks
|
||||
.named("sourcesJar", AbstractArchiveTask::class)
|
||||
.flatMap { it.archiveFile })
|
||||
) {
|
||||
|
@ -43,15 +43,15 @@ val sourcesJar by tasks.existing(AbstractArchiveTask::class) {
|
|||
}
|
||||
}
|
||||
|
||||
val prefix = project.name.substringAfter("paperweight-")
|
||||
val prefix = project.name.substringAfter("nugget-")
|
||||
|
||||
gradlePlugin {
|
||||
website.set("https://github.com/PaperMC/paperweight")
|
||||
vcsUrl.set("https://github.com/PaperMC/paperweight")
|
||||
plugins.create("paperweight-$prefix") {
|
||||
website.set("https://git.zontreck.com/ObsidianMC/nugget")
|
||||
vcsUrl.set("https://git.zontreck.com/ObsidianMC/nugget")
|
||||
plugins.create("nugget-$prefix") {
|
||||
id = "io.papermc.paperweight." + prefix
|
||||
displayName = "paperweight $prefix"
|
||||
tags.set(listOf("paper", "minecraft"))
|
||||
displayName = "nugget $prefix"
|
||||
tags.set(listOf("obsidian", "minecraft"))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,7 @@ val shadowJar by tasks.existing(ShadowJar::class) {
|
|||
return@existing
|
||||
}
|
||||
|
||||
val prefix = "paper.libs"
|
||||
val prefix = "obsidian.libs"
|
||||
listOf(
|
||||
"com.github.salomonbrys.kotson",
|
||||
"com.google.errorprone.annotations",
|
||||
|
@ -91,11 +91,21 @@ val shadowJar by tasks.existing(ShadowJar::class) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
val MAVEN_PASSWORD = "AriasCreationsMavenPassword"
|
||||
val MAVEN_USER = "AriasCreationsMavenUser"
|
||||
|
||||
|
||||
publishing {
|
||||
repositories {
|
||||
maven("https://repo.papermc.io/repository/maven-snapshots/") {
|
||||
credentials(PasswordCredentials::class)
|
||||
name = "paper"
|
||||
maven {
|
||||
url = uri("https://git.zontreck.com/api/packages/ObsidianMC/maven")
|
||||
name = "obsidian"
|
||||
|
||||
credentials {
|
||||
username = project.findProperty(MAVEN_USER)?.toString()
|
||||
password = project.findProperty(MAVEN_PASSWORD)?.toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -109,11 +119,11 @@ publishing {
|
|||
}
|
||||
|
||||
fun MavenPom.pomConfig() {
|
||||
val repoPath = "PaperMC/paperweight"
|
||||
val repoUrl = "https://github.com/$repoPath"
|
||||
val repoPath = "ObsidianMC/nugget"
|
||||
val repoUrl = "https://git.zontreck.com/$repoPath"
|
||||
|
||||
name.set("paperweight")
|
||||
description.set("Gradle plugin for the PaperMC project")
|
||||
name.set("nugget")
|
||||
description.set("Gradle plugin for the ObsidianMC project")
|
||||
url.set(repoUrl)
|
||||
inceptionYear.set("2020")
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
group = io.papermc.paperweight
|
||||
group = com.zontreck.nugget
|
||||
version = 1.7.4-SNAPSHOT
|
||||
|
||||
org.gradle.caching = true
|
||||
|
|
|
@ -4,7 +4,7 @@ plugins {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
shade(projects.paperweightLib)
|
||||
shade(projects.nuggetLib)
|
||||
|
||||
implementation(libs.bundles.kotson)
|
||||
}
|
|
@ -49,7 +49,7 @@ class PaperweightCore : Plugin<Project> {
|
|||
override fun apply(target: Project) {
|
||||
checkJavaVersion()
|
||||
Git.checkForGit()
|
||||
printId<PaperweightCore>("paperweight-core", target.gradle)
|
||||
printId<PaperweightCore>("nugget-core", target.gradle)
|
||||
|
||||
val ext = target.extensions.create(PAPERWEIGHT_EXTENSION, PaperweightCoreExtension::class, target)
|
||||
|
||||
|
@ -70,7 +70,7 @@ class PaperweightCore : Plugin<Project> {
|
|||
target.configurations.create(DECOMPILER_CONFIG)
|
||||
target.configurations.create(PAPERCLIP_CONFIG)
|
||||
|
||||
if (target.providers.gradleProperty("paperweight.dev").orNull == "true") {
|
||||
if (target.providers.gradleProperty("nugget.dev").orNull == "true") {
|
||||
target.tasks.register<CreateDiffOutput>("diff") {
|
||||
inputDir.convention(ext.paper.paperServerDir.map { it.dir("src/main/java") })
|
||||
val prop = target.providers.gradleProperty("paperweight.diff.output")
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue