exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 08:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dependency on vault

Browse Source
This commit is contained in:
Sn0wStorm
2013-11-21 17:36:03 +01:00
parent a8d6a78b69
commit 200f41f0c9
2 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/P.java
-13
View File
@@ -15,8 +15,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang.math.NumberUtils;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
@@ -46,8 +44,6 @@ public class P extends JavaPlugin {
public String language; public String language;
public LanguageReader languageReader; public LanguageReader languageReader;
public Permission permission = null;
@Override @Override
public void onEnable() { public void onEnable() {
p = this; p = this;
@@ -58,8 +54,6 @@ public class P extends JavaPlugin {
// Load LanguageReader // Load LanguageReader
languageReader = new LanguageReader(new File(p.getDataFolder(), "languages/" + language + ".yml")); languageReader = new LanguageReader(new File(p.getDataFolder(), "languages/" + language + ".yml"));
initPermissions();
// Listeners // Listeners
blockListener = new BlockListener(); blockListener = new BlockListener();
playerListener = new PlayerListener(); playerListener = new PlayerListener();
@@ -155,13 +149,6 @@ public class P extends JavaPlugin {
Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[Brewery] " + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg); Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[Brewery] " + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg);
} }
public void initPermissions() {
RegisteredServiceProvider<Permission> permissionProvider = getServer().getServicesManager().getRegistration(Permission.class);
if (permissionProvider != null) {
permission = permissionProvider.getProvider();
}
}
public void readConfig() { public void readConfig() {
File file = new File(p.getDataFolder(), "config.yml"); File file = new File(p.getDataFolder(), "config.yml");
src/com/dre/brewery/listeners/CommandListener.java
+17 -17
View File
@@ -31,7 +31,7 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("reload")) { } else if (cmd.equalsIgnoreCase("reload")) {
if (p.permission.has(sender, "brewery.cmd.reload")) { if (sender.hasPermission("brewery.cmd.reload")) {
p.reload(sender); p.reload(sender);
p.msg(sender, p.languageReader.get("CMD_Reload")); p.msg(sender, p.languageReader.get("CMD_Reload"));
} else { } else {
@@ -40,7 +40,7 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("wakeup")) { } else if (cmd.equalsIgnoreCase("wakeup")) {
if (p.permission.has(sender, "brewery.cmd.wakeup")) { if (sender.hasPermission("brewery.cmd.wakeup")) {
cmdWakeup(sender, args); cmdWakeup(sender, args);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
@@ -53,13 +53,13 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("info")) { } else if (cmd.equalsIgnoreCase("info")) {
if (args.length > 1) { if (args.length > 1) {
if (p.permission.has(sender, "brewery.cmd.infoOther")) { if (sender.hasPermission("brewery.cmd.infoOther")) {
cmdInfo(sender, args[1]); cmdInfo(sender, args[1]);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
} }
} else { } else {
if (p.permission.has(sender, "brewery.cmd.info")) { if (sender.hasPermission("brewery.cmd.info")) {
cmdInfo(sender, null); cmdInfo(sender, null);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
@@ -68,7 +68,7 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("copy") || cmd.equalsIgnoreCase("cp")) { } else if (cmd.equalsIgnoreCase("copy") || cmd.equalsIgnoreCase("cp")) {
if (p.permission.has(sender, "brewery.cmd.copy")) { if (sender.hasPermission("brewery.cmd.copy")) {
if (args.length > 1) { if (args.length > 1) {
cmdCopy(sender, p.parseInt(args[1])); cmdCopy(sender, p.parseInt(args[1]));
} else { } else {
@@ -80,7 +80,7 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("delete") || cmd.equalsIgnoreCase("rm")) { } else if (cmd.equalsIgnoreCase("delete") || cmd.equalsIgnoreCase("rm")) {
if (p.permission.has(sender, "brewery.cmd.delete")) { if (sender.hasPermission("brewery.cmd.delete")) {
cmdDelete(sender); cmdDelete(sender);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
@@ -88,7 +88,7 @@ public class CommandListener implements CommandExecutor {
} else if (cmd.equalsIgnoreCase("unlabel")) { } else if (cmd.equalsIgnoreCase("unlabel")) {
if (p.permission.has(sender, "brewery.cmd.unlabel")) { if (sender.hasPermission("brewery.cmd.unlabel")) {
cmdUnlabel(sender); cmdUnlabel(sender);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
@@ -99,11 +99,11 @@ public class CommandListener implements CommandExecutor {
if (p.getServer().getPlayerExact(cmd) != null || BPlayer.players.containsKey(cmd)) { if (p.getServer().getPlayerExact(cmd) != null || BPlayer.players.containsKey(cmd)) {
if (args.length == 1) { if (args.length == 1) {
if (p.permission.has(sender, "brewery.cmd.infoOther")) { if (sender.hasPermission("brewery.cmd.infoOther")) {
cmdInfo(sender, cmd); cmdInfo(sender, cmd);
} }
} else { } else {
if (p.permission.has(sender, "brewery.cmd.player")) { if (sender.hasPermission("brewery.cmd.player")) {
cmdPlayer(sender, args); cmdPlayer(sender, args);
} else { } else {
p.msg(sender, p.languageReader.get("Error_NoPermissions")); p.msg(sender, p.languageReader.get("Error_NoPermissions"));
@@ -143,31 +143,31 @@ public class CommandListener implements CommandExecutor {
ArrayList<String> cmds = new ArrayList<String>(); ArrayList<String> cmds = new ArrayList<String>();
cmds.add(p.languageReader.get("Help_Help")); cmds.add(p.languageReader.get("Help_Help"));
if (p.permission.has(sender, "brewery.cmd.player")) { if (sender.hasPermission("brewery.cmd.player")) {
cmds.add (p.languageReader.get("Help_Player")); cmds.add (p.languageReader.get("Help_Player"));
} }
if (p.permission.has(sender, "brewery.cmd.info")) { if (sender.hasPermission("brewery.cmd.info")) {
cmds.add (p.languageReader.get("Help_Info")); cmds.add (p.languageReader.get("Help_Info"));
} }
if (p.permission.has(sender, "brewery.cmd.unlabel")) { if (sender.hasPermission("brewery.cmd.unlabel")) {
cmds.add (p.languageReader.get("Help_UnLabel")); cmds.add (p.languageReader.get("Help_UnLabel"));
} }
if (p.permission.has(sender, "brewery.cmd.copy")) { if (sender.hasPermission("brewery.cmd.copy")) {
cmds.add (p.languageReader.get("Help_Copy")); cmds.add (p.languageReader.get("Help_Copy"));
} }
if (p.permission.has(sender, "brewery.cmd.delete")) { if (sender.hasPermission("brewery.cmd.delete")) {
cmds.add (p.languageReader.get("Help_Delete")); cmds.add (p.languageReader.get("Help_Delete"));
} }
if (p.permission.has(sender, "brewery.cmd.infoOther")) { if (sender.hasPermission("brewery.cmd.infoOther")) {
cmds.add (p.languageReader.get("Help_InfoOther")); cmds.add (p.languageReader.get("Help_InfoOther"));
} }
if (p.permission.has(sender, "brewery.cmd.wakeup")) { if (sender.hasPermission("brewery.cmd.wakeup")) {
cmds.add(p.languageReader.get("Help_Wakeup")); cmds.add(p.languageReader.get("Help_Wakeup"));
cmds.add(p.languageReader.get("Help_WakeupList")); cmds.add(p.languageReader.get("Help_WakeupList"));
cmds.add(p.languageReader.get("Help_WakeupCheck")); cmds.add(p.languageReader.get("Help_WakeupCheck"));
@@ -176,7 +176,7 @@ public class CommandListener implements CommandExecutor {
cmds.add(p.languageReader.get("Help_WakeupRemove")); cmds.add(p.languageReader.get("Help_WakeupRemove"));
} }
if (p.permission.has(sender, "brewery.cmd.reload")) { if (sender.hasPermission("brewery.cmd.reload")) {
cmds.add(p.languageReader.get("Help_Reload")); cmds.add(p.languageReader.get("Help_Reload"));
} }