diff --git a/src/main/java/me/melontini/commander/api/expression/extensions/CustomFields.java b/src/main/java/me/melontini/commander/api/expression/extensions/CustomFields.java index c57dd13..b896446 100644 --- a/src/main/java/me/melontini/commander/api/expression/extensions/CustomFields.java +++ b/src/main/java/me/melontini/commander/api/expression/extensions/CustomFields.java @@ -16,7 +16,8 @@ public class CustomFields { * Adds virtual fields to objects. This works only if the object is not handled by object converters.
* For better UX, it's best to return types which are handled by converters. */ - public static void addVirtualField(Class cls, String name, BiFunction accessor) { + public static void addVirtualField( + Class cls, String name, BiFunction accessor) { ReflectiveMapStructure.addField(cls, name, accessor); } diff --git a/src/main/java/me/melontini/commander/impl/expression/extensions/ReflectiveMapStructure.java b/src/main/java/me/melontini/commander/impl/expression/extensions/ReflectiveMapStructure.java index 0b6976d..0e826d9 100644 --- a/src/main/java/me/melontini/commander/impl/expression/extensions/ReflectiveMapStructure.java +++ b/src/main/java/me/melontini/commander/impl/expression/extensions/ReflectiveMapStructure.java @@ -49,8 +49,10 @@ public class ReflectiveMapStructure implements DataAccessorIfc { this.mappings = getAccessors(object.getClass()); } - public static void addField(Class cls, String name, BiFunction accessor) { - ReflectiveMapStructure.getAccessors(cls).addAccessor(name, (BiFunction) accessor); + public static void addField( + Class cls, String name, BiFunction accessor) { + ReflectiveMapStructure.getAccessors(cls) + .addAccessor(name, (BiFunction) accessor); } private static Struct getAccessors(Class cls) { @@ -99,7 +101,9 @@ public class ReflectiveMapStructure implements DataAccessorIfc { if (this.mappings.isInvalid(variable)) return null; var cache = this.mappings.getAccessor(variable); - if (cache != null) return ReflectiveValueConverter.convert(cache.apply(this.object, (LootContext) context.context()[0])); + if (cache != null) + return ReflectiveValueConverter.convert( + cache.apply(this.object, (LootContext) context.context()[0])); var accessor = findFieldOrMethod(this.object.getClass(), variable); if (accessor == null) { @@ -110,11 +114,12 @@ public class ReflectiveMapStructure implements DataAccessorIfc { synchronized (MAPPINGS) { getAccessors(accessor.left()).addAccessor(variable, accessor.right()); } - return ReflectiveValueConverter.convert(accessor.right().apply(this.object, (LootContext) context.context()[0])); + return ReflectiveValueConverter.convert( + accessor.right().apply(this.object, (LootContext) context.context()[0])); } - private static @Nullable Tuple, BiFunction> findFieldOrMethod( - Class cls, String name) { + private static @Nullable Tuple, BiFunction> + findFieldOrMethod(Class cls, String name) { var keeper = Commander.get().mappingKeeper(); String mapped; Class target = cls; diff --git a/src/main/java/me/melontini/commander/impl/expression/extensions/convert/misc/DataAccessorConverter.java b/src/main/java/me/melontini/commander/impl/expression/extensions/convert/misc/DataAccessorConverter.java index 8ec304e..e64d4af 100644 --- a/src/main/java/me/melontini/commander/impl/expression/extensions/convert/misc/DataAccessorConverter.java +++ b/src/main/java/me/melontini/commander/impl/expression/extensions/convert/misc/DataAccessorConverter.java @@ -34,10 +34,11 @@ public class DataAccessorConverter implements ConverterIfc { public record AccessorWrapper(CustomDataAccessor accessor) implements DataAccessorIfc { @Override - public @Nullable EvaluationValue getData(String variable, Token token, EvaluationContext context) throws EvaluationException { + public @Nullable EvaluationValue getData( + String variable, Token token, EvaluationContext context) throws EvaluationException { try { return (EvaluationValue) - accessor().getExpressionData(variable, (LootContext) context.context()[0]); + accessor().getExpressionData(variable, (LootContext) context.context()[0]); } catch (Exception e) { throw new EvaluationException(token, Exceptions.unwrap(e).getMessage()); }