Skip to content

Commit

Permalink
Removed the reload command.
Browse files Browse the repository at this point in the history
Moved from my own threads over to bukkit's scheduler system.
AutoBroadcastMessage are still running from my own thread (will move
this later)
  • Loading branch information
Kiwz committed Dec 27, 2012
1 parent ff27d49 commit 11d9b9b
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 208 deletions.
10 changes: 0 additions & 10 deletions plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ commands:
permission: larvikgaming.restart
permission-message: You do not have <larvikgaming.restart> permission!
usage: Syntax error! Simply type /<lgrestart>.
lgreload:
description: Reloads this plugin.
aliases: [lgrl]
permission: larvikgaming.reload
permission-message: You do not have <larvikgaming.reload> permission!
usage: Syntax error! Simply type /<lgreload>.
lggroups:
description: Gets groups of players.
aliases: [lgg, groups]
Expand All @@ -46,7 +40,6 @@ permissions:
larvikgaming.test: true
larvikgaming.info: true
larvikgaming.restart: true
larvikgaming.reload: true
larvikgaming.groups: true
larvikgaming.freetp: true
larvikgaming.tab.*: true
Expand All @@ -56,9 +49,6 @@ permissions:
larvikgaming.restart:
description: Restarts the whole server.
default: op
larvikgaming.reload:
description: Reloads this plugin.
default: op
larvikgaming.groups:
description: Create a user.txt file that contains groups of players.
default: op
Expand Down
27 changes: 10 additions & 17 deletions src/net/kiwz/larvikgaming/Commands.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.kiwz.larvikgaming.utils.PlayerGroups;
import net.kiwz.larvikgaming.utils.StopServer;
import net.milkbowl.vault.economy.Economy;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
Expand All @@ -28,33 +29,21 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
sender.sendMessage(color + "</lginfo> Shows this information.");
sender.sendMessage(color + "</help larvikgaming> Show the help entries.");
sender.sendMessage(color + "</lgrestart> Will stop the server!");
sender.sendMessage(color + "</lgreload> Reloads this plugin.");
sender.sendMessage(color + "</lggroups> Create a user.txt file that contains groups of players.");
sender.sendMessage(color + "</restart> Gives information about time untill next restart.");
return true;
}

if (cmd.getName().equalsIgnoreCase("lgreload") && sender.hasPermission("larvikgaming.reload")) {
Bukkit.getPluginManager().disablePlugin(larvikGaming);
larvikGaming.reloadConfig();
Bukkit.getPluginManager().enablePlugin(larvikGaming);
if (sender instanceof Player) {
sender.sendMessage(color + "The LarivkGaming plugin is reloaded!");
}
else {
sender.sendMessage(LarvikGaming.name + color + "Plugin is reloaded!");
}
return true;
}

if (cmd.getName().equalsIgnoreCase("lgrestart") && sender.hasPermission("larvikgaming.restart")) {
StopServer.stopServer();
StopServer ss = new StopServer();
ss.stopServer();
return true;
}

