zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Compare commits

base: zhdev:dfec660fc751ade57aefb10c012d08b082486eca
Branches Tags
zhdev:master
zhdev:3.5.6
..
compare: zhdev:919bfadc38d5d741024a704cabebafea7df6e8f2
Branches Tags
zhdev:master
zhdev:3.5.6

No commits in common. "dfec660fc751ade57aefb10c012d08b082486eca" and "919bfadc38d5d741024a704cabebafea7df6e8f2" have entirely different histories.
dfec660fc7 ... 919bfadc38

6 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Bukkit/build.gradle.kts
View file

@ -14,21 +14,14 @@ base {
dependencies { dependencies {
implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}") implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}")
implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}")
exclude("net.kyori", "adventure-text-minimessage") implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}")
}
implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") {
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") {
exclude("net.kyori", "adventure-api") exclude("net.kyori", "adventure-api")
} }
implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}") implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}")
implementation(project(":Common")) implementation(project(":Common"))
compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") { compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT")
exclude("net.kyori", "*")
}
} }
tasks.withType<ShadowJar> { tasks.withType<ShadowJar> {

9
Bungee/build.gradle.kts
View file

@ -18,13 +18,8 @@ repositories {
dependencies { dependencies {
implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}") implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}")
implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}")
exclude("net.kyori", "adventure-text-minimessage") implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}")
}
implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") {
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") {
exclude("net.kyori", "adventure-api") exclude("net.kyori", "adventure-api")
} }

5
Common/build.gradle.kts
View file

@ -15,10 +15,7 @@ repositories {
} }
dependencies { dependencies {
compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") { compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}")
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}")
compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1")

2
Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java
View file

@ -63,7 +63,7 @@ public class WatchManager<P, T> {
PluginWatchResults watchResults = new PluginWatchResults(); PluginWatchResults watchResults = new PluginWatchResults();
for (String pluginId : task.pluginIds) { for (String pluginId : task.pluginIds) {
watchResults.add(WatchResult.STOPPED, "plugin", pluginId); watchResults.add(WatchResult.START, "plugin", pluginId);
} }
return watchResults; return watchResults;
} }

2
build.gradle.kts
View file

@ -8,7 +8,7 @@ plugins {
group = "net.frankheijden.serverutils" group = "net.frankheijden.serverutils"
val dependencyDir = "${group}.dependencies" val dependencyDir = "${group}.dependencies"
version = "3.5.5-SNAPSHOT" version = "3.5.3"
java { java {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8

6
buildSrc/src/main/kotlin/VersionConstants.kt
View file

@ -1,7 +1,7 @@
object VersionConstants { object VersionConstants {
const val cloudVersion = "1.8.0" const val cloudVersion = "1.8.0-SNAPSHOT"
const val adventureVersion = "4.11.0" const val adventureVersion = "4.9.3"
const val adventurePlatformVersion = "4.1.2" const val adventurePlatformVersion = "4.0.1"
const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT"
const val bstatsVersion = "3.0.0" const val bstatsVersion = "3.0.0"
} }