From ea03915aede223e7cfab8b625f22dfcaa13235cb Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Thu, 8 Aug 2024 21:55:39 +0200 Subject: [PATCH] Updated optconfig API usage --- .../protocoltranslator/viaproxy/ViaProxyConfig.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java b/src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java index b7568c4..34faa74 100644 --- a/src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java +++ b/src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java @@ -23,6 +23,7 @@ import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; import net.lenni0451.optconfig.ConfigContext; +import net.lenni0451.optconfig.access.impl.reflection.ReflectionClassAccess; import net.lenni0451.optconfig.annotations.*; import net.lenni0451.optconfig.index.ClassIndexer; import net.lenni0451.optconfig.index.ConfigType; @@ -188,7 +189,7 @@ public class ViaProxyConfig { final Map, ConfigOption> optionMap = new HashMap<>(); final Stack stack = new Stack<>(); - stack.push(ClassIndexer.indexClass(ConfigType.INSTANCED, ViaProxyConfig.class)); + stack.push(ClassIndexer.indexClass(ConfigType.INSTANCED, ViaProxyConfig.class, ReflectionClassAccess::new)); while (!stack.isEmpty()) { final SectionIndex index = stack.pop(); stack.addAll(index.getSubSections().values()); @@ -196,7 +197,7 @@ public class ViaProxyConfig { for (ConfigOption option : index.getOptions()) { if (index.getSubSections().containsKey(option)) continue; - Object defaultValue = option.getField().get(this); + Object defaultValue = option.getFieldAccess().getValue(this); if (option.getTypeSerializer() != null) { defaultValue = option.createTypeSerializer(null, ViaProxyConfig.class, this).serialize(defaultValue); } @@ -220,12 +221,12 @@ public class ViaProxyConfig { if (options.has(entry.getKey())) { Object value = options.valueOf(entry.getKey()); if (option.getTypeSerializer() != null) { - value = option.createTypeSerializer(null, ViaProxyConfig.class, this).deserialize((Class) option.getField().getType(), value); + value = option.createTypeSerializer(null, ViaProxyConfig.class, this).deserialize((Class) option.getFieldAccess().getType(), value); } if (option.getValidator() != null) { value = option.getValidator().invoke(this, value); } - option.getField().set(this, value); + option.getFieldAccess().setValue(this, value); } }