if (cmd.getName().equalsIgnoreCase("lggroups") && sender.hasPermission("larvikgaming.groups")) {
String message = "";
message = PlayerGroups.refreshGroups();
PlayerGroups pg = new PlayerGroups();
message = pg.refreshGroups();
if (sender instanceof Player) {
sender.sendMessage(color + message);
}
Expand All @@ -81,7 +70,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
long start = System.currentTimeMillis();

// All testing stuff goes in here:


Economy econ = Bukkit.getServer().getServicesManager().getRegistration(Economy.class).getProvider();
econ.deleteBank("Tredep");


// All testing stuff ends here!

sender.sendMessage("Dette er 'test' kommandoen til larvikgaming! " + (System.currentTimeMillis() - start));
Expand Down
35 changes: 15 additions & 20 deletions src/net/kiwz/larvikgaming/LarvikGaming.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import net.kiwz.larvikgaming.listeners.LoginListener;
import net.kiwz.larvikgaming.logs.LogHandlers;
import net.kiwz.larvikgaming.runnables.RunAutoMessage;
import net.kiwz.larvikgaming.runnables.RunOnlinePlayers;
import net.kiwz.larvikgaming.runnables.RunPlayerGroups;
import net.kiwz.larvikgaming.runnables.RunStopServer;
import net.kiwz.larvikgaming.runnables.Threads;
import net.kiwz.larvikgaming.tasks.Schedules;
import net.kiwz.larvikgaming.utils.ConfigHeader;
import net.kiwz.larvikgaming.utils.MakeFolders;
import org.bukkit.Bukkit;
Expand All @@ -25,9 +23,6 @@ public class LarvikGaming extends JavaPlugin {
private Logger log = Logger.getLogger("Minecraft");
private PluginManager pm = Bukkit.getServer().getPluginManager();
private RunAutoMessage abm;
private RunOnlinePlayers op;
private RunPlayerGroups pg;
private RunStopServer ss;

public void onLoad() {
this.getConfig().options().copyDefaults(true);
Expand All @@ -40,38 +35,38 @@ public void onLoad() {
public void onEnable() {
Commands cmds = new Commands();
getCommand("lginfo").setExecutor(cmds);
getCommand("lgreload").setExecutor(cmds);
getCommand("lgrestart").setExecutor(cmds);
getCommand("lggroups").setExecutor(cmds);
getCommand("restart").setExecutor(cmds);
getCommand("lgtest").setExecutor(cmds);

ChatListener chat = new ChatListener();
pm.registerEvents(chat, this);

CommandListener cmd = new CommandListener();
pm.registerEvents(cmd, this);

LoginListener ll = new LoginListener();
pm.registerEvents(ll, this);

Schedules sche = new Schedules();
sche.PlayerGroups();
sche.OnlinePlayersLog();
sche.StopServer();
sche.StopServerMessage();

//////////////
abm = Threads.threadABM();
op = Threads.threadOP();
pg = Threads.threadPG();
ss = Threads.threadSS();
///////////////
log.info(name + "ENABLED!");
}

public void onDisable() {
public void onDisable() {
////////////
if (abm != null) {
abm.setGo(false);
}
if (op != null) {
op.setGo(false);
}
if (pg != null) {
pg.setGo(false);
}
if (ss != null) {
ss.setGo(false);
}
///////////////
log.info(name + "DISABLED!");
}
}
36 changes: 0 additions & 36 deletions src/net/kiwz/larvikgaming/runnables/RunOnlinePlayers.java

This file was deleted.

42 changes: 0 additions & 42 deletions src/net/kiwz/larvikgaming/runnables/RunPlayerGroups.java

This file was deleted.

55 changes: 0 additions & 55 deletions src/net/kiwz/larvikgaming/runnables/RunStopServer.java

This file was deleted.

21 changes: 0 additions & 21 deletions src/net/kiwz/larvikgaming/runnables/Threads.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,4 @@ public static RunAutoMessage threadABM() {
thread.start();
return run;
}

public static RunOnlinePlayers threadOP() {
RunOnlinePlayers run = new RunOnlinePlayers();
Thread thread = new Thread(run);
thread.start();
return run;
}

public static RunPlayerGroups threadPG() {
RunPlayerGroups run = new RunPlayerGroups();
Thread thread = new Thread(run);
thread.start();
return run;
}

public static RunStopServer threadSS() {
RunStopServer run = new RunStopServer();
Thread thread = new Thread(run);
thread.start();
return run;
}
}
59 changes: 59 additions & 0 deletions src/net/kiwz/larvikgaming/tasks/Schedules.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package net.kiwz.larvikgaming.tasks;

import net.kiwz.larvikgaming.utils.OnlinePlayers;
import net.kiwz.larvikgaming.utils.PlayerGroups;
import net.kiwz.larvikgaming.utils.StopServer;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.Plugin;

public class Schedules {
static Server server = Bukkit.getServer();
static Plugin larvikGaming = server.getPluginManager().getPlugin("LarvikGaming");
static FileConfiguration conf = larvikGaming.getConfig();
int permGroupsRefreshTime = conf.getInt("RefreshGroupInMin", 10) * 1200;
int onlinePlayersLogTime = conf.getInt("TimeBetweenOnlinePlayersLog", 10) * 1200;
int restartTime = conf.getInt("RestartTimeInHours", 6) * 20;//72000;

public void PlayerGroups() {
larvikGaming.getServer().getScheduler().scheduleSyncRepeatingTask(larvikGaming, new Runnable() {
@Override
public void run() {
PlayerGroups pg = new PlayerGroups();
pg.refreshGroups();
}
}, permGroupsRefreshTime - 600, permGroupsRefreshTime);
}

public void OnlinePlayersLog() {
larvikGaming.getServer().getScheduler().scheduleSyncRepeatingTask(larvikGaming, new Runnable() {
@Override
public void run() {
OnlinePlayers op = new OnlinePlayers();
op.makeFile();
}
}, onlinePlayersLogTime - 600, onlinePlayersLogTime);
}

public void StopServer() {
larvikGaming.getServer().getScheduler().scheduleSyncDelayedTask(larvikGaming, new Runnable() {
@Override
public void run() {
StopServer ss = new StopServer();
ss.stopServer();
}
}, restartTime);
}

public void StopServerMessage() {
larvikGaming.getServer().getScheduler().scheduleSyncDelayedTask(larvikGaming, new Runnable() {
@Override
public void run() {
server.broadcastMessage(ChatColor.DARK_PURPLE + "**Server-Restart in 2min**");
}
}, restartTime - 2400);
}
}
1 change: 1 addition & 0 deletions src/net/kiwz/larvikgaming/utils/OnlinePlayers.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.bukkit.plugin.Plugin;

public class OnlinePlayers {

public void makeFile() {
Plugin larvikGaming = Bukkit.getServer().getPluginManager().getPlugin("LarvikGaming");
String dir = larvikGaming.getConfig().getString("FileDir", "plugins/LarvikGaming/files") + "/misc/";
Expand Down
Loading

0 comments on commit 11d9b9b

Please sign in to comment.