mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 16:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made patch version optional as not all Minecraft versions have a patch number

Browse Source
This commit is contained in:
Oak 2024-06-19 13:33:55 +01:00
parent d810cad8d0
commit 0758e13bc7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java
View File

@ -9,7 +9,7 @@ import com.dfsek.terra.bukkit.PlatformImpl;
public interface Initializer { public interface Initializer {
String NMS = "v" + VersionUtil.getMinecraftVersionInfo().toString().replace(".", "_"); String NMS = VersionUtil.getMinecraftVersionInfo().toString().replace(".", "_");
String TERRA_PACKAGE = Initializer.class.getPackageName(); String TERRA_PACKAGE = Initializer.class.getPackageName();
static boolean init(PlatformImpl platform) { static boolean init(PlatformImpl platform) {

10
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java
View File

@ -77,7 +77,7 @@ public final class VersionUtil {
public static final class MinecraftVersionInfo { public static final class MinecraftVersionInfo {
private static final Logger logger = LoggerFactory.getLogger(MinecraftVersionInfo.class); private static final Logger logger = LoggerFactory.getLogger(MinecraftVersionInfo.class);
private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)(?:\\.(\\d+))?");
private final int major; private final int major;
private final int minor; private final int minor;
private final int patch; private final int patch;
@ -97,7 +97,7 @@ public final class VersionUtil {
if(versionMatcher.find()) { if(versionMatcher.find()) {
major = Integer.parseInt(versionMatcher.group(1)); major = Integer.parseInt(versionMatcher.group(1));
minor = Integer.parseInt(versionMatcher.group(2)); minor = Integer.parseInt(versionMatcher.group(2));
patch = Integer.parseInt(versionMatcher.group(3)); patch = versionMatcher.group(3) != null ? Integer.parseInt(versionMatcher.group(3)) : -1;
} else { } else {
logger.warn("Error while parsing minecraft version info. Continuing launch, but setting all versions to -1."); logger.warn("Error while parsing minecraft version info. Continuing launch, but setting all versions to -1.");
@ -112,7 +112,11 @@ public final class VersionUtil {
if(major == -1 && minor == -1 && patch == -1) if(major == -1 && minor == -1 && patch == -1)
return "Unknown"; return "Unknown";
return String.format("v%d.%d.%d", major, minor, patch); if (patch >= 0) {
return String.format("v%d.%d.%d", major, minor, patch);
} else {
return String.format("v%d.%d", major, minor);
}
} }
public int getMajor() { public int getMajor() {