From b41015bfd8cf32f4c54209e4a90ebb5917c67953 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 13 Apr 2022 23:12:24 -0500 Subject: [PATCH] try this --- .../java/dev/plex/config/ModuleConfig.java | 44 ++++--------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/src/main/java/dev/plex/config/ModuleConfig.java b/src/main/java/dev/plex/config/ModuleConfig.java index 36e3347..a498b16 100644 --- a/src/main/java/dev/plex/config/ModuleConfig.java +++ b/src/main/java/dev/plex/config/ModuleConfig.java @@ -27,17 +27,23 @@ public class ModuleConfig extends YamlConfiguration */ private String name; + /** + * The folder in which the module files are in + */ + private String folder; + /** * Creates a config object * * @param module The module instance * @param name The file name */ - public ModuleConfig(PlexModule module, String name) + public ModuleConfig(PlexModule module, String name, String folder) { this.module = module; this.file = new File(module.getDataFolder(), name); this.name = name; + this.folder = folder; if (!file.exists()) { @@ -79,45 +85,11 @@ public class ModuleConfig extends YamlConfiguration { try { - Files.copy(module.getClass().getResourceAsStream("/" + name), this.file.toPath()); + Files.copy(module.getClass().getResourceAsStream("/" + folder), this.file.toPath()); } catch (IOException e) { e.printStackTrace(); } - /*if (name == null || name.equals("")) { - throw new IllegalArgumentException("ResourcePath cannot be null or empty"); - } - - name = name.replace('\\', '/'); - InputStream in = module.getResource("/" + name); - if (in == null) { - throw new IllegalArgumentException("The embedded resource '" + name + "'"); - } - - File outFile = new File(module.getDataFolder(), name); - int lastIndex = name.lastIndexOf('/'); - File outDir = new File(module.getDataFolder(), name.substring(0, lastIndex >= 0 ? lastIndex : 0)); - - if (!outDir.exists()) { - outDir.mkdirs(); - } - - try { - if (!outFile.exists()) { - OutputStream out = new FileOutputStream(outFile); - byte[] buf = new byte[1024]; - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.close(); - in.close(); - } else { - module.getLogger().log(org.apache.logging.log4j.Level.INFO, "Could not save " + outFile.getName() + " to " + outFile + " because " + outFile.getName() + " already exists."); - } - } catch (IOException ex) { - module.getLogger().log(Level.ERROR, "Could not save " + outFile.getName() + " to " + outFile, ex); - }*/ } } \ No newline at end of file