Skip to content

Commit 783536b

Browse files
FungY911FungY911
committed
New messages design
1 parent eed07bc commit 783536b

5 files changed

Lines changed: 36 additions & 43 deletions

File tree

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

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.md_5.bungee.api.chat.HoverEvent;
66
import net.md_5.bungee.api.chat.TextComponent;
77
import org.bukkit.Bukkit;
8+
import org.bukkit.Color;
89
import org.bukkit.command.CommandExecutor;
910
import org.bukkit.command.CommandSender;
1011
import org.bukkit.command.TabCompleter;
@@ -16,7 +17,7 @@
1617
public class Command implements CommandExecutor, TabCompleter {
1718
private static String secured;
1819
public static WebServer ws;
19-
20+
private static String running;
2021
@Override
2122
public boolean onCommand(CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
2223
if (!(sender instanceof Player)) {
@@ -38,20 +39,20 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
3839
if (args.length >= 0 && sender.hasPermission("ws.*")) {
3940
switch (args[0]) {
4041
case "help":
41-
sender.sendMessage(
42+
sender.sendMessage(Colors.translate(
4243
"Commands: \n" +
4344
"/wsm reload [config] / [plugin]\n" +
4445
"/wsm start\n" +
4546
"/wsm status\n" +
46-
"/wsm version\n");
47+
"/wsm version\n"));
4748
return true;
4849
case "ver":
4950
case "version":
5051
if (!(sender.hasPermission("ws.ver") || sender.hasPermission("ws.*"))) {
5152
sender.sendMessage(Colors.translate(new FileManager().getStringFromConfig("No-Permission")));
5253
return true;
5354
}
54-
sender.sendMessage("&bYour version is: &c" + Main.getInstance().getDescription().getVersion() + "&b, Latest: &c" + Updater.latestVersion);
55+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bYour version is: &c" + Main.getInstance().getDescription().getVersion() + "&b, Latest: &c" + Updater.latestVersion));
5556
return true;
5657
case "start":
5758
if (!(sender.hasPermission("ws.start") || sender.hasPermission("ws.*"))) {
@@ -60,18 +61,14 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
6061
}
6162

6263
if (ws != null) {
63-
sender.sendMessage("WebServer is alredy started!");
64+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &cWebServer is alredy started!"));
6465
return true;
6566
}
66-
sender.sendMessage("Starting...");
67+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &7Starting..."));
6768
ws = new WebServer();
6869
ws.start();
69-
if (new FileManager().getBooleanFromConfig("WebServer.ssl")) {
70-
secured = "https://";
71-
} else {
72-
secured = "http://";
73-
}
74-
TextComponent message = new TextComponent(Colors.translate("Accessible via " +
70+
if (new FileManager().getBooleanFromConfig("WebServer.ssl")) { secured = "https://"; } else { secured = "http://"; }
71+
TextComponent message = new TextComponent(Colors.translate("&8[&cWebServer&8] &bAccessible via &7" +
7572
secured +
7673
new FileManager().getStringFromConfig("WebServer.domain") +
7774
":" +
@@ -90,15 +87,15 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
9087
}
9188

9289
if (ws == null) {
93-
sender.sendMessage("WebServer was not started yet!");
90+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &cWebServer was not started yet!"));
9491
return true;
9592
}
9693
ws.stop();
9794
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(false));
9895
if (!(ws.isAlive())) {
99-
sender.sendMessage("Webserver has been Stopped!");
96+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &aWebserver has been Stopped!"));
10097
} else {
101-
sender.sendMessage("Webserver has not been Stopped!");
98+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &cWebserver has not been Stopped!"));
10299
}
103100
ws = null;
104101
return true;
@@ -110,22 +107,27 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
110107
if(args.length > 1) {
111108
switch (args[1]) {
112109
case "config":
113-
sender.sendMessage("Reloading config...");
110+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &7Reloading config..."));
114111
new FileManager().reloadConfig();
115-
sender.sendMessage("Reloaded");
112+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &aReloaded"));
116113
return true;
117114
case "plugin":
118-
sender.sendMessage("Reloading plugin...");
115+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &7Reloading plugin..."));
119116
Bukkit.getPluginManager().disablePlugin(Main.instance);
120117
Bukkit.getPluginManager().enablePlugin(Main.instance);
121-
sender.sendMessage("Reloaded");
118+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &aReloaded"));
122119
return true;
123120
}
124121
} else {
125-
sender.sendMessage("Please choose config/plugin");
122+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bPlease choose config/plugin"));
126123
}
127124
return true;
128-
case "type":
125+
126+
//
127+
//TODO: Its for future
128+
//
129+
130+
/*case "type":
129131
switch (args[1]) {
130132
case "cdn":
131133
sender.sendMessage("Setting to cdn...");
@@ -138,15 +140,19 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
138140
sender.sendMessage("Setted");
139141
return true;
140142
}
141-
return true;
143+
return true;*/
144+
142145
case "status":
143-
sender.sendMessage("Is Active: " + new FileManager().getBooleanFromConfig("WebServer.isRunning"));
144-
sender.sendMessage("Uptime: null"); //TODO: Add Uptime
145-
sender.sendMessage("Enable Log: true\n"); //TODO: Add toggle accesslog
146-
sender.sendMessage("Created by FungYY911 for everyone");
146+
if (new FileManager().getBooleanFromConfig("WebServer.isRunning")) { running = "&aOnline"; } else { running = "&cOffline"; }
147+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &8⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"));
148+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bStatus: " + running));
149+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bUptime: &7null &8(&7This is in TODO&8)")); //TODO: Add Uptime
150+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bAccesss Log: &aEnabled &8(&7This is in TODO&8)\n")); //TODO: Add toggle accesslog
151+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &bCreated by FungYY911 for everyone"));
152+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &8⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"));
147153
return true;
148154
default:
149-
sender.sendMessage("Command not found!");
155+
sender.sendMessage(Colors.translate("&8[&cWebServer&8] &cCommand not found!"));
150156
}
151157
} else {
152158
sender.sendMessage(Colors.translate(new FileManager().getStringFromConfig("No-Permission")));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ public void onEnable() {
4646
if (!(new FileManager().getBooleanFromConfig("Version"))) {
4747
new FileManager().setBooleanInConfig("Updates", true);
4848
}
49-
Updater.startUpdater();
5049

5150
int pluginId = 17696;
5251
Metrics metrics = new Metrics(Main.instance, pluginId);
52+
53+
Updater.startUpdater();
5354
}
5455

5556
@Override

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.net.URL;
2020

2121
public class Updater implements Listener {
22-
private static String currentVersion = new FileManager().getStringFromConfig("Version");
23-
public static boolean toggleUpdates = new FileManager().getBooleanFromConfig("Version");
22+
private static String currentVersion = Main.getInstance().getDescription().getVersion();
2423
public static String latestVersion;
2524
public static void startUpdater() {
2625
Bukkit.getScheduler().runTaskTimerAsynchronously(Main.instance, new Runnable() {
@@ -64,15 +63,6 @@ public void onPlayerJoin(PlayerJoinEvent event) {
6463
return;
6564
}
6665

67-
if (!toggleUpdates) {
68-
return;
69-
}
70-
71-
if (currentVersion == null) {
72-
Bukkit.getLogger().warning(Colors.translate("[WebServer] An error occured! Please report console error to our discord! https://codeitfor.fun/discord"));
73-
return;
74-
}
75-
7666
TextComponent message = new TextComponent(Colors.translate("&8[&cWebServer&8] &bA new update of Web Server for minecraft is available: &c" +
7767
latestVersion + "&b. Your version is: &c" + currentVersion));
7868
message.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://www.spigotmc.org/resources/web-server-for-minecraft.107949/"));

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public WebServer() {
2626
super(port);
2727
logFile = new File(Main.instance.getDataFolder() + "/logs/access.log");
2828
}
29-
//TODO:
30-
//TODO: FIX TOGGLE V CONFIGU A CHATE ATD..
31-
//TODO:
3229

3330
private String getMimeType(String uri) {
3431
if (uri.endsWith(".css")) {

‎src/main/resources/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ WebServer:
3535

3636
No-Permission: "&cYou dont have permissions to do this command"
3737
Version: "1.3.1" # Do not edit this line!
38-
Updates: true # Toggle updates

0 commit comments

Comments
 (0)