Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-16 17:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read minecraft version from paper if available (#2002)

Browse Source 
* read version from paper if available

* fix for versions without release information
This commit is contained in:
Hannes Greule 2022-11-01 23:39:42 +01:00 committed by GitHub
parent e305c5d5ab
commit bbc1db9bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/MinecraftVersion.java
View File

@ -1,9 +1,11 @@
package com.fastasyncworldedit.bukkit.util; package com.fastasyncworldedit.bukkit.util;
import com.google.common.collect.ComparisonChain; import com.google.common.collect.ComparisonChain;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.regex.Pattern;
/** /**
* Utility class for retrieving and comparing minecraft server versions. * Utility class for retrieving and comparing minecraft server versions.
@ -44,18 +46,15 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
/** /**
* Construct a new version with major, minor and release based on the server version. * Construct a new version with major, minor and release based on the server version.
* @deprecated use {@link MinecraftVersion#getCurrent()} instead.
*/ */
@Deprecated(since = "TODO", forRemoval = true)
public MinecraftVersion() { public MinecraftVersion() {
// Array consists of three version parts, eg. ['v1', '16', 'R3'] MinecraftVersion current = getCurrent();
String[] versionParts = getPackageVersion().split("_");
if (versionParts.length != 3) { this.major = current.getMajor();
throw new IllegalStateException("Failed to determine minecraft version!"); this.minor = current.getMinor();
} this.release = current.getRelease();
this.major = Integer.parseInt(versionParts[0].substring(1));
this.minor = Integer.parseInt(versionParts[1]);
this.release = Integer.parseInt(versionParts[2].substring(1));
} }
/** /**
@ -65,11 +64,35 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
*/ */
public static MinecraftVersion getCurrent() { public static MinecraftVersion getCurrent() {
if (current == null) { if (current == null) {
return current = new MinecraftVersion(); return current = detectMinecraftVersion();
} }
return current; return current;
} }
private static MinecraftVersion detectMinecraftVersion() {
int major;
int minor;
int release;
if (PaperLib.isPaper()) {
String[] parts = Bukkit.getMinecraftVersion().split(Pattern.quote("."));
if (parts.length != 2 && parts.length != 3) {
throw new IllegalStateException("Failed to determine minecraft version!");
}
major = Integer.parseInt(parts[0]);
minor = Integer.parseInt(parts[1]);
release = parts.length == 3 ? Integer.parseInt(parts[2]) : 0; // e.g. 1.18
} else {
String[] parts = getPackageVersion().split("_");
if (parts.length != 3) {
throw new IllegalStateException("Failed to determine minecraft version!");
}
major = Integer.parseInt(parts[0].substring(1));
minor = Integer.parseInt(parts[1]);
release = Integer.parseInt(parts[2].substring(1));
}
return new MinecraftVersion(major, minor, release);
}
/** /**
* Determines the server version based on the CraftBukkit package path, e.g. {@code org.bukkit.craftbukkit.v1_16_R3}, * Determines the server version based on the CraftBukkit package path, e.g. {@code org.bukkit.craftbukkit.v1_16_R3},
* where v1_16_R3 is the resolved version. * where v1_16_R3 is the resolved version.