Address more code review

Author: DerEchtePilz

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

@@ -1,4 +1,9 @@
 package dev.jorel.commandapi;
 
 public record LoadContext(CommandAPIPlatform<?, ?, ?> platform, Runnable context) {
+
+	public LoadContext(CommandAPIPlatform<?, ?, ?> platform) {
+		this(platform, () -> {});
+	}
+
 }

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/src/main/resources/config.yml

@@ -46,7 +46,7 @@ use-latest-nms-version: false
 # For example, this setting may allow updating from 1.21.1 to 1.21.2 as only the minor version is changing
 # but will not allow an update from 1.21.2 to 1.22.
 # Keep in mind that implementations may vary and actually updating the CommandAPI might be necessary.
-lenient-for-minor-versions: false
+be-lenient-for-minor-versions: false
 
 # Hook into Paper's ServerResourcesReloadedEvent (default: true)
 # If "true", and the CommandAPI detects it is running on a Paper server, it will

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/resources/config.yml

@@ -46,7 +46,7 @@ use-latest-nms-version: false
 # For example, this setting may allow updating from 1.21.1 to 1.21.2 as only the minor version is changing
 # but will not allow an update from 1.21.2 to 1.22.
 # Keep in mind that implementations may vary and actually updating the CommandAPI might be necessary.
-lenient-for-minor-versions: false
+be-lenient-for-minor-versions: false
 
 # Hook into Paper's ServerResourcesReloadedEvent (default: true)
 # If "true", and the CommandAPI detects it is running on a Paper server, it will

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-kotlin-test/src/test/kotlin/dev/jorel/commandapi/CommandAPIVersionHandler.kt

@@ -14,7 +14,7 @@ interface CommandAPIVersionHandler {
 
 		@JvmStatic
 		fun getPlatform() : LoadContext {
-			return LoadContext(MockNMS(NMS_1_19_1_R1())) {}
+			return LoadContext(MockNMS(NMS_1_19_1_R1()))
 		}
 
 	}

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/CommandAPIVersionHandler.java

@@ -59,7 +59,7 @@ static LoadContext getPlatform() {
 				case "Minecraft_1_17" -> new NMS_1_17();
 				case "Minecraft_1_16_5" -> new NMS_1_16_R3();
 				default -> throw new IllegalArgumentException("Unexpected value: " + System.getProperty("profileId"));
-			}), () -> {});
+			}));
 		}
 	}
 

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

@@ -24,6 +24,8 @@
 import dev.jorel.commandapi.nms.*;
 import org.bukkit.Bukkit;
 
+import java.util.function.Supplier;
+
 /**
  * This file handles the NMS version to be loaded. The CommandAPIVersionHandler
  * file within the commandapi-core module is NOT used at compile time. Instead,
@@ -49,10 +51,11 @@ public interface CommandAPIVersionHandler {
 	 * @return an instance of NMS which can run on the specified Minecraft version
 	 */
 	static LoadContext getPlatform() {
-		int latestMajorVersion = 21; // Change this for Minecraft's major update
+		String latestMajorVersion = "21"; // Change this for Minecraft's major update
+		Supplier<CommandAPIPlatform<?, ?, ?>> latestNMS = NMS_1_21_R1::new;
 		if (CommandAPI.getConfiguration().shouldUseLatestNMSVersion()) {
-			return new LoadContext(new NMS_1_21_R1(), () -> {
-				CommandAPI.logWarning("Loading the CommandAPI with a potentially incompatible NMS implementation.");
+			return new LoadContext(latestNMS.get(), () -> {
+				CommandAPI.logWarning("Loading the CommandAPI with the latest and potentially incompatible NMS implementation.");
 				CommandAPI.logWarning("While you may find success with this, further updates might be necessary to fully support the version you are using.");
 			});
 		} else {
@@ -75,17 +78,15 @@ static LoadContext getPlatform() {
 				default -> null;
 			};
 			if (platform != null) {
-				return new LoadContext(platform, () -> {});
+				return new LoadContext(platform);
 			}
 			if (CommandAPI.getConfiguration().shouldBeLenientForMinorVersions()) {
-				int currentMajorVersion = Integer.parseInt(version.split("\\.")[1]);
-				if (latestMajorVersion == currentMajorVersion) {
-					return new LoadContext(new NMS_1_21_R1(), () -> {
+				String currentMajorVersion = version.split("\\.")[1];
+				if (latestMajorVersion.equals(currentMajorVersion)) {
+					return new LoadContext(latestNMS.get(), () -> {
 						CommandAPI.logWarning("Loading the CommandAPI with a potentially incompatible NMS implementation.");
 						CommandAPI.logWarning("While you may find success with this, further updates might be necessary to fully support the version you are using.");
 					});
-				} else {
-					throw new UnsupportedVersionException(version);
 				}
 			}
 			throw new UnsupportedVersionException(version);

commandapi-platforms/commandapi-velocity/commandapi-velocity-core/src/main/java/dev/jorel/commandapi/CommandAPIVersionHandler.java

@@ -2,6 +2,6 @@
 
 public interface CommandAPIVersionHandler {
 	static LoadContext getPlatform() {
-		return new LoadContext(new CommandAPIVelocity(), () -> {});
+		return new LoadContext(new CommandAPIVelocity());
 	}
 }

docssrc/src/config.md

@@ -120,7 +120,7 @@ use-latest-nms-version: true
 
 -----
 
-### `lenient-for-minor-versions`
+### `be-lenient-for-minor-versions`
 
 Controls whether the CommandAPI should be more lenient when updating to a new Minecraft version.
 
@@ -135,13 +135,13 @@ Take the warning from the [`use-latest-nms-version`](#use-latest-nms-version) an
 **Default value**
 
 ```yml
-lenient-for-minor-versions: false
+be-lenient-for-minor-versions: false
 ```
 
 **Example value**
 
 ```yml
-lenient-for-minor-versions: true
+be-lenient-for-minor-versions: true
 ```
 
 -----