diff --git a/build.gradle.kts b/build.gradle.kts index 6472026..0f9454e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` id("idea") id("io.github.goooler.shadow") version "8.1.7" - id("io.papermc.paperweight.userdev") version "1.7.1" apply false + id("io.papermc.paperweight.userdev") version "1.7.3" apply false } idea { diff --git a/plugin-core/build.gradle.kts b/plugin-core/build.gradle.kts index bcf724a..09a877a 100644 --- a/plugin-core/build.gradle.kts +++ b/plugin-core/build.gradle.kts @@ -1,7 +1,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -14,34 +16,32 @@ dependencies { compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT") // -- dream-platform -- - implementation("cc.dreamcode.platform:core:1.12.8") - implementation("cc.dreamcode.platform:bukkit:1.12.8") - implementation("cc.dreamcode.platform:bukkit-config:1.12.8") - implementation("cc.dreamcode.platform:dream-command:1.12.8") - implementation("cc.dreamcode.platform:persistence:1.12.8") + implementation("cc.dreamcode.platform:core:1.12.9") + implementation("cc.dreamcode.platform:bukkit:1.12.9") + implementation("cc.dreamcode.platform:bukkit-config:1.12.9") + implementation("cc.dreamcode.platform:dream-command:1.12.9") + implementation("cc.dreamcode.platform:persistence:1.12.9") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") // -- dream-notice -- - implementation("cc.dreamcode.notice:core:1.5.7") - implementation("cc.dreamcode.notice:minecraft:1.5.7") - implementation("cc.dreamcode.notice:minecraft-adventure:1.5.7") - implementation("cc.dreamcode.notice:bukkit-adventure:1.5.7") - implementation("cc.dreamcode.notice:bukkit-adventure-serializer:1.5.7") + implementation("cc.dreamcode.notice:core:1.6.6") + implementation("cc.dreamcode.notice:bukkit-adventure:1.6.6") + implementation("cc.dreamcode.notice:bukkit-adventure-serializer:1.6.6") // -- notice mini-messages -- implementation("net.kyori:adventure-text-minimessage:4.17.0") // -- dream-command -- - implementation("cc.dreamcode.command:core:2.1.2") - implementation("cc.dreamcode.command:bukkit:2.1.2") + implementation("cc.dreamcode.command:core:2.1.3") + implementation("cc.dreamcode.command:bukkit:2.1.3") // -- dream-menu -- - implementation("cc.dreamcode.menu:core:1.3.6") - implementation("cc.dreamcode.menu:bukkit-adventure:1.3.6") - implementation("cc.dreamcode.menu:bukkit-adventure-serializer:1.3.6") + implementation("cc.dreamcode.menu:core:1.3.7") + implementation("cc.dreamcode.menu:bukkit-adventure:1.3.7") + implementation("cc.dreamcode.menu:bukkit-adventure-serializer:1.3.7") // -- configs-- implementation("eu.okaeri:okaeri-configs-yaml-bukkit:5.0.2") @@ -67,7 +67,7 @@ dependencies { implementation("eu.okaeri:okaeri-tasker-bukkit:2.1.0-beta.3") // -- Multi-Version Items helper -- - implementation("com.github.cryptomorin:XSeries:9.10.0") + implementation("com.github.cryptomorin:XSeries:11.3.0") } tasks.withType { diff --git a/plugin-core/nms/api/build.gradle.kts b/plugin-core/nms/api/build.gradle.kts index 21dbf99..f3afcd1 100644 --- a/plugin-core/nms/api/build.gradle.kts +++ b/plugin-core/nms/api/build.gradle.kts @@ -1,11 +1,13 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_12_R1/build.gradle.kts b/plugin-core/nms/v1_12_R1/build.gradle.kts index ddf581c..d68b106 100644 --- a/plugin-core/nms/v1_12_R1/build.gradle.kts +++ b/plugin-core/nms/v1_12_R1/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { compileOnly("org.spigotmc:spigot:1.12.2-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_16_R3/build.gradle.kts b/plugin-core/nms/v1_16_R3/build.gradle.kts index 2adccea..e7df5fb 100644 --- a/plugin-core/nms/v1_16_R3/build.gradle.kts +++ b/plugin-core/nms/v1_16_R3/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_17_R1/build.gradle.kts b/plugin-core/nms/v1_17_R1/build.gradle.kts index 9d3721c..99a357f 100644 --- a/plugin-core/nms/v1_17_R1/build.gradle.kts +++ b/plugin-core/nms/v1_17_R1/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.17.1-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_18_R2/build.gradle.kts b/plugin-core/nms/v1_18_R2/build.gradle.kts index 43ae3e2..094d393 100644 --- a/plugin-core/nms/v1_18_R2/build.gradle.kts +++ b/plugin-core/nms/v1_18_R2/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.18.2-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_19_R2/build.gradle.kts b/plugin-core/nms/v1_19_R2/build.gradle.kts index abe3006..13465a7 100644 --- a/plugin-core/nms/v1_19_R2/build.gradle.kts +++ b/plugin-core/nms/v1_19_R2/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.19.3-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_19_R3/build.gradle.kts b/plugin-core/nms/v1_19_R3/build.gradle.kts index 0b7cff9..140499c 100644 --- a/plugin-core/nms/v1_19_R3/build.gradle.kts +++ b/plugin-core/nms/v1_19_R3/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_20_R1/build.gradle.kts b/plugin-core/nms/v1_20_R1/build.gradle.kts index 03d3c04..1fbb3ab 100644 --- a/plugin-core/nms/v1_20_R1/build.gradle.kts +++ b/plugin-core/nms/v1_20_R1/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_20_R2/build.gradle.kts b/plugin-core/nms/v1_20_R2/build.gradle.kts index f29ec50..7de4997 100644 --- a/plugin-core/nms/v1_20_R2/build.gradle.kts +++ b/plugin-core/nms/v1_20_R2/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_20_R3/build.gradle.kts b/plugin-core/nms/v1_20_R3/build.gradle.kts index d4a62f5..3274886 100644 --- a/plugin-core/nms/v1_20_R3/build.gradle.kts +++ b/plugin-core/nms/v1_20_R3/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_20_R4/build.gradle.kts b/plugin-core/nms/v1_20_R4/build.gradle.kts index 8494318..7f5cc02 100644 --- a/plugin-core/nms/v1_20_R4/build.gradle.kts +++ b/plugin-core/nms/v1_20_R4/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/nms/v1_8_R3/build.gradle.kts b/plugin-core/nms/v1_8_R3/build.gradle.kts index 4099dbb..e2ab53c 100644 --- a/plugin-core/nms/v1_8_R3/build.gradle.kts +++ b/plugin-core/nms/v1_8_R3/build.gradle.kts @@ -1,5 +1,7 @@ repositories { - maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/nms") + maven("https://repo.codemc.io/repository/maven-public") + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { @@ -8,6 +10,6 @@ dependencies { compileOnly("org.spigotmc:spigot:1.8.8-R0.1-SNAPSHOT") // -- dream-utilities -- - implementation("cc.dreamcode:utilities:1.4.5") - implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.5") + implementation("cc.dreamcode:utilities:1.5.1") + implementation("cc.dreamcode:utilities-bukkit-adventure:1.5.1") } \ No newline at end of file diff --git a/plugin-core/src/main/java/cc/dreamcode/template/TemplatePlugin.java b/plugin-core/src/main/java/cc/dreamcode/template/TemplatePlugin.java index d195c09..4648db2 100644 --- a/plugin-core/src/main/java/cc/dreamcode/template/TemplatePlugin.java +++ b/plugin-core/src/main/java/cc/dreamcode/template/TemplatePlugin.java @@ -3,8 +3,8 @@ import cc.dreamcode.command.bukkit.BukkitCommandProvider; import cc.dreamcode.menu.adventure.BukkitMenuProvider; import cc.dreamcode.menu.adventure.serializer.MenuBuilderSerializer; -import cc.dreamcode.notice.adventure.BukkitNoticeProvider; -import cc.dreamcode.notice.adventure.serializer.BukkitNoticeSerializer; +import cc.dreamcode.notice.bukkit.BukkitNoticeProvider; +import cc.dreamcode.notice.serializer.BukkitNoticeSerializer; import cc.dreamcode.platform.DreamVersion; import cc.dreamcode.platform.bukkit.DreamBukkitConfig; import cc.dreamcode.platform.bukkit.DreamBukkitPlatform; diff --git a/plugin-core/src/main/java/cc/dreamcode/template/command/ExampleCommand.java b/plugin-core/src/main/java/cc/dreamcode/template/command/ExampleCommand.java index 6325f0d..670fc69 100644 --- a/plugin-core/src/main/java/cc/dreamcode/template/command/ExampleCommand.java +++ b/plugin-core/src/main/java/cc/dreamcode/template/command/ExampleCommand.java @@ -5,7 +5,7 @@ import cc.dreamcode.command.annotation.Command; import cc.dreamcode.command.annotation.Executor; import cc.dreamcode.command.annotation.Permission; -import cc.dreamcode.notice.adventure.BukkitNotice; +import cc.dreamcode.notice.bukkit.BukkitNotice; import cc.dreamcode.template.config.MessageConfig; import cc.dreamcode.template.config.PluginConfig; import cc.dreamcode.utilities.TimeUtil; diff --git a/plugin-core/src/main/java/cc/dreamcode/template/command/result/BukkitNoticeResolver.java b/plugin-core/src/main/java/cc/dreamcode/template/command/result/BukkitNoticeResolver.java index 1a64064..ea34d3b 100644 --- a/plugin-core/src/main/java/cc/dreamcode/template/command/result/BukkitNoticeResolver.java +++ b/plugin-core/src/main/java/cc/dreamcode/template/command/result/BukkitNoticeResolver.java @@ -3,7 +3,7 @@ import cc.dreamcode.command.DreamSender; import cc.dreamcode.command.bukkit.BukkitSender; import cc.dreamcode.command.result.ResultResolver; -import cc.dreamcode.notice.adventure.BukkitNotice; +import cc.dreamcode.notice.bukkit.BukkitNotice; import lombok.NonNull; public class BukkitNoticeResolver implements ResultResolver { diff --git a/plugin-core/src/main/java/cc/dreamcode/template/config/MessageConfig.java b/plugin-core/src/main/java/cc/dreamcode/template/config/MessageConfig.java index 161143e..c61aef0 100644 --- a/plugin-core/src/main/java/cc/dreamcode/template/config/MessageConfig.java +++ b/plugin-core/src/main/java/cc/dreamcode/template/config/MessageConfig.java @@ -1,6 +1,6 @@ package cc.dreamcode.template.config; -import cc.dreamcode.notice.adventure.BukkitNotice; +import cc.dreamcode.notice.bukkit.BukkitNotice; import cc.dreamcode.platform.bukkit.component.configuration.Configuration; import eu.okaeri.configs.OkaeriConfig; import eu.okaeri.configs.annotation.CustomKey;