Parker2991/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-22 07:28:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated Via*
Some checks are pending
build-docker / build (push) Waiting to run
Details
build / build (push) Waiting to run
Details

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

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

17
src/main/java/net/raphimc/viaproxy/saves/impl/AccountsSaveV3.java
View file

@ -41,22 +41,15 @@ public class AccountsSaveV3 extends AbstractSave {
@Override @Override
public void load(JsonElement jsonElement) throws Exception { 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<>(); this.accounts = new ArrayList<>();
for (JsonElement element : jsonElement.getAsJsonArray()) { for (JsonElement element : jsonElement.getAsJsonArray()) {
final JsonObject jsonObject = element.getAsJsonObject(); final JsonObject jsonObject = element.getAsJsonObject();
final String type = jsonObject.get("accountType").getAsString(); final String type = jsonObject.get("accountType").getAsString();
Class<?> clazz = Classes.byName(type); final Class<?> clazz = Classes.find(type, true, classLoaders);
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 Account account = (Account) clazz.getConstructor(JsonObject.class).newInstance(jsonObject); final Account account = (Account) clazz.getConstructor(JsonObject.class).newInstance(jsonObject);
this.accounts.add(account); this.accounts.add(account);