diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/NodeTypeKey.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/NodeTypeKey.java index 651bfac5..11103c00 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/NodeTypeKey.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/NodeTypeKey.java @@ -27,9 +27,6 @@ package me.lucko.luckperms.api.nodetype; import org.checkerframework.checker.nullness.qual.NonNull; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - /** * Marks an instance used as a key for a {@link NodeType}. * @@ -47,9 +44,8 @@ public interface NodeTypeKey { * @return the name of the represented type */ default @NonNull String getTypeName() { - ParameterizedType thisType = (ParameterizedType) getClass().getGenericSuperclass(); - Type nodeType = thisType.getActualTypeArguments()[0]; - return ((Class) nodeType).getSimpleName(); + String name = getClass().getName(); + return name.substring(name.lastIndexOf('.') + 1, name.length() - 2); } } diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/DisplayNameType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/DisplayNameType.java index 28e56375..73995d6b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/DisplayNameType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/DisplayNameType.java @@ -41,8 +41,7 @@ public interface DisplayNameType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the display name. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/InheritanceType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/InheritanceType.java index 5e9b9223..a6868fed 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/InheritanceType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/InheritanceType.java @@ -42,8 +42,7 @@ public interface InheritanceType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the name of the group to be inherited. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/MetaType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/MetaType.java index 4ce05a76..69e30d2a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/MetaType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/MetaType.java @@ -43,8 +43,7 @@ public interface MetaType extends NodeType, Map.Entry { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the meta key. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/PrefixType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/PrefixType.java index 0fa71ec1..58f0efb4 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/PrefixType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/PrefixType.java @@ -43,8 +43,7 @@ public interface PrefixType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the priority of the prefix assignment. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/RegexType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/RegexType.java index de939faf..13c0f102 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/RegexType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/RegexType.java @@ -44,8 +44,7 @@ public interface RegexType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the non-compiled pattern string. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/SuffixType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/SuffixType.java index b0c79aaf..a99d15b0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/SuffixType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/SuffixType.java @@ -43,8 +43,7 @@ public interface SuffixType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the priority of the suffix assignment. diff --git a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/WeightType.java b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/WeightType.java index cbca93c8..b4f78192 100644 --- a/api/src/main/java/me/lucko/luckperms/api/nodetype/types/WeightType.java +++ b/api/src/main/java/me/lucko/luckperms/api/nodetype/types/WeightType.java @@ -39,8 +39,7 @@ public interface WeightType extends NodeType { /** * The key for this type. */ - NodeTypeKey KEY = new NodeTypeKey() { - }; + NodeTypeKey KEY = new NodeTypeKey(){}; /** * Gets the weight value.