Fix broken root folder reference in VV platform

Closes #567
ViaVersion · Sep 19, 2024 · 419a296 · 419a296
1 parent 67f51ff
commit 419a296
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java b/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java
@@ -265,13 +265,13 @@ public static UserConnection getPlayNetworkUserConnection() {
  /**
  * Apply recommended config options to the ViaVersion config files
  *
- * @param configFolder The directory where the ViaVersion config files is located
+ * @param directory The directory where the ViaVersion config files is located
  */
- private static void patchConfigs(final File configFolder) {
- configFolder.mkdirs();
+ private static void patchConfigs(final File directory) {
+ directory.mkdirs();
 
  try {
- final File viaVersionConfig = new File(configFolder, "viaversion.yml");
+ final File viaVersionConfig = new File(directory, "viaversion.yml");
  Files.writeString(viaVersionConfig.toPath(), """
  fix-infested-block-breaking: false
  shield-blocking: false
@@ -284,7 +284,7 @@ private static void patchConfigs(final File configFolder) {
  }
 
  try {
- final File viaLegacyConfig = new File(configFolder, "vialegacy.yml");
+ final File viaLegacyConfig = new File(directory, "vialegacy.yml");
  Files.writeString(viaLegacyConfig.toPath(), """
  legacy-skull-loading: true
  legacy-skin-loading: true

diff --git a/...l/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java b/...l/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
@@ -22,6 +22,7 @@
 import com.viaversion.viaversion.configuration.AbstractViaConfig;
 import com.viaversion.viaversion.libs.gson.JsonArray;
 import com.viaversion.viaversion.libs.gson.JsonObject;
+import de.florianmichael.viafabricplus.ViaFabricPlus;
 import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
 import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
 import de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLViaConfig;
@@ -32,16 +33,14 @@
 
 public class ViaFabricPlusViaVersionPlatformImpl extends ViaVersionPlatformImpl {
 
- private final File rootFolder;
-
- public ViaFabricPlusViaVersionPlatformImpl(File rootFolder) {
+ public ViaFabricPlusViaVersionPlatformImpl(File rootFolder) { // Only required to not throw an exception, not used
  super(rootFolder);
- this.rootFolder = rootFolder;
  }
 
  @Override
  protected AbstractViaConfig createConfig() {
- return new ViaFabricPlusVLViaConfig(new File(this.getDataFolder(), "viaversion.yml"), this.getLogger());
+ // Use config overload and change directory to root folder
+ return new ViaFabricPlusVLViaConfig(new File(getDataFolder(), "viaversion.yml"), this.getLogger());
  }
 
  @Override
@@ -80,7 +79,7 @@ public JsonObject getDump() {
  @Override
  public File getDataFolder() {
  // Move ViaLoader files directly into root folder
- return this.rootFolder;
+ return ViaFabricPlus.global().getDirectory();
  }
 
 }