From ffe7680795fd758510134a150cba6366aaef7c58 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 24 Jul 2020 20:36:12 +0200 Subject: [PATCH 1/2] Fix missing line break in expansion list command. --- .../commands/impl/cloud/CommandECloudExpansionList.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java index 71962ac..e75ba9f 100644 --- a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java +++ b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java @@ -143,7 +143,8 @@ public final class CommandECloudExpansionList extends PlaceholderCommand int index = ((page - 1) * PAGE_SIZE) + 1; for (final CloudExpansion expansion : values) { - builder.append("&8") + builder.append("\n") + .append("&8") .append(index++) .append(". ") .append((expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7")) From 5ef360e3fe7dc12a27d82f171ca3d9bde7d10d27 Mon Sep 17 00:00:00 2001 From: Sxtanna Date: Fri, 24 Jul 2020 14:47:30 -0400 Subject: [PATCH 2/2] updated build.gradle formatting, and added missing values --- build.gradle | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 9c49f70..61506a6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,22 +5,16 @@ plugins { group 'me.clip' version "2.10.7-DEV-${System.getProperty("BUILD_NUMBER")}" -description 'PlaceholderAPI' -sourceCompatibility = JavaVersion.VERSION_1_8 +description 'An awesome placeholder provider!' + repositories { mavenCentral() - mavenLocal() - maven { - url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - } - maven { - url = 'https://repo.codemc.org/repository/maven-public' - } - maven { - url = 'https://rayzr.dev/repo/' - } + + maven({ url 'https://rayzr.dev/repo/' }) + maven({ url 'https://repo.codemc.org/repository/maven-public' }) + maven({ url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }) } dependencies { @@ -38,18 +32,22 @@ dependencies { testRuntime "org.junit.jupiter:junit-jupiter-engine:5.6.2" } -import org.apache.tools.ant.filters.ReplaceTokens - processResources { from(sourceSets.main.resources.srcDirs) { - filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description] + filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description] } } -compileJava.options.encoding = 'UTF-8' +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} shadowJar { - archiveClassifier.set("") + archiveClassifier = "" + relocate "org.bstats", "me.clip.placeholderapi.metrics" relocate "com.google.gson", "me.clip.placeholderapi.libs.gson" relocate "me.rayzr522.jsonmessage", "me.clip.placeholderapi.libs.jsonmessage"