Updated Via*

This commit is contained in:
RaphiMC 2024-11-05 20:34:52 +01:00
parent a89f7bb1e5
commit 11b6426c79
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
2 changed files with 7 additions and 14 deletions

View File

@ -61,8 +61,8 @@ repositories {
}
dependencies {
include "com.viaversion:viaversion-common:5.1.1"
include "com.viaversion:viabackwards-common:5.1.1"
include "com.viaversion:viaversion-common:5.1.2-SNAPSHOT"
include "com.viaversion:viabackwards-common:5.1.2-SNAPSHOT"
include "com.viaversion:viarewind-common:4.0.3"
include "net.raphimc:ViaLegacy:3.0.5"
include "net.raphimc:viaaprilfools-common:3.0.4"

View File

@ -41,22 +41,15 @@ public class AccountsSaveV3 extends AbstractSave {
@Override
public void load(JsonElement jsonElement) throws Exception {
final List<ClassLoader> classLoaders = new ArrayList<>();
classLoaders.add(ViaProxy.class.getClassLoader());
classLoaders.addAll(ViaProxy.getPluginManager().getPlugins().stream().map(ViaProxyPlugin::getClassLoader).toList());
this.accounts = new ArrayList<>();
for (JsonElement element : jsonElement.getAsJsonArray()) {
final JsonObject jsonObject = element.getAsJsonObject();
final String type = jsonObject.get("accountType").getAsString();
Class<?> clazz = Classes.byName(type);
if (clazz == null) {
for (ViaProxyPlugin plugin : ViaProxy.getPluginManager().getPlugins()) {
clazz = Classes.byName(type, plugin.getClass().getClassLoader());
if (clazz != null) {
break;
}
}
}
if (clazz == null) {
throw new ClassNotFoundException(type);
}
final Class<?> clazz = Classes.find(type, true, classLoaders);
final Account account = (Account) clazz.getConstructor(JsonObject.class).newInstance(jsonObject);
this.accounts.add(account);