diff --git a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java index 08b0b46..6639ff4 100644 --- a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java +++ b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java @@ -91,19 +91,17 @@ public void onEnable() { Settings.FAWE = false; } - final Map data; + String schemDirName; try { - File weConfig = new File(getWorldEditPlugin().getDataFolder(), (Settings.FAWE ? "worldedit-" : "") + "config" + ".yml"); - Yaml yaml = new Yaml(); - data = yaml.load(new FileInputStream(weConfig)); - } catch (IOException e){ - getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config")); + // Try loading from API + schemDirName = worldEditPlugin.getLocalConfiguration().saveDir; + } catch (Exception e) { e.printStackTrace(); + getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config")); getServer().getPluginManager().disablePlugin(this); return; } - - File schemDir = new File(worldEditPlugin.getDataFolder(), (String) ((Map) data.get("saving")).get("dir")); + File schemDir = new File(worldEditPlugin.getDataFolder(), schemDirName); worldEditHandler = new WorldEditHandler(schemDir, this); boolean foundRegionProvider = false; @@ -135,7 +133,7 @@ public void onEnable() { getLogger().info(I18nSupport.getInternationalisedString("Startup - Restrict to regions set to false")); } - getCommand("structurebox").setExecutor(new StructureBoxCommand()); + getCommand("structurebox").setExecutor(new StructureBoxCommand(schemDirName)); getServer().getPluginManager().registerEvents(new BlockListener(), this); getServer().getPluginManager().registerEvents(new InventoryListener(), this); diff --git a/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java b/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java index 11ca731..56bf9d9 100644 --- a/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java +++ b/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java @@ -31,8 +31,8 @@ public class StructureBoxCommand implements TabExecutor { private final String schematicDir; - public StructureBoxCommand(){ - schematicDir = StructureBoxes.getInstance().getWorldEditPlugin().getConfig().getConfigurationSection("saving").getString("dir"); + public StructureBoxCommand(String schematicDirName) { + schematicDir = schematicDirName; } @Override public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {