EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking

Browse Source
This commit is contained in:
MattBDev 2019-12-09 14:44:16 -05:00
commit 3af05e7960
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit/build.gradle
View File

@ -82,9 +82,9 @@ shadowJar {
// update notification stuff // update notification stuff
include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT"))
include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) 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("com.squareup.okio:okio:2.4.1"))
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("io.papermc:paperlib:1.0.2"))
include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
} }

10
Core/build.gradle
View File

@ -5,19 +5,19 @@ def textVersion = "3.0.2"
dependencies { dependencies {
implementation("org.yaml:snakeyaml:1.25") 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") because("Minecraft uses GSON 2.8.0")
force = true force = true
} }
implementation("org.projectlombok:lombok:1.18.8") implementation("org.projectlombok:lombok:1.18.10")
compileOnly("org.projectlombok:lombok:1.18.8") compileOnly("org.projectlombok:lombok:1.18.8")
testCompileOnly("org.projectlombok:lombok:1.18.8") testCompileOnly("org.projectlombok:lombok:1.18.8")
annotationProcessor("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8")
testAnnotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8")
implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") 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("com.squareup.okio:okio:2.4.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.61")
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8

15
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
View File

@ -1828,11 +1828,24 @@ import java.util.zip.ZipInputStream;
if (this.version != null) { if (this.version != null) {
this.style.set("Version", this.version.toString()); this.style.set("Version", this.version.toString());
} }
Map<String, Object> object = new HashMap<>(4); this.style.set("Information", "Left Row: PlotSquared color codes ($), right row: Minecraft color codes (&)");
Map<String, Object> object = new HashMap<>(16);
object.put("color.1", "6"); object.put("color.1", "6");
object.put("color.2", "7"); object.put("color.2", "7");
object.put("color.3", "8"); object.put("color.3", "8");
object.put("color.4", "3"); 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")) { if (!this.style.contains("color")) {
for (Entry<String, Object> node : object.entrySet()) { for (Entry<String, Object> node : object.entrySet()) {
this.style.set(node.getKey(), node.getValue()); this.style.set(node.getKey(), node.getValue());

8
build.gradle
View File

@ -12,14 +12,14 @@ buildscript {
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
force("org.ow2.asm:asm:7.2") force("org.ow2.asm:asm:7.2")
force("org.jetbrains:annotations:17.0.0") force("org.jetbrains:annotations:18.0.0")
} }
} }
} }
plugins { plugins {
id "maven-publish" id "maven-publish"
id "org.ajoberstar.grgit" version "3.1.1" id "org.ajoberstar.grgit" version "4.0.0"
} }
group = "com.github.intellectualsites.plotsquared" group = "com.github.intellectualsites.plotsquared"
@ -83,7 +83,7 @@ subprojects {
because("Minecraft uses Guava 21 as of 1.13") because("Minecraft uses Guava 21 as of 1.13")
} }
compileOnly("org.jetbrains:annotations:17.0.0") 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") testCompileOnly("org.projectlombok:lombok:1.18.8")
annotationProcessor("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8")
testAnnotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8")
@ -94,7 +94,7 @@ subprojects {
resolutionStrategy { resolutionStrategy {
force("junit:junit:4.12") force("junit:junit:4.12")
force("com.google.guava:guava:21.0") 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") force("com.google.code.findbugs:jsr305:3.0.2")
} }
} }