@@ -19,19 +19,14 @@ val paperApiName = "1.21-R0.1-SNAPSHOT"
19
19
// = = =
20
20
21
21
// for Jenkins CI
22
- val buildNumber = System .getenv(" BUILD_NUMBER" ) ? : " local"
23
- val mavenDirectory =
24
- System .getenv(" MAVEN_DIR" )
25
- ? : layout.buildDirectory.dir(" repo" ).path.toString()
26
- val javaDocDirectory =
27
- System .getenv(" JAVADOC_DIR" )
28
- ? : layout.buildDirectory.dir(" javadoc" ).path.toString()
22
+ val buildNumber = System .getenv(" BUILD_NUMBER" ) ? : " x"
23
+ val mavenDirectory = System .getenv(" MAVEN_DIR" ) ? : layout.buildDirectory.dir(" repo" ).path.toString()
24
+ val javaDocDirectory = System .getenv(" JAVADOC_DIR" ) ? : layout.buildDirectory.dir(" javadoc" ).path.toString()
29
25
30
26
// Version used for distribution. Different from maven repo
31
27
group = " cat.nyaa"
32
28
// archivesBaseName = "${pluginNameUpper}-mc$minecraftVersion"
33
- version =
34
- " $majorVersion .$minorVersion "
29
+ version = " $majorVersion .$minorVersion "
35
30
36
31
java {
37
32
// Configure the java toolchain. This allows gradle to auto-provision JDK 21 on systems that only have JDK 8 installed for example.
@@ -45,12 +40,12 @@ repositories {
45
40
} // paper
46
41
maven { url = uri(" https://libraries.minecraft.net" ) } // mojang
47
42
maven { url = uri(" https://repo.essentialsx.net/releases/" ) } // essentials
48
- maven { url = uri(" https://ci.nyaacat.com/maven/" ) } // nyaacat
43
+ // maven { url = uri("https://ci.nyaacat.com/maven/") } // nyaacat
49
44
50
45
}
51
46
52
47
dependencies {
53
- paperweightDevelopmentBundle( paperweight.paperDevBundle(paperApiName) )
48
+ paperweight.paperDevBundle(paperApiName)
54
49
// paperweight.foliaDevBundle("1.21-R0.1-SNAPSHOT")
55
50
// paperweight.devBundle("com.example.paperfork", "1.21-R0.1-SNAPSHOT")
56
51
compileOnly(" net.essentialsx:EssentialsX:2.20.1" ) // soft dep
@@ -68,23 +63,24 @@ dependencies {
68
63
publishing {
69
64
publications {
70
65
create<MavenPublication >(" mavenJava" ) {
71
- from(getComponents()[" java" ])
72
- afterEvaluate {
73
- artifactId = pluginName.lowercase()
74
- groupId = " $group "
75
- version =
76
- " $majorVersion .$minorVersion .$buildNumber -${
77
- getMcVersion(
78
- paperApiName
79
- )
80
- } "
81
- }
66
+ from(components[" java" ])
67
+ groupId = group.toString()
68
+ artifactId = pluginName.lowercase()
69
+ version = " $majorVersion .$minorVersion .$buildNumber -mc${getMcVersion(paperApiName)} "
82
70
}
83
71
}
84
72
repositories {
85
73
maven {
86
- name = " nyaaMaven "
74
+ name = " PublishMaven "
87
75
url = uri(mavenDirectory)
76
+ val mavenUserName = System .getenv(" MAVEN_USERNAME" )
77
+ val mavenPassword = System .getenv(" MAVEN_PASSWORD" )
78
+ if (mavenUserName != null && mavenPassword != null ) {
79
+ credentials {
80
+ username = mavenUserName
81
+ password = mavenPassword
82
+ }
83
+ }
88
84
}
89
85
}
90
86
}
@@ -99,11 +95,29 @@ reobfJar {
99
95
100
96
101
97
tasks {
98
+
99
+ // 1)
100
+ // For >=1.20.5 when you don't care about supporting spigot
101
+ // paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
102
+
103
+ // 2)
104
+ // For 1.20.4 or below, or when you care about supporting Spigot on >=1.20.5
105
+ // Configure reobfJar to run when invoking the build task
106
+ /*
102
107
// Configure reobfJar to run when invoking the build task
103
108
assemble {
104
109
dependsOn(reobfJar)
105
110
}
111
+ */
106
112
113
+ withType<ProcessResources > {
114
+
115
+ val newProperties = project.properties.toMutableMap()
116
+ newProperties[" api_version" ] = getMcVersion(paperApiName)
117
+ filesMatching(" plugin.yml" ) {
118
+ expand(newProperties)
119
+ }
120
+ }
107
121
108
122
compileJava {
109
123
options.encoding = Charsets .UTF_8 .name() // We want UTF-8 for everything
@@ -112,6 +126,7 @@ tasks {
112
126
// See https://openjdk.java.net/jeps/247 for more information.
113
127
options.release.set(21 )
114
128
}
129
+
115
130
javadoc {
116
131
with ((options as StandardJavadocDocletOptions )) {
117
132
options.encoding =
0 commit comments