Add a LoadContext to only display a warning when applicable

Author: DerEchtePilz

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

@@ -109,13 +109,10 @@ public static void onLoad(CommandAPIConfig<?> config) {
 			CommandAPI.config = new InternalConfig(config);
 
 			// Initialize handlers
-			CommandAPIPlatform<?, ?, ?> platform = CommandAPIVersionHandler.getPlatform();
+			LoadContext loadContext = CommandAPIVersionHandler.getPlatform();
+			CommandAPIPlatform<?, ?, ?> platform = loadContext.platform();
 			new CommandAPIHandler<>(platform);
-
-			if (CommandAPI.getConfiguration().shouldUseLatestNMSVersion() || CommandAPI.getConfiguration().shouldBeLenientForMinorVersions()) {
-				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.");
-			}
+			loadContext.context().run();
 
 			// Log platform load
 			final String platformClassHierarchy;

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

@@ -12,7 +12,7 @@ public interface CommandAPIVersionHandler {
 	 *
 	 * @return an instance of CommandAPIPlatform which can run on the currently active server
 	 */
-	static CommandAPIPlatform<?, ?, ?> getPlatform() {
+	static LoadContext getPlatform() {
 		throw new IllegalStateException("You have the wrong copy of the CommandAPI! If you're shading, did you use commandapi-core instead of commandapi-{platform}-shade?");
 	}
 }

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

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

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

@@ -13,8 +13,8 @@ interface CommandAPIVersionHandler {
 	companion object {
 
 		@JvmStatic
-		fun getPlatform() : CommandAPIPlatform<*, *, *> {
-			return MockNMS(NMS_1_19_1_R1());
+		fun getPlatform() : LoadContext {
+			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

@@ -43,12 +43,12 @@ private static boolean isMojangMapped() {
 		}
 	}
 
-	static CommandAPIPlatform<?, ?, ?> getPlatform() {
+	static LoadContext getPlatform() {
 		if(profileId == null) {
 			System.out.println("Using default version 1.19.4");
-			return new MockNMS(new NMS_1_19_4_R3());
+			return new LoadContext(new MockNMS(new NMS_1_19_4_R3()), () -> {});
 		} else {
-			return new MockNMS(switch(profileId) {
+			return new LoadContext(new MockNMS(switch(profileId) {
 				case "Minecraft_1_20_5" -> new NMS_1_20_R4();
 				case "Minecraft_1_20_3" -> new NMS_1_20_R3();
 				case "Minecraft_1_20_2" -> new NMS_1_20_R2();
@@ -59,7 +59,7 @@ private static boolean isMojangMapped() {
 				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

@@ -48,13 +48,16 @@ public interface CommandAPIVersionHandler {
 	 *
 	 * @return an instance of NMS which can run on the specified Minecraft version
 	 */
-	static CommandAPIPlatform<?, ?, ?> getPlatform() {
+	static LoadContext getPlatform() {
 		int latestMajorVersion = 21; // Change this for Minecraft's major update
 		if (CommandAPI.getConfiguration().shouldUseLatestNMSVersion()) {
-			return new NMS_1_21_R1();
+			return new LoadContext(new NMS_1_21_R1(), () -> {
+				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 {
 			String version = Bukkit.getBukkitVersion().split("-")[0];
-			return switch (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();
@@ -69,15 +72,23 @@ 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 -> {
-					int currentMajorVersion = Integer.parseInt(version.split("\\.")[1]);
-					if (CommandAPI.getConfiguration().shouldBeLenientForMinorVersions() && latestMajorVersion == currentMajorVersion) {
-						yield new NMS_1_21_R1();
-					} else {
-						throw new UnsupportedVersionException(version);
-					}
-				}
+				default -> null;
 			};
+			if (platform != null) {
+				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(), () -> {
+						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

@@ -1,7 +1,7 @@
 package dev.jorel.commandapi;
 
 public interface CommandAPIVersionHandler {
-	static CommandAPIPlatform<?, ?, ?> getPlatform() {
-		return new CommandAPIVelocity();
+	static LoadContext getPlatform() {
+		return new LoadContext(new CommandAPIVelocity(), () -> {});
 	}
 }