Skip to content

Commit b85ffed

Browse files
committed
(Untested) Improvements to multi-module projects.
1 parent 95e8577 commit b85ffed

File tree

223 files changed

+307
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+307
-258
lines changed

action/build.gradle.kts

-26
This file was deleted.

api/action/build.gradle.kts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
plugins {
2+
id("io.izzel.taboolib")
3+
id("trplugins.build.publish")
4+
}
5+
6+
val taboolibVersion: String by rootProject
7+
8+
taboolib {
9+
description {
10+
name(rootProject.name)
11+
}
12+
install(
13+
"common",
14+
"common-5",
15+
"expansion-javascript",
16+
"module-chat",
17+
"module-configuration",
18+
)
19+
options(
20+
"skip-minimize",
21+
"keep-kotlin-module",
22+
"skip-taboolib-relocate",
23+
)
24+
classifier = null
25+
version = taboolibVersion
26+
}
27+
28+
dependencies {
29+
api(project(":api:common"))
30+
31+
compileOnly("net.md-5:bungeecord-chat:1.18-R0.1-SNAPSHOT")
32+
}

api/common/build.gradle.kts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
plugins {
2+
id("io.izzel.taboolib")
3+
id("trplugins.build.publish")
4+
}
5+
6+
val taboolibVersion: String by rootProject
7+
8+
taboolib {
9+
description {
10+
name(rootProject.name)
11+
}
12+
install(
13+
"common",
14+
"common-5",
15+
"expansion-javascript",
16+
"module-chat",
17+
"module-lang",
18+
"module-configuration",
19+
)
20+
options(
21+
"skip-minimize",
22+
"keep-kotlin-module",
23+
"skip-taboolib-relocate",
24+
)
25+
classifier = null
26+
version = taboolibVersion
27+
}
28+
29+
dependencies {
30+
compileOnly("com.google.code.gson:gson:2.8.7")
31+
compileOnly("com.electronwill.night-config:core:3.6.5")
32+
}

api/receptacle/build.gradle.kts

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id("io.izzel.taboolib")
3+
id("trplugins.build.publish")
4+
}
5+
6+
val taboolibVersion: String by rootProject
7+
8+
taboolib {
9+
description {
10+
name(rootProject.name)
11+
}
12+
install(
13+
"common",
14+
"module-nms",
15+
"platform-bukkit",
16+
)
17+
options(
18+
"skip-minimize",
19+
"keep-kotlin-module",
20+
"skip-taboolib-relocate",
21+
)
22+
classifier = null
23+
version = taboolibVersion
24+
}
25+
26+
dependencies {
27+
api(project(":api:common"))
28+
29+
compileOnly("org.spigotmc:spigot:1.16.5-R0.1-20210611.090701-17")
30+
compileOnly("ink.ptms.core:v11701:11701-minimize:universal")
31+
compileOnly("ink.ptms.core:v11600:11600-minimize")
32+
compileOnly("ink.ptms.core:v11200:11200-minimize")
33+
compileOnly("ink.ptms.core:v11400:11400-minimize")
34+
35+
compileOnly("org.geysermc.floodgate:api:2.1.1-SNAPSHOT")
36+
}

assist/build.gradle.kts

-25
This file was deleted.

build.gradle.kts

+24-73
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,39 @@
11
val taboolibVersion: String by project
22

33
plugins {
4-
kotlin("jvm") version "1.6.10"
5-
id("io.izzel.taboolib") version "1.34"
6-
id("trplugins.build.publish")
4+
id("org.gradle.java")
5+
id("org.gradle.maven-publish")
6+
kotlin("jvm") version "1.6.21" apply false
7+
id("io.izzel.taboolib") version "1.40" apply false
78
}
89

910
description = "Modern & Advanced Menu-Plugin for Minecraft Servers"
1011

