Merge pull request #14 from anweisen/development

Release v1.3.11

Author: DomiIRL

bukkit-utils/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>bukkit-utils</artifactId>

bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/utils/item/ItemUtils.java

@@ -64,11 +64,12 @@ public static boolean isObtainableInSurvival(@Nonnull Material material) {
 			case "BUDDING_AMETHYST":
 			case "POWDER_SNOW":
 			case "LIGHT":
+			case "BUNDLE":
 				return false;
 		}
 
 		if (MinecraftVersion.current().isOlderThan(MinecraftVersion.V1_19)) {
-			if (name.equals("BUNDLE") || name.equals("SCULK_SENSOR")) {
+			if (name.equals("SCULK_SENSOR")) {
 				return false;
 			}
 		}

bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/utils/misc/BukkitReflectionUtils.java

@@ -1,13 +1,18 @@
 package net.anweisen.utilities.bukkit.utils.misc;
 
+import com.google.common.base.Preconditions;
 import net.anweisen.utilities.common.logging.ILogger;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.lang.reflect.Method;
+import java.util.regex.Pattern;
 
 /**
  * This class gives access to
@@ -21,7 +26,8 @@ public final class BukkitReflectionUtils {
 
 	protected static final ILogger logger = ILogger.forThisClass();
 
-	private BukkitReflectionUtils() {}
+	private BukkitReflectionUtils() {
+	}
 
 	public static double getAbsorptionAmount(@Nonnull Player player) {
 		Class<?> classOfPlayer = player.getClass();
@@ -75,8 +81,8 @@ public static int getMinHeight(@Nonnull World world) {
 	}
 
 	/**
-	 * @deprecated not implemented in all forks of bukkit
 	 * @return if the entity is in water, {@code false} otherwise or if not implemented
+	 * @deprecated not implemented in all forks of bukkit
 	 */
 	@Deprecated
 	public static boolean isInWater(@Nonnull Entity entity) {
@@ -88,4 +94,80 @@ public static boolean isInWater(@Nonnull Entity entity) {
 		return false;
 	}
 
+	private static final Pattern VALID_KEY = Pattern.compile("[a-z0-9/._-]+");
+
+	/**
+	 * Get a NamespacedKey from the supplied string.
+	 *
+	 * The default namespace will be Minecraft's (i.e.
+	 * {@link NamespacedKey#minecraft(String)}).
+	 *
+	 * @param key the key to convert to a NamespacedKey
+	 * @return the created NamespacedKey. null if invalid
+	 * @see #fromString(String, Plugin)
+	 */
+	@Nullable
+	public static NamespacedKey fromString(@Nonnull String key) {
+		return fromString(key, null);
+	}
+
+	/**
+	 * Does not exists in versions prior to 1.14
+	 *
+	 * Get a NamespacedKey from the supplied string with a default namespace if
+	 * a namespace is not defined. This is a utility method meant to fetch a
+	 * NamespacedKey from user input. Please note that casing does matter and
+	 * any instance of uppercase characters will be considered invalid. The
+	 * input contract is as follows:
+	 * <pre>
+	 * fromString("foo", plugin) -{@literal >} "plugin:foo"
+	 * fromString("foo:bar", plugin) -{@literal >} "foo:bar"
+	 * fromString(":foo", null) -{@literal >} "minecraft:foo"
+	 * fromString("foo", null) -{@literal >} "minecraft:foo"
+	 * fromString("Foo", plugin) -{@literal >} null
+	 * fromString(":Foo", plugin) -{@literal >} null
+	 * fromString("foo:bar:bazz", plugin) -{@literal >} null
+	 * fromString("", plugin) -{@literal >} null
+	 * </pre>
+	 *
+	 * @param string the string to convert to a NamespacedKey
+	 * @param defaultNamespace the default namespace to use if none was
+	 * supplied. If null, the {@code minecraft} namespace
+	 * ({@link NamespacedKey#minecraft(String)}) will be used
+	 * @return the created NamespacedKey. null if invalid key
+	 * @see #fromString(String)
+	 */
+	@Nullable
+	public static NamespacedKey fromString(@Nonnull String string, @Nullable Plugin defaultNamespace) {
+		Preconditions.checkArgument(string != null && !string.isEmpty(), "Input string must not be empty or null");
+
+		String[] components = string.split(":", 3);
+		if (components.length > 2) {
+			return null;
+		}
+
+		String key = (components.length == 2) ? components[1] : "";
+		if (components.length == 1) {
+			String value = components[0];
+			if (value.isEmpty() || !VALID_KEY.matcher(value).matches()) {
+				return null;
+			}
+
+			return (defaultNamespace != null) ? new NamespacedKey(defaultNamespace, value) : NamespacedKey.minecraft(value);
+		} else if (components.length == 2 && !VALID_KEY.matcher(key).matches()) {
+			return null;
+		}
+
+		String namespace = components[0];
+		if (namespace.isEmpty()) {
+			return (defaultNamespace != null) ? new NamespacedKey(defaultNamespace, key) : NamespacedKey.minecraft(key);
+		}
+
+		if (!VALID_KEY.matcher(namespace).matches()) {
+			return null;
+		}
+
+		return new NamespacedKey(namespace, key);
+	}
+
 }

common-utils/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>common-utils</artifactId>

database-api/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>database-api</artifactId>

database-mongodb/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>database-mongodb</artifactId>

database-sql/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>database-sql</artifactId>

jda-manager/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.11</version>
+		<version>1.3.12</version>
 	</parent>
 
 	<artifactId>jda-manager</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>net.anweisen.utilities</groupId>
 	<artifactId>root</artifactId>
-	<version>1.3.11</version>
+	<version>1.3.12</version>
 	<packaging>pom</packaging>
 
 	<modules>