Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-02 08:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/recode/3.0.0' into recode/3.0.0

Browse Source 
# Conflicts:
#	src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
This commit is contained in:
RaphiMC 2023-11-26 21:12:48 +01:00
commit 7494a220ab
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
View File

@ -24,6 +24,7 @@ import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import de.florianmichael.viafabricplus.save.SaveManager; import de.florianmichael.viafabricplus.save.SaveManager;
import de.florianmichael.viafabricplus.settings.SettingsManager; import de.florianmichael.viafabricplus.settings.SettingsManager;
import net.fabricmc.loader.api.FabricLoader;
import de.florianmichael.viafabricplus.util.ClassLoaderPriorityUtil; import de.florianmichael.viafabricplus.util.ClassLoaderPriorityUtil;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -60,7 +61,7 @@ public class ViaFabricPlus {
private static final ViaFabricPlus instance = new ViaFabricPlus(); private static final ViaFabricPlus instance = new ViaFabricPlus();
private final Logger logger = LogManager.getLogger("ViaFabricPlus"); private final Logger logger = LogManager.getLogger("ViaFabricPlus");
private final File directory = new File("ViaFabricPlus"); private final File directory = FabricLoader.getInstance().getConfigDir().resolve("viafabricplus").toFile();
private SettingsManager settingsManager; private SettingsManager settingsManager;
private SaveManager saveManager; private SaveManager saveManager;