fix: language file duplication

core/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/LangUpdateSubCommand.java

@@ -18,13 +18,19 @@ public LangUpdateSubCommand() {
 
     @Override
     public void onCommand(CommandSenderContainer sender, String[] args) {
-        this.portalsCore.getDataStorage().copyDefaultFile("lang/en_GB.lang", true);
-        sender.sendMessage(Lang.translate("messageprefix.positive") + Lang.translate("translatedata.replaced"));
+        //this.portalsCore.getDataStorage().copyDefaultFile("lang/en_GB.lang", true);
+        if(args.length > 1 && args[1].equalsIgnoreCase("overwrite")) {
+            this.portalsCore.getDataStorage().copyDefaultFile("lang/en_GB.lang", true);
+            sender.sendMessage(Lang.translate("messageprefix.positive") + Lang.translate("translatedata.replaced"));
+        } else {
+            this.portalsCore.getDataStorage().copyDefaultFile("lang/en_GB.lang", "lang/en_GB-new.lang", true);
+            sender.sendMessage(Lang.translate("messageprefix.positive") + Lang.translate("translatedata.replaced") + Lang.translate("translatedata.overwrite"));
+        }
     }
 
     @Override
     public boolean hasPermission(CommandSenderContainer sender) {
-        return sender.isOp() || sender.hasPermission("advancedportals.transupdate");
+        return sender.isOp() || sender.hasPermission("advancedportals.langupdate");
     }
 
     @Override
@@ -34,11 +40,11 @@ public List<String> onTabComplete(CommandSenderContainer sender, String[] args)
 
     @Override
     public String getBasicHelpText() {
-        return Lang.translate("command.trans.help");
+        return Lang.translate("command.lang.help");
     }
 
     @Override
     public String getDetailedHelpText() {
-        return Lang.translate("command.trans.help");
+        return Lang.translate("command.lang.help");
     }
 }

core/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java

@@ -19,6 +19,7 @@ public void onCommand(CommandSenderContainer sender, String[] args) {
         // TODO re-add or figure out a replacement.
         //portalsCore.getPortalServices().loadPortals();
         //portalsCore.getDestinationServices().loadDestinations();
+        // TODO also reload stuff like translations.
         sender.sendMessage(Lang.translate("messageprefix.positive") + Lang.translate("command.reload.reloaded"));
     }
 

core/src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java

@@ -83,13 +83,24 @@ public void storeJson(Object dataHolder, String location) {
      * @return if the file is copied, will be false if override is false and the file already existed.
      */
     public boolean copyDefaultFile(String fileLoc, boolean overwrite) {
+        return this.copyDefaultFile(fileLoc, fileLoc, overwrite);
+    }
+
+    /**
+     * Copies the specified file out of the plugin and into the plugins folder.
+     *
+     * @param sourceLoc - location of the file in the jar
+     * @param fileLoc - location to save the file
+     * @return if the file is copied, will be false if override is false and the file already existed.
+     */
+    public boolean copyDefaultFile(String sourceLoc, String fileLoc, boolean overwrite) {
         File outFile = new File(this.dataFolder, fileLoc);
         if (!outFile.exists()) {
             outFile.getParentFile().mkdirs();
         }
         if (!outFile.exists() || overwrite) {
             try {
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileLoc);
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(sourceLoc);
                 if(inputStream == null) {
                     return false;
                 }
@@ -105,15 +116,15 @@ public boolean copyDefaultFile(String fileLoc, boolean overwrite) {
                 outStream.close();
             } catch (NullPointerException e) {
                 e.printStackTrace();
-                this.infoLogger.logWarning("Could not load " + fileLoc + ". The file does" +
+                this.infoLogger.logWarning("Could not load " + sourceLoc + ". The file does" +
                         "not exist or there has been an error reading the file.");
                 return false;
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
-                this.infoLogger.logWarning("Could not create " + fileLoc);
+                this.infoLogger.logWarning("Could not create " + sourceLoc);
             } catch (IOException e) {
                 e.printStackTrace();
-                this.infoLogger.logWarning("File error reading " + fileLoc);
+                this.infoLogger.logWarning("File error reading " + sourceLoc);
             }
         }
         return true;