list) {
if (list == null) {
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedType.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedType.java
index d5ae7390..42ce7cad 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedType.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedType.java
@@ -1,22 +1,26 @@
package dev.kejona.crossplatforms.serialize;
+import org.spongepowered.configurate.ConfigurationNode;
+
/**
- * For use with {@link KeyedTypeSerializer}
+ * For use with {@link KeyedTypeSerializer}. Implementing classes must adhere to {@link ConfigurationNode#isMap()}
+ * in order to be successfully serialized. They do not need to be concerned with containing a type field,
+ * as {@link KeyedTypeSerializer} handles the reading and writing of the type.
+ *
+ * However, the implementation of {@link KeyedType#type()} must be exactly equal to the String type identifier
+ * provided in {@link KeyedTypeSerializer#registerType(String, Class)} when this implementation is registered.
*/
public interface KeyedType {
- /**
- * @return The identifier for the type of this implementation
- */
String type();
/**
- * @return An object serializable by Configurate that represents this implementation, which should be successfully
- * deserialized back to an equivalent instance of this implementation if necessary.
- *
- * The default implementation is that this returns the given instance that this is called on.
+ * @return false if the type of a serialized form can always be inferred, meaning that the type does not
+ * have to be included in the serialization. If it can sometimes or never be inferred, then true. {@link TypeResolver}s
+ * that are registered to a {@link KeyedTypeSerializer} are responsible for inferring the type to deserialize as.
+ * @see KeyedTypeSerializer#registerType(String, Class, TypeResolver)
*/
- default Object value() {
- return this;
+ default boolean serializeWithType() {
+ return true;
}
}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeListSerializer.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeListSerializer.java
deleted file mode 100644
index 83e9a713..00000000
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeListSerializer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package dev.kejona.crossplatforms.serialize;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.serialize.TypeSerializer;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Deserializes a map with keys of type identifiers (strings) and values that are instances of type provided type T,
- * into a list of T.
- * @param The parent type that all entry values have in common.
- */
-public class KeyedTypeListSerializer implements TypeSerializer> {
-
- private final KeyedTypeSerializer elementSerializer;
-
- public KeyedTypeListSerializer(KeyedTypeSerializer elementSerializer) {
- this.elementSerializer = elementSerializer;
- }
-
- @Override
- public List deserialize(Type type, ConfigurationNode node) throws SerializationException {
- if (!(type instanceof ParameterizedType)) {
- throw new SerializationException("Cannot deserialize to list with no element type parameter");
- }
-
- ParameterizedType parameterized = (ParameterizedType) type;
- Type[] typeArgs = parameterized.getActualTypeArguments();
- if (typeArgs.length < 1) {
- throw new SerializationException("Cannot deserialize to a list that is a raw type");
- }
- Type elementType = parameterized.getActualTypeArguments()[0];
-
- List mapped = new ArrayList<>();
- for (ConfigurationNode child : node.childrenMap().values()) {
- mapped.add(elementSerializer.deserialize(elementType, child));
- }
-
- return mapped;
- }
-
- @Override
- public void serialize(Type type, @Nullable List list, ConfigurationNode node) throws SerializationException {
- node.raw(null);
-
- if (list != null) {
- node.set(Collections.emptyMap());
-
- for (E element : list) {
- // KeyedType decides what value should be serialized. If it is a non-simple type, it is expected that
- // the class instance is passed. If its a simple type, its expected that the singleton value is passed.
- node.node(element.type()).set(element.value());
- }
- }
- }
-}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeSerializer.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeSerializer.java
index 9a9c5319..60d741e8 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeSerializer.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/serialize/KeyedTypeSerializer.java
@@ -1,112 +1,99 @@
package dev.kejona.crossplatforms.serialize;
-import com.google.inject.AbstractModule;
-import com.google.inject.Injector;
-import dev.kejona.crossplatforms.Entry;
-import dev.kejona.crossplatforms.utils.ConfigurateUtils;
-import io.leangen.geantyref.TypeToken;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.serialize.SerializationException;
import org.spongepowered.configurate.serialize.TypeSerializer;
import org.spongepowered.configurate.serialize.TypeSerializerCollection;
-import javax.annotation.Nonnull;
import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
/**
- * Deserializes a value node into {@link T} depending on the key of the node. This serializer must be registered using
- * {@link TypeSerializerCollection.Builder#registerExact(Class, TypeSerializer)} or
- * {@link TypeSerializerCollection.Builder#registerExact(TypeToken, TypeSerializer)} or
- * @param A parent type that all possible deserializations of the node share
+ * Deserializes a value {@link T} depending on a string node within the node representing {@link T}.
+ * This serializer must be registered with one of the registerExact methods of {@link TypeSerializerCollection.Builder}
+ * @param The parent type that all entry values have in common.
*/
public class KeyedTypeSerializer extends TypeRegistry implements TypeSerializer {
- private final Injector injector;
- private final Map, Class>> simpleTypes = new HashMap<>();
+ private final String typeKey;
+ private final List typeResolvers = new ArrayList<>();
- public KeyedTypeSerializer(Injector injector) {
- this.injector = injector;
+ /**
+ * Creates a ValuedTypeSerializer with the given key to read the type at
+ * @param typeKey The key that the type value is expected to reside at when deserializing/serializing
+ */
+ public KeyedTypeSerializer(String typeKey) {
+ this.typeKey = Objects.requireNonNull(typeKey);
}
- @Nonnull
- @Override
- public Set getTypes(Type superType) {
- Set types = filter(
- superType,
- simpleTypes.entrySet().stream().map(e -> Entry.of(e.getKey(), e.getValue().getValue()))
- );
-
- types.addAll(super.getTypes(superType));
- return types;
+ /**
+ * Creates a ValuedTypeSerializer with a type key of "type".
+ */
+ public KeyedTypeSerializer() {
+ this("type");
}
- public void registerSimpleType(String typeId, TypeToken valueType, Class simpleType) {
- String lowerCase = typeId.toLowerCase(Locale.ROOT);
- if (simpleTypes.get(lowerCase) != null) {
- throw new IllegalArgumentException("Simple Type " + lowerCase + " is already registered");
- }
- simpleTypes.put(lowerCase, Entry.of(valueType, simpleType));
- }
-
- public void registerSimpleType(String typeId, Class valueType, Class simpleType) {
- registerSimpleType(typeId, TypeToken.get(valueType), simpleType);
+ public void registerType(String typeId, Class type, TypeResolver typeResolver) {
+ registerType(typeId, type);
+ typeResolvers.add(typeResolver);
}
@Override
public T deserialize(Type returnType, ConfigurationNode node) throws SerializationException {
- Object key = node.key();
- if (key == null || key.toString().equals("")) {
- throw new SerializationException("Cannot deserialization a node into a KeyedType with a key of: " + key);
+ String typeId = node.node(typeKey).getString();
+ if (typeId == null) {
+ // try to infer the type based off the nodes content
+ for (TypeResolver resolver : typeResolvers) {
+ String possibleType = resolver.inferType(node);
+ if (possibleType != null) {
+ if (typeId != null) {
+ throw new SerializationException("Failed to infer the type because both types matched: " + typeId + " and " + possibleType);
+ }
+ typeId = possibleType;
+ }
+ }
+
+ if (typeId == null) {
+ throw new SerializationException("No 'type' value present and the type could not be inferred. Possible type options are: " + getTypes(returnType));
+ }
}
- String typeId = key.toString();
- Class type = getType(typeId);
- T instance;
+ Class type = getType(typeId);
if (type == null) {
- Entry, Class> simpleType = simpleTypes.get(typeId.toLowerCase(Locale.ROOT));
- if (simpleType == null) {
- throw new SerializationException("Unsupported type (not registered) '" + typeId + "'. Possible options are: " + getTypes(returnType));
- } else {
- validateType(returnType, typeId, simpleType.getValue());
- instance = deserializeSimple(simpleType.getKey(), simpleType.getValue(), node);
- }
- } else {
- validateType(returnType, typeId, type);
- instance = node.get(type);
+ throw new SerializationException("Unsupported type '" + typeId + "'. Not registered. Possible options are: " + getTypes(returnType));
}
- if (instance == null) {
- throw new SerializationException("Failed to deserialize as '" + typeId + "' because deserialization returned null.");
+
+ if (!isCompatible(returnType, type)) {
+ throw new SerializationException("Unsupported type '" + typeId + "'. " + type + " is registered but incompatible. Possible type options are: " + getTypes(returnType));
}
- return instance;
+
+ T object = node.get(type);
+ if (object == null) {
+ throw new SerializationException("Failed to deserialize as '" + type + "' because deserialization returned null.");
+ }
+
+ return object;
}
@Override
- public void serialize(Type type, @Nullable T keyedType, ConfigurationNode node) throws SerializationException {
+ public void serialize(Type returnType, @Nullable T value, ConfigurationNode node) throws SerializationException {
node.raw(null);
- if (keyedType != null) {
- if (keyedType.type().equals(node.key())) {
- node.set(keyedType.value());
- } else {
- throw new SerializationException("Cannot deserialize '" + keyedType.value() + "' of type '" + keyedType.type() + "' because the key of the node at " + node.path() + " does not match the type");
+ if (value != null) {
+ String typeIdentifier = value.type();
+ if (getType(typeIdentifier) == null) {
+ // we don't actually need it for serializing but its probably a mistake or bad design
+ throw new SerializationException("Cannot serialize implementation of ValueType " + value.getClass() + " that has not been registered");
}
- }
- }
- private T deserializeSimple(TypeToken valueType, Class simpleType, ConfigurationNode node) throws SerializationException {
- final V value = node.get(valueType);
- Injector childInjector = injector.createChildInjector(new AbstractModule() {
- @Override
- protected void configure() {
- bind(ConfigurateUtils.keyFromToken(valueType)).toInstance(value);
+ node.set(value);
+ if (value.serializeWithType()) {
+ // the type must be included because when this node is deserialized, the type cannot be inferred
+ node.node(typeKey).set(typeIdentifier);
}
- });
-
- return childInjector.getInstance(simpleType);
+ }
}
}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/SimpleType.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/SimpleType.java
deleted file mode 100644
index b816d100..00000000
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/SimpleType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package dev.kejona.crossplatforms.serialize;
-
-import lombok.AllArgsConstructor;
-import lombok.ToString;
-
-import javax.annotation.Nonnull;
-
-@ToString
-@AllArgsConstructor
-public abstract class SimpleType implements KeyedType {
-
- @Nonnull
- private final String type;
-
- @Nonnull
- private final V value;
-
- @Override
- public final String type() {
- return type;
- }
-
- @Override
- public final V value() {
- return value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- SimpleType that = (SimpleType) o;
- return type.equals(that.type) && value.equals(that.value);
- }
-}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeRegistry.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeRegistry.java
index 35b0349f..808d424b 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeRegistry.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeRegistry.java
@@ -1,6 +1,6 @@
package dev.kejona.crossplatforms.serialize;
-import org.spongepowered.configurate.serialize.SerializationException;
+import io.leangen.geantyref.GenericTypeReflector;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -10,9 +10,6 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static io.leangen.geantyref.GenericTypeReflector.isSuperType;
/**
* Deserializes a map with keys of type identifiers (strings) and values that are instances of type provided type T,
@@ -32,7 +29,7 @@ public class TypeRegistry {
*/
public void registerType(String typeId, Class type) {
String lowerCase = typeId.toLowerCase(Locale.ROOT);
- if (types.get(lowerCase) != null) {
+ if (types.containsKey(lowerCase)) {
throw new IllegalArgumentException("Type " + lowerCase + " is already registered");
}
types.put(lowerCase, type);
@@ -50,26 +47,19 @@ public Class getType(String typeId) {
@Nonnull
public Set getTypes(Type superType) {
- return filter(superType, types);
- }
-
- public void validateType(Type required, String typeKey, Type registered) throws SerializationException {
- if (!isValidType(required, registered)) {
- throw new SerializationException("Unsupported type '" + typeKey + "'. " + registered + " is registered but incompatible. Possible type options are: " + getTypes(required));
- }
- }
-
- public boolean isValidType(Type required, Type registered) {
- return isSuperType(required, registered);
- }
-
- public final Set filter(Type superType, Map> types) {
- return filter(superType, types.entrySet().stream());
- }
-
- public final Set filter(Type superType, Stream>> types) {
- return types.filter(e -> isValidType(superType, e.getValue()))
+ return types.entrySet().stream()
+ .filter(e -> isCompatible(superType, e.getValue()))
.map(Map.Entry::getKey)
.collect(Collectors.toSet());
}
+
+ /**
+ * Tests if a registered Type is compatible with some required Type.
+ * @param required the Type that is required. For example, in the context of serialization, this would be the declared field type.
+ * @param registered a Type that is registered in a Registry
+ * @return true if the registered type is a subtype of the required type
+ */
+ public static boolean isCompatible(Type required, Type registered) {
+ return GenericTypeReflector.isSuperType(required, registered);
+ }
}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeResolver.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeResolver.java
index 7280c31b..df3e7dcf 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeResolver.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/serialize/TypeResolver.java
@@ -9,7 +9,7 @@
public interface TypeResolver {
@Nullable
- String getType(ConfigurationNode node);
+ String inferType(ConfigurationNode node);
static TypeResolver listOrScalar(String childKey, String type) {
return node -> {
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedType.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedType.java
deleted file mode 100644
index 32031050..00000000
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package dev.kejona.crossplatforms.serialize;
-
-import org.spongepowered.configurate.ConfigurationNode;
-
-/**
- * For use with {@link ValuedTypeSerializer}. Implementing classes must adhere to {@link ConfigurationNode#isMap()}
- * in order to be successfully serialized. They, do not need to be concerned with containing a type field,
- * as {@link ValuedTypeSerializer} handles the reading and writing of the type.
- *
- * However, the implementation of {@link ValuedType#type()} must be exactly equal to the String type identifier
- * provided in {@link ValuedTypeSerializer#registerType(String, Class)} when this implementation is registered.
- */
-public interface ValuedType {
-
- String type();
-
- default boolean serializeWithType() {
- return true;
- }
-}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedTypeSerializer.java b/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedTypeSerializer.java
deleted file mode 100644
index 7796f3af..00000000
--- a/core/src/main/java/dev/kejona/crossplatforms/serialize/ValuedTypeSerializer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package dev.kejona.crossplatforms.serialize;
-
-import lombok.Getter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.serialize.TypeSerializer;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Deserializes a value {@link T} depending on a string node in the node representing {@link T}.
- * This serializer must be registered exact.
- * @param The parent type that all entry values have in common.
- */
-public class ValuedTypeSerializer extends TypeRegistry implements TypeSerializer {
-
- @Getter
- private final String typeKey;
- private final List typeResolvers = new ArrayList<>();
-
- /**
- * Creates a ValuedTypeSerializer with the given key to read the type at
- * @param typeKey The key that the type value is expected to reside at when deserializing/serializing
- */
- public ValuedTypeSerializer(String typeKey) {
- Objects.requireNonNull(typeKey);
- this.typeKey = typeKey;
- }
-
- /**
- * Creates a ValuedTypeSerializer with a type key of "type".
- */
- public ValuedTypeSerializer() {
- this("type");
- }
-
- public void registerType(String typeId, Class type, TypeResolver typeResolver) {
- super.registerType(typeId, type);
- typeResolvers.add(typeResolver);
- }
-
- @Override
- public T deserialize(Type returnType, ConfigurationNode node) throws SerializationException {
- String typeId = node.node(typeKey).getString();
- if (typeId == null) {
- // try to infer the type based off the nodes content
- for (TypeResolver resolver : typeResolvers) {
- String possibleType = resolver.getType(node);
- if (possibleType != null) {
- if (typeId != null) {
- throw new SerializationException("Failed to infer the type because both types matched: " + typeId + " and " + possibleType);
- }
- typeId = possibleType;
- }
- }
-
- if (typeId == null) {
- throw new SerializationException("No 'type' value present and the type could not be inferred. Possible type options are: " + getTypes(returnType));
- }
- }
-
- Class type = getType(typeId);
- if (type == null) {
- throw new SerializationException("Unsupported type '" + typeId + "'. Not registered. Possible options are: " + getTypes(returnType));
- }
-
- validateType(returnType, typeId, type);
-
- T object = node.get(type);
- if (object == null) {
- throw new SerializationException("Failed to deserialize as '" + type + "' because deserialization returned null.");
- }
-
- return object;
- }
-
- @Override
- public void serialize(Type returnType, @Nullable T value, ConfigurationNode node) throws SerializationException {
- node.raw(null);
-
- if (value != null) {
- String typeIdentifier = value.type();
- if (getType(typeIdentifier) == null) {
- // we don't actually need it for serializing but its probably a mistake or bad design
- throw new SerializationException("Cannot serialize implementation of ValueType " + value.getClass() + " that has not been registered");
- }
-
- node.set(value);
- if (value.serializeWithType()) {
- // the type must be included because when this node is deserialized, the type cannot be inferred
- node.node(typeKey).set(typeIdentifier);
- }
- }
- }
-}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/utils/ParseUtils.java b/core/src/main/java/dev/kejona/crossplatforms/utils/ParseUtils.java
index e23f1853..7eb89476 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/utils/ParseUtils.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/utils/ParseUtils.java
@@ -41,6 +41,21 @@ public static int getUnsignedInt(@Nullable String value, String identifier) thro
}
}
+ /**
+ * Converts a float to an integer if it can be done without loss of precision.
+ * @param floaty The float, in string representation.
+ * @return the integer as a string if conversion was possible, otherwise the floaty parameter
+ * @throws NumberFormatException if the parameter could not be parsed to a float
+ */
+ public static String downSize(String floaty) throws NumberFormatException {
+ float value = Float.parseFloat(floaty);
+ if ((int) value == value) {
+ return Integer.toString((int) value);
+ } else {
+ return floaty;
+ }
+ }
+
public static float getFloat(@Nullable String value, String identifier) throws IllegalValueException {
if (value == null) {
throw new IllegalValueException(null, "decimal number", identifier);
@@ -54,6 +69,17 @@ public static float getFloat(@Nullable String value, String identifier) throws I
}
}
+ /**
+ * Requires the string value to be a float, that is positive. It must not be zero or negative.
+ */
+ public static float getPositiveFloat(@Nullable String value, String identifier) throws IllegalValueException {
+ float f = getFloat(value, identifier);
+ if (f <= 0) {
+ throw new IllegalValueException(value, "positive decimal number", identifier);
+ }
+ return f;
+ }
+
public static boolean getBoolean(@Nullable String value, String identifier) throws IllegalValueException {
if (value == null) {
throw new IllegalValueException(null, "boolean", identifier);
diff --git a/core/src/main/java/dev/kejona/crossplatforms/utils/ReflectionUtils.java b/core/src/main/java/dev/kejona/crossplatforms/utils/ReflectionUtils.java
index ba64ac94..00f1294e 100644
--- a/core/src/main/java/dev/kejona/crossplatforms/utils/ReflectionUtils.java
+++ b/core/src/main/java/dev/kejona/crossplatforms/utils/ReflectionUtils.java
@@ -1,9 +1,12 @@
package dev.kejona.crossplatforms.utils;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Objects;
public final class ReflectionUtils {
@@ -16,11 +19,15 @@ public static Class getClass(String name) {
try {
return Class.forName(name);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
return null;
}
}
+ @Nonnull
+ public static Class requireClass(String name) {
+ return Objects.requireNonNull(getClass(name), "Class for name " + name);
+ }
+
@Nullable
public static Method getMethod(Class clazz, String method, boolean declared, Class... arguments) {
try {
@@ -42,13 +49,21 @@ public static Method getMethod(Class clazz, String methodName, Class... ar
return getMethod(clazz, methodName, false, arguments);
}
+ @Nonnull
+ public static Method requireMethod(Class clazz, String methodName, Class... arguments) {
+ return Objects.requireNonNull(
+ getMethod(clazz, methodName, arguments),
+ () -> methodName + " method of " + clazz.getName() + " with arguments " + Arrays.toString(arguments)
+ );
+ }
+
@Nullable
public static Object invoke(Object instance, Method method, Object... arguments) {
method.setAccessible(true);
try {
return method.invoke(instance, arguments);
- } catch (IllegalAccessException | InvocationTargetException exception) {
- exception.printStackTrace();
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ e.printStackTrace();
return null;
}
}
@@ -59,6 +74,34 @@ public static T castedInvoke(Object instance, Method method, Object... argum
return (T) invoke(instance, method, arguments);
}
+ @Nullable
+ public static Field getField(Class clazz, String name, boolean declared) {
+ try {
+ if (declared) {
+ return clazz.getDeclaredField(name);
+ } else {
+ return clazz.getField(name);
+ }
+ } catch (NoSuchFieldException ignored) {
+ return null;
+ }
+ }
+
+ @Nullable
+ public static Field getField(Class clazz, String name) {
+ Field field = getField(clazz, name, true); // try declared fields, private or public
+ if (field == null) {
+ field = getField(clazz, name, false); // try public inherited fields
+ }
+
+ return field;
+ }
+
+ @Nonnull
+ public static Field requireField(Class clazz, String name) {
+ return Objects.requireNonNull(getField(clazz, name), () -> name + " field of " + clazz.getName());
+ }
+
@Nullable
public static Object getValue(Object instance, Field field) {
field.setAccessible(true);
@@ -68,4 +111,13 @@ public static Object getValue(Object instance, Field field) {
throw new IllegalStateException("Failed to set " + field.getName() + " on " + instance.getClass() + " accessible", e);
}
}
+
+ public static void setValue(Object instance, Field field, Object value) {
+ field.setAccessible(true);
+ try {
+ field.set(instance, value);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/core/src/main/java/dev/kejona/crossplatforms/utils/SkinUtils.java b/core/src/main/java/dev/kejona/crossplatforms/utils/SkinUtils.java
new file mode 100644
index 00000000..787136c6
--- /dev/null
+++ b/core/src/main/java/dev/kejona/crossplatforms/utils/SkinUtils.java
@@ -0,0 +1,70 @@
+package dev.kejona.crossplatforms.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class SkinUtils {
+
+ private static final Gson GSON = new Gson();
+ private static final Pattern URL_PATTERN = Pattern.compile("(http|https)://textures\\.minecraft\\.net/texture/([a-zA-Z0-9]+)");
+
+ private SkinUtils() {
+
+ }
+
+ @Nonnull
+ public static String urlFromEncoding(@Nonnull String encodedData) throws IllegalArgumentException {
+ // See https://wiki.vg/Mojang_API#UUID_to_Profile_and_Skin.2FCape
+ JsonObject json;
+ try {
+ String decoded = new String(Base64.getDecoder().decode(encodedData), StandardCharsets.UTF_8);
+ json = GSON.fromJson(decoded, JsonObject.class);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to decode base64 textures value: " + encodedData, e);
+ }
+
+ JsonObject textures = json.getAsJsonObject("textures");
+ if (textures == null) {
+ throw new IllegalArgumentException("textures member missing in " + encodedData);
+ }
+
+ JsonObject skin = textures.getAsJsonObject("SKIN");
+ if (skin == null) {
+ throw new IllegalArgumentException("SKIN member missing in " + encodedData);
+ }
+
+ JsonElement url = skin.get("url");
+ if (url == null) {
+ throw new IllegalArgumentException("url member missing in " + encodedData);
+ }
+
+ try {
+ return Objects.requireNonNull(url.getAsString(), "url as string");
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to get url element in " + encodedData, e);
+ }
+ }
+
+ @Nonnull
+ public static String idFromUrl(@Nonnull String skinUrl) throws IllegalArgumentException {
+ Matcher matcher = URL_PATTERN.matcher(skinUrl);
+ if (matcher.matches()) {
+ return matcher.group(2);
+ } else {
+ throw new IllegalArgumentException("Skin url has unexpected format: " + skinUrl);
+ }
+ }
+
+ @Nonnull
+ public static String idFromEncoding(@Nonnull String encodedData) throws IllegalArgumentException {
+ return idFromUrl(urlFromEncoding(encodedData));
+ }
+}
diff --git a/core/src/main/java16/dev/kejona/crossplatforms/handler/GeyserHandler.java b/core/src/main/java16/dev/kejona/crossplatforms/handler/GeyserHandler.java
index 47b5bb8f..21f89e5c 100644
--- a/core/src/main/java16/dev/kejona/crossplatforms/handler/GeyserHandler.java
+++ b/core/src/main/java16/dev/kejona/crossplatforms/handler/GeyserHandler.java
@@ -1,17 +1,15 @@
package dev.kejona.crossplatforms.handler;
-import org.geysermc.api.connection.Connection;
import org.geysermc.cumulus.form.Form;
-import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.api.GeyserApi;
+import org.geysermc.geyser.api.connection.GeyserConnection;
-import java.util.Objects;
import java.util.UUID;
@SuppressWarnings("unused") // loaded on JDK 16
public class GeyserHandler implements BedrockHandler {
- private final GeyserImpl geyser = Objects.requireNonNull(GeyserImpl.getInstance());
+ private final GeyserApi api = GeyserApi.api();
public static boolean supported() {
// method is used so that compiler doesn't inline value
@@ -25,17 +23,13 @@ public String getType() {
@Override
public boolean isBedrockPlayer(UUID uuid) {
- return geyser.connectionByUuid(uuid) != null;
+ return api.isBedrockPlayer(uuid);
}
@Override
public void sendForm(UUID uuid, Form form) {
- GeyserSession session = geyser.connectionByUuid(uuid);
- if (session == null) {
- throw new NullPointerException("Failed to get GeyserSession for UUID " + uuid);
- } else {
- session.getFormCache().showForm(form);
- }
+ // don't use GeyserApi#sendForm since it only returns false when there is no session found for the uuid
+ requireConnection(uuid).sendForm(form);
}
@Override
@@ -45,11 +39,16 @@ public boolean executesResponseHandlersSafely() {
@Override
public boolean transfer(FormPlayer player, String address, int port) {
- Connection connection = geyser.connectionByUuid(player.getUuid());
+ // don't use GeyserApi#transfer since it only returns false when there is no session found for the uuid
+ return requireConnection(player.getUuid()).transfer(address, port);
+ }
+
+ private GeyserConnection requireConnection(UUID uuid) {
+ GeyserConnection connection = api.connectionByUuid(uuid);
if (connection == null) {
- throw new IllegalArgumentException("Failed to find GeyserSession for " + player.getName() + player.getUuid());
- } else {
- return connection.transfer(address, port);
+ throw new NullPointerException("Failed to get GeyserConnection for UUID: " + uuid);
}
+
+ return connection;
}
}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/ParseUtilsTest.java b/core/src/test/java/dev/kejona/crossplatforms/ParseUtilsTest.java
new file mode 100644
index 00000000..5991ee0d
--- /dev/null
+++ b/core/src/test/java/dev/kejona/crossplatforms/ParseUtilsTest.java
@@ -0,0 +1,29 @@
+package dev.kejona.crossplatforms;
+
+import org.junit.jupiter.api.Test;
+
+import static dev.kejona.crossplatforms.utils.ParseUtils.downSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ParseUtilsTest {
+
+ @Test
+ public void testDownSize() {
+ assertEquals("1.2", downSize("1.2"));
+ assertEquals("3.14", downSize("3.14"));
+ assertEquals("-5.56", downSize("-5.56"));
+
+ assertEquals("3", downSize("3.0"));
+ assertEquals("14", downSize("14.00"));
+ assertEquals("-16", downSize("-16.000000000"));
+ assertEquals("256", downSize("256.0000000000000000000"));
+
+ assertEquals("165", downSize("165"));
+ assertEquals("-100", downSize("-100"));
+
+ assertThrows(Exception.class, () -> downSize(null));
+ assertThrows(Exception.class, () -> downSize(""));
+ assertThrows(Exception.class, () -> downSize(" "));
+ }
+}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeListSerializerTest.java b/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeListSerializerTest.java
deleted file mode 100644
index 85621911..00000000
--- a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeListSerializerTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package dev.kejona.crossplatforms.config.keyedserializer;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Guice;
-import dev.kejona.crossplatforms.TestModule;
-import dev.kejona.crossplatforms.serialize.KeyedTypeListSerializer;
-import dev.kejona.crossplatforms.serialize.KeyedTypeSerializer;
-import dev.kejona.crossplatforms.utils.ConfigurateUtils;
-import dev.kejona.crossplatforms.utils.FileUtils;
-import io.leangen.geantyref.TypeToken;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-public class KeyedTypeListSerializerTest {
-
- private static final TypeToken> messageListType = new TypeToken>() {};
-
- @TempDir
- private static File directory;
-
- private final KeyedTypeSerializer messageSerializer = new KeyedTypeSerializer<>(Guice.createInjector(new TestModule()));
- private final YamlConfigurationLoader loader;
-
- public KeyedTypeListSerializerTest() throws IOException {
- messageSerializer.registerSimpleType("message", String.class, SingleMessage.class);
- messageSerializer.registerType("messages", MultiMessage.class);
-
- File config = FileUtils.fileOrCopiedFromResource(new File(directory, "KeyedTypeConfig.yml"));
- YamlConfigurationLoader.Builder loaderBuilder = ConfigurateUtils.loaderBuilder(config);
- loaderBuilder.defaultOptions(opts -> (opts.serializers(builder -> {
- builder.registerExact(Message.class, messageSerializer);
- builder.register(new TypeToken>() {}, new KeyedTypeListSerializer<>(messageSerializer));
- })));
- loader = loaderBuilder.build();
- }
-
- @Test
- public void testDeserialize() throws ConfigurateException {
- ConfigurationNode actions = loader.load().node("actions");
- Assertions.assertFalse(actions.virtual());
- Assertions.assertTrue(actions.isMap());
- List actualMessages = actions.get(messageListType);
-
- SingleMessage single = new SingleMessage("[WARN] Hello");
- MultiMessage list = new MultiMessage("[INFO]", ImmutableList.of("One", "Two", "Three"));
- List expectedMessages = ImmutableList.of(single, list);
-
- Assertions.assertEquals(expectedMessages, actualMessages);
- }
-
- @Test
- public void testSerialize() throws ConfigurateException {
- ConfigurationNode actions = loader.load().node("actions");
- ConfigurationNode copy = actions.copy();
-
- List actualMessages = actions.get(messageListType);
- Objects.requireNonNull(actualMessages);
-
- copy.set(messageListType, actualMessages);
- Assertions.assertEquals(actions, copy);
-
- List modifiedMessages = new ArrayList<>(actualMessages);
- modifiedMessages.add(new SingleMessage("greetings"));
- copy.set(messageListType, modifiedMessages);
- Assertions.assertNotEquals(actions, copy);
- }
-}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeSerializerTest.java b/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeSerializerTest.java
deleted file mode 100644
index 68b1006d..00000000
--- a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/KeyedTypeSerializerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package dev.kejona.crossplatforms.config.keyedserializer;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import dev.kejona.crossplatforms.TestModule;
-import dev.kejona.crossplatforms.serialize.KeyedTypeSerializer;
-import dev.kejona.crossplatforms.utils.ConfigurateUtils;
-import dev.kejona.crossplatforms.utils.FileUtils;
-import io.leangen.geantyref.TypeToken;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class KeyedTypeSerializerTest {
-
- private static final TypeToken> messagesType = new TypeToken>() {};
-
- @TempDir
- private static File directory;
-
- private final KeyedTypeSerializer messageSerializer = new KeyedTypeSerializer<>(Guice.createInjector(new TestModule()));
- private final YamlConfigurationLoader loader;
-
- public KeyedTypeSerializerTest() throws IOException {
- messageSerializer.registerSimpleType("message", String.class, SingleMessage.class);
- messageSerializer.registerType("messages", MultiMessage.class);
-
- File config = FileUtils.fileOrCopiedFromResource(new File(directory, "KeyedTypeConfig.yml"));
- YamlConfigurationLoader.Builder loaderBuilder = ConfigurateUtils.loaderBuilder(config);
- loaderBuilder.defaultOptions(opts -> (opts.serializers(builder -> builder.registerExact(new TypeToken() {}, messageSerializer))));
- loader = loaderBuilder.build();
- }
-
- @Test
- public void testDeserialize() throws ConfigurateException {
- ConfigurationNode actions = loader.load().node("actions");
- Assertions.assertFalse(actions.virtual());
- Assertions.assertTrue(actions.isMap());
-
- Map actualMessages = actions.get(messagesType);
-
- SingleMessage single = new SingleMessage("[WARN] Hello");
- MultiMessage list = new MultiMessage("[INFO]", ImmutableList.of("One", "Two", "Three"));
- Map expectedMessages = ImmutableMap.of(SingleMessage.TYPE, single, MultiMessage.TYPE, list);
-
- Assertions.assertEquals(expectedMessages, actualMessages);
- }
-
- @Test
- public void testSerialize() throws ConfigurateException {
- ConfigurationNode actions = loader.load().node("actions");
- ConfigurationNode copy = actions.copy();
-
- Map actualMessages = actions.get(messagesType);
- Objects.requireNonNull(actualMessages);
- copy.set(messagesType, actualMessages);
- Assertions.assertEquals(actions, copy);
-
- Map modifiedMessages = new HashMap<>(actualMessages);
- modifiedMessages.put(SingleMessage.TYPE, new SingleMessage("greetings"));
- copy.set(messagesType, modifiedMessages);
- Assertions.assertNotEquals(actions, copy);
- }
-}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/Message.java b/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/Message.java
deleted file mode 100644
index 399286cc..00000000
--- a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/Message.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dev.kejona.crossplatforms.config.keyedserializer;
-
-import dev.kejona.crossplatforms.serialize.KeyedType;
-
-public interface Message extends KeyedType {
-
- void send();
-}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/MultiMessage.java b/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/MultiMessage.java
deleted file mode 100644
index 2a898aae..00000000
--- a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/MultiMessage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package dev.kejona.crossplatforms.config.keyedserializer;
-
-import org.spongepowered.configurate.objectmapping.ConfigSerializable;
-import org.spongepowered.configurate.objectmapping.meta.Required;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@ConfigSerializable
-public class MultiMessage implements Message {
-
- public static final String TYPE = "messages";
-
- private String prefix = "";
-
- @Required
- private List list = new ArrayList<>();
-
- @SuppressWarnings("unused") //configurate
- private MultiMessage() {
-
- }
-
- public MultiMessage(String prefix, List messages) {
- this.prefix = prefix;
- this.list = messages;
- }
-
- @Override
- public String type() {
- return TYPE;
- }
-
- @Override
- public void send() {
- list.forEach(System.out::println);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MultiMessage that = (MultiMessage) o;
- return prefix.equals(that.prefix) && list.equals(that.list);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(prefix, list);
- }
-}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/SingleMessage.java b/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/SingleMessage.java
deleted file mode 100644
index b3d7894e..00000000
--- a/core/src/test/java/dev/kejona/crossplatforms/config/keyedserializer/SingleMessage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package dev.kejona.crossplatforms.config.keyedserializer;
-
-import com.google.inject.Inject;
-import dev.kejona.crossplatforms.serialize.SimpleType;
-
-import javax.annotation.Nonnull;
-
-public class SingleMessage extends SimpleType implements Message {
-
- public static final String TYPE = "message";
-
- @Inject
- public SingleMessage(@Nonnull String value) {
- super(TYPE, value);
- }
-
- @Override
- public void send() {
- System.out.println(value());
- }
-}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/ValuedTypeSerializerTest.java b/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/KeyedTypeSerializerTest.java
similarity index 91%
rename from core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/ValuedTypeSerializerTest.java
rename to core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/KeyedTypeSerializerTest.java
index 39fc51e3..467bcc98 100644
--- a/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/ValuedTypeSerializerTest.java
+++ b/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/KeyedTypeSerializerTest.java
@@ -1,7 +1,7 @@
package dev.kejona.crossplatforms.config.valuedserializer;
import com.google.common.collect.ImmutableList;
-import dev.kejona.crossplatforms.serialize.ValuedTypeSerializer;
+import dev.kejona.crossplatforms.serialize.KeyedTypeSerializer;
import dev.kejona.crossplatforms.utils.ConfigurateUtils;
import dev.kejona.crossplatforms.utils.FileUtils;
import io.leangen.geantyref.TypeToken;
@@ -18,17 +18,17 @@
import java.util.List;
import java.util.Objects;
-public class ValuedTypeSerializerTest {
+public class KeyedTypeSerializerTest {
private static final TypeToken> numberListType = new TypeToken>() {};
@TempDir
private static File directory;
- private final ValuedTypeSerializer numberSerializer = new ValuedTypeSerializer<>();
+ private final KeyedTypeSerializer numberSerializer = new KeyedTypeSerializer<>();
private final YamlConfigurationLoader loader;
- public ValuedTypeSerializerTest() throws IOException {
+ public KeyedTypeSerializerTest() throws IOException {
numberSerializer.registerType(Integer.TYPE, Integer.class);
numberSerializer.registerType(ScientificNotationNumber.TYPE, ScientificNotationNumber.class);
diff --git a/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/Number.java b/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/Number.java
index 0cca0655..a6e5ccdb 100644
--- a/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/Number.java
+++ b/core/src/test/java/dev/kejona/crossplatforms/config/valuedserializer/Number.java
@@ -1,10 +1,10 @@
package dev.kejona.crossplatforms.config.valuedserializer;
-import dev.kejona.crossplatforms.serialize.ValuedType;
+import dev.kejona.crossplatforms.serialize.KeyedType;
import java.math.BigDecimal;
-public interface Number extends ValuedType {
+public interface Number extends KeyedType {
BigDecimal value();
}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/form/component/ResolvePlaceholdersTest.java b/core/src/test/java/dev/kejona/crossplatforms/form/component/ResolvePlaceholdersTest.java
index 2238b049..3f97330c 100644
--- a/core/src/test/java/dev/kejona/crossplatforms/form/component/ResolvePlaceholdersTest.java
+++ b/core/src/test/java/dev/kejona/crossplatforms/form/component/ResolvePlaceholdersTest.java
@@ -1,13 +1,18 @@
package dev.kejona.crossplatforms.form.component;
-import dev.kejona.crossplatforms.resolver.Resolver;
+import dev.kejona.crossplatforms.FakePlayer;
+import dev.kejona.crossplatforms.context.PlayerContext;
+import dev.kejona.crossplatforms.handler.FormPlayer;
import dev.kejona.crossplatforms.interfacing.bedrock.custom.Input;
+import dev.kejona.crossplatforms.resolver.Resolver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class ResolvePlaceholdersTest {
- private static final Resolver resolver = Resolver.of(s -> s.replace("%1%", "one").replace("%two%", "2"));
+ private static final FormPlayer PLAYER = new FakePlayer();
+ private static final Resolver RESOLVER = Resolver.of(s -> s.replace("%1%", "one").replace("%two%", "2"));
+ private static final PlayerContext CONTEXT = new PlayerContext(PLAYER, RESOLVER);
@Test
public void copyInputTest() {
@@ -20,11 +25,11 @@ public void copyInputTest() {
public void resolveInputTest() {
Input expected = new Input("words","one", "2");
- Input withActual = new Input("words","%1%", "%two%").preparedCopy(resolver);
+ Input withActual = new Input("words","%1%", "%two%").preparedCopy(CONTEXT);
Assertions.assertEquals(withActual, expected);
Input setActual = new Input("words","%1%", "%two%");
- setActual.prepare(resolver);
+ setActual.prepare(CONTEXT);
Assertions.assertEquals(setActual, expected);
}
}
diff --git a/core/src/test/java/dev/kejona/crossplatforms/util/ConfigurateUtilsTest.java b/core/src/test/java/dev/kejona/crossplatforms/util/ConfigurateUtilsTest.java
index d6d55227..336c63a3 100644
--- a/core/src/test/java/dev/kejona/crossplatforms/util/ConfigurateUtilsTest.java
+++ b/core/src/test/java/dev/kejona/crossplatforms/util/ConfigurateUtilsTest.java
@@ -1,16 +1,9 @@
package dev.kejona.crossplatforms.util;
-import dev.kejona.crossplatforms.action.ActionSerializer;
-import dev.kejona.crossplatforms.interfacing.bedrock.custom.Input;
-import dev.kejona.crossplatforms.serialize.ValuedTypeSerializer;
import dev.kejona.crossplatforms.utils.ConfigurateUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
public class ConfigurateUtilsTest {
private static final String MESSAGE = "[23:57:30 ERROR]: [CForms] [forms, servers, buttons, 0, actions, 2] of type java.util.List>: Unsupported type 'close'. The type is registered but is not compatible with dev.kejona.crossplatforms.action.Action. Possible type options are: [server, form, message, commands, transfer_packet]";
diff --git a/core/src/testFixtures/java/dev/kejona/crossplatforms/TestModule.java b/core/src/testFixtures/java/dev/kejona/crossplatforms/TestModule.java
index 6205174d..3598a13c 100644
--- a/core/src/testFixtures/java/dev/kejona/crossplatforms/TestModule.java
+++ b/core/src/testFixtures/java/dev/kejona/crossplatforms/TestModule.java
@@ -9,15 +9,10 @@
import dev.kejona.crossplatforms.handler.FormPlayer;
import dev.kejona.crossplatforms.handler.Placeholders;
import dev.kejona.crossplatforms.handler.ServerHandler;
-import dev.kejona.crossplatforms.interfacing.Interfacer;
-import dev.kejona.crossplatforms.interfacing.java.JavaMenu;
-import dev.kejona.crossplatforms.permission.PermissionDefault;
-import dev.kejona.crossplatforms.resolver.Resolver;
import net.kyori.adventure.audience.Audience;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nonnull;
-import java.util.Map;
import java.util.UUID;
import java.util.stream.Stream;
@@ -25,12 +20,6 @@ public class TestModule extends AbstractModule {
@Override
protected void configure() {
- bind(Interfacer.class).toInstance(new Interfacer() {
- @Override
- public void sendMenu(FormPlayer player, JavaMenu menu, @Nonnull Resolver resolver) {
-
- }
- });
bind(BedrockHandler.class).toInstance(BedrockHandler.empty());
@@ -68,16 +57,6 @@ public boolean isFloodgateEnabled() {
return false;
}
- @Override
- public void registerPermission(String key, @Nullable String description, PermissionDefault def) {
-
- }
-
- @Override
- public void unregisterPermission(String key) {
-
- }
-
@Override
public void dispatchCommand(DispatchableCommand command) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33ede..ae04661e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts
index d6f2d17c..ae41951e 100644
--- a/proxy/build.gradle.kts
+++ b/proxy/build.gradle.kts
@@ -2,7 +2,6 @@
description = "proxy"
dependencies {
- compileOnly("dev.simplix:protocolize-api:2.1.2")
- compileOnly("net.luckperms:api:5.4")
+ compileOnly("dev.simplix:protocolize-api:2.2.3")
compileOnly(projects.core)
}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/PermissionHook.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/PermissionHook.java
deleted file mode 100644
index 56727fc0..00000000
--- a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/PermissionHook.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package dev.kejona.crossplatforms.proxy;
-
-import dev.kejona.crossplatforms.permission.PermissionDefault;
-import org.jetbrains.annotations.Nullable;
-
-public interface PermissionHook {
-
- static PermissionHook empty() {
- return Empty.INSTANCE;
- }
-
- void registerPermission(String key, @Nullable String description, PermissionDefault def);
-
- final class Empty implements PermissionHook {
-
- private static final PermissionHook INSTANCE = new Empty();
-
- @Override
- public void registerPermission(String key, @Nullable String description, PermissionDefault def) {
- //no-op
- }
- }
-}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeInterfacer.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeInterfacer.java
deleted file mode 100644
index cdce4c00..00000000
--- a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeInterfacer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package dev.kejona.crossplatforms.proxy;
-
-import dev.kejona.crossplatforms.Logger;
-import dev.kejona.crossplatforms.handler.FormPlayer;
-import dev.kejona.crossplatforms.interfacing.Interfacer;
-import dev.kejona.crossplatforms.interfacing.java.ItemButton;
-import dev.kejona.crossplatforms.interfacing.java.JavaMenu;
-import dev.kejona.crossplatforms.resolver.Resolver;
-import dev.simplix.protocolize.api.ClickType;
-import dev.simplix.protocolize.api.Protocolize;
-import dev.simplix.protocolize.api.inventory.Inventory;
-import dev.simplix.protocolize.api.item.ItemStack;
-import dev.simplix.protocolize.api.player.ProtocolizePlayer;
-import dev.simplix.protocolize.api.providers.ProtocolizePlayerProvider;
-import dev.simplix.protocolize.data.ItemType;
-import dev.simplix.protocolize.data.inventory.InventoryType;
-
-import javax.annotation.Nonnull;
-import java.util.Locale;
-import java.util.Map;
-
-public class ProtocolizeInterfacer extends Interfacer {
-
- private final Logger logger;
- private final ProtocolizePlayerProvider playerProvider;
-
- public ProtocolizeInterfacer() {
- this.logger = Logger.get();
- this.playerProvider = Protocolize.playerProvider();
- }
-
- @Override
- public void sendMenu(FormPlayer player, JavaMenu source, @Nonnull Resolver resolver) {
- // construct the inventory. todo: validate size
- // todo: apply placeholders and use args
- InventoryType inventoryType;
- int size = source.getSize();
- if (size == 5) {
- inventoryType = InventoryType.HOPPER;
- } else {
- inventoryType = InventoryType.chestInventoryWithSize(size);
- }
-
- Inventory inventory = new Inventory(inventoryType);
- inventory.title(source.getTitle());
-
- Map buttons = source.getButtons();
- for (Map.Entry entry : buttons.entrySet()) {
- Integer slot = entry.getKey();
- ItemButton button = entry.getValue();
- // determine the material for this button
- String material = button.getMaterial();
- ItemType type;
- if (material == null) {
- type = ItemType.STONE;
- } else {
- material = material.toUpperCase(Locale.ROOT).trim();
- try {
- type = ItemType.valueOf(material);
- } catch (IllegalArgumentException e) {
- logger.severe("Java Button: " + source.getIdentifier() + "." + slot + " will be stone because '" + material + "' failed to map to a valid Spigot Material.");
- type = ItemType.STONE;
- }
- }
-
- // construct itemstack
- final ItemStack item = new ItemStack(type);
- item.displayName(button.getDisplayName());
- button.getLore().forEach(item::addToLore);
- inventory.item(slot, item); // add itemstack to inventory
- }
-
- ProtocolizePlayer protocolizePlayer = playerProvider.player(player.getUuid());
-
- inventory.onClick(click -> {
- int realSize = inventory.type().getTypicalSize(protocolizePlayer.protocolVersion());
-
- // Clicks are cancelled by default, so we don't have to do it explicitly.
- ClickType clickType = click.clickType();
- if (click.slot() >= 0 && click.slot() < realSize) {
- switch (clickType) {
- case RIGHT_CLICK:
- case SHIFT_RIGHT_CLICK:
- source.process(click.slot(), true, player, resolver);
- break;
- case LEFT_CLICK:
- case SHIFT_LEFT_CLICK:
- source.process(click.slot(), false, player, resolver);
- break;
- }
- }
- });
-
- protocolizePlayer.openInventory(inventory);
- }
-}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeModule.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeModule.java
new file mode 100644
index 00000000..18eecbf7
--- /dev/null
+++ b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProtocolizeModule.java
@@ -0,0 +1,16 @@
+package dev.kejona.crossplatforms.proxy;
+
+import com.google.inject.AbstractModule;
+import dev.kejona.crossplatforms.inventory.InventoryController;
+import dev.kejona.crossplatforms.inventory.InventoryFactory;
+import dev.kejona.crossplatforms.proxy.inventory.ProtocolizeInventoryController;
+import dev.kejona.crossplatforms.proxy.inventory.ProtocolizeInventoryFactory;
+
+public class ProtocolizeModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+ bind(InventoryFactory.class).to(ProtocolizeInventoryFactory.class);
+ bind(InventoryController.class).to(ProtocolizeInventoryController.class);
+ }
+}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProxyHandler.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProxyHandler.java
deleted file mode 100644
index ab7ce18f..00000000
--- a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/ProxyHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package dev.kejona.crossplatforms.proxy;
-
-import dev.kejona.crossplatforms.Logger;
-import dev.kejona.crossplatforms.command.custom.InterceptCommandCache;
-import dev.kejona.crossplatforms.handler.ServerHandler;
-import dev.kejona.crossplatforms.permission.PermissionDefault;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class ProxyHandler extends InterceptCommandCache implements ServerHandler {
-
- private final PermissionHook permissionHook;
-
- public ProxyHandler(PermissionHook permissionHook) {
- this.permissionHook = permissionHook;
- if (permissionHook instanceof PermissionHook.Empty) {
- Logger.get().warn("Install LuckPerms in order for permission defaults to take effect.");
- }
- }
-
- @Override
- public void registerPermission(String key, @Nullable String description, PermissionDefault def) {
- permissionHook.registerPermission(key, description, def);
- }
-
- @Override
- public void unregisterPermission(String key) {
- // this will only have to be implemented if we had a hook for some permission system that
- // complains about registering the same permission twice
- }
-}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventory.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventory.java
new file mode 100644
index 00000000..4927ab09
--- /dev/null
+++ b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventory.java
@@ -0,0 +1,28 @@
+package dev.kejona.crossplatforms.proxy.inventory;
+
+import dev.kejona.crossplatforms.inventory.InventoryHandle;
+import dev.kejona.crossplatforms.inventory.ItemHandle;
+import dev.simplix.protocolize.api.inventory.Inventory;
+import dev.simplix.protocolize.api.item.ItemStack;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ProtocolizeInventory implements InventoryHandle {
+
+ private final Inventory inventory;
+
+ @Override
+ public Object handle() {
+ return inventory;
+ }
+
+ @Override
+ public String title() {
+ return inventory.title(true);
+ }
+
+ @Override
+ public void setSlot(int index, ItemHandle item) {
+ inventory.item(index, item.castedHandle(ItemStack.class));
+ }
+}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryController.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryController.java
new file mode 100644
index 00000000..d01da8ca
--- /dev/null
+++ b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryController.java
@@ -0,0 +1,42 @@
+package dev.kejona.crossplatforms.proxy.inventory;
+
+import dev.kejona.crossplatforms.handler.FormPlayer;
+import dev.kejona.crossplatforms.inventory.ClickHandler;
+import dev.kejona.crossplatforms.inventory.InventoryController;
+import dev.kejona.crossplatforms.inventory.InventoryHandle;
+import dev.simplix.protocolize.api.Protocolize;
+import dev.simplix.protocolize.api.inventory.Inventory;
+import dev.simplix.protocolize.api.player.ProtocolizePlayer;
+import dev.simplix.protocolize.api.providers.ProtocolizePlayerProvider;
+
+public class ProtocolizeInventoryController implements InventoryController {
+
+ private final ProtocolizePlayerProvider players = Protocolize.playerProvider();
+
+ @Override
+ public void openInventory(FormPlayer recipient, InventoryHandle container, ClickHandler clickHandler) {
+ ProtocolizePlayer player = players.player(recipient.getUuid());
+ Inventory inventory = container.castedHandle(Inventory.class);
+
+ inventory.onClick(click -> {
+ int slot = click.slot();
+ int realSize = inventory.type().getTypicalSize(player.protocolVersion());
+
+ // Clicks are cancelled by default, so we don't have to do it explicitly.
+ if (slot >= 0 && slot < realSize) {
+ switch (click.clickType()) {
+ case RIGHT_CLICK:
+ case SHIFT_RIGHT_CLICK:
+ clickHandler.handle(slot, true);
+ break;
+ case LEFT_CLICK:
+ case SHIFT_LEFT_CLICK:
+ clickHandler.handle(slot, false);
+ break;
+ }
+ }
+ });
+
+ player.openInventory(inventory);
+ }
+}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryFactory.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryFactory.java
new file mode 100644
index 00000000..42fb080f
--- /dev/null
+++ b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeInventoryFactory.java
@@ -0,0 +1,147 @@
+package dev.kejona.crossplatforms.proxy.inventory;
+
+import dev.kejona.crossplatforms.Logger;
+import dev.kejona.crossplatforms.handler.FormPlayer;
+import dev.kejona.crossplatforms.inventory.InventoryFactory;
+import dev.kejona.crossplatforms.inventory.InventoryHandle;
+import dev.kejona.crossplatforms.inventory.InventoryLayout;
+import dev.kejona.crossplatforms.inventory.ItemHandle;
+import dev.kejona.crossplatforms.inventory.SkullProfile;
+import dev.simplix.protocolize.api.inventory.Inventory;
+import dev.simplix.protocolize.api.item.ItemStack;
+import dev.simplix.protocolize.data.ItemType;
+import dev.simplix.protocolize.data.inventory.InventoryType;
+import net.querz.nbt.tag.CompoundTag;
+import net.querz.nbt.tag.ListTag;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Locale;
+
+public class ProtocolizeInventoryFactory implements InventoryFactory {
+
+ private static final String CUSTOM_MODEL_DATA_KEY = "CustomModelData";
+
+ @Override
+ public InventoryHandle chest(String title, int chestSize) {
+ InventoryType type = InventoryType.chestInventoryWithSize(chestSize);
+ Inventory inventory = new Inventory(type);
+ inventory.title(title);
+
+ return new ProtocolizeInventory(inventory);
+ }
+
+ @Override
+ public InventoryHandle inventory(String title, InventoryLayout layout) {
+ InventoryType type = convertType(layout);
+ Inventory inventory = new Inventory(type);
+ inventory.title(title);
+
+ return new ProtocolizeInventory(inventory);
+ }
+
+ @Override
+ public ItemHandle item(@Nullable String material, @Nullable String displayName, @Nonnull List lore, @Nullable Integer customModelData) {
+ ItemType type;
+ if (material == null) {
+ type = ItemType.STONE;
+ } else {
+ try {
+ type = ItemType.valueOf(material.toUpperCase(Locale.ROOT).trim());
+ } catch (IllegalArgumentException ignored) {
+ Logger.get().warn("Material '" + material + "' is not a valid material on BungeeCord/Velocity (Protocolize)");
+ type = ItemType.STONE;
+ }
+ }
+
+ ItemStack item = new ItemStack(type);
+ if (displayName != null) {
+ item.displayName(displayName);
+ }
+ item.lore(lore, true);
+
+ if (customModelData != null) {
+ item.nbtData().putInt(CUSTOM_MODEL_DATA_KEY, customModelData);
+ }
+
+ return new ProtocolizeItem(item);
+ }
+
+ @Override
+ public ItemHandle skullItem(FormPlayer profile, @Nullable String displayName, List lore) {
+ ItemStack item = skullBase(displayName, lore);
+ setSkullOwner(item.nbtData(), profile.getName(), profile.getEncodedSkinData());
+ return new ProtocolizeItem(item);
+ }
+
+ @Override
+ public ItemHandle skullItem(SkullProfile profile, @Nullable String displayName, List lore) {
+ ItemStack item = skullBase(displayName, lore);
+ setSkullOwner(item.nbtData(), profile.getOwner(), profile.getTextures());
+
+ return new ProtocolizeItem(item);
+ }
+
+ private ItemStack skullBase(@Nullable String displayName, List lore) {
+ ItemStack item = new ItemStack(ItemType.PLAYER_HEAD);
+ if (displayName != null) {
+ item.displayName(displayName);
+ }
+ item.lore(lore, true);
+
+ return item;
+ }
+
+ private void setSkullOwner(CompoundTag tag, String owner, String textures) {
+ if (textures == null) {
+ if (owner == null) {
+ throw new IllegalArgumentException("both owner and textures cannot be null");
+ }
+
+ // old cruddy format of only the owner
+ tag.putString("SkullOwner", owner);
+ return;
+ }
+
+ String name;
+ if (owner == null) {
+ // silly fallback since providing UUID instead of name would mean
+ // having to handle the two different UUID formats, which is quite complicated and ugly
+ name = "spinbom";
+ } else {
+ name = owner;
+ }
+
+ CompoundTag skullOwner = new CompoundTag();
+ skullOwner.putString("Name", name); // client doesn't seem to complain about not having a UUID
+ skullOwner.put("Properties", propertiesWithTextures(textures));
+
+ tag.put("SkullOwner", skullOwner);
+ }
+
+ private CompoundTag propertiesWithTextures(String encodedTexture) {
+ CompoundTag texture = new CompoundTag();
+ texture.putString("Value", encodedTexture);
+
+ ListTag textures = new ListTag<>(CompoundTag.class);
+ textures.add(texture);
+
+ CompoundTag properties = new CompoundTag();
+ properties.put("textures", textures);
+ return properties;
+ }
+
+ private static InventoryType convertType(InventoryLayout layout) {
+ switch (layout) {
+ case HOPPER:
+ return InventoryType.HOPPER;
+ case DISPENSER:
+ return InventoryType.GENERIC_3X3;
+ case CHEST:
+ throw new IllegalArgumentException("Chest inventories should be created directly");
+ }
+
+ throw new AssertionError("Unhandled InventoryLayout: " + layout.name());
+ }
+}
diff --git a/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeItem.java b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeItem.java
new file mode 100644
index 00000000..a5887415
--- /dev/null
+++ b/proxy/src/main/java/dev/kejona/crossplatforms/proxy/inventory/ProtocolizeItem.java
@@ -0,0 +1,16 @@
+package dev.kejona.crossplatforms.proxy.inventory;
+
+import dev.kejona.crossplatforms.inventory.ItemHandle;
+import dev.simplix.protocolize.api.item.ItemStack;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ProtocolizeItem implements ItemHandle {
+
+ private final ItemStack item;
+
+ @Override
+ public Object handle() {
+ return item;
+ }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f951a7cb..588cbaf9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,22 +2,13 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
rootProject.name = "CrossplatForms"
-include(":core")
-include(":proxy")
-include(":bungeecord")
-include(":velocity")
-include(":access-item")
-include(":spigot-common")
-include(":spigot")
-include(":spigot-legacy")
-
pluginManagement {
repositories {
gradlePluginPortal()
}
plugins {
- id("net.kyori.indra.git") version "2.2.0"
- id("net.kyori.indra") version "2.2.0" // multi-release jar
+ id("net.kyori.indra.git") version "3.0.1" // getting branch and commit info at compile time
+ id("net.kyori.indra") version "3.0.1" // multi-release jar for referencing Java 16 geyser api
id("com.github.johnrengelman.shadow") version "7.1.2" // shadowing dependencies
}
}
@@ -36,6 +27,33 @@ dependencyResolutionManagement {
maven("https://repo.codemc.io//repository/maven-public/") // NBT api
maven("https://mvn.exceptionflug.de/repository/exceptionflug-public/") // protocolize for proxies
- maven("https://nexus.velocitypowered.com/repository/maven-public/") // velocity
+ maven("https://repo.papermc.io/repository/maven-public/") // velocity
}
}
+
+include(":core")
+include(":access-item")
+
+include(":proxy")
+include(":bungeecord")
+include(":velocity")
+
+include(":spigot")
+
+include(":spigot-common:common")
+findProject(":spigot-common:common")?.name = "common"
+
+include(":spigot-common:v1_8_R3")
+findProject(":spigot-common:v1_8_R3")?.name = "v1_8_R3"
+
+include(":spigot-common:v1_9_R2")
+findProject(":spigot-common:v1_9_R2")?.name = "v1_9_R2"
+
+include(":spigot-common:v1_12_R1")
+findProject(":spigot-common:v1_12_R1")?.name = "v1_12_R1"
+
+include(":spigot-common:v1_13_R2")
+findProject(":spigot-common:v1_13_R2")?.name = "v1_13_R2"
+
+include(":spigot-common:v1_14_R1")
+findProject(":spigot-common:v1_14_R1")?.name = "v1_14_R1"
diff --git a/spigot-common/build.gradle.kts b/spigot-common/build.gradle.kts
deleted file mode 100644
index 7d03e417..00000000
--- a/spigot-common/build.gradle.kts
+++ /dev/null
@@ -1,17 +0,0 @@
-
-dependencies {
- testImplementation(testFixtures(projects.core))
-
- // 1.8.8 is supported but we target 1.9.4 to use PlayerSwapItemEvent if necessary
- compileOnly("org.spigotmc:spigot-api:1.9.4-R0.1-SNAPSHOT")
- compileOnly("com.mojang:authlib:1.5.21")
- compileOnly("me.clip:placeholderapi:2.11.1")
- api(projects.core)
- api(projects.accessItem)
- api("cloud.commandframework:cloud-paper:1.7.1")
- api("me.lucko:commodore:2.2")
- api("net.kyori:adventure-platform-bukkit:4.1.2")
- api("org.bstats:bstats-bukkit:3.0.0")
-}
-
-description = "spigot-common"
diff --git a/spigot-common/common/build.gradle.kts b/spigot-common/common/build.gradle.kts
new file mode 100644
index 00000000..866f8c0d
--- /dev/null
+++ b/spigot-common/common/build.gradle.kts
@@ -0,0 +1,16 @@
+
+dependencies {
+ testImplementation(testFixtures(projects.core))
+
+ compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+ compileOnly("com.mojang:authlib:1.5.21") // Mirrored from floodgate-spigot - probably the version from 1.8.8
+ compileOnly("me.clip:placeholderapi:2.11.3")
+ api(projects.core)
+ api(projects.accessItem)
+ api("cloud.commandframework:cloud-paper:1.8.3")
+ api("me.lucko:commodore:2.2")
+ api("net.kyori:adventure-platform-bukkit:4.3.0")
+ api("org.bstats:bstats-bukkit:3.0.2")
+}
+
+description = "spigot-common"
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/ClassNames.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/ClassNames.java
new file mode 100644
index 00000000..ccf5e649
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/ClassNames.java
@@ -0,0 +1,34 @@
+package dev.kejona.crossplatforms.spigot;
+
+import dev.kejona.crossplatforms.utils.ReflectionUtils;
+import org.bukkit.Bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * Thanks to Floodgate
+ * https://github.com/GeyserMC/Floodgate/blob/master/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
+ */
+public final class ClassNames {
+
+ /**
+ * Includes the v at the front
+ */
+ public static final String NMS_VERSION;
+ private static final String CRAFTBUKKIT_PACKAGE;
+
+ public static final Method PLAYER_GET_PROFILE;
+ public static final Field META_SKULL_PROFILE;
+
+ static {
+ NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+ CRAFTBUKKIT_PACKAGE = "org.bukkit.craftbukkit." + NMS_VERSION;
+
+ Class craftPlayer = ReflectionUtils.requireClass(CRAFTBUKKIT_PACKAGE + ".entity.CraftPlayer");
+ PLAYER_GET_PROFILE = ReflectionUtils.requireMethod(craftPlayer, "getProfile");
+
+ Class craftMetaSkull = ReflectionUtils.requireClass(CRAFTBUKKIT_PACKAGE + ".inventory.CraftMetaSkull");
+ META_SKULL_PROFILE = ReflectionUtils.requireField(craftMetaSkull, "profile");
+ }
+}
diff --git a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/CloseMenuAction.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/CloseMenuAction.java
similarity index 94%
rename from spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/CloseMenuAction.java
rename to spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/CloseMenuAction.java
index bdd59d83..6d866c46 100644
--- a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/CloseMenuAction.java
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/CloseMenuAction.java
@@ -1,4 +1,4 @@
-package dev.kejona.crossplatforms.spigot.common;
+package dev.kejona.crossplatforms.spigot;
import dev.kejona.crossplatforms.action.ActionSerializer;
import dev.kejona.crossplatforms.action.GenericAction;
diff --git a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/GeyserHubConverter.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/GeyserHubConverter.java
similarity index 99%
rename from spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/GeyserHubConverter.java
rename to spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/GeyserHubConverter.java
index 72d3819a..7ead7bda 100644
--- a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/GeyserHubConverter.java
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/GeyserHubConverter.java
@@ -1,4 +1,4 @@
-package dev.kejona.crossplatforms.spigot.common;
+package dev.kejona.crossplatforms.spigot;
import dev.kejona.crossplatforms.Logger;
import dev.kejona.crossplatforms.permission.PermissionDefault;
diff --git a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotAccessItemsBase.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotAccessItems.java
similarity index 82%
rename from spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotAccessItemsBase.java
rename to spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotAccessItems.java
index 27fed96d..e259d0a3 100644
--- a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotAccessItemsBase.java
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotAccessItems.java
@@ -1,4 +1,4 @@
-package dev.kejona.crossplatforms.spigot.common;
+package dev.kejona.crossplatforms.spigot;
import dev.kejona.crossplatforms.Logger;
import dev.kejona.crossplatforms.accessitem.AccessItem;
@@ -7,15 +7,19 @@
import dev.kejona.crossplatforms.handler.BedrockHandler;
import dev.kejona.crossplatforms.handler.FormPlayer;
import dev.kejona.crossplatforms.handler.Placeholders;
-import dev.kejona.crossplatforms.handler.ServerHandler;
-import dev.kejona.crossplatforms.interfacing.Interfacer;
-import dev.kejona.crossplatforms.spigot.common.handler.SpigotPlayer;
+import dev.kejona.crossplatforms.inventory.ItemHandle;
+import dev.kejona.crossplatforms.permission.Permissions;
+import dev.kejona.crossplatforms.resolver.PlayerResolver;
+import dev.kejona.crossplatforms.resolver.Resolver;
+import dev.kejona.crossplatforms.spigot.adapter.NbtAccessor;
+import dev.kejona.crossplatforms.spigot.adapter.SpigotAdapter;
+import dev.kejona.crossplatforms.spigot.handler.SpigotPlayer;
import lombok.AllArgsConstructor;
-import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
@@ -28,7 +32,6 @@
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.java.JavaPlugin;
import javax.annotation.Nonnull;
@@ -36,38 +39,31 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Objects;
-import java.util.function.Consumer;
import java.util.function.Predicate;
-/**
- * Abstract AccessItemRegistry for spigot platforms. Automatically registers {@link SwapHandItemsListener} if
- * the class is event is available on the current server version.
- */
-public abstract class SpigotAccessItemsBase extends AccessItemRegistry implements Listener {
+public final class SpigotAccessItems extends AccessItemRegistry implements Listener {
private final Logger logger = Logger.get();
- protected final Interfacer interfacer;
- protected final BedrockHandler bedrockHandler;
- protected final Placeholders placeholders;
-
- public SpigotAccessItemsBase(JavaPlugin plugin,
- ConfigManager configManager,
- ServerHandler serverHandler,
- Interfacer interfacer,
- BedrockHandler bedrockHandler,
- Placeholders placeholders) {
- super(configManager, serverHandler);
- this.interfacer = interfacer;
+
+ private final NbtAccessor nbt;
+ private final BedrockHandler bedrockHandler;
+ private final Placeholders placeholders;
+
+ public SpigotAccessItems(JavaPlugin plugin,
+ SpigotAdapter adapter,
+ ConfigManager configManager,
+ Permissions permissions,
+ BedrockHandler bedrockHandler,
+ Placeholders placeholders) {
+ super(configManager, permissions);
+ this.nbt = adapter.nbtAccessor(plugin);
this.bedrockHandler = bedrockHandler;
this.placeholders = placeholders;
-
- if (!Bukkit.getVersion().contains("1.8")) { // Older versions not supported, 1.9 and newer has offhand
- Bukkit.getPluginManager().registerEvents(new SwapHandItemsListener(this), plugin);
- }
}
- public abstract void setItemId(@Nonnull ItemStack itemStack, @Nonnull String identifier);
+ public void setItemId(@Nonnull ItemStack itemStack, @Nonnull String identifier) {
+ nbt.setCustomString(itemStack, AccessItem.STATIC_IDENTIFIER, identifier);
+ }
/**
* Attempt to retrieve the Access Item ID that an ItemStack points to. The Access Item ID may or may not refer
@@ -76,28 +72,17 @@ public SpigotAccessItemsBase(JavaPlugin plugin,
* @return The AccessItem ID if the ItemStack contained the name, null if not.
*/
@Nullable
- public abstract String getItemId(@Nonnull ItemStack itemStack);
+ public String getItemId(@Nonnull ItemStack itemStack) {
+ return nbt.getCustomString(itemStack, AccessItem.STATIC_IDENTIFIER);
+ }
public ItemStack createItemStack(AccessItem accessItem, Player player) {
FormPlayer formPlayer = new SpigotPlayer(player);
- // todo: material lookups on 1.13 on SpigotLegacy seem to fail on materials with underscores.
- // Have not checked any other versions
- Material material = Material.matchMaterial(accessItem.getMaterial());
- if (material == null) {
- logger.severe(String.format("Failed to get access item from '%s' for access item '%s'", accessItem.getMaterial(), accessItem.getIdentifier()));
- material = Material.COMPASS;
- }
+ Resolver resolver = new PlayerResolver(formPlayer, placeholders);
+
+ ItemHandle handle = accessItem.convertAndResolve(resolver);
+ ItemStack item = handle.castedHandle(ItemStack.class);
- ItemStack item = new ItemStack(material);
- ItemMeta meta = item.getItemMeta();
- if (meta == null) {
- logger.severe(String.format("Itemstack from material %s for access item %s has null item meta!", material, accessItem.getIdentifier()));
- item = new ItemStack(Material.COMPASS);
- meta = Objects.requireNonNull(item.getItemMeta());
- }
- meta.setDisplayName(placeholders.setPlaceholders(formPlayer, accessItem.getDisplayName()));
- meta.setLore(placeholders.setPlaceholders(formPlayer, accessItem.getLore()));
- item.setItemMeta(meta);
setItemId(item, accessItem.getIdentifier());
return item;
}
@@ -118,7 +103,7 @@ public void onInteract(PlayerInteractEvent event) { // opening menus through acc
if (isEnabled()) {
AccessItem access = getItem(id);
if (access == null) {
- // item not longer exists
+ // item no longer exists
remove(player, item, RemoveReason.ITEM_REMOVED);
} else if (player.hasPermission(access.permission(AccessItem.Limit.POSSESS))) {
if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK) {
@@ -242,16 +227,16 @@ public void onPlayerLeave(PlayerQuitEvent event) {
}
}
- protected final void handlePlayerPickupItem(Player player, Item item, Consumer canceller) {
+ public void handlePlayerPickupItem(Player player, Item item, Cancellable event) {
String id = getItemId(item.getItemStack());
if (id != null) {
AccessItem access = getItem(id);
if (access == null) {
// the item no longer exists, don't allow picking it up
- canceller.accept(true);
+ event.setCancelled(true);
} else if (!player.hasPermission(access.permission(AccessItem.Limit.POSSESS))) {
// they don't have permission to have it
- canceller.accept(true);
+ event.setCancelled(true);
}
}
}
@@ -364,6 +349,7 @@ private enum RemoveReason {
ITEM_REMOVED("That Access Item doesn't exist anymore."),
IMPERMISSIBLE("You don't have permission to have that.");
- @Nonnull String message;
+ @Nonnull
+ final String message;
}
}
diff --git a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotBase.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotBase.java
similarity index 58%
rename from spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotBase.java
rename to spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotBase.java
index 3e51fe1f..5ece6fba 100644
--- a/spigot-common/src/main/java/dev/kejona/crossplatforms/spigot/common/SpigotBase.java
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/SpigotBase.java
@@ -1,8 +1,10 @@
-package dev.kejona.crossplatforms.spigot.common;
+package dev.kejona.crossplatforms.spigot;
import cloud.commandframework.bukkit.BukkitCommandManager;
import cloud.commandframework.execution.CommandExecutionCoordinator;
import cloud.commandframework.paper.PaperCommandManager;
+import com.google.inject.AbstractModule;
+import com.google.inject.Module;
import dev.kejona.crossplatforms.Constants;
import dev.kejona.crossplatforms.CrossplatForms;
import dev.kejona.crossplatforms.CrossplatFormsBootstrap;
@@ -19,26 +21,36 @@
import dev.kejona.crossplatforms.handler.BasicPlaceholders;
import dev.kejona.crossplatforms.handler.Placeholders;
import dev.kejona.crossplatforms.handler.ServerHandler;
-import dev.kejona.crossplatforms.interfacing.Interfacer;
-import dev.kejona.crossplatforms.spigot.common.handler.PlaceholderAPIHandler;
-import dev.kejona.crossplatforms.spigot.common.handler.SpigotCommandOrigin;
-import dev.kejona.crossplatforms.spigot.common.handler.SpigotHandler;
+import dev.kejona.crossplatforms.inventory.InventoryController;
+import dev.kejona.crossplatforms.inventory.InventoryFactory;
+import dev.kejona.crossplatforms.permission.LuckPermsHook;
+import dev.kejona.crossplatforms.permission.Permissions;
+import dev.kejona.crossplatforms.spigot.adapter.SpigotAdapter;
+import dev.kejona.crossplatforms.spigot.adapter.Versioned;
+import dev.kejona.crossplatforms.spigot.handler.PlaceholderAPIHandler;
+import dev.kejona.crossplatforms.spigot.handler.SpigotCommandOrigin;
+import dev.kejona.crossplatforms.spigot.handler.SpigotHandler;
+import dev.kejona.crossplatforms.spigot.handler.SpigotPermissions;
+import dev.kejona.crossplatforms.spigot.item.SpigotInventoryController;
+import dev.kejona.crossplatforms.spigot.item.SpigotInventoryFactory;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.CustomChart;
+import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
public abstract class SpigotBase extends JavaPlugin implements CrossplatFormsBootstrap {
- protected static final String PIE_CHART_LEGACY = "legacy";
- protected static final int METRICS_ID = 14707;
+ private static final int METRICS_ID = 14707;
public static final LegacyComponentSerializer LEGACY_SERIALIZER = BukkitComponentSerializer.legacy();
private static SpigotBase INSTANCE;
@@ -48,10 +60,10 @@ public abstract class SpigotBase extends JavaPlugin implements CrossplatFormsBoo
Constants.fetch();
}
- private Logger logger;
- protected Server server;
- protected BukkitAudiences audiences;
+ protected Logger logger;
+ private BukkitAudiences audiences;
private Metrics metrics;
+ private SpigotAdapter spigotAdapter;
protected SpigotBase() {
INSTANCE = this;
@@ -59,14 +71,30 @@ protected SpigotBase() {
@Override
public void onEnable() {
+ Server server = getServer();
+
logger = new JavaUtilLogger(getLogger());
- metrics = new Metrics(this, METRICS_ID);
- server = getServer();
audiences = BukkitAudiences.create(this);
- ServerHandler serverHandler = new SpigotHandler(this, audiences);
+ metrics = new Metrics(this, METRICS_ID);
+
+ Versioned result = findVersionAdapter();
+ result.betterVersion().ifPresent(v -> logger.warn("Consider using server version " + v + " instead."));
+ if (result.value().isPresent()) {
+ spigotAdapter = result.value().get();
+ } else {
+ logger.severe("This server version is unsupported. If you believe this is incorrect, please contact us.");
+ getServer().getPluginManager().disablePlugin(this);
+ return;
+ }
+
+ // For ServerAction
+ server.getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
convertGeyserHubConfig();
+ ServerHandler serverHandler = new SpigotHandler(this, audiences);
+ Permissions permissions = server.getPluginManager().isPluginEnabled("LuckPerms") ? new LuckPermsHook() : new SpigotPermissions(this);
+
// Yes, this is not Paper-exclusive plugin. Cloud handles this gracefully.
PaperCommandManager commandManager;
try {
@@ -82,18 +110,20 @@ public void onEnable() {
return;
}
- if (attemptBrigadier()) {
+ if (brigadierAvailable()) {
try {
// Brigadier is ideal if possible. Allows for much more readable command options, especially on BE.
commandManager.registerBrigadier();
+ logger.info("Successfully registered Brigadier mappings");
} catch (BukkitCommandManager.BrigadierFailureException e) {
logger.warn("Failed to initialize Brigadier support: " + e.getMessage());
+ if (e.getReason() == BukkitCommandManager.BrigadierFailureReason.VERSION_TOO_HIGH) {
+ // Commodore brig only supports Spigot 1.13 - 1.18.2
+ logger.warn("Using Paper instead of Spigot will likely fix this.");
+ }
}
}
- // For ServerAction
- server.getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
-
Placeholders placeholders;
if (server.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
placeholders = new PlaceholderAPIHandler(this);
@@ -106,22 +136,51 @@ public void onEnable() {
logger,
getDataFolder().toPath(),
serverHandler,
+ permissions,
"forms",
commandManager,
placeholders,
this
);
- if (!crossplatForms.isSuccess()) {
- return;
- }
+ // Wait for debug to be set or not
+ logger.debug("Using " + spigotAdapter.getClass().getSimpleName() + " for server version " + ClassNames.NMS_VERSION);
- SpigotAccessItemsBase accessItems = accessItems(crossplatForms);
+ SpigotAccessItems accessItems = new SpigotAccessItems(
+ this,
+ spigotAdapter,
+ crossplatForms.getConfigManager(),
+ crossplatForms.getPermissions(),
+ crossplatForms.getBedrockHandler(),
+ crossplatForms.getPlaceholders()
+ );
server.getPluginManager().registerEvents(accessItems, this);
+ spigotAdapter.registerAuxiliaryEvents(this, accessItems); // Events for versions above 1.8
// Commands added by access items
new GiveCommand(crossplatForms, accessItems).register(commandManager, crossplatForms.getCommandBuilder());
new InspectItemCommand(crossplatForms, accessItems).register(commandManager, crossplatForms.getCommandBuilder());
+
+ permissions.notifyPluginLoaded();
+ }
+
+ @Override
+ public List configModules() {
+ List modules = new ArrayList<>();
+
+ SpigotInventoryController controller = new SpigotInventoryController();
+ getServer().getPluginManager().registerEvents(controller, this);
+ SpigotInventoryFactory factory = new SpigotInventoryFactory(spigotAdapter);
+
+ modules.add(new AbstractModule() {
+ @Override
+ public void configure() {
+ bind(InventoryController.class).toInstance(controller);
+ bind(InventoryFactory.class).toInstance(factory);
+ }
+ });
+
+ return modules;
}
@Override
@@ -134,19 +193,13 @@ public void preConfigLoad(ConfigManager configManager) {
CloseMenuAction.register(actionSerializer);
}
- @Override
- public Interfacer interfaceManager() {
- SpigotInterfacer manager = new SpigotInterfacer();
- server.getPluginManager().registerEvents(manager, this);
- return manager;
- }
-
@Override
public void onDisable() {
if (audiences != null) {
audiences.close();
}
- server.getMessenger().unregisterOutgoingPluginChannel(this);
+ // note: server var might be null here in case plugin is disabled early
+ Bukkit.getMessenger().unregisterOutgoingPluginChannel(this);
}
@Override
@@ -170,9 +223,19 @@ private void convertGeyserHubConfig() {
}
}
- public abstract boolean attemptBrigadier();
-
- public abstract SpigotAccessItemsBase accessItems(CrossplatForms crossplatForms);
+ private boolean brigadierAvailable() {
+ try {
+ // Brigadier is available on 1.13 and above
+ Class.forName("org.bukkit.entity.Dolphin");
+ return true;
+ } catch (ClassNotFoundException ignored) {
+ // no-op
+ }
+
+ return false;
+ }
+
+ public abstract Versioned findVersionAdapter();
public static SpigotBase getInstance() {
return INSTANCE;
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/NbtAccessor.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/NbtAccessor.java
new file mode 100644
index 00000000..5f789091
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/NbtAccessor.java
@@ -0,0 +1,14 @@
+package dev.kejona.crossplatforms.spigot.adapter;
+
+import org.bukkit.inventory.ItemStack;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public interface NbtAccessor {
+
+ @Nullable
+ String getCustomString(@Nonnull ItemStack stack, @Nonnull String key);
+
+ void setCustomString(@Nonnull ItemStack stack, @Nonnull String key, @Nonnull String value);
+}
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/SpigotAdapter.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/SpigotAdapter.java
new file mode 100644
index 00000000..96b58f3f
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/SpigotAdapter.java
@@ -0,0 +1,32 @@
+package dev.kejona.crossplatforms.spigot.adapter;
+
+import dev.kejona.crossplatforms.handler.FormPlayer;
+import dev.kejona.crossplatforms.spigot.SpigotAccessItems;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.Contract;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public interface SpigotAdapter {
+
+ boolean customModelData();
+
+ void setCustomModelData(@Nonnull ItemStack stack, @Nullable Integer value);
+
+ Material playerHeadMaterial();
+
+ @Contract("_, null, null -> fail")
+ void setSkullProfile(SkullMeta meta, String name, String textures);
+
+ default void setSkullProfile(SkullMeta meta, FormPlayer player) {
+ setSkullProfile(meta, player.getName(), player.getEncodedSkinData());
+ }
+
+ NbtAccessor nbtAccessor(Plugin plugin);
+
+ void registerAuxiliaryEvents(Plugin plugin, SpigotAccessItems items);
+}
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Version.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Version.java
new file mode 100644
index 00000000..f110ae2d
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Version.java
@@ -0,0 +1,57 @@
+package dev.kejona.crossplatforms.spigot.adapter;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+import org.jetbrains.annotations.NotNull;
+
+@Accessors(fluent = true)
+@Getter
+@EqualsAndHashCode
+public class Version implements Comparable {
+ private final int major;
+ private final int minor;
+ private final int patch;
+
+ public Version(String nmsVersion) throws IllegalArgumentException {
+ try {
+ String[] split = nmsVersion.split("_", 3);
+
+ major = Integer.parseUnsignedInt(split[0]);
+ minor = Integer.parseUnsignedInt(split[1]);
+ patch = Integer.parseUnsignedInt(split[2].substring(1)); // substring to remove the R
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to parse NMS version: " + nmsVersion, e);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return major + "_" + minor + "_R" + patch;
+ }
+
+ @Override
+ public int compareTo(@NotNull Version other) {
+ if (major < other.major) {
+ return -1;
+ } else if (major > other.major) {
+ return 1;
+ }
+ // major version the same
+
+ if (minor < other.minor) {
+ return -1;
+ } else if (minor > other.minor) {
+ return 1;
+ }
+ // minor the same
+
+ if (patch < other.patch) {
+ return -1;
+ } else if (patch > other.patch) {
+ return 1;
+ }
+
+ return 0; // the same
+ }
+}
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/VersionMap.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/VersionMap.java
new file mode 100644
index 00000000..61a1fbbe
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/VersionMap.java
@@ -0,0 +1,70 @@
+package dev.kejona.crossplatforms.spigot.adapter;
+
+import javax.annotation.Nonnull;
+import java.util.Objects;
+import java.util.TreeMap;
+
+public class VersionMap extends TreeMap {
+
+ private final int majorVersion;
+
+ public VersionMap(int supportedMajorVersion) {
+ this.majorVersion = supportedMajorVersion;
+ }
+
+ @Nonnull
+ private T getOrThrow(Version version) {
+ return Objects.requireNonNull(get(version));
+ }
+
+ /**
+ * @param nmsVersion x_y_Rz
+ */
+ public Versioned lenientSearch(String nmsVersion) throws IllegalArgumentException {
+ if (isEmpty()) {
+ throw new IllegalStateException("The map is empty");
+ }
+
+ Version version = new Version(nmsVersion);
+
+ if (version.major() != majorVersion) {
+ return Versioned.unsupported(lastKey().toString());
+ }
+
+ if (containsKey(version)) {
+ // Direct support for this version
+ return Versioned.supported(getOrThrow(version));
+ }
+
+ // Find adapter versions below and above the given version
+ Version lower = floorKey(version);
+ Version higher = ceilingKey(version);
+
+ if (lower == null) {
+ // Given version is lower than the lowest adapter version
+ return Versioned.unsupported(higher.toString());
+ }
+ if (higher == null) {
+ // Given version is higher than the highest adapter version. Assume we know this works
+ return Versioned.supported(getOrThrow(lower));
+ }
+
+ if (lower.minor() != version.minor()) {
+ // Lower version is not the same "game version". eg 1.13 vs 1.14
+
+ if (higher.minor() == version.minor()) {
+ // The given version and higher adapter version only differ in patch version. The server should be updated.
+ // eg 1.13 < 1.14.1 < 1.14.2
+ // lower version higher
+ return Versioned.supported(getOrThrow(higher), higher.toString());
+ } else {
+ // eg 1.13 < 1.14 < 1.15
+ // lower version higher
+ return Versioned.supported(getOrThrow(lower));
+ }
+ }
+
+ // There is an adapter for the same minor version, but a lower patch version
+ return Versioned.supported(getOrThrow(lower));
+ }
+}
diff --git a/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Versioned.java b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Versioned.java
new file mode 100644
index 00000000..73c1cdf5
--- /dev/null
+++ b/spigot-common/common/src/main/java/dev/kejona/crossplatforms/spigot/adapter/Versioned.java
@@ -0,0 +1,60 @@
+package dev.kejona.crossplatforms.spigot.adapter;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+public class Versioned {
+
+ /**
+ * The value found for a version
+ */
+ @Nullable
+ private final T value;
+
+ /**
+ * A version that would be more ideal than the one used to find this value
+ */
+ @Nullable
+ private final String betterVersion;
+
+ private Versioned(@Nullable T value, @Nullable String betterVersion) {
+ this.value = value;
+ this.betterVersion = betterVersion;
+ }
+
+ public Optional value() {
+ return Optional.ofNullable(value);
+ }
+
+ public Optional betterVersion() {
+ return Optional.ofNullable(betterVersion);
+ }
+
+ public static Versioned supported(@Nonnull T value, @Nullable String betterVersion) {
+ return new Versioned<>(Objects.requireNonNull(value), betterVersion);
+ }
+
+ public static Versioned supported(@Nonnull T value) {
+ return supported(value, null);
+ }
+
+ public static Versioned unsupported(@Nonnull String betterVersion) {
+ return new Versioned<>(null, Objects.requireNonNull(betterVersion));
+ }
+
+ /**
+ * Converts the given {@link Versioned} of a {@link Supplier} by calling {@link Supplier#get()} if the value is
+ * present, otherwise using null for the new Versioned.
+ *
+ * @param v The Supplier-type Versioned to convert
+ * @param The type that the Supplier provides, that will be the type of the converted VersionValue
+ * @return A new {@link Versioned} with the Supplier intermediary removed
+ */
+ public static Versioned
[](https://ci.kejona.dev/job/CrossplatForms/job/main/)
-[](https://github.com/kejonaMC/CrossplatForms/releases)
+[](https://github.com/kejonaMC/CrossplatForms/releases)
[](https://github.com/kejonaMC/CrossplatForms/blob/master/LICENSE)
[](https://discord.gg/M2SvqCu4e9)
[](https://bstats.org/author/Konicai)
@@ -38,8 +38,7 @@ BungeeCord and Velocity do not support Access Items.
---
-* [`CrossplatForms-Spigot.jar`](https://ci.kejona.dev/job/CrossplatForms/job/main/) : Spigot 1.14.4 - 1.19.1
-* [`CrossplatForms-SpigotLegacy.jar`](https://ci.kejona.dev/job/CrossplatForms/job/main/) : Spigot 1.8.8 - 1.13.2
+* [`CrossplatForms-Spigot.jar`](https://ci.kejona.dev/job/CrossplatForms/job/main/) : Spigot 1.8.8 - 1.19.4
* [`CrossplatForms-BungeeCord.jar`](https://ci.kejona.dev/job/CrossplatForms/job/main/) : BungeeCord
* [`CrossplatForms-Velocity.jar`](https://ci.kejona.dev/job/CrossplatForms/job/main/) : Velocity 3.x
diff --git a/access-item/src/main/java/dev/kejona/crossplatforms/accessitem/AccessItem.java b/access-item/src/main/java/dev/kejona/crossplatforms/accessitem/AccessItem.java
index 1a4885eb..302bad99 100644
--- a/access-item/src/main/java/dev/kejona/crossplatforms/accessitem/AccessItem.java
+++ b/access-item/src/main/java/dev/kejona/crossplatforms/accessitem/AccessItem.java
@@ -8,6 +8,7 @@
import dev.kejona.crossplatforms.handler.BedrockHandler;
import dev.kejona.crossplatforms.handler.FormPlayer;
import dev.kejona.crossplatforms.handler.Placeholders;
+import dev.kejona.crossplatforms.inventory.ConfiguredItem;
import dev.kejona.crossplatforms.permission.Permission;
import dev.kejona.crossplatforms.permission.PermissionDefault;
import dev.kejona.crossplatforms.resolver.Resolver;
@@ -27,7 +28,7 @@
@Getter
@ConfigSerializable
@SuppressWarnings("FieldMayBeFinal")
-public class AccessItem {
+public class AccessItem extends ConfiguredItem {
public static final String STATIC_IDENTIFIER = "crossplatformsaccessitem"; // changing this will break existing setups
private static final String PERMISSION_BASE = Constants.Id() + ".item";
@@ -49,20 +50,6 @@ public class AccessItem {
private List