Implement a map to map primitive types to their wrapper classes

DerEchtePilz · DerEchtePilz · commit ef000683ae35 · 2024-04-07T12:10:38.000+02:00
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/executors/CommandArguments.java b/commandapi-core/src/main/java/dev/jorel/commandapi/executors/CommandArguments.java
@@ -6,6 +6,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -48,6 +49,17 @@ public record CommandArguments(
 	String fullInput
 ) {
 
+	private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER = new HashMap<>() {{
+		put(boolean.class, Boolean.class);
+		put(char.class, Character.class);
+		put(byte.class, Byte.class);
+		put(short.class, Short.class);
+		put(int.class, Integer.class);
+		put(long.class, Long.class);
+		put(float.class, Float.class);
+		put(double.class, Double.class);
+	}};
+
 	// Access the inner structure directly
 
 	/**
@@ -487,10 +499,10 @@ private <T> T castArgument(Object argument, Class<T> argumentType) {
 		if (argument == null) {
 			return null;
 		}
-		if (!argument.getClass().equals(argumentType)) {
+		if (!argument.getClass().equals(PRIMITIVE_TO_WRAPPER.getOrDefault(argumentType, argumentType))) {
 			return null;
 		}
-		if (!argumentType.isAssignableFrom(argument.getClass())) {
+		if (!PRIMITIVE_TO_WRAPPER.getOrDefault(argumentType, argumentType).isAssignableFrom(argument.getClass())) {
 			return null;
 		}
 		return (T) argument;
