Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 03:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Made ServerCompatibility#getServerVersion() and #getServerSoftware() public

Browse Source
This commit is contained in:
Florian CUNY 2019-02-06 15:45:53 +01:00
parent 8786c3a879
commit 5118b30303
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
View File

@ -1,5 +1,8 @@
package world.bentobox.bentobox.versions; package world.bentobox.bentobox.versions;
import org.bukkit.Server;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
/** /**
@ -100,6 +103,7 @@ public class ServerCompatibility {
} }
@Override @Override
@NonNull
public String toString() { public String toString() {
return super.toString().substring(1).replace("_", "."); return super.toString().substring(1).replace("_", ".");
} }
@ -114,7 +118,7 @@ public class ServerCompatibility {
public Compatibility checkCompatibility(BentoBox plugin) { public Compatibility checkCompatibility(BentoBox plugin) {
if (result == null) { if (result == null) {
// Check the server version first // Check the server version first
ServerVersion version = getServerVersion(plugin.getServer().getBukkitVersion()); ServerVersion version = getServerVersion(plugin.getServer());
if (version == null || version.getCompatibility().equals(Compatibility.INCOMPATIBLE)) { if (version == null || version.getCompatibility().equals(Compatibility.INCOMPATIBLE)) {
// 'Version = null' means that it's not listed. And therefore, it's implicitly incompatible. // 'Version = null' means that it's not listed. And therefore, it's implicitly incompatible.
@ -123,7 +127,7 @@ public class ServerCompatibility {
} }
// Now, check the server software // Now, check the server software
ServerSoftware software = getServerSoftware(plugin.getServer().getVersion()); ServerSoftware software = getServerSoftware(plugin.getServer());
if (software == null || software.getCompatibility().equals(Compatibility.INCOMPATIBLE)) { if (software == null || software.getCompatibility().equals(Compatibility.INCOMPATIBLE)) {
// 'software = null' means that it's not listed. And therefore, it's implicitly incompatible. // 'software = null' means that it's not listed. And therefore, it's implicitly incompatible.
@ -149,18 +153,32 @@ public class ServerCompatibility {
return result; return result;
} }
private ServerSoftware getServerSoftware(String server) { /**
* Returns the {@link ServerSoftware} entry corresponding to the current server software, may be null.
* @param server the {@link Server} instance, must not be null.
* @return the {@link ServerSoftware} run by this server or null.
* @since 1.3.0
*/
@Nullable
public ServerSoftware getServerSoftware(@NonNull Server server) {
String serverSoftware = server.getVersion().substring(4).split("-")[0];
try { try {
String serverSoftware = server.substring(4).split("-")[0];
return ServerSoftware.valueOf(serverSoftware.toUpperCase()); return ServerSoftware.valueOf(serverSoftware.toUpperCase());
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return null; return null;
} }
} }
private ServerVersion getServerVersion(String bukkitVersion) { /**
* Returns the {@link ServerVersion} entry corresponding to the current server software, may be null.
* @param server the {@link Server} instance, must not be null.
* @return the {@link ServerVersion} run by this server or null.
* @since 1.3.0
*/
@Nullable
public ServerVersion getServerVersion(@NonNull Server server) {
String serverVersion = server.getBukkitVersion().split("-")[0].replace(".", "_");
try { try {
String serverVersion = bukkitVersion.split("-")[0].replace(".", "_");
return ServerVersion.valueOf("V" + serverVersion.toUpperCase()); return ServerVersion.valueOf("V" + serverVersion.toUpperCase());
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return null; return null;