Add user´s IP as default

Author: FungY911

src/main/java/tk/fungy/wsformc/Command.java

@@ -6,12 +6,12 @@
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
-import java.sql.Time;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Command implements CommandExecutor, TabCompleter {
+    private static String secured;
+
     @Override
     public boolean onCommand(CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
         if (!(sender instanceof Player)) {
@@ -35,7 +35,7 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
                 case "help":
                     sender.sendMessage(
                             "Commands: \n" +
-                                    "/wsm reload\n" +
+                                    "/wsm reload [config] / [plugin]\n" +
                                     "/wsm start\n" +
                                     "/wsm status\n" +
                                     "/wsm \n");
@@ -44,6 +44,12 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
                     sender.sendMessage("Starting...");
                     WebServer server = new WebServer();
                     server.start();
+                    if (new FileManager().getBooleanFromConfig("WebServer.ssl")) { secured = "https://"; } else { secured = "http://"; }
+                    sender.sendMessage(Colors.translate("Accessible via " +
+                            secured +
+                            new FileManager().getStringFromConfig("WebServer.domain") +
+                            ":" +
+                            new FileManager().getStringFromConfig("WebServer.port")));
                     return true;
                 case "reload":
                     switch (args[1]) {
@@ -77,15 +83,15 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
                     return true;
                 case "status":
                     sender.sendMessage("Is Active: " + new FileManager().getBooleanFromConfig("WebServer.isRunning"));
-                    sender.sendMessage("Uptime: null");
-                    sender.sendMessage("Enable Log: null\n");
+                    sender.sendMessage("Uptime: null"); //TODO: Add Uptime
+                    sender.sendMessage("Enable Log: true\n"); //TODO: Add toggle accesslog
                     sender.sendMessage("Created by FungYY911 for everyone");
                     return true;
                 default:
                     sender.sendMessage("Command not found!");
             }
         } else {
-            sender.sendMessage(new FileManager().getStringFromConfig("No-Permission"));
+            sender.sendMessage(Colors.translate(new FileManager().getStringFromConfig("No-Permission")));
         }
         return true;
     }
@@ -100,20 +106,6 @@ public List<String> onTabComplete(CommandSender sender, org.bukkit.command.Comma
                 arguments.add("start");
             }
             return arguments;
-        } else if(args.length == 2) {
-            switch(args[0].toLowerCase()) {
-                //TODO: ADD LOG AND THEIR TYPES AND TYPE ADD CDN
-                case "type":
-                    List<String> arguments = new ArrayList<>();
-                    arguments.add("cdn");
-                    arguments.add("origin");
-                    return arguments;
-                case "log":
-                    List<String> arguments0 = new ArrayList<>();
-                    arguments0.add("live");
-                    arguments0.add("grep");
-                    return arguments0;
-            }
         }
         return null;
     }

src/main/java/tk/fungy/wsformc/FileManager.java

@@ -3,6 +3,7 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.*;
+import java.net.URL;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -14,6 +15,7 @@ public class FileManager {
     public static File logsFolder = new File(Main.instance.getDataFolder(), "logs");
     public static File logsFile = new File(Main.instance.getDataFolder(), "logs/access.log");
     public static YamlConfiguration config;
+    public static String ipaddr;
     public boolean getBooleanFromConfig(String b) { return Boolean.parseBoolean(config.getString(String.valueOf(b))); }
     public static void setStringInConfig(String key, String value) {
         config.set(key, value);
@@ -31,7 +33,15 @@ public void startup() throws UnknownHostException {
             config = new YamlConfiguration().loadConfiguration(configFile);
             String domain = getStringFromConfig("WebServer.domain");
             if (domain.equalsIgnoreCase("CHANGE_ME")) {
-                    FileManager.setStringInConfig("WebServer.domain", "0.0.0.0");
+                try {
+                    URL url = new URL("http://checkip.amazonaws.com");
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
+                    String ipaddr = reader.readLine();
+                    System.out.println(ipaddr);
+                } catch (Exception e) {
+                    System.out.println("Failed to get your public ip. Returned error is:ww " + e.getMessage());
+                }
+                FileManager.setStringInConfig("WebServer.domain", ipaddr);
             }
             File cfgFile = new File(Main.instance.getDataFolder(), "config.yml");
             config = YamlConfiguration.loadConfiguration(cfgFile);

src/main/java/tk/fungy/wsformc/Main.java

@@ -22,7 +22,6 @@ public static Main getInstance() {
     public void onEnable() {
         instance = this;
         getLogger().info("Starting plugin...");
-        Updater.startUpdater();
         getServer().getPluginManager().registerEvents(new Updater(), Main.instance);
         getLogger().info("Loading File Manager.");
         try {
@@ -37,9 +36,10 @@ public void onEnable() {
             WebServer server = new WebServer();
             server.start();
         }
-        getLogger().info("Loading Commands.");
+        getLogger().info("Loading Assets.");
         instance.getCommand("wsm").setExecutor(new Command());
         instance.getCommand("webserver").setExecutor(new Command());
+        Updater.startUpdater();
     }
 
     @Override

src/main/java/tk/fungy/wsformc/Updater.java

@@ -14,7 +14,7 @@
 import java.net.URL;
 
 public class Updater implements Listener {
-    private static final String currentVersion = new FileManager().getStringFromConfig("Version").toString();
+    private static final String currentVersion = new FileManager().getStringFromConfig("Version");
     private static String latestVersion;
     public static void startUpdater() {
         Bukkit.getScheduler().runTaskTimerAsynchronously(Main.instance, new Runnable() {

src/main/resources/config.yml

@@ -29,7 +29,6 @@ WebServer:
   port: 8080 # Set this to your open port
   isRunning: true # For effect you need to reload plugin
   domain: "CHANGE_ME" # Domain of your server, default is ip of your server.
-  type: "origin" # origin/cdn
   ssl: false # toggle: true/false, set this to true only if you have generated certificate and webserver pointed to domain
 
 No-Permission: "nemas prava L"