Fixes plugin versioning #12
This commit is contained in:
@@ -81,6 +81,12 @@ public abstract class Akari {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final String serverVersion = Akari.class.getPackage().getImplementationVersion();
|
||||||
|
|
||||||
|
public static String getServerVersion() {
|
||||||
|
return serverVersion + " (MC: " + MinecraftServer.getServer().getVersion() + ")";
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Timings
|
* Timings
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -14,8 +14,10 @@ import net.minecraft.server.MinecraftServer;
|
|||||||
@Mixin(value = CraftServer.class, remap = false)
|
@Mixin(value = CraftServer.class, remap = false)
|
||||||
public abstract class MixinCraftServer {
|
public abstract class MixinCraftServer {
|
||||||
@Shadow @Final @Mutable private String serverName;
|
@Shadow @Final @Mutable private String serverName;
|
||||||
|
@Shadow @Final @Mutable private String serverVersion;
|
||||||
@Shadow @Final protected MinecraftServer console;
|
@Shadow @Final protected MinecraftServer console;
|
||||||
private boolean needApplyServerName = true;
|
private boolean needApplyServerName = true;
|
||||||
|
private boolean needApplyServerVersion = true;
|
||||||
|
|
||||||
@Overwrite
|
@Overwrite
|
||||||
public String getName() {
|
public String getName() {
|
||||||
@@ -28,6 +30,15 @@ public abstract class MixinCraftServer {
|
|||||||
return serverName;
|
return serverName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Overwrite
|
||||||
|
public String getVersion() {
|
||||||
|
if (needApplyServerVersion) {
|
||||||
|
serverVersion = AkarinGlobalConfig.serverBrandName.equals(Akari.EMPTY_STRING) ? serverVersion : serverVersion.replace("Akarin", AkarinGlobalConfig.serverBrandName);
|
||||||
|
needApplyServerVersion = false;
|
||||||
|
}
|
||||||
|
return serverVersion + " (MC: " + console.getVersion() + ")";
|
||||||
|
}
|
||||||
|
|
||||||
@Overwrite
|
@Overwrite
|
||||||
public boolean isPrimaryThread() {
|
public boolean isPrimaryThread() {
|
||||||
return Akari.isPrimaryThread();
|
return Akari.isPrimaryThread();
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ public abstract class MixinVersionCommand {
|
|||||||
versionWaiters.add(sender);
|
versionWaiters.add(sender);
|
||||||
sender.sendMessage("Checking version, please wait...");
|
sender.sendMessage("Checking version, please wait...");
|
||||||
|
|
||||||
String version = Bukkit.getVersion();
|
String version = Akari.getServerVersion();
|
||||||
if (version == null) {
|
if (version == null) {
|
||||||
version = "Unique"; // Custom - > Unique
|
version = "Unique"; // Custom - > Unique
|
||||||
customVersion = true;
|
customVersion = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user