diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 4dd1d8f48..95bf96671 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -82,9 +82,9 @@ shadowJar { // update notification stuff include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) - include(dependency("com.squareup.okhttp3:okhttp:3.12.0")) - include(dependency("com.squareup.okio:okio:2.2.2")) - include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) + include(dependency("com.squareup.okhttp3:okhttp:4.2.2")) + include(dependency("com.squareup.okio:okio:2.4.1")) + include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.61")) include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) } diff --git a/Core/build.gradle b/Core/build.gradle index 865e18257..4d57e4c86 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -5,19 +5,19 @@ def textVersion = "3.0.2" dependencies { implementation("org.yaml:snakeyaml:1.25") - implementation("com.google.code.gson:gson:2.8.0") { + implementation("com.google.code.gson:gson:2.8.6") { because("Minecraft uses GSON 2.8.0") force = true } - implementation("org.projectlombok:lombok:1.18.8") + implementation("org.projectlombok:lombok:1.18.10") compileOnly("org.projectlombok:lombok:1.18.8") testCompileOnly("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") - implementation("com.squareup.okhttp3:okhttp:3.12.0") - implementation("com.squareup.okio:okio:2.2.2") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") + implementation("com.squareup.okhttp3:okhttp:4.2.2") + implementation("com.squareup.okio:okio:2.4.1") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.61") } sourceCompatibility = 1.8 diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java index 25e861b35..880f2aaab 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java @@ -1828,11 +1828,24 @@ import java.util.zip.ZipInputStream; if (this.version != null) { this.style.set("Version", this.version.toString()); } - Map object = new HashMap<>(4); + this.style.set("Information", "Left Row: PlotSquared color codes ($), right row: Minecraft color codes (&)"); + Map object = new HashMap<>(16); object.put("color.1", "6"); object.put("color.2", "7"); object.put("color.3", "8"); object.put("color.4", "3"); + object.put("color.5", "1"); + object.put("color.6", "2"); + object.put("color.7", "4"); + object.put("color.8", "5"); + object.put("color.9", "9"); + object.put("color.10", "0"); + object.put("color.11", "a"); + object.put("color.12", "b"); + object.put("color.13", "c"); + object.put("color.14", "d"); + object.put("color.15", "e"); + object.put("color.16", "f"); if (!this.style.contains("color")) { for (Entry node : object.entrySet()) { this.style.set(node.getKey(), node.getValue()); diff --git a/build.gradle b/build.gradle index 4a8237379..28988c1e5 100644 --- a/build.gradle +++ b/build.gradle @@ -12,14 +12,14 @@ buildscript { configurations.all { resolutionStrategy { force("org.ow2.asm:asm:7.2") - force("org.jetbrains:annotations:17.0.0") + force("org.jetbrains:annotations:18.0.0") } } } plugins { id "maven-publish" - id "org.ajoberstar.grgit" version "3.1.1" + id "org.ajoberstar.grgit" version "4.0.0" } group = "com.github.intellectualsites.plotsquared" @@ -83,7 +83,7 @@ subprojects { because("Minecraft uses Guava 21 as of 1.13") } compileOnly("org.jetbrains:annotations:17.0.0") - compileClasspath("org.projectlombok:lombok:1.18.8") + compileClasspath("org.projectlombok:lombok:1.18.10") testCompileOnly("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") @@ -94,7 +94,7 @@ subprojects { resolutionStrategy { force("junit:junit:4.12") force("com.google.guava:guava:21.0") - force("org.jetbrains:annotations:17.0.0") + force("org.jetbrains:annotations:18.0.0") force("com.google.code.findbugs:jsr305:3.0.2") } }