From 784fc5aaca22995a9652ca228484c1833c962db0 Mon Sep 17 00:00:00 2001 From: Luke Hohlin Date: Sun, 1 Sep 2024 14:12:58 +0200 Subject: Fix server crashing when trying to load MusicRecordDurations (#3008) * Fix server crashing when trying to load MusicRecordDurations * Use Loader.getConfigDir() instead of current working dir --------- Co-authored-by: Martin Robertz --- src/main/java/gregtech/api/util/GT_MusicSystem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/util/GT_MusicSystem.java b/src/main/java/gregtech/api/util/GT_MusicSystem.java index 3a171e0395..7c0ec929e9 100644 --- a/src/main/java/gregtech/api/util/GT_MusicSystem.java +++ b/src/main/java/gregtech/api/util/GT_MusicSystem.java @@ -20,7 +20,6 @@ import net.minecraft.client.audio.SoundRegistry; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.launchwrapper.Launch; import net.minecraft.util.ResourceLocation; import org.apache.commons.io.FileUtils; @@ -33,6 +32,7 @@ import com.google.gson.GsonBuilder; import com.jcraft.jorbis.VorbisFile; import baubles.api.BaublesApi; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.network.ByteBufUtils; import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; @@ -628,8 +628,9 @@ public final class GT_MusicSystem { final ArrayList candidates = Collections.list( GT_MusicSystem.class.getClassLoader() .getResources("soundmeta/durations.json")); - final Path configPath = Launch.minecraftHome.toPath() - .resolve("config") + final Path configPath = Loader.instance() + .getConfigDir() + .toPath() .resolve("soundmeta") .resolve("durations.json"); if (Files.exists(configPath)) { -- cgit