11-
taboolib {
12-
install(
13-
"common",
14-
"common-5",
15-
"expansion-javascript",
16-
"module-kether",
17-
"module-ui",
18-
"module-lang",
19-
"module-database",
20-
"module-database-mongodb",
21-
"module-metrics",
22-
"module-nms",
23-
"module-chat",
24-
"module-nms-util",
25-
"module-configuration",
26-
"platform-bukkit"
27-
)
28-
29-
description {
30-
contributors {
31-
name("Arasple")
32-
name("Score2")
33-
}
34-
dependencies {
35-
name("PlaceholderAPI").optional(true)
36-
name("Skulls").optional(true)
37-
name("Vault").optional(true)
38-
name("PlayerPoints").optional(true)
39-
name("HeadDatabase").optional(true)
40-
name("Oraxen").optional(true)
41-
name("SkinsRestorer").optional(true)
42-
name("ItemsAdder").optional(true)
43-
name("floodgate-bukkit").optional(true)
44-
name("FastScript").optional(true)
45-
}
46-
}
47-
relocate("trplugins.menu", group.toString().toLowerCase())
48-
49-
classifier = null
50-
version = taboolibVersion
51-
}
52-
5312
repositories {
5413
mavenCentral()
5514
maven("https://repo.tabooproject.org/repository/releases")
56-
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
57-
maven("https://repo.codemc.org/repository/maven-public")
58-
maven("https://repo.rosewooddev.io/repository/public/")
59-
maven("https://repo.opencollab.dev/maven-snapshots/")
6015
maven("https://jitpack.io")
6116
}
6217

63-
dependencies {
64-
taboo(project(":action")) { isTransitive = false }
65-
taboo(project(":assist")) { isTransitive = false }
66-
taboo(project(":receptacle")) { isTransitive = false }
67-
68-
// Libraries
69-
compileOnly(kotlin("stdlib"))
70-
compileOnly("org.apache.commons:commons-lang3:3.12.0")
71-
compileOnly("com.electronwill.night-config:core:3.6.5")
18+
subprojects {
19+
apply<JavaPlugin>()
20+
apply(plugin = "org.jetbrains.kotlin.jvm")
7221

73-
// Server Core
74-
compileOnly("ink.ptms.core:v11701:11701-minimize:mapped")
75-
compileOnly("ink.ptms.core:v11701:11701-minimize:universal")
76-
compileOnly("ink.ptms.core:v11604:11604")
77-
78-
// Hook Plugins
79-
compileOnly("me.clip:placeholderapi:2.10.9") { isTransitive = false }
80-
compileOnly("ink.ptms:Zaphkiel:1.6.0") { isTransitive = false }
81-
compileOnly("ca.tweetzy:skulls:2.7.2") { isTransitive = false }
82-
compileOnly("net.skinsrestorer:skinsrestorer-api:14.1.10") { isTransitive = false }
83-
compileOnly("com.github.Th0rgal:Oraxen:-SNAPSHOT") { isTransitive = false }
84-
compileOnly("org.black_ixx:playerpoints:3.1.1") { isTransitive = false }
85-
compileOnly("com.github.MilkBowl:VaultAPI:-SNAPSHOT") { isTransitive = false }
86-
87-
compileOnly(fileTree("libs"))
22+
repositories {
23+
mavenCentral()
24+
maven("https://repo.tabooproject.org/repository/releases")
25+
maven("https://hub.spigotmc.org/nexus/content/groups/public/")
26+
maven("https://repo.codemc.io/repository/nms/")
27+
maven("https://repo.opencollab.dev/maven-snapshots/")
28+
}
29+
dependencies {
30+
"compileOnly"(kotlin("stdlib"))
31+
}
32+
tasks.withType<JavaCompile> {
33+
options.encoding = "UTF-8"
34+
}
35+
configure<JavaPluginExtension> {
36+
sourceCompatibility = JavaVersion.VERSION_1_8
37+
targetCompatibility = JavaVersion.VERSION_1_8
38+
}
8839
}

buildSrc/src/main/kotlin/trplugins/build/publish.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package trplugins.build
22

3-
import gradle.kotlin.dsl.accessors._e98ba513b34f86980a981ef4cafb3d49.publishing
4-
import org.gradle.kotlin.dsl.`maven-publish`
5-
63
plugins {
74
`maven-publish`
85
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

plugin/build.gradle.kts

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
val taboolibVersion: String by project
2+
3+
plugins {
4+
id("io.izzel.taboolib")
5+
id("trplugins.build.publish")
6+
}
7+
8+
taboolib {
9+
install(
10+
"common",
11+
"common-5",
12+
"expansion-javascript",
13+
"module-kether",
14+
"module-ui",
15+
"module-lang",
16+
"module-database",
17+
"module-database-mongodb",
18+
"module-metrics",
19+
"module-nms",
20+
"module-chat",
21+
"module-nms-util",
22+
"module-configuration",
23+
"platform-bukkit"
24+
)
25+
26+
description {
27+
contributors {
28+
name("Arasple")
29+
name("Score2")
30+
}
31+
dependencies {
32+
name("PlaceholderAPI").optional(true)
33+
name("Skulls").optional(true)
34+
name("Vault").optional(true)
35+
name("PlayerPoints").optional(true)
36+
name("HeadDatabase").optional(true)
37+
name("Oraxen").optional(true)
38+
name("SkinsRestorer").optional(true)
39+
name("ItemsAdder").optional(true)
40+
name("floodgate-bukkit").optional(true)
41+
name("FastScript").optional(true)
42+
}
43+
}
44+
relocate("trplugins.menu", group.toString().toLowerCase())
45+
46+
classifier = null
47+
version = taboolibVersion
48+
}
49+
50+
repositories {
51+
mavenCentral()
52+
maven("https://repo.tabooproject.org/repository/releases")
53+
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
54+
maven("https://repo.codemc.org/repository/maven-public")
55+
maven("https://repo.rosewooddev.io/repository/public/")
56+
maven("https://repo.opencollab.dev/maven-snapshots/")
57+
maven("https://jitpack.io")
58+
}
59+
60+
dependencies {
61+
taboo(project(":api:common")) { isTransitive = false }
62+
taboo(project(":api:receptacle")) { isTransitive = false }
63+
taboo(project(":api:action")) { isTransitive = false }
64+
65+
// Libraries
66+
compileOnly("org.apache.commons:commons-lang3:3.12.0")
67+
compileOnly("com.electronwill.night-config:core:3.6.5")
68+
69+
// Server Core
70+
compileOnly("ink.ptms.core:v11701:11701-minimize:mapped")
71+
compileOnly("ink.ptms.core:v11701:11701-minimize:universal")
72+
compileOnly("ink.ptms.core:v11604:11604")
73+
74+
// Hook Plugins
75+
compileOnly("me.clip:placeholderapi:2.10.9") { isTransitive = false }
76+
compileOnly("ink.ptms:Zaphkiel:1.6.0") { isTransitive = false }
77+
compileOnly("ca.tweetzy:skulls:2.7.2") { isTransitive = false }
78+
compileOnly("net.skinsrestorer:skinsrestorer-api:14.1.10") { isTransitive = false }
79+
compileOnly("com.github.Th0rgal:Oraxen:-SNAPSHOT") { isTransitive = false }
80+
compileOnly("org.black_ixx:playerpoints:3.1.1") { isTransitive = false }
81+
compileOnly("com.github.MilkBowl:VaultAPI:-SNAPSHOT") { isTransitive = false }
82+
83+
compileOnly(fileTree("libs"))
84+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/main/kotlin/trplugins/menu/util/bukkit/ItemHelper.kt plugin/src/main/kotlin/trplugins/menu/util/bukkit/ItemHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import kotlin.math.min
2626
object ItemHelper {
2727

2828
fun serializeColor(color: String): Color {
29-
val rgb = color.split(",").toTypedArray()
29+
val rgb = color.split(",")
3030
if (rgb.size == 3) {
3131
val r = min(rgb[0].toIntOrNull() ?: 0, 255)
3232
val g = min(rgb[1].toIntOrNull() ?: 0, 255)
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)