trueog/Server-PAPI
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37 from Andre601/feature/improve-build-placeholder

Browse Source 
Try and fix the paper build.
This commit is contained in:
Gabriel Dumitru authored and GitHub committed 2021-10-21 20:47:10 +03:00
2 parents cfb2910ef6 411ffab461
commit daeb8a88cc
2 files changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/extendedclip/papi/expansion/server/ServerExpansion.java
+1
View File
@@ -150,6 +150,7 @@ public class ServerExpansion extends PlaceholderExpansion implements Cacheable,
case "build":
return ServerUtils.BUILD;
case "version_build":
case "version_full":
return ServerUtils.VERSION + '-' + ServerUtils.BUILD;
// -----
src/main/java/com/extendedclip/papi/expansion/server/ServerUtils.java
+9 -9
View File
@@ -2,16 +2,23 @@ package com.extendedclip.papi.expansion.server;
import org.bukkit.Bukkit;
import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.Map;
public final class ServerUtils {
public static final String VERSION = Bukkit.getBukkitVersion().split("-")[0];
public static final String BUILD;
private static final Map<String, String> variants = new HashMap<>();
static {
boolean isPaper = false;
variants.put("Purpur", "net.pl3x.purpur.PurpurConfig");
variants.put("Airplane", "gg.airplane.AirplaneConfig");
variants.put("Tuinity", "com.tuinity.tuinity.config.TuinityConfig");
variants.put("Paper", "com.destroystokyo.paper.PaperConfig");
variants.put("Spigot", "org.spigotmc.SpigotConfig");
try {
Class.forName("com.destroystokyo.paper.PaperConfig");
@@ -21,7 +28,7 @@ public final class ServerUtils {
String[] buildParts = Bukkit.getVersion().split("-");
if (buildParts.length >= 3) {
BUILD = isPaper ? buildParts[2] : buildParts[0];
BUILD = isPaper ? buildParts[2].substring(0, buildParts[2].indexOf(" ")) : buildParts[0];
} else {
BUILD = "UNKNOWN";
}
@@ -29,14 +36,7 @@ public final class ServerUtils {
private ServerUtils() { }
@SuppressWarnings("SpellCheckingInspection")
public static String getServerVariant() {
final Map<String, String> variants = new LinkedHashMap<>();
variants.put("Purpur", "net.pl3x.purpur.PurpurConfig");
variants.put("Airplane", "gg.airplane.AirplaneConfig");
variants.put("Tuinity", "com.tuinity.tuinity.config.TuinityConfig");
variants.put("Paper", "com.destroystokyo.paper.PaperConfig");
variants.put("Spigot", "org.spigotmc.SpigotConfig");
for (Map.Entry<String, String> variant : variants.entrySet()) {
try {