Be more lenient when updating the minor version of the game

That includes an update from, for example, 1.21 -> 1.21.1, but not, for example, 1.21.1 -> 1.22

Also changes build order to first package actual artifacts (shade, plugin) and then runs tests

Author: DerEchtePilz

commandapi-core/src/main/java/dev/jorel/commandapi/CommandAPIConfig.java

@@ -39,6 +39,7 @@ public abstract class CommandAPIConfig<Impl
 	boolean verboseOutput = false;
 	boolean silentLogs = false;
 	boolean useLatestNMSVersion = false;
+	boolean lenientForMinorVersions = false;
 	String missingExecutorImplementationMessage = "This command has no implementations for %s";
 
 	File dispatcherFile = null;
@@ -90,6 +91,22 @@ public Impl useLatestNMSVersion(boolean value) {
 		return instance();
 	}
 
+	/**
+	 * Sets whether the CommandAPI should load a (potentially unsupported) NMS version
+	 * when updating to a minor release of Minecraft, for example this setting would
+	 * allow running a minor version of the game before the CommandAPI makes a proper
+	 * release for it. Unlike {@link #useLatestNMSVersion(boolean)}, this setting does
+	 * not blindly load the latest NMS version and as a result break cross version compatibility
+	 * but will actually prefer loading the correct NMS implementation.
+	 *
+	 * @param value whether the CommandAPI should assume that minor Minecraft releases do not cause incompatibilities
+	 * @return this CommandAPIConfig
+	 */
+	public Impl lenientForMinorVersions(boolean value) {
+		this.lenientForMinorVersions = value;
+		return instance();
+	}
+
 	/**
 	 * Sets the message to display to users when a command has no executor.
 	 * Available formatting parameters are:

commandapi-core/src/main/java/dev/jorel/commandapi/InternalConfig.java

@@ -40,6 +40,8 @@ public class InternalConfig {
 	// Whether we should use the latest NMS version (which may not be compatible)
 	private final boolean useLatestNMSVersion;
 
+	private final boolean beMoreLenientForMinorVerions;
+
 	// The message to display when an executor implementation is missing
 	private final String messageMissingExecutorImplementation;
 
@@ -65,6 +67,7 @@ public InternalConfig(CommandAPIConfig<?> config) {
 		this.verboseOutput = config.verboseOutput;
 		this.silentLogs = config.silentLogs;
 		this.useLatestNMSVersion = config.useLatestNMSVersion;
+		this.beMoreLenientForMinorVerions = config.lenientForMinorVersions;
 		this.messageMissingExecutorImplementation = config.missingExecutorImplementationMessage;
 		this.dispatcherFile = config.dispatcherFile;
 		this.skipSenderProxy = config.skipSenderProxy;
@@ -94,6 +97,13 @@ public boolean shouldUseLatestNMSVersion() {
 		return this.useLatestNMSVersion;
 	}
 
+	/**
+	 * @return Whether the CommandAPI should assume that minor versions of officially unsupported versions do not cause incompatibilities
+	 */
+	public boolean shouldBeMoreLenientForMinorVersions() {
+		return this.beMoreLenientForMinorVerions;
+	}
+
 	/**
 	 * @return The message to display if a command executor does not have an
 	 *         implementation for a given type

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-vh/src/main/java/dev/jorel/commandapi/CommandAPIVersionHandler.java

@@ -49,11 +49,13 @@ public interface CommandAPIVersionHandler {
 	 * @return an instance of NMS which can run on the specified Minecraft version
 	 */
 	static CommandAPIPlatform<?, ?, ?> getPlatform() {
+		CommandAPIPlatform<?, ?, ?> latestNMS = new NMS_1_21_R1();
 		if (CommandAPI.getConfiguration().shouldUseLatestNMSVersion()) {
-			return new NMS_1_21_R1();
+			return latestNMS;
 		} else {
 			String version = Bukkit.getBukkitVersion().split("-")[0];
-			return switch (version) {
+			Version minecraftVersion = new Version(version);
+			CommandAPIPlatform<?, ?, ?> platform = switch (version) {
 				case "1.16.5" -> new NMS_1_16_R3();
 				case "1.17" -> new NMS_1_17();
 				case "1.17.1" -> new NMS_1_17_R1();
@@ -68,9 +70,54 @@ public interface CommandAPIVersionHandler {
 				case "1.20.3", "1.20.4" -> new NMS_1_20_R3();
 				case "1.20.5", "1.20.6" -> new NMS_1_20_R4();
 				case "1.21", "1.21.1" -> new NMS_1_21_R1();
-				default -> throw new UnsupportedVersionException(version);
+				default -> null;
 			};
+			if (platform != null) {
+				return platform;
+			} else {
+				if (CommandAPI.getConfiguration().shouldBeMoreLenientForMinorVersions()) {
+					return minecraftVersion.matchesPatch((NMS<?>) latestNMS);
+				}
+				throw new UnsupportedVersionException(version);
+			}
 		}
 	}
 
+	class Version {
+
+		private final String version;
+
+		// The minor version is something like 1.x
+		private final int minor;
+
+		private Version(String version) {
+			this.version = version;
+			String[] versionParts = version.split("\\.");
+			minor = Integer.parseInt(versionParts[1]);
+		}
+
+		private CommandAPIPlatform<?, ?, ?> matchesPatch(NMS<?> latestNMS) {
+			if (minor <= 16) {
+				// We absolutely do not support versions older than 1.16.5
+				// As we match 1.16.5 in the getPlatform() method, this if branch means that
+				// the server is on 1.16.4 or older
+				throw new UnsupportedVersionException(version);
+			} else {
+				// Any other Minecraft that is older or exactly the last version we match in getPlatform()
+				// does not appear here. Furthermore, we do not want to be lenient with 1.x versions so we
+				// can simply return the latest NMS version here if its supported Minecraft version's minor version
+				// is the same as the current Minecraft version
+				String[] supportedNMSVersions = latestNMS.compatibleVersions();
+				int minorVersion = Integer.parseInt(supportedNMSVersions[0].split("\\.")[1]); // Index 1 returns the minor version by SemVer's rules
+				if (this.minor == minorVersion) {
+					return (CommandAPIPlatform<?, ?, ?>) latestNMS;
+				}
+			}
+			// If we end up here, that means the server's current minor version in SemVer terms is newer than the
+			// latest minor version of Minecraft in SemVer terms that this method allows. We do not support that.
+			throw new UnsupportedVersionException(version);
+		}
+
+	}
+
 }

commandapi-platforms/commandapi-bukkit/pom.xml

@@ -26,10 +26,11 @@
 
 		<!-- Outputs -->
 		<module>commandapi-bukkit-plugin</module>
-		<module>commandapi-bukkit-test</module>
 		<module>commandapi-bukkit-shade</module>
-		
 		<module>commandapi-bukkit-plugin-mojang-mapped</module>
 		<module>commandapi-bukkit-shade-mojang-mapped</module>
+
+		<!-- Tests -->
+		<module>commandapi-bukkit-test</module>
 	</modules>
 </project>