SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2025-02-06 04:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into managers

Browse Source
This commit is contained in:
Sxtanna 2020-07-24 15:54:00 -04:00
commit f4466059ac
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.gradle
View File

@ -5,22 +5,16 @@ plugins {
group 'me.clip' group 'me.clip'
version "2.10.7-DEV-${System.getProperty("BUILD_NUMBER")}" version "2.10.7-DEV-${System.getProperty("BUILD_NUMBER")}"
description 'PlaceholderAPI'
sourceCompatibility = JavaVersion.VERSION_1_8 description 'An awesome placeholder provider!'
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal()
maven { maven({ url 'https://rayzr.dev/repo/' })
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' maven({ url 'https://repo.codemc.org/repository/maven-public' })
} 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/'
}
} }
dependencies { dependencies {
@ -38,18 +32,22 @@ dependencies {
testRuntime "org.junit.jupiter:junit-jupiter-engine:5.6.2" testRuntime "org.junit.jupiter:junit-jupiter-engine:5.6.2"
} }
import org.apache.tools.ant.filters.ReplaceTokens
processResources { processResources {
from(sourceSets.main.resources.srcDirs) { 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 { shadowJar {
archiveClassifier.set("") archiveClassifier = ""
relocate "org.bstats", "me.clip.placeholderapi.metrics" relocate "org.bstats", "me.clip.placeholderapi.metrics"
relocate "com.google.gson", "me.clip.placeholderapi.libs.gson" relocate "com.google.gson", "me.clip.placeholderapi.libs.gson"
relocate "me.rayzr522.jsonmessage", "me.clip.placeholderapi.libs.jsonmessage" relocate "me.rayzr522.jsonmessage", "me.clip.placeholderapi.libs.jsonmessage"

3
src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java
View File

@ -227,7 +227,8 @@ public final class CommandECloudExpansionList extends PlaceholderCommand
int index = ((page - 1) * PAGE_SIZE) + 1; int index = ((page - 1) * PAGE_SIZE) + 1;
for (final CloudExpansion expansion : values) for (final CloudExpansion expansion : values)
{ {
builder.append("&8") builder.append("\n")
.append("&8")
.append(index++) .append(index++)
.append(". ") .append(". ")
.append((expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7")) .append((expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7"))