From 30a7d85f3d4606aeb634b7aab2b909fc97d237a4 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 19 Jul 2024 23:33:33 +0200 Subject: [PATCH] Update configuration file paths and enum usage The configuration files for the VillagerShopUI have been relocated from the home directory to a mounted volume at "/mnt/configs/VillagerShopUI". Also, an outdated way of accessing enums in the 'CommandCreateVillager' class has been updated to use 'OldEnum' instead of 'Enum'. --- .../com/alttd/commands/subcommands/CommandCreateVillager.java | 3 ++- src/main/java/com/alttd/config/Config.java | 2 +- src/main/java/com/alttd/config/VillagerMessagesConfig.java | 2 +- src/main/java/com/alttd/config/WorthConfig.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alttd/commands/subcommands/CommandCreateVillager.java b/src/main/java/com/alttd/commands/subcommands/CommandCreateVillager.java index 5fafc7f..f831c93 100644 --- a/src/main/java/com/alttd/commands/subcommands/CommandCreateVillager.java +++ b/src/main/java/com/alttd/commands/subcommands/CommandCreateVillager.java @@ -17,6 +17,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Villager; import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.util.OldEnum; import java.util.*; import java.util.stream.Collectors; @@ -81,7 +82,7 @@ public class CommandCreateVillager extends SubCommand { case 2 -> res.addAll(VillagerTypeManager.getVillagerTypes().stream() .map(VillagerType::getName) .collect(Collectors.toList())); - case 3 -> res.addAll(Arrays.stream(Villager.Type.values()).map(Enum::name).collect(Collectors.toList())); + case 3 -> res.addAll(Arrays.stream(Villager.Type.values()).map(OldEnum::name).collect(Collectors.toList())); case 4 -> { if (commandSender instanceof Player player) { res.add(String.valueOf(Utilities.round(player.getLocation().getX(), 2))); diff --git a/src/main/java/com/alttd/config/Config.java b/src/main/java/com/alttd/config/Config.java index 1cc0df0..2384e9c 100644 --- a/src/main/java/com/alttd/config/Config.java +++ b/src/main/java/com/alttd/config/Config.java @@ -18,7 +18,7 @@ public final class Config extends AbstractConfig { static Config config; static int version; public Config() { - super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "VillagerShopUI"), "config.yml"); + super(new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "VillagerShopUI"), "config.yml"); } public static void reload() { diff --git a/src/main/java/com/alttd/config/VillagerMessagesConfig.java b/src/main/java/com/alttd/config/VillagerMessagesConfig.java index f63ef38..0eba349 100644 --- a/src/main/java/com/alttd/config/VillagerMessagesConfig.java +++ b/src/main/java/com/alttd/config/VillagerMessagesConfig.java @@ -14,7 +14,7 @@ public class VillagerMessagesConfig extends AbstractConfig { static int version; protected VillagerMessagesConfig() { - super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "VillagerShopUI"), "villager-messages.yml"); + super(new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "VillagerShopUI"), "villager-messages.yml"); } protected static void reload() { diff --git a/src/main/java/com/alttd/config/WorthConfig.java b/src/main/java/com/alttd/config/WorthConfig.java index 02dc72a..d0d8d0a 100644 --- a/src/main/java/com/alttd/config/WorthConfig.java +++ b/src/main/java/com/alttd/config/WorthConfig.java @@ -17,7 +17,7 @@ public class WorthConfig extends AbstractConfig { static int version; public WorthConfig() { - super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "VillagerShopUI"), "worth.yml"); + super(new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "VillagerShopUI"), "worth.yml"); } public static void reload() {