Skip to content

Commit bb5610c

Browse files
Added ViaRewindPlatform#getDataFolder to match VV/VB style
1 parent 57997b2 commit bb5610c

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

common/src/main/java/com/viaversion/viarewind/api/ViaRewindPlatform.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,11 @@ default void init(final File configFile) {
6363
* @return the logger
6464
*/
6565
Logger getLogger();
66+
67+
/**
68+
* Returns ViaRewind's data folder.
69+
*
70+
* @return data folder
71+
*/
72+
File getDataFolder();
6673
}

fabric/src/main/java/com/viaversion/viarewind/ViaFabricAddon.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,26 @@
2323
import net.fabricmc.loader.api.FabricLoader;
2424
import org.apache.logging.log4j.LogManager;
2525

26+
import java.io.File;
27+
import java.nio.file.Path;
2628
import java.util.logging.Logger;
2729

2830
public class ViaFabricAddon implements ViaRewindPlatform, Runnable {
2931
private final Logger logger = new LoggerWrapper(LogManager.getLogger("ViaRewind"));
32+
private File configDir;
3033

3134
@Override
3235
public void run() {
33-
this.init(FabricLoader.getInstance().getConfigDir().resolve("ViaRewind").resolve("config.yml").toFile());
36+
final Path configDirPath = FabricLoader.getInstance().getConfigDir().resolve("ViaRewind");
37+
this.configDir = configDirPath.toFile();
38+
this.init(new File(getDataFolder(), "config.yml"));
3439
}
3540

41+
@Override
42+
public File getDataFolder() {
43+
return this.configDir;
44+
}
45+
3646
@Override
3747
public Logger getLogger() {
3848
return this.logger;

sponge/src/main/java/com/viaversion/viarewind/SpongePlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ public class SpongePlugin implements ViaRewindPlatform {
4242

4343
@Inject
4444
@ConfigDir(sharedRoot = false)
45-
private Path configDir;
45+
private Path configPath;
4646

4747
@Listener(order = Order.LATE)
4848
public void loadPlugin(ConstructPluginEvent e) {
4949
this.logger = new LoggerWrapper(loggerSlf4j);
50-
Via.getManager().addEnableListener(() -> this.init(new File(configDir.toFile(), "config.yml")));
50+
Via.getManager().addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml")));
51+
}
52+
53+
@Override
54+
public File getDataFolder() {
55+
return configPath.toFile();
5156
}
5257

5358
@Override

velocity/src/main/java/com/viaversion/viarewind/VelocityPlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,17 @@ public class VelocityPlugin implements ViaRewindPlatform {
5252

5353
@Inject
5454
@DataDirectory
55-
private Path configDir;
55+
private Path configPath;
5656

5757
@Subscribe(order = PostOrder.LATE)
5858
public void onProxyStart(ProxyInitializeEvent e) {
5959
this.logger = new LoggerWrapper(loggerSlf4j);
60-
Via.getManager().addEnableListener(() -> this.init(new File(configDir.toFile(), "config.yml")));
60+
Via.getManager().addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml")));
61+
}
62+
63+
@Override
64+
public File getDataFolder() {
65+
return configPath.toFile();
6166
}
6267

6368
@Override

0 commit comments

Comments
 (0)