From 3ba29583fcde44126fc61669dcc9836ef0a33dbb Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 7 Dec 2019 17:40:15 +0100 Subject: [PATCH 01/10] Add all colors to style.yml For further releases , we should aim to get a rid of the styles.yml and $ codes. I've seen a lot of people struggling with them, and if you want to use other formatting codes, you need to yamlize the non yamlized messages, otherwise it won't work properly. --- .../plotsquared/plot/PlotSquared.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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()); From 781a4d8d78bff471494764cf3bba8005ee25bfa9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 18:25:18 +0000 Subject: [PATCH 02/10] Bump org.ajoberstar.grgit from 3.1.1 to 4.0.0 Bumps org.ajoberstar.grgit from 3.1.1 to 4.0.0. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a8237379..8a03527df 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { 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" From c1a7844f4a3fed8043037f0a17af6af81e0c596c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 18:25:42 +0000 Subject: [PATCH 03/10] Bump lombok from 1.18.8 to 1.18.10 Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.8 to 1.18.10. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/build.gradle b/Core/build.gradle index 865e18257..6d70d77d3 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -9,7 +9,7 @@ dependencies { 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") diff --git a/build.gradle b/build.gradle index 8a03527df..05971ee6c 100644 --- a/build.gradle +++ b/build.gradle @@ -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") From 4ba5b6da1dd20fae5e49784a8f687c781520b2ce Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 07:36:06 +0000 Subject: [PATCH 04/10] Bump annotations from 17.0.0 to 18.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 17.0.0 to 18.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Commits](https://github.com/JetBrains/java-annotations/compare/17.0.0...18.0.0) Signed-off-by: dependabot-preview[bot] --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 05971ee6c..28988c1e5 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ 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") } } } @@ -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") } } From e5423b5e08c64cb1e8128d859dd014952f6e43b9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:26:55 +0000 Subject: [PATCH 05/10] Bump kotlin-stdlib from 1.3.50 to 1.3.61 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.50 to 1.3.61. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.61/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.50...v1.3.61) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 4dd1d8f48..bfc358d03 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -84,7 +84,7 @@ shadowJar { 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("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 6d70d77d3..80456c626 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -17,7 +17,7 @@ dependencies { 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("org.jetbrains.kotlin:kotlin-stdlib:1.3.61") } sourceCompatibility = 1.8 From 1097f44febe5ce82e85e96a9e11fda4a74e3057e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 07:35:42 +0000 Subject: [PATCH 06/10] Bump retrofit from 2.4.0 to 2.6.2 Bumps [retrofit](https://github.com/square/retrofit) from 2.4.0 to 2.6.2. - [Release notes](https://github.com/square/retrofit/releases) - [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/retrofit/commits) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index bfc358d03..c57f1c7ff 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation("org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT") compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.0.0") compile("io.papermc:paperlib:1.0.2") - compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.4.0") + compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.6.2") implementation("net.kyori:text-adapter-bukkit:3.0.3") compile("net.milkbowl.vault:VaultAPI:1.7") { exclude(module: "bukkit") From 4e2c90e399a0c18ee9d1575bbccb8a4b6d1783a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 18:26:16 +0000 Subject: [PATCH 07/10] Bump gson from 2.8.0 to 2.8.6 Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.6. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/build.gradle b/Core/build.gradle index 80456c626..a4d125b8e 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -5,7 +5,7 @@ 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 } From eb09e0a633d27bf605b61772707915ff56baaf39 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 18:24:56 +0000 Subject: [PATCH 08/10] Bump okhttp from 3.12.0 to 4.2.2 Bumps [okhttp](https://github.com/square/okhttp) from 3.12.0 to 4.2.2. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-3.12.0...parent-4.2.2) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index c57f1c7ff..2a975ab65 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -82,7 +82,7 @@ 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.okhttp3:okhttp:4.2.2")) include(dependency("com.squareup.okio:okio:2.2.2")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.61")) include(dependency("io.papermc:paperlib:1.0.2")) diff --git a/Core/build.gradle b/Core/build.gradle index a4d125b8e..735cd5a40 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -15,7 +15,7 @@ dependencies { 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.okhttp3:okhttp:4.2.2") implementation("com.squareup.okio:okio:2.2.2") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.61") } From 241589fdb0949686eb3ee4461018ce8606ca0c2d Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 7 Dec 2019 18:56:43 +0100 Subject: [PATCH 09/10] Revert "Bump retrofit from 2.4.0 to 2.6.2" This reverts commit 1097f44febe5ce82e85e96a9e11fda4a74e3057e. --- Bukkit/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 2a975ab65..e3ab0db97 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation("org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT") compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.0.0") compile("io.papermc:paperlib:1.0.2") - compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.6.2") + compile(group: "com.squareup.retrofit2", name: "retrofit", version: "2.4.0") implementation("net.kyori:text-adapter-bukkit:3.0.3") compile("net.milkbowl.vault:VaultAPI:1.7") { exclude(module: "bukkit") From 7d8a5213dd54cc5a5edb587db341ad31565c8a00 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2019 18:17:32 +0000 Subject: [PATCH 10/10] Bump okio from 2.2.2 to 2.4.1 Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1. - [Release notes](https://github.com/square/okio/releases) - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index e3ab0db97..95bf96671 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -83,7 +83,7 @@ shadowJar { include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) include(dependency("com.squareup.okhttp3:okhttp:4.2.2")) - include(dependency("com.squareup.okio:okio:2.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 735cd5a40..4d57e4c86 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -16,7 +16,7 @@ dependencies { testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") implementation("com.squareup.okhttp3:okhttp:4.2.2") - implementation("com.squareup.okio:okio:2.2.2") + implementation("com.squareup.okio:okio:2.4.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.61") }