Skip to content

Commit e6679b3

Browse files
DevSnoxDevSnox
committed
[1.9-RELEASE]
+ cleaned up code (Main-Class initialization and more) + changed from TickUnit to the java own TimeUnit + better name definition of final jar
1 parent e075988 commit e6679b3

File tree

8 files changed

+95
-78
lines changed

8 files changed

+95
-78
lines changed

‎pom.xml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>me.devsnox</groupId>
8-
<artifactId>SpigotBroadcast</artifactId>
9-
<version>1.8-SNAPSHOT</version>
8+
<artifactId>spigotbroadcast</artifactId>
9+
<version>1.9-RELEASE</version>
10+
<name>SpigotBroadcast</name>
1011

1112
<repositories>
1213
<repository>
@@ -61,8 +62,16 @@
6162
<groupId>org.apache.maven.plugins</groupId>
6263
<artifactId>maven-compiler-plugin</artifactId>
6364
<configuration>
64-
<source>1.7</source>
65-
<target>1.7</target>
65+
<source>1.8</source>
66+
<target>1.8</target>
67+
</configuration>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-jar-plugin</artifactId>
72+
<version>3.1.0</version>
73+
<configuration>
74+
<finalName>${project.name}-${project.version}</finalName>
6675
</configuration>
6776
</plugin>
6877
</plugins>

‎src/main/java/me/devsnox/spigotbroadcast/SpigotBroadcast.java‎

Lines changed: 66 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,30 @@
99
import org.bukkit.ChatColor;
1010
import org.bukkit.plugin.java.JavaPlugin;
1111

12+
import java.util.logging.Level;
13+
import java.util.logging.Logger;
14+
1215
public class SpigotBroadcast extends AdvancedPlugin {
1316

1417
private BroadcastConfigurator broadcastConfigurator;
1518
private BroadcastTask broadcastTask;
1619

20+
@Override
1721
public void onEnable() {
18-
Bukkit.getConsoleSender().sendMessage(" ");
19-
Bukkit.getConsoleSender().sendMessage(ChatColor.AQUA + "[ -------------------------------------------------------------- ]");
20-
Bukkit.getConsoleSender().sendMessage(" ");
21-
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "INFORMATIONS" + ChatColor.DARK_GRAY + " }");
22-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= SpigotBroadcast =- ");
23-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= Author: DevSnox =-");
24-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= Version: 1.8 =-");
25-
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_RED + "Please report bugs on spigotmc.org per PM");
26-
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "------------" + ChatColor.DARK_GRAY + " }");
27-
Bukkit.getConsoleSender().sendMessage(" ");
28-
29-
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "LOADING" + ChatColor.DARK_GRAY + " }");
30-
31-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= register metrics =-");
32-
new Metrics(this);
22+
this.load();
23+
}
3324

34-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= creating config.yml =-");
35-
this.createConfigFile();
25+
private void load() {
26+
this.sendHeader();
3627

37-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= creating messages.txt =-");
28+
this.createConfigFile();
3829
this.createMessagesFile();
30+
this.loadConfiguration();
31+
this.startTask();
32+
this.registerCommands();
33+
this.initializeMetrics();
3934

40-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= loading configuration =-");
41-
broadcastConfigurator = new BroadcastConfigurator(this);
42-
broadcastConfigurator.load();
43-
44-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= starting task =-");
45-
broadcastTask = new BroadcastTask(this, broadcastConfigurator.getBroadcastConfiguration());
46-
broadcastTask.start();
47-
48-
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "-= register commands =-");
49-
getCommand("spigotbroadcast").setExecutor(new BroadcastCommand(this));
50-
51-
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "sucessfully enabled SpigotBroadcast");
52-
53-
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "-------" + ChatColor.DARK_GRAY + " }");
54-
55-
Bukkit.getConsoleSender().sendMessage(" ");
56-
Bukkit.getConsoleSender().sendMessage(ChatColor.AQUA + "[ -------------------------------------------------------------- ]");
57-
Bukkit.getConsoleSender().sendMessage(" ");
35+
this.sendFooter();
5836
}
5937

6038
public void reload() {
@@ -63,14 +41,63 @@ public void reload() {
6341
this.broadcastTask.cancel();
6442
this.broadcastTask = null;
6543

66-
this.onEnable();
44+
this.load();
45+
}
46+
47+
private void registerCommands() {
48+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= register commands =-");
49+
this.getCommand("spigotbroadcast").setExecutor(new BroadcastCommand(this));
50+
}
51+
52+
private void startTask() {
53+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= starting task =-");
54+
broadcastTask = new BroadcastTask(this, broadcastConfigurator.getBroadcastConfiguration());
55+
broadcastTask.start();
56+
}
57+
58+
private void initializeMetrics() {
59+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= register metrics =-");
60+
new Metrics(this);
6761
}
6862

6963
public void createConfigFile() {
70-
saveResource("config.yml", false);
64+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= creating config.yml =-");
65+
this.saveResource("config.yml", false);
7166
}
7267

7368
public void createMessagesFile() {
74-
saveResource("messages.txt", false);
69+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= creating messages.txt =-");
70+
this.saveResource("messages.txt", false);
71+
}
72+
73+
private void loadConfiguration() {
74+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= loading configuration =-");
75+
broadcastConfigurator = new BroadcastConfigurator(this);
76+
broadcastConfigurator.load();
77+
}
78+
79+
private void sendHeader() {
80+
this.getLogger().log(Level.INFO, " ");
81+
this.getLogger().log(Level.INFO, ChatColor.AQUA + "[ -------------------------------------------------------------- ]");
82+
this.getLogger().log(Level.INFO, " ");
83+
this.getLogger().log(Level.INFO, ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "INFORMATIONS" + ChatColor.DARK_GRAY + " }");
84+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= SpigotBroadcast =- ");
85+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= Author: DevSnox =-");
86+
this.getLogger().log(Level.INFO, ChatColor.YELLOW + "-= Version: 1.9-RELEASE =-");
87+
this.getLogger().log(Level.INFO, ChatColor.DARK_RED + "Please report bugs on spigotmc.org per PM");
88+
this.getLogger().log(Level.INFO, ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "------------" + ChatColor.DARK_GRAY + " }");
89+
this.getLogger().log(Level.INFO, " ");
90+
this.getLogger().log(Level.INFO, ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "LOADING" + ChatColor.DARK_GRAY + " }");
91+
}
92+
93+
94+
private void sendFooter() {
95+
this.getLogger().log(Level.INFO, ChatColor.GREEN + "sucessfully enabled SpigotBroadcast");
96+
97+
this.getLogger().log(Level.INFO, ChatColor.DARK_GRAY + "{ " + ChatColor.GREEN + "-------" + ChatColor.DARK_GRAY + " }");
98+
99+
this.getLogger().log(Level.INFO, " ");
100+
this.getLogger().log(Level.INFO, ChatColor.AQUA + "[ -------------------------------------------------------------- ]");
101+
this.getLogger().log(Level.INFO, " ");
75102
}
76103
}

‎src/main/java/me/devsnox/spigotbroadcast/configuration/BroadcastConfiguration.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package me.devsnox.spigotbroadcast.configuration;
22

3-
import me.devsnox.spigotbroadcast.task.TickUnit;
4-
53
import java.util.List;
4+
import java.util.concurrent.TimeUnit;
65

76
public class BroadcastConfiguration {
87

98
private String prefix;
109
private Integer interval;
11-
private TickUnit tickUnit;
10+
private TimeUnit timeUnit;
1211
private List<String> messages;
1312

14-
public BroadcastConfiguration(String prefix, int interval, TickUnit tickUnit, List<String> messages) {
13+
public BroadcastConfiguration(String prefix, int interval, TimeUnit timeUnit, List<String> messages) {
1514
this.prefix = prefix;
1615
this.interval = Integer.valueOf(interval);
17-
this.tickUnit = tickUnit;
16+
this.timeUnit = timeUnit;
1817
this.messages = messages;
1918
}
2019

@@ -26,8 +25,8 @@ public Integer getInterval() {
2625
return interval;
2726
}
2827

29-
public TickUnit getTickUnit() {
30-
return tickUnit;
28+
public TimeUnit getTimeUnit() {
29+
return timeUnit;
3130
}
3231

3332
public List<String> getMessages() {

‎src/main/java/me/devsnox/spigotbroadcast/configuration/BroadcastConfigurator.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
import com.google.common.base.Charsets;
44
import me.devsnox.spigotbroadcast.SpigotBroadcast;
5-
import me.devsnox.spigotbroadcast.task.TickUnit;
65
import org.bukkit.Bukkit;
76
import org.bukkit.ChatColor;
87
import org.bukkit.configuration.InvalidConfigurationException;
9-
import org.bukkit.configuration.file.YamlConfiguration;
10-
import org.bukkit.plugin.Plugin;
118

129
import java.io.*;
1310
import java.util.ArrayList;
1411
import java.util.List;
12+
import java.util.concurrent.TimeUnit;
1513

1614
public class BroadcastConfigurator {
1715

@@ -51,15 +49,15 @@ public void load() {
5149
Bukkit.getConsoleSender().sendMessage(ChatColor.AQUA + "" + ChatColor.BOLD + " - IMPORTANT - ");
5250
}
5351

54-
TickUnit tickUnit = TickUnit.MINUTES;
52+
TimeUnit timeUnit = TimeUnit.MINUTES;
5553

5654
try {
57-
tickUnit = TickUnit.valueOf(yamlConfiguration.getString("timeunit"));
55+
timeUnit.valueOf(yamlConfiguration.getString("timeunit"));
5856
} catch (IllegalArgumentException exception) {
5957
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Error while trying to get timeunit!");
6058
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Valid timeunits are HOURS, MINUTES, SECONDS!");
6159

62-
yamlConfiguration.set("timeunit", TickUnit.MINUTES);
60+
yamlConfiguration.set("timeunit", timeUnit.MINUTES);
6361
try {
6462
yamlConfiguration.save(config);
6563
} catch (IOException e) {
@@ -69,7 +67,7 @@ public void load() {
6967
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "TimeUnit changed to MINUTES, you can change it in the config.yml!");
7068
}
7169

72-
broadcastConfiguration = new BroadcastConfiguration(yamlConfiguration.getString("prefix"), yamlConfiguration.getInt("interval"), tickUnit, yamlConfiguration.getStringList("messages"));
70+
broadcastConfiguration = new BroadcastConfiguration(yamlConfiguration.getString("prefix"), yamlConfiguration.getInt("interval"), timeUnit, yamlConfiguration.getStringList("messages"));
7371

7472
if(yamlConfiguration.getBoolean("enabled") == true) {
7573
List<String> lines = new ArrayList<>();

‎src/main/java/me/devsnox/spigotbroadcast/task/BroadcastTask.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import org.bukkit.ChatColor;
88
import org.bukkit.plugin.Plugin;
99

10+
import java.util.concurrent.TimeUnit;
11+
1012
public class BroadcastTask extends org.bukkit.scheduler.BukkitRunnable {
1113

1214
private Plugin plugin;
@@ -22,7 +24,7 @@ public BroadcastTask(Plugin plugin, BroadcastConfiguration broadcastConfiguratio
2224
}
2325

2426
public void start() {
25-
runTaskTimer(plugin, 0L, broadcastConfiguration.getInterval().intValue() * broadcastConfiguration.getTickUnit().getTicks());
27+
runTaskTimer(plugin, 0L, broadcastConfiguration.getTimeUnit().toSeconds(broadcastConfiguration.getInterval().intValue()) * 20);
2628
}
2729

2830
public void run() {

‎src/main/java/me/devsnox/spigotbroadcast/task/TickUnit.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/resources/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# [ --------------------------------------------------------------------------------------- ] #
33
# -= SpigotBroadcast =- #
44
# -= Author: DevSnox =- #
5-
# -= Version: 1.8 =- #
5+
# -= Version: 1.9-RELEASE =- #
66
# -= Contact: E-mail: me.devsnox@gmail.com Skype: live:chaos3729 Discord: DevSnox#5642 =- #
77
# -= Informations: #
88
# -= Please send Errors per PM on spigotmc.org =- #

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: SpigotBroadcast
22
author: DevSnox
3-
version: 1.8
3+
version: "1.9-RELEASE"
44
main: me.devsnox.spigotbroadcast.SpigotBroadcast
55
commands:
66
spigotbroadcast:

0 commit comments

Comments
 (0)