Skip to content

Commit c6cf138

Browse files
FungY911FungY911
committed
WebServerManager > WebServer
1 parent 10f687d commit c6cf138

File tree

5 files changed

+31
-43
lines changed

5 files changed

+31
-43
lines changed

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

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
public class ConfigFixManager {
88
public void autofixConfig() {
99
/**
10-
* WebServerManager.port to 8080 as Integer
10+
* WebServer.port to 8080 as Integer
1111
*/
12-
setInt("WebServerManager.port", 8080);
12+
setInt("WebServer.port", 8080);
1313
/**
14-
* WebServerManager.isRunning to false as Boolean
14+
* WebServer.isRunning to false as Boolean
1515
*/
16-
setBoolean("WebServerManager.isRunning", false);
16+
setBoolean("WebServer.isRunning", false);
1717
/**
18-
* WebServerManager.domain to "CHANGE_ME" as String
18+
* WebServer.domain to "CHANGE_ME" as String
1919
*/
20-
setString("WebServerManager.domain", "CHANGE_ME");
20+
setString("WebServer.domain", "CHANGE_ME");
2121
/**
22-
* WebServerManager.ssl to false as Boolean
22+
* WebServer.ssl to false as Boolean
2323
*/
24-
setBoolean("WebServerManager.ssl", false);
24+
setBoolean("WebServer.ssl", false);
2525
/**
26-
* WebServerManager.accessLog to true as Boolean
26+
* WebServer.accessLog to true as Boolean
2727
*/
28-
setBoolean("WebServerManager.accessLog", true);
28+
setBoolean("WebServer.accessLog", true);
2929
/**
30-
* WebServerManager.threads to 0 as Integer
30+
* WebServer.threads to 0 as Integer
3131
*/
32-
setInt("WebServerManager.threads", 0);
32+
setInt("WebServer.threads", 0);
3333
/**
3434
* No-Permission to "&cYou dont have permissions to do this command" as String
3535
*/
@@ -38,11 +38,6 @@ public void autofixConfig() {
3838
* Version to version from pom.xml as String
3939
*/
4040
setString("Version", Main.getInstance().getDescription().getVersion());
41-
42-
43-
/**
44-
* Save the changes
45-
*/
4641
save();
4742
}
4843

@@ -58,17 +53,10 @@ private void save() {
5853
e.printStackTrace();
5954
Main.getInstance().getLogger().warning("\nEnd of error.");
6055
Main.getInstance().getLogger().warning("----------------------------------------------------------------");
61-
6256
}
6357
}
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-
}
58+
private void setInt(String s, int var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
59+
private void setString(String s, String var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
60+
private void setBoolean(String s, boolean var) { if (!FileManager.config.contains(s)) { FileManager.config.set(s, var); } save(); }
7361

7462
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void startup() throws UnknownHostException {
6060
if(!configFile.exists()) {
6161
Main.getInstance().saveResource("config.yml", true);
6262
config = new YamlConfiguration().loadConfiguration(configFile);
63-
//new ConfigFixManager().autofixConfig();
64-
String domain = getStringFromConfig("WebServerManager.domain");
63+
new ConfigFixManager().autofixConfig();
64+
String domain = getStringFromConfig("WebServer.domain");
6565
if (domain.equalsIgnoreCase("CHANGE_ME")) {
6666
try {
6767
URL url = new URL("http://checkip.amazonaws.com");
@@ -73,7 +73,7 @@ public void startup() throws UnknownHostException {
7373
}
7474
ipaddr.replace(" ", "");
7575
ipaddr.replace("[STDOUT]", "");
76-
FileManager.setStringInConfig("WebServerManager.domain", ipaddr);
76+
FileManager.setStringInConfig("WebServer.domain", ipaddr);
7777
}
7878
File cfgFile = new File(Main.getInstance().getDataFolder(), "config.yml");
7979
config = YamlConfiguration.loadConfiguration(cfgFile);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ private static void checkForUpdates() {
4949
if(currentVersion == null) { currentVersion = new FileManager().getStringFromConfig("Version"); }
5050

5151
if (!currentVersion.equals(latestVersion)) {
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/"));
52+
Bukkit.getLogger().warning(ColorUtil.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/"));
5353
} else {
54-
Bukkit.getLogger().warning(ColorUtil.translate("[WebServerManager] You are using latest version"));
54+
Bukkit.getLogger().warning(ColorUtil.translate("[WebServer] You are using latest version"));
5555
}
5656
} catch (Exception e) {
57-
Bukkit.getLogger().warning(ColorUtil.translate("[WebServerManager] Failed to check for updates: " + e.getMessage()));
57+
Bukkit.getLogger().warning(ColorUtil.translate("[WebServer] Failed to check for updates: " + e.getMessage()));
5858
}
5959
}
6060

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public WebServerManager(int port) {
2626
public WebServerManager(String hostname, int port) {
2727
super(hostname, port);
2828
}
29-
public static boolean running = new FileManager().getBooleanFromConfig("WebServerManager.isRunning");
29+
public static boolean running = new FileManager().getBooleanFromConfig("WebServer.isRunning");
3030
private File logFile;
3131
public WebServerManager() {
32-
super(Integer.valueOf(new FileManager().getStringFromConfig("WebServerManager.port")));
32+
super(Integer.valueOf(new FileManager().getStringFromConfig("WebServer.port")));
3333
logFile = new File(Main.getInstance().getDataFolder() + "/logs/access.log");
3434
}
3535

@@ -89,13 +89,13 @@ private String getMimeType(String uri) {
8989

9090

9191
public void start() {
92-
int maxThreads = new FileManager().getIntegerFromConfig("WebServerManager.threads"); // maximum number of threads
92+
int maxThreads = new FileManager().getIntegerFromConfig("WebServer.threads"); // maximum number of threads
9393
if (maxThreads == 0) {
9494
try {
9595
super.start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);
9696
} catch (IOException e) {
9797
Main.getInstance().getLogger().warning("Couldn't start server: " + e.getMessage());
98-
FileManager.setBooleanInConfig("WebServerManager.isRunning", false);
98+
FileManager.setBooleanInConfig("WebServer.isRunning", false);
9999
}
100100
} else {
101101
ExecutorService executorService = Executors.newFixedThreadPool(maxThreads);
@@ -104,11 +104,11 @@ public void start() {
104104
super.start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);
105105
} catch (IOException e) {
106106
Main.getInstance().getLogger().warning("Couldn't start server: " + e.getMessage());
107-
FileManager.setBooleanInConfig("WebServerManager.isRunning", false);
107+
FileManager.setBooleanInConfig("WebServer.isRunning", false);
108108
}
109109
});
110110
}
111-
FileManager.setBooleanInConfig("WebServerManager.isRunning", true);
111+
FileManager.setBooleanInConfig("WebServer.isRunning", true);
112112
if (new FileManager().getBooleanFromConfig("WebServerManager.ssl")) {
113113
Main.getInstance().getLogger().warning("Running! https://" + new FileManager().getStringFromConfig("WebServerManager.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServerManager.port")) + "/");
114114
} else {
@@ -120,7 +120,7 @@ public void start() {
120120
public void stop() {
121121
super.stop();
122122
Main.tc.stop();
123-
FileManager.setBooleanInConfig("WebServerManager.isRunning", false);
123+
FileManager.setBooleanInConfig("WebServer.isRunning", false);
124124
if (!(super.isAlive())) {
125125
Main.getInstance().getLogger().warning("Webserver has been Stopped!");
126126
} else {
@@ -131,7 +131,7 @@ public void stop() {
131131
public Response serve(IHTTPSession session) {
132132
String uri = session.getUri().toLowerCase();
133133
String hostHeader = session.getHeaders().get("host");
134-
if (hostHeader == null || !hostHeader.contains(new FileManager().getStringFromConfig("WebServerManager.domain"))) {
134+
if (hostHeader == null || !hostHeader.contains(new FileManager().getStringFromConfig("WebServer.domain"))) {
135135
return newFixedLengthResponse(Response.Status.BAD_REQUEST, "text/plain", "Permanent Redirect to " + new FileManager().getStringFromConfig("WebServerManager.domain") + ":" + Integer.valueOf(new FileManager().getStringFromConfig("WebServerManager.port")));
136136
}
137137

@@ -141,7 +141,7 @@ public Response serve(IHTTPSession session) {
141141
String mimeType = getMimeType(uri);
142142
File file = new File(Main.getInstance().getDataFolder() + "/web/" + uri);
143143
try {
144-
if (new FileManager().getBooleanFromConfig("WebServerManager.accessLog")) {
144+
if (new FileManager().getBooleanFromConfig("WebServer.accessLog")) {
145145
try (FileWriter writer = new FileWriter(logFile, true)) {
146146
Map<String, String> headers = session.getHeaders();
147147
String referer = headers.get("referer");

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: WebServerManager
1+
name: WebServer
22
version: '${project.version}'
33
main: tk.fungy.wsformc.Main
44
api-version: 1.19

0 commit comments

Comments
 (0)