Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit ec21b93

Browse files
committed
Version 1.2
1 parent b71e9ee commit ec21b93

11 files changed

Lines changed: 29 additions & 12 deletions

File tree

src/main/java/me/refrac/simpleannounce/bungee/commands/AnnounceCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public void execute(CommandSender sender, String[] args) {
3535
player.sendMessage(Utils.formatComponent("&b&lSimpleAnnounce &7by Refrac"));
3636
player.sendMessage(new TextComponent(""));
3737
player.sendMessage(Utils.formatComponent("&b/announce <message> &7- Announce your messages"));
38-
player.sendMessage(Utils.formatComponent("&b/announce reload &7- Reload your config files"));
38+
player.sendMessage(Utils.formatComponent("&b/announcereload &7- Reload your config files"));
3939
}
4040

41-
if (args.length != 1) return;
41+
if (!(args.length >= 1)) return;
4242

4343
if (instance.getConfig().getBoolean("Format.ENABLED")) {
4444
String message = Joiner.on(" ").join(args);

src/main/java/me/refrac/simpleannounce/bungee/tasks/AnnounceTask.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package me.refrac.simpleannounce.bungee.tasks;
66

77
import me.refrac.simpleannounce.bungee.BungeeAnnounce;
8+
import me.refrac.simpleannounce.bungee.utils.Logger;
89
import me.refrac.simpleannounce.bungee.utils.Utils;
910
import net.md_5.bungee.api.ProxyServer;
1011
import net.md_5.bungee.config.Configuration;
@@ -27,8 +28,16 @@ public AnnounceTask(BungeeAnnounce instance) {
2728
@Override
2829
public void run() {
2930
Set<String> broadcastList = (Set<String>) instance.getConfig().getSection("Announcements").getKeys();
31+
32+
if (broadcastList.isEmpty()) {
33+
Logger.WARNING.out("[SimpleAnnounce] There are no announcements :(");
34+
ProxyServer.getInstance().getScheduler().cancel(instance);
35+
return;
36+
}
37+
3038
String broadcastId = getRandom(broadcastList);
3139
Configuration broadcast = instance.getConfig().getSection("Announcements." + broadcastId);
40+
3241
for (String message : broadcast.getStringList("LINES")) {
3342
ProxyServer.getInstance().getPlayers().forEach((player -> player.sendMessage(Utils.formatComponent(message.replace("{arrow}", "»")))));
3443
}

src/main/java/me/refrac/simpleannounce/bungee/utils/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static TextComponent formatComponent(String message) {
2121
}
2222

2323
public static final String getName = "SimpleAnnounce";
24-
public static final String getVersion = "1.1";
24+
public static final String getVersion = "1.2";
2525
public static final String getDeveloper = "Refrac";
2626

2727
}

src/main/java/me/refrac/simpleannounce/spigot/SimpleAnnounce.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void onEnable() {
2525
getCommand("announce").setExecutor(new AnnounceCommand(this));
2626
getCommand("announcereload").setExecutor(new AnnounceReloadCommand(this));
2727

28-
Bukkit.getScheduler().runTaskTimerAsynchronously(this, new AnnounceTask(this), 0, getConfig().getInt("Interval"));
28+
Bukkit.getScheduler().runTaskTimerAsynchronously(this, new AnnounceTask(this), 0L, getConfig().getLong("Interval")*20);
2929

3030
Logger.NONE.out(Utils.format("&8&m==&c&m=====&f&m======================&c&m=====&8&m=="));
3131
Logger.NONE.out(Utils.format("&e" + Utils.getName + " has been enabled."));

src/main/java/me/refrac/simpleannounce/spigot/commands/AnnounceCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
3737
player.sendMessage(Utils.format("&b&lSimpleAnnounce &7by Refrac"));
3838
player.sendMessage("");
3939
player.sendMessage(Utils.format("&b/announce <message> &7- Announce your messages"));
40-
player.sendMessage(Utils.format("&b/announce reload &7- Reload your config files"));
40+
player.sendMessage(Utils.format("&b/announcereload &7- Reload your config files"));
4141
}
4242

43-
if (args.length != 1) return false;
43+
if (!(args.length >= 1)) return false;
4444

4545
if (instance.getConfig().getBoolean("Format.ENABLED")) {
4646
if (!player.hasPermission("simpleannounce.use")) {

src/main/java/me/refrac/simpleannounce/spigot/tasks/AnnounceTask.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ public AnnounceTask(SimpleAnnounce instance) {
2929
@Override
3030
public void run() {
3131
Set<String> broadcastList = instance.getConfig().getConfigurationSection("Announcements").getKeys(false);
32+
33+
if (broadcastList.isEmpty()) {
34+
Logger.WARNING.out("[SimpleAnnounce] There are no announcements :(");
35+
Bukkit.getServer().getScheduler().cancelTasks(instance);
36+
return;
37+
}
38+
3239
String broadcastId = getRandom(broadcastList);
3340
ConfigurationSection broadcast = instance.getConfig().getConfigurationSection("Announcements." + broadcastId);
41+
3442
for (String message : broadcast.getStringList("LINES")) {
3543
Bukkit.getOnlinePlayers().forEach((p -> p.sendMessage(Utils.format(message.replace("{arrow}", "»")))));
3644
}

src/main/java/me/refrac/simpleannounce/spigot/utils/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static String format(String message) {
1616
}
1717

1818
public static final String getName = "SimpleAnnounce";
19-
public static final String getVersion = "1.1";
19+
public static final String getVersion = "1.2";
2020
public static final String getDeveloper = "Refrac";
2121

2222
}

src/main/resources/bungee-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Format:
1212
- "&8&m-------------------------------------------------"
1313
- "&8{arrow} &b&lSIMPLEANNOUNCE"
1414
- ""
15-
- "&8{arrow} &7{message}"
15+
- "&8{arrow} &7{message}&7"
1616
- ""
1717
- "&8&m-------------------------------------------------"
1818
Announcements:

src/main/resources/bungee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: SimpleAnnounce
2-
version: '1.1'
2+
version: '1.2'
33
main: me.refrac.simpleannounce.bungee.BungeeAnnounce
44
author: Refrac
55
description: A Lightweight Announcer Plugin

src/main/resources/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# If you don't want a prefix leave this blank
66
Prefix: "&b&lSIMPLEANNOUNCE >> &7"
7-
Interval: 3600 # IN TICKS (1200 TICKS = 1 MINUTE, 3600 TICKS = 1 HOUR)
7+
Interval: 3600 # IN SECONDS (3600 SECONDS = 1 HOUR)
88
# This format is if you want to announce manually with /announce <message>
99
# If this is disabled the command will have the Prefix instead
1010
Format:
@@ -18,7 +18,7 @@ Format:
1818
- "&8&m-------------------------------------------------"
1919
- "&8{arrow} &b&lSIMPLEANNOUNCE"
2020
- ""
21-
- "&8{arrow} &7{message}"
21+
- "&8{arrow} &7{message}&7"
2222
- ""
2323
- "&8&m-------------------------------------------------"
2424
Announcements:

0 commit comments

Comments
 (0)