Skip to content

Commit 2d8fea2

Browse files
FungY911FungY911
committed
src update
1 parent a8b5b4b commit 2d8fea2

File tree

10 files changed

+202
-124
lines changed

10 files changed

+202
-124
lines changed

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.bstats.bukkit.Metrics;
44
import org.bukkit.Bukkit;
55
import org.bukkit.plugin.java.JavaPlugin;
6+
import tk.fungy.wsformc.commands.WSMCommand;
7+
import tk.fungy.wsformc.managers.*;
68

79
import java.net.UnknownHostException;
810

@@ -12,14 +14,14 @@ public static Main getInstance() {
1214
return instance;
1315
}
1416

15-
public static Main instance;
16-
public static TimeCounter tc = new TimeCounter ();
17+
private static Main instance;
18+
public static TimeCounterManager tc = new TimeCounterManager();
1719

1820
@Override
1921
public void onEnable() {
2022
instance = this;
2123
getLogger().info("Starting plugin...");
22-
getServer().getPluginManager().registerEvents(new Updater(), Main.instance);
24+
getServer().getPluginManager().registerEvents(new UpdateManager(), Main.getInstance());
2325
getLogger().info("Loading File Manager.");
2426
try {
2527
new FileManager().startup();
@@ -28,12 +30,12 @@ public void onEnable() {
2830
}
2931
new FileManager().removeLogFile();
3032
getLogger().info("Loading Assets.");
31-
instance.getCommand("wsm").setExecutor(new Command());
32-
instance.getCommand("webserver").setExecutor(new Command());
33-
if (WebServer.running) {
34-
if (Command.ws == null) Command.ws = new WebServer();
33+
getInstance().getCommand("wsm").setExecutor(new WSMCommand());
34+
getInstance().getCommand("webserver").setExecutor(new WSMCommand());
35+
if (WebServerManager.running) {
36+
if (WSMCommand.ws == null) WSMCommand.ws = new WebServerManager();
3537
getLogger().info("Starting Webserver.");
36-
Command.ws.start();
38+
WSMCommand.ws.start();
3739
}
3840
if (FileManager.config == null) {
3941
try {
@@ -44,9 +46,9 @@ public void onEnable() {
4446
}
4547
FileManager.setStringInConfig("Version", getDescription().getVersion());
4648

47-
Metrics metrics = new Metrics(Main.instance, 17696);
49+
Metrics metrics = new Metrics(Main.getInstance(), 17696);
4850

49-
Updater.startUpdater();
51+
UpdateManager.startUpdater();
5052

5153
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") == null) {
5254
getLogger().warning("Could not find PlaceholderAPI! This plugin is required for Web placeholders.");

‎src/main/java/tk/fungy/wsformc/Command.java renamed to ‎src/main/java/tk/fungy/wsformc/commands/WSMCommand.java

Lines changed: 56 additions & 54 deletions
Large diffs are not rendered by default.

‎src/main/java/tk/fungy/wsformc/managers/ConfigFixManager.java

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
package tk.fungy.wsformc.managers;
2+
3+
import tk.fungy.wsformc.Main;
4+
5+
import java.io.IOException;
6+
7+
public class ConfigFixManager {
8+
public void autofixConfig() {
9+
/**
10+
* WebServerManager.port to 8080 as Integer
11+
*/
12+
setInt("WebServerManager.port", 8080);
13+
/**
14+
* WebServerManager.isRunning to false as Boolean
15+
*/
16+
setBoolean("WebServerManager.isRunning", false);
17+
/**
18+
* WebServerManager.domain to "CHANGE_ME" as String
19+
*/
20+
setString("WebServerManager.domain", "CHANGE_ME");
21+
/**
22+
* WebServerManager.ssl to false as Boolean
23+
*/
24+
setBoolean("WebServerManager.ssl", false);
25+
/**
26+
* WebServerManager.accessLog to true as Boolean
27+
*/
28+
setBoolean("WebServerManager.accessLog", true);
29+
/**
30+
* WebServerManager.threads to 0 as Integer
31+
*/
32+
setInt("WebServerManager.threads", 0);
33+
/**
34+
* No-Permission to "&cYou dont have permissions to do this command" as String
35+
*/
36+
setString("No-Permission", "&cYou dont have permissions to do this command");
37+
/**
38+
* Version to version from pom.xml as String
39+
*/
40+
setString("Version", Main.getInstance().getDescription().getVersion());
41+
42+
43+
/**
44+
* Save the changes
45+
*/
46+
save();
47+
}
48+
49+
private void save() {
50+
/**
51+
* Save the config
52+
*/
53+
try {
54+
FileManager.config.save(FileManager.configFile);
55+
} catch (IOException e) {
56+
Main.getInstance().getLogger().warning("----------------------------------------------------------------");
57+
Main.getInstance().getLogger().warning("Failed to config fix, please report error bottom in our discord!\n");
58+
e.printStackTrace();
59+
Main.getInstance().getLogger().warning("\nEnd of error.");
60+
Main.getInstance().getLogger().warning("----------------------------------------------------------------");
61+
62+
}
63+
}
64+
private void setInt(String s, int var) {
65+
if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); }
66+
}
67+
private void setString(String s, String var) {
68+
if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); }
69+
}
70+
private void setBoolean(String s, Boolean var) {
71+
if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); }
72+
}
73+
74+
}

‎src/main/java/tk/fungy/wsformc/FileManager.java renamed to ‎src/main/java/tk/fungy/wsformc/managers/FileManager.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package tk.fungy.wsformc;
1+
package tk.fungy.wsformc.managers;
22

33
import org.bukkit.configuration.file.YamlConfiguration;
4+
import tk.fungy.wsformc.Main;
45

56
import java.io.*;
67
import java.net.URL;
@@ -10,10 +11,10 @@
1011

1112
public class FileManager {
1213

13-
public static File configFile = new File(Main.instance.getDataFolder(), "config.yml");
14-
public static File webFolder = new File(Main.instance.getDataFolder(), "/web");
15-
public static File logsFolder = new File(Main.instance.getDataFolder(), "/logs");
16-
public static File logsFile = new File(Main.instance.getDataFolder(), "/logs/access.log");
14+
public static File configFile = new File(Main.getInstance().getDataFolder(), "config.yml");
15+
public static File webFolder = new File(Main.getInstance().getDataFolder(), "/web");
16+
public static File logsFolder = new File(Main.getInstance().getDataFolder(), "/logs");
17+
public static File logsFile = new File(Main.getInstance().getDataFolder(), "/logs/access.log");
1718
public static YamlConfiguration config;
1819
public static String ipaddr;
1920
public static void setStringInConfig(String key, String value) {
@@ -57,9 +58,10 @@ public static void setBooleanInConfig(String key, Boolean value) {
5758

5859
public void startup() throws UnknownHostException {
5960
if(!configFile.exists()) {
60-
Main.instance.saveResource("config.yml", true);
61+
Main.getInstance().saveResource("config.yml", true);
6162
config = new YamlConfiguration().loadConfiguration(configFile);
62-
String domain = getStringFromConfig("WebServer.domain");
63+
//new ConfigFixManager().autofixConfig();
64+
String domain = getStringFromConfig("WebServerManager.domain");
6365
if (domain.equalsIgnoreCase("CHANGE_ME")) {
6466
try {
6567
URL url = new URL("http://checkip.amazonaws.com");
@@ -71,9 +73,9 @@ public void startup() throws UnknownHostException {
7173
}
7274
ipaddr.replace(" ", "");
7375
ipaddr.replace("[STDOUT]", "");
74-
FileManager.setStringInConfig("WebServer.domain", ipaddr);
76+
FileManager.setStringInConfig("WebServerManager.domain", ipaddr);
7577
}
76-
File cfgFile = new File(Main.instance.getDataFolder(), "config.yml");
78+
File cfgFile = new File(Main.getInstance().getDataFolder(), "config.yml");
7779
config = YamlConfiguration.loadConfiguration(cfgFile);
7880
}
7981
if (!logsFolder.exists()) logsFolder.mkdir();
@@ -83,7 +85,7 @@ public void startup() throws UnknownHostException {
8385

8486
public void saveMyResource(String resourceName, String destination, boolean replace) {
8587
// Get the plugin's data folder
86-
File dataFolder = Main.instance.getDataFolder();
88+
File dataFolder = Main.getInstance().getDataFolder();
8789

8890
// Create the destination file
8991
File destFile = new File(dataFolder + destination, resourceName);
@@ -94,7 +96,7 @@ public void saveMyResource(String resourceName, String destination, boolean repl
9496
}
9597

9698
// Open the resource file
97-
InputStream is = Main.instance.getResource(resourceName);
99+
InputStream is = Main.getInstance().getResource(resourceName);
98100

99101
// If the resource file is not found, throw an exception
100102
if (is == null) {
@@ -170,14 +172,14 @@ public boolean checkIntFromConfig(String key, Integer string) {
170172
}
171173
}
172174
public void reloadConfig() {
173-
File cfgFile = new File(Main.instance.getDataFolder(), "config.yml");
175+
File cfgFile = new File(Main.getInstance().getDataFolder(), "config.yml");
174176
config = YamlConfiguration.loadConfiguration(cfgFile);
175177
}
176178

177179
public void removeLogFile() {
178180
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy_ss:mm:HH");
179181
String newFileName = dateFormat.format(new Date()) + ".log";
180-
File newFile = new File(Main.instance.getDataFolder(), "logs/" + newFileName);
182+
File newFile = new File(Main.getInstance().getDataFolder(), "logs/" + newFileName);
181183
logsFile.renameTo(newFile);
182184
}
183185
}

‎src/main/java/tk/fungy/wsformc/TimeCounter.java renamed to ‎src/main/java/tk/fungy/wsformc/managers/TimeCounterManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package tk.fungy.wsformc;
1+
package tk.fungy.wsformc.managers;
22

33
import java.util.concurrent.TimeUnit;
44

5-
public class TimeCounter {
5+
public class TimeCounterManager {
66
private long startTime;
77
private long stopTime;
88
public static boolean running;
99

10-
public TimeCounter() {
10+
public TimeCounterManager() {
1111
reset();
1212
}
1313

‎src/main/java/tk/fungy/wsformc/Updater.java renamed to ‎src/main/java/tk/fungy/wsformc/managers/UpdateManager.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package tk.fungy.wsformc;
1+
package tk.fungy.wsformc.managers;
22

33
import com.google.gson.JsonArray;
44
import com.google.gson.JsonObject;
55
import com.google.gson.JsonParser;
6-
import net.md_5.bungee.api.ChatMessageType;
76
import net.md_5.bungee.api.chat.ClickEvent;
87
import net.md_5.bungee.api.chat.ComponentBuilder;
98
import net.md_5.bungee.api.chat.HoverEvent;
@@ -13,18 +12,20 @@
1312
import org.bukkit.event.EventHandler;
1413
import org.bukkit.event.Listener;
1514
import org.bukkit.event.player.PlayerJoinEvent;
15+
import tk.fungy.wsformc.Main;
16+
import tk.fungy.wsformc.utils.ColorUtil;
1617

1718
import java.io.*;
1819

1920
import java.net.URL;
2021

21-
public class Updater implements Listener {
22+
public class UpdateManager implements Listener {
2223
private static String currentVersion = Main.getInstance().getDescription().getVersion();
2324
public static String latestVersion;
2425
private static String user = "CodeITForFun";
2526
private static String repo = "WSForMC";
2627
public static void startUpdater() {
27-
Bukkit.getScheduler().runTaskTimerAsynchronously(Main.instance, new Runnable() {
28+
Bukkit.getScheduler().runTaskTimerAsynchronously(Main.getInstance(), new Runnable() {
2829
@Override
2930
public void run() {
3031
checkForUpdates();
@@ -48,12 +49,12 @@ private static void checkForUpdates() {
4849
if(currentVersion == null) { currentVersion = new FileManager().getStringFromConfig("Version"); }
4950

5051
if (!currentVersion.equals(latestVersion)) {
51-
Bukkit.getLogger().warning(Colors.translate("[WebServer] A new update is available: " + latestVersion + " Your version is: " + currentVersion + ". Download it here: https://www.spigotmc.org/resources/web-server-for-minecraft.107949/"));
52+
Bukkit.getLogger().warning(ColorUtil.translate("[WebServerManager] A new update is available: " + latestVersion + " Your version is: " + currentVersion + ". Download it here: https://www.spigotmc.org/resources/web-server-for-minecraft.107949/"));
5253
} else {
53-
Bukkit.getLogger().warning(Colors.translate("[WebServer] You are using latest version"));
54+
Bukkit.getLogger().warning(ColorUtil.translate("[WebServerManager] You are using latest version"));
5455
}
5556
} catch (Exception e) {
56-
Bukkit.getLogger().warning(Colors.translate("[WebServer] Failed to check for updates: " + e.getMessage()));
57+
Bukkit.getLogger().warning(ColorUtil.translate("[WebServerManager] Failed to check for updates: " + e.getMessage()));
5758
}
5859
}
5960

@@ -65,7 +66,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
6566
return;
6667
}
6768

68-
TextComponent message = new TextComponent(Colors.translate("&8[&cWebServer&8] &bA new update of Web Server for minecraft is available: &c" +
69+
TextComponent message = new TextComponent(ColorUtil.translate("&8[&cWebServer&8] &bA new update of Web Server for minecraft is available: &c" +
6970
latestVersion + "&b. Your version is: &c" + currentVersion));
7071
message.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://www.spigotmc.org/resources/web-server-for-minecraft.107949/"));
7172
message.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to Download Manual Update from SpigotMC").create()));

0 commit comments

Comments
 (0)