ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config: revert back to pre-upstream

Browse Source
This commit is contained in:
Justin
2021-12-02 17:15:00 +11:00
parent 45216c2d66
commit 2722244b91
4 changed files with 685 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/config/ConfigInvocationHandler.java
View File

@@ -40,8 +40,8 @@ class ConfigInvocationHandler implements InvocationHandler
private final ConfigManager manager; private final ConfigManager manager;
private final Cache<Method, Object> cache = CacheBuilder.newBuilder() private final Cache<Method, Object> cache = CacheBuilder.newBuilder()
.maximumSize(256) .maximumSize(256)
.build(); .build();
ConfigInvocationHandler(ConfigManager manager) ConfigInvocationHandler(ConfigManager manager)
{ {
@@ -99,9 +99,11 @@ class ConfigInvocationHandler implements InvocationHandler
} }
// Convert value to return type // Convert value to return type
Class<?> returnType = method.getReturnType();
try try
{ {
Object objectValue = manager.stringToObject(value, method.getGenericReturnType()); Object objectValue = ConfigManager.stringToObject(value, returnType);
cache.put(method, objectValue == null ? NULL : objectValue); cache.put(method, objectValue == null ? NULL : objectValue);
return objectValue; return objectValue;
} }
@@ -153,7 +155,7 @@ class ConfigInvocationHandler implements InvocationHandler
} }
else else
{ {
String newValueStr = manager.objectToString(newValue); String newValueStr = ConfigManager.objectToString(newValue);
manager.setConfiguration(group.value(), item.keyName(), newValueStr); manager.setConfiguration(group.value(), item.keyName(), newValueStr);
} }
return null; return null;
@@ -164,9 +166,9 @@ class ConfigInvocationHandler implements InvocationHandler
{ {
Class<?> declaringClass = method.getDeclaringClass(); Class<?> declaringClass = method.getDeclaringClass();
return ReflectUtil.privateLookupIn(declaringClass) return ReflectUtil.privateLookupIn(declaringClass)
.unreflectSpecial(method, declaringClass) .unreflectSpecial(method, declaringClass)
.bindTo(proxy) .bindTo(proxy)
.invokeWithArguments(args); .invokeWithArguments(args);
} }
void invalidate() void invalidate()

3
runelite-client/src/main/java/net/runelite/client/config/ConfigItemDescriptor.java
View File

@@ -24,14 +24,13 @@
*/ */
package net.runelite.client.config; package net.runelite.client.config;
import java.lang.reflect.Type;
import lombok.Value; import lombok.Value;
@Value @Value
public class ConfigItemDescriptor implements ConfigObject public class ConfigItemDescriptor implements ConfigObject
{ {
private final ConfigItem item; private final ConfigItem item;
private final Type type; private final Class<?> type;
private final Range range; private final Range range;
private final Alpha alpha; private final Alpha alpha;
private final Units units; private final Units units;

241
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -30,7 +30,6 @@ import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.hash.Hasher; import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing; import com.google.common.hash.Hashing;
import com.google.gson.Gson;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Point; import java.awt.Point;
@@ -45,9 +44,7 @@ import java.io.OutputStreamWriter;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.AtomicMoveNotSupportedException;
@@ -131,7 +128,6 @@ public class ConfigManager
private final File settingsFileInput; private final File settingsFileInput;
private final EventBus eventBus; private final EventBus eventBus;
private final OkHttpClient okHttpClient; private final OkHttpClient okHttpClient;
private final Gson gson;
private AccountSession session; private AccountSession session;
private ConfigClient configClient; private ConfigClient configClient;
@@ -152,19 +148,17 @@ public class ConfigManager
@Inject @Inject
public ConfigManager( public ConfigManager(
@Named("config") File config, @Named("config") File config,
ScheduledExecutorService scheduledExecutorService, ScheduledExecutorService scheduledExecutorService,
EventBus eventBus, EventBus eventBus,
OkHttpClient okHttpClient, OkHttpClient okHttpClient,
@Nullable Client client, @Nullable Client client)
Gson gson)
{ {
this.settingsFileInput = config; this.settingsFileInput = config;
this.eventBus = eventBus; this.eventBus = eventBus;
this.okHttpClient = okHttpClient; this.okHttpClient = okHttpClient;
this.client = client; this.client = client;
this.propertiesFile = getPropertiesFile(); this.propertiesFile = getPropertiesFile();
this.gson = gson;
scheduledExecutorService.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS); scheduledExecutorService.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS);
} }
@@ -345,8 +339,8 @@ public class ConfigManager
File tempFile = File.createTempFile("runelite", null, parent); File tempFile = File.createTempFile("runelite", null, parent);
try (FileOutputStream out = new FileOutputStream(tempFile); try (FileOutputStream out = new FileOutputStream(tempFile);
FileChannel channel = out.getChannel(); FileChannel channel = out.getChannel();
OutputStreamWriter writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) OutputStreamWriter writer = new OutputStreamWriter(out, StandardCharsets.UTF_8))
{ {
channel.lock(); channel.lock();
properties.store(writer, "RuneLite configuration"); properties.store(writer, "RuneLite configuration");
@@ -373,9 +367,9 @@ public class ConfigManager
} }
T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class<?>[] T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class<?>[]
{ {
clazz clazz
}, handler); }, handler);
return t; return t;
} }
@@ -418,17 +412,12 @@ public class ConfigManager
return properties.getProperty(getWholeKey(groupName, profile, key)); return properties.getProperty(getWholeKey(groupName, profile, key));
} }
public <T> T getConfiguration(String groupName, String key, Type clazz)
{
return getConfiguration(groupName, null, key, clazz);
}
public <T> T getConfiguration(String groupName, String key, Class<T> clazz) public <T> T getConfiguration(String groupName, String key, Class<T> clazz)
{ {
return getConfiguration(groupName, null, key, clazz); return getConfiguration(groupName, null, key, clazz);
} }
public <T> T getRSProfileConfiguration(String groupName, String key, Type clazz) public <T> T getRSProfileConfiguration(String groupName, String key, Class<T> clazz)
{ {
String rsProfileKey = this.rsProfileKey; String rsProfileKey = this.rsProfileKey;
if (rsProfileKey == null) if (rsProfileKey == null)
@@ -439,14 +428,14 @@ public class ConfigManager
return getConfiguration(groupName, rsProfileKey, key, clazz); return getConfiguration(groupName, rsProfileKey, key, clazz);
} }
public <T> T getConfiguration(String groupName, String profile, String key, Type type) public <T> T getConfiguration(String groupName, String profile, String key, Class<T> clazz)
{ {
String value = getConfiguration(groupName, profile, key); String value = getConfiguration(groupName, profile, key);
if (!Strings.isNullOrEmpty(value)) if (!Strings.isNullOrEmpty(value))
{ {
try try
{ {
return (T) stringToObject(value, type); return (T) stringToObject(value, clazz);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -499,12 +488,12 @@ public class ConfigManager
eventBus.post(configChanged); eventBus.post(configChanged);
} }
public <T> void setConfiguration(String groupName, String profile, String key, T value) public void setConfiguration(String groupName, String profile, String key, Object value)
{ {
setConfiguration(groupName, profile, key, objectToString(value)); setConfiguration(groupName, profile, key, objectToString(value));
} }
public <T> void setConfiguration(String groupName, String key, T value) public void setConfiguration(String groupName, String key, Object value)
{ {
// do not save consumers for buttons, they cannot be changed anyway // do not save consumers for buttons, they cannot be changed anyway
if (value instanceof Consumer) if (value instanceof Consumer)
@@ -515,7 +504,7 @@ public class ConfigManager
setConfiguration(groupName, null, key, value); setConfiguration(groupName, null, key, value);
} }
public <T> void setRSProfileConfiguration(String groupName, String key, T value) public void setRSProfileConfiguration(String groupName, String key, Object value)
{ {
String rsProfileKey = this.rsProfileKey; String rsProfileKey = this.rsProfileKey;
if (rsProfileKey == null) if (rsProfileKey == null)
@@ -610,67 +599,67 @@ public class ConfigManager
} }
final List<ConfigSectionDescriptor> sections = getAllDeclaredInterfaceFields(inter).stream() final List<ConfigSectionDescriptor> sections = getAllDeclaredInterfaceFields(inter).stream()
.filter(m -> m.isAnnotationPresent(ConfigSection.class) && m.getType() == String.class) .filter(m -> m.isAnnotationPresent(ConfigSection.class) && m.getType() == String.class)
.map(m -> .map(m ->
{
try
{ {
return new ConfigSectionDescriptor( try
String.valueOf(m.get(inter)), {
m.getDeclaredAnnotation(ConfigSection.class) return new ConfigSectionDescriptor(
); String.valueOf(m.get(inter)),
} m.getDeclaredAnnotation(ConfigSection.class)
catch (IllegalAccessException e) );
{ }
log.warn("Unable to load section {}::{}", inter.getSimpleName(), m.getName()); catch (IllegalAccessException e)
return null; {
} log.warn("Unable to load section {}::{}", inter.getSimpleName(), m.getName());
}) return null;
.filter(Objects::nonNull) }
.sorted((a, b) -> ComparisonChain.start() })
.compare(a.getSection().position(), b.getSection().position()) .filter(Objects::nonNull)
.compare(a.getSection().name(), b.getSection().name()) .sorted((a, b) -> ComparisonChain.start()
.result()) .compare(a.getSection().position(), b.getSection().position())
.collect(Collectors.toList()); .compare(a.getSection().name(), b.getSection().name())
.result())
.collect(Collectors.toList());
final List<ConfigTitleDescriptor> titles = getAllDeclaredInterfaceFields(inter).stream() final List<ConfigTitleDescriptor> titles = getAllDeclaredInterfaceFields(inter).stream()
.filter(m -> m.isAnnotationPresent(ConfigTitle.class) && m.getType() == String.class) .filter(m -> m.isAnnotationPresent(ConfigTitle.class) && m.getType() == String.class)
.map(m -> .map(m ->
{
try
{ {
return new ConfigTitleDescriptor( try
String.valueOf(m.get(inter)), {
m.getDeclaredAnnotation(ConfigTitle.class) return new ConfigTitleDescriptor(
); String.valueOf(m.get(inter)),
} m.getDeclaredAnnotation(ConfigTitle.class)
catch (IllegalAccessException e) );
{ }
log.warn("Unable to load title {}::{}", inter.getSimpleName(), m.getName()); catch (IllegalAccessException e)
return null; {
} log.warn("Unable to load title {}::{}", inter.getSimpleName(), m.getName());
}) return null;
.filter(Objects::nonNull) }
.sorted((a, b) -> ComparisonChain.start() })
.compare(a.getTitle().position(), b.getTitle().position()) .filter(Objects::nonNull)
.compare(a.getTitle().name(), b.getTitle().name()) .sorted((a, b) -> ComparisonChain.start()
.result()) .compare(a.getTitle().position(), b.getTitle().position())
.collect(Collectors.toList()); .compare(a.getTitle().name(), b.getTitle().name())
.result())
.collect(Collectors.toList());
final List<ConfigItemDescriptor> items = Arrays.stream(inter.getMethods()) final List<ConfigItemDescriptor> items = Arrays.stream(inter.getMethods())
.filter(m -> m.getParameterCount() == 0 && m.isAnnotationPresent(ConfigItem.class)) .filter(m -> m.getParameterCount() == 0 && m.isAnnotationPresent(ConfigItem.class))
.map(m -> new ConfigItemDescriptor( .map(m -> new ConfigItemDescriptor(
m.getDeclaredAnnotation(ConfigItem.class), m.getDeclaredAnnotation(ConfigItem.class),
m.getGenericReturnType(), m.getReturnType(),
m.getDeclaredAnnotation(Range.class), m.getDeclaredAnnotation(Range.class),
m.getDeclaredAnnotation(Alpha.class), m.getDeclaredAnnotation(Alpha.class),
m.getDeclaredAnnotation(Units.class) m.getDeclaredAnnotation(Units.class)
)) ))
.sorted((a, b) -> ComparisonChain.start() .sorted((a, b) -> ComparisonChain.start()
.compare(a.getItem().position(), b.getItem().position()) .compare(a.getItem().position(), b.getItem().position())
.compare(a.getItem().name(), b.getItem().name()) .compare(a.getItem().name(), b.getItem().name())
.result()) .result())
.collect(Collectors.toList()); .collect(Collectors.toList());
return new ConfigDescriptor(group, sections, titles, items); return new ConfigDescriptor(group, sections, titles, items);
} }
@@ -732,16 +721,16 @@ public class ConfigManager
continue; continue;
} }
if (!override) if (!override)
{
// This checks if it is set and is also unmarshallable to the correct type; so
// we will overwrite invalid config values with the default
Object current = getConfiguration(group.value(), item.keyName(), method.getGenericReturnType());
if (current != null)
{ {
continue; // something else is already set // This checks if it is set and is also unmarshallable to the correct type; so
// we will overwrite invalid config values with the default
Object current = getConfiguration(group.value(), item.keyName(), method.getReturnType());
if (current != null)
{
continue; // something else is already set
}
} }
}
Object defaultValue; Object defaultValue;
try try
@@ -771,7 +760,7 @@ public class ConfigManager
} }
} }
Object stringToObject(String str, Type type) static Object stringToObject(String str, Class<?> type)
{ {
if (type == boolean.class || type == Boolean.class) if (type == boolean.class || type == Boolean.class)
{ {
@@ -812,7 +801,7 @@ public class ConfigManager
int height = Integer.parseInt(splitStr[3]); int height = Integer.parseInt(splitStr[3]);
return new Rectangle(x, y, width, height); return new Rectangle(x, y, width, height);
} }
if (type instanceof Class && ((Class<?>) type).isEnum()) if (type.isEnum())
{ {
return Enum.valueOf((Class<? extends Enum>) type, str); return Enum.valueOf((Class<? extends Enum>) type, str);
} }
@@ -847,14 +836,6 @@ public class ConfigManager
{ {
return Base64.getUrlDecoder().decode(str); return Base64.getUrlDecoder().decode(str);
} }
if (type instanceof ParameterizedType)
{
ParameterizedType parameterizedType = (ParameterizedType) type;
if (parameterizedType.getRawType() == Set.class)
{
return gson.fromJson(str, parameterizedType);
}
}
if (type == EnumSet.class) if (type == EnumSet.class)
{ {
try try
@@ -894,7 +875,7 @@ public class ConfigManager
} }
@Nullable @Nullable
String objectToString(Object object) static String objectToString(Object object)
{ {
if (object instanceof Color) if (object instanceof Color)
{ {
@@ -941,10 +922,6 @@ public class ConfigManager
{ {
return Base64.getUrlEncoder().encodeToString((byte[]) object); return Base64.getUrlEncoder().encodeToString((byte[]) object);
} }
if (object instanceof Set)
{
return gson.toJson(object, Set.class);
}
if (object instanceof EnumSet) if (object instanceof EnumSet)
{ {
if (((EnumSet) object).size() == 0) if (((EnumSet) object).size() == 0)
@@ -1073,8 +1050,8 @@ public class ConfigManager
if (configClient != null) if (configClient != null)
{ {
Configuration patch = new Configuration(pendingChanges.entrySet().stream() Configuration patch = new Configuration(pendingChanges.entrySet().stream()
.map(e -> new ConfigEntry(e.getKey(), e.getValue())) .map(e -> new ConfigEntry(e.getKey(), e.getValue()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
future = configClient.patch(patch); future = configClient.patch(patch);
} }
@@ -1116,18 +1093,18 @@ public class ConfigManager
} }
return profileKeys.stream() return profileKeys.stream()
.map(key -> .map(key ->
{ {
RuneScapeProfile prof = new RuneScapeProfile( RuneScapeProfile prof = new RuneScapeProfile(
getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_DISPLAY_NAME), getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_DISPLAY_NAME),
getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_TYPE, RuneScapeProfileType.class), getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_TYPE, RuneScapeProfileType.class),
getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_LOGIN_HASH, byte[].class), getConfiguration(RSPROFILE_GROUP, key, RSPROFILE_LOGIN_HASH, byte[].class),
key key
); );
return prof; return prof;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private synchronized RuneScapeProfile findRSProfile(List<RuneScapeProfile> profiles, String username, RuneScapeProfileType type, String displayName, boolean create) private synchronized RuneScapeProfile findRSProfile(List<RuneScapeProfile> profiles, String username, RuneScapeProfileType type, String displayName, boolean create)
@@ -1137,7 +1114,7 @@ public class ConfigManager
{ {
salt = new byte[15]; salt = new byte[15];
new SecureRandom() new SecureRandom()
.nextBytes(salt); .nextBytes(salt);
log.info("creating new salt as there is no existing one {}", Base64.getUrlEncoder().encodeToString(salt)); log.info("creating new salt as there is no existing one {}", Base64.getUrlEncoder().encodeToString(salt));
setConfiguration(RSPROFILE_GROUP, RSPROFILE_LOGIN_SALT, salt); setConfiguration(RSPROFILE_GROUP, RSPROFILE_LOGIN_SALT, salt);
} }
@@ -1148,8 +1125,8 @@ public class ConfigManager
byte[] loginHash = h.hash().asBytes(); byte[] loginHash = h.hash().asBytes();
Set<RuneScapeProfile> matches = profiles.stream() Set<RuneScapeProfile> matches = profiles.stream()
.filter(p -> Arrays.equals(p.getLoginHash(), loginHash) && p.getType() == type) .filter(p -> Arrays.equals(p.getLoginHash(), loginHash) && p.getType() == type)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (matches.size() > 1) if (matches.size() > 1)
{ {
@@ -1273,19 +1250,19 @@ public class ConfigManager
AtomicInteger changes = new AtomicInteger(); AtomicInteger changes = new AtomicInteger();
List<Predicate<String>> migrators = new ArrayList<>(); List<Predicate<String>> migrators = new ArrayList<>();
for (String[] tpl : new String[][] for (String[] tpl : new String[][]
{ {
{"(grandexchange)\\.buylimit_(%)\\.(#)", "$1.buylimit.$3"}, {"(grandexchange)\\.buylimit_(%)\\.(#)", "$1.buylimit.$3"},
{"(timetracking)\\.(%)\\.(autoweed|contract)", "$1.$3"}, {"(timetracking)\\.(%)\\.(autoweed|contract)", "$1.$3"},
{"(timetracking)\\.(%)\\.(#\\.#)", "$1.$3"}, {"(timetracking)\\.(%)\\.(#\\.#)", "$1.$3"},
{"(timetracking)\\.(%)\\.(birdhouse)\\.(#)", "$1.$3.$4"}, {"(timetracking)\\.(%)\\.(birdhouse)\\.(#)", "$1.$3.$4"},
{"(killcount|personalbest)\\.(%)\\.([^.]+)", "$1.$3"}, {"(killcount|personalbest)\\.(%)\\.([^.]+)", "$1.$3"},
{"(geoffer)\\.(%)\\.(#)", "$1.$3"}, {"(geoffer)\\.(%)\\.(#)", "$1.$3"},
}) })
{ {
String replace = tpl[1]; String replace = tpl[1];
String pat = ("^" + tpl[0] + "$") String pat = ("^" + tpl[0] + "$")
.replace("#", "-?[0-9]+") .replace("#", "-?[0-9]+")
.replace("(%)", "(?<login>.*)"); .replace("(%)", "(?<login>.*)");
Pattern p = Pattern.compile(pat); Pattern p = Pattern.compile(pat);
migrators.add(oldkey -> migrators.add(oldkey ->
@@ -1305,7 +1282,7 @@ public class ConfigManager
} }
String profKey = profiles.computeIfAbsent(username, u -> String profKey = profiles.computeIfAbsent(username, u ->
findRSProfile(getRSProfiles(), u, RuneScapeProfileType.STANDARD, u, true).getKey()); findRSProfile(getRSProfiles(), u, RuneScapeProfileType.STANDARD, u, true).getKey());
String[] oldKeySplit = splitKey(oldkey); String[] oldKeySplit = splitKey(oldkey);
if (oldKeySplit == null) if (oldKeySplit == null)

896
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

File diff suppressed because it is too large Load Diff