Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-21 17:45:36 +01:00
Code Issues Projects Releases Wiki Activity

Move config load after platform creation

Browse Source
This commit is contained in:
Nassim Jahnke 2024-02-13 23:37:00 +01:00
parent 564286d742
commit 7a6c51331b
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
9 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java
View File

@ -56,8 +56,8 @@ import org.bukkit.plugin.java.JavaPlugin;
public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player> {
private static final boolean FOLIA = PaperViaInjector.hasClass("io.papermc.paper.threadedregions.RegionizedServer");
private static ViaVersionPlugin instance;
private final BukkitCommandHandler commandHandler;
private final BukkitViaConfig conf;
private final BukkitCommandHandler commandHandler = new BukkitCommandHandler();
private final BukkitViaConfig conf = new BukkitViaConfig(getDataFolder());
private final ViaAPI<Player> api = new BukkitViaAPI(this);
private boolean protocolSupport;
private boolean lateBind;
@ -65,20 +65,14 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
public ViaVersionPlugin() {
instance = this;
// Command handler
commandHandler = new BukkitCommandHandler();
// Init platform
BukkitViaInjector injector = new BukkitViaInjector();
Via.init(ViaManagerImpl.builder()
.platform(this)
.commandHandler(commandHandler)
.injector(injector)
.injector(new BukkitViaInjector())
.loader(new BukkitViaLoader(this))
.build());
// Config magic
conf = new BukkitViaConfig();
conf.reload();
}
@Override

7
bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
View File

@ -17,13 +17,11 @@
*/
package com.viaversion.viaversion.bukkit.platform;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.configuration.AbstractViaConfig;
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.bukkit.plugin.Plugin;
public class BukkitViaConfig extends AbstractViaConfig {
private static final List<String> UNSUPPORTED = Arrays.asList("bungee-ping-interval", "bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers");
@ -34,9 +32,8 @@ public class BukkitViaConfig extends AbstractViaConfig {
private boolean armorToggleFix;
private boolean registerUserConnectionOnJoin;
public BukkitViaConfig() {
super(new File(((Plugin) Via.getPlatform()).getDataFolder(), "config.yml"));
reload();
public BukkitViaConfig(final File folder) {
super(new File(folder, "config.yml"));
}
@Override

2
bungee/src/main/java/com/viaversion/viaversion/BungeePlugin.java
View File

@ -80,6 +80,8 @@ public class BungeePlugin extends Plugin implements ViaServerProxyPlatform<Proxi
.loader(new BungeeViaLoader(this))
.commandHandler(commandHandler)
.build());
config.reload();
}
@Override

5
bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
View File

@ -33,9 +33,8 @@ public class BungeeViaConfig extends AbstractViaConfig {
private boolean bungeePingSave;
private Map<String, Integer> bungeeServerProtocols;
public BungeeViaConfig(File configFile) {
super(new File(configFile, "config.yml"));
reload();
public BungeeViaConfig(File folder) {
super(new File(folder, "config.yml"));
}
@Override

4
common/src/test/java/com/viaversion/viaversion/common/dummy/TestConfig.java
View File

@ -26,8 +26,8 @@ import java.util.Map;
public final class TestConfig extends AbstractViaConfig {
public TestConfig(File configFile) {
super(configFile);
public TestConfig(File file) {
super(file);
}
@Override

1
sponge/src/main/java/com/viaversion/viaversion/SpongePlugin.java
View File

@ -95,6 +95,7 @@ public class SpongePlugin implements ViaPlatform<Player> {
.injector(new SpongeViaInjector())
.loader(new SpongeViaLoader(this))
.build());
conf.reload();
}
@Listener

5
sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
View File

@ -28,9 +28,8 @@ public class SpongeViaConfig extends AbstractViaConfig {
"bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers",
"quick-move-action-fix", "change-1_9-hitbox", "change-1_14-hitbox", "blockconnection-method");
public SpongeViaConfig(File configFile) {
super(new File(configFile, "config.yml"));
reload();
public SpongeViaConfig(File folder) {
super(new File(folder, "config.yml"));
}
@Override

1
velocity/src/main/java/com/viaversion/viaversion/VelocityPlugin.java
View File

@ -103,6 +103,7 @@ public class VelocityPlugin implements ViaServerProxyPlatform<Player> {
.commandHandler(commandHandler)
.loader(new VelocityViaLoader())
.injector(new VelocityViaInjector()).build());
conf.reload();
}
@Subscribe(order = PostOrder.LAST)

5
velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
View File

@ -32,9 +32,8 @@ public class VelocityViaConfig extends AbstractViaConfig {
private boolean velocityPingSave;
private Map<String, Integer> velocityServerProtocols;
public VelocityViaConfig(File configFile) {
super(new File(configFile, "config.yml"));
reload();
public VelocityViaConfig(File folder) {
super(new File(folder, "config.yml"));
}
@Override