From 05c5c36f47282a25880047bf6b2ce08c0635929d Mon Sep 17 00:00:00 2001 From: OverCaste Date: Sat, 20 Jun 2015 22:25:56 -0500 Subject: [PATCH] Fixed formatting, and other stuff like licenses. I guess those changed out from under me. --- ...missions.jar => overpermissions-2.0.0.jar} | Bin 297202 -> 297187 bytes pom.xml | 4 +- .../chat/plugins/Chat_OverPermissions.java | 105 ++++++++---------- .../plugins/Permission_OverPermissions.java | 81 +++++++------- 4 files changed, 88 insertions(+), 102 deletions(-) rename lib/{overpermissions.jar => overpermissions-2.0.0.jar} (87%) diff --git a/lib/overpermissions.jar b/lib/overpermissions-2.0.0.jar similarity index 87% rename from lib/overpermissions.jar rename to lib/overpermissions-2.0.0.jar index 7702d22fe081125c6572aca0b6a306b8d89e9fe2..05d7aff5922aaa58f9ecb42752a50616bce44d91 100644 GIT binary patch delta 14235 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 Tu>|m{hkzE&*d65E6xRO%%5V2W delta 14143 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 diff --git a/pom.xml b/pom.xml index 7dfd25c..0876966 100644 --- a/pom.xml +++ b/pom.xml @@ -407,10 +407,10 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms com.overmc overpermissions - 1.0.5 + 2.0.0 true system - ${project.basedir}/lib/overpermissions.jar + ${project.basedir}/lib/overpermissions-2.0.0.jar diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java index 97c4409..e2cddca 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java @@ -1,14 +1,31 @@ +/* This file is part of Vault. + Vault is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + Vault is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public License + along with Vault. If not, see . +*/ package net.milkbowl.vault.chat.plugins; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.permission.Permission; -import org.bukkit.event.*; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; -import com.overmc.overpermissions.api.*; +import com.overmc.overpermissions.api.GroupManager; +import com.overmc.overpermissions.api.PermissionGroup; +import com.overmc.overpermissions.api.PermissionUser; +import com.overmc.overpermissions.api.UserManager; import com.overmc.overpermissions.internal.OverPermissions; public class Chat_OverPermissions extends Chat { @@ -17,8 +34,7 @@ public class Chat_OverPermissions extends Chat { private UserManager userManager; private GroupManager groupManager; - public Chat_OverPermissions(Plugin plugin, Permission perms) - { + public Chat_OverPermissions(Plugin plugin, Permission perms) { super(perms); this.plugin = plugin; @@ -36,68 +52,57 @@ public class Chat_OverPermissions extends Chat { } @Override - public String getName( ) - { + public String getName( ) { return "OverPermissions"; } @Override - public boolean isEnabled( ) - { + public boolean isEnabled( ) { return overPerms != null; } @Override - public String getPlayerPrefix(String world, String player) - { + public String getPlayerPrefix(String world, String player) { return getPlayerInfoString(world, player, "prefix", ""); } @Override - public void setPlayerPrefix(String world, String player, String prefix) - { + public void setPlayerPrefix(String world, String player, String prefix) { setPlayerInfoString(world, player, "prefix", prefix); } @Override - public String getPlayerSuffix(String world, String player) - { + public String getPlayerSuffix(String world, String player) { return getPlayerInfoString(world, player, "suffix", ""); } @Override - public void setPlayerSuffix(String world, String player, String suffix) - { + public void setPlayerSuffix(String world, String player, String suffix) { setPlayerInfoString(world, player, "suffix", suffix); } @Override - public String getGroupPrefix(String world, String group) - { + public String getGroupPrefix(String world, String group) { return getGroupInfoString(world, group, "prefix", ""); } @Override - public void setGroupPrefix(String world, String group, String prefix) - { + public void setGroupPrefix(String world, String group, String prefix) { setGroupInfoString(world, group, "prefix", prefix); } @Override - public String getGroupSuffix(String world, String group) - { + public String getGroupSuffix(String world, String group) { return getGroupInfoString(world, group, "suffix", ""); } @Override - public void setGroupSuffix(String world, String group, String suffix) - { + public void setGroupSuffix(String world, String group, String suffix) { setGroupInfoString(world, group, "prefix", suffix); } @Override - public int getPlayerInfoInteger(String world, String player, String node, int defaultValue) - { + public int getPlayerInfoInteger(String world, String player, String node, int defaultValue) { String s = getPlayerInfoString(world, player, node, null); if (s == null) { return defaultValue; @@ -111,14 +116,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setPlayerInfoInteger(String world, String player, String node, int value) - { + public void setPlayerInfoInteger(String world, String player, String node, int value) { setPlayerInfoString(world, player, node, String.valueOf(value)); } @Override - public int getGroupInfoInteger(String world, String group, String node, int defaultValue) - { + public int getGroupInfoInteger(String world, String group, String node, int defaultValue) { String s = getGroupInfoString(world, group, node, null); if (s == null) { return defaultValue; @@ -132,14 +135,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setGroupInfoInteger(String world, String group, String node, int value) - { + public void setGroupInfoInteger(String world, String group, String node, int value) { setGroupInfoString(world, group, node, String.valueOf(value)); } @Override - public double getPlayerInfoDouble(String world, String player, String node, double defaultValue) - { + public double getPlayerInfoDouble(String world, String player, String node, double defaultValue) { String s = getPlayerInfoString(world, player, node, null); if (s == null) { return defaultValue; @@ -153,14 +154,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setPlayerInfoDouble(String world, String player, String node, double value) - { + public void setPlayerInfoDouble(String world, String player, String node, double value) { setPlayerInfoString(world, player, node, String.valueOf(value)); } @Override - public double getGroupInfoDouble(String world, String group, String node, double defaultValue) - { + public double getGroupInfoDouble(String world, String group, String node, double defaultValue) { String s = getGroupInfoString(world, group, node, null); if (s == null) { return defaultValue; @@ -174,14 +173,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setGroupInfoDouble(String world, String group, String node, double value) - { + public void setGroupInfoDouble(String world, String group, String node, double value) { setGroupInfoString(world, group, node, String.valueOf(value)); } @Override - public boolean getPlayerInfoBoolean(String world, String player, String node, boolean defaultValue) - { + public boolean getPlayerInfoBoolean(String world, String player, String node, boolean defaultValue) { String s = getPlayerInfoString(world, player, node, null); if (s == null) { return defaultValue; @@ -191,14 +188,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setPlayerInfoBoolean(String world, String player, String node, boolean value) - { + public void setPlayerInfoBoolean(String world, String player, String node, boolean value) { setPlayerInfoString(world, player, node, String.valueOf(value)); } @Override - public boolean getGroupInfoBoolean(String world, String group, String node, boolean defaultValue) - { + public boolean getGroupInfoBoolean(String world, String group, String node, boolean defaultValue) { String s = getGroupInfoString(world, group, node, null); if (s == null) { return defaultValue; @@ -208,14 +203,12 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setGroupInfoBoolean(String world, String group, String node, boolean value) - { + public void setGroupInfoBoolean(String world, String group, String node, boolean value) { setGroupInfoString(world, group, node, String.valueOf(value)); } @Override - public String getPlayerInfoString(String world, String playerName, String node, String defaultValue) - { + public String getPlayerInfoString(String world, String playerName, String node, String defaultValue) { if (!userManager.doesUserExist(playerName)) { return defaultValue; } @@ -234,8 +227,7 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setPlayerInfoString(String world, String playerName, String node, String value) - { + public void setPlayerInfoString(String world, String playerName, String node, String value) { if (!userManager.canUserExist(playerName)) { return; } @@ -256,8 +248,7 @@ public class Chat_OverPermissions extends Chat { } @Override - public String getGroupInfoString(String world, String groupName, String node, String defaultValue) - { + public String getGroupInfoString(String world, String groupName, String node, String defaultValue) { if (!groupManager.doesGroupExist(groupName)) { return defaultValue; } @@ -276,8 +267,7 @@ public class Chat_OverPermissions extends Chat { } @Override - public void setGroupInfoString(String world, String groupName, String node, String value) - { + public void setGroupInfoString(String world, String groupName, String node, String value) { if (!overPerms.getGroupManager().doesGroupExist(groupName)) { return; } @@ -297,8 +287,7 @@ public class Chat_OverPermissions extends Chat { } } - public class PermissionServerListener implements Listener - { + public class PermissionServerListener implements Listener { Chat_OverPermissions chat = null; public PermissionServerListener(Chat_OverPermissions chat) { diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_OverPermissions.java b/src/net/milkbowl/vault/permission/plugins/Permission_OverPermissions.java index 2a528f3..723df68 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_OverPermissions.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_OverPermissions.java @@ -1,3 +1,15 @@ +/* This file is part of Vault. + Vault is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + Vault is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public License + along with Vault. If not, see . +*/ package net.milkbowl.vault.permission.plugins; import java.util.ArrayList; @@ -5,12 +17,17 @@ import java.util.ArrayList; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; -import org.bukkit.event.*; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; -import com.overmc.overpermissions.api.*; +import com.overmc.overpermissions.api.GroupManager; +import com.overmc.overpermissions.api.PermissionGroup; +import com.overmc.overpermissions.api.PermissionUser; +import com.overmc.overpermissions.api.UserManager; import com.overmc.overpermissions.internal.OverPermissions; public class Permission_OverPermissions extends Permission { @@ -20,8 +37,7 @@ public class Permission_OverPermissions extends Permission { private UserManager userManager; private GroupManager groupManager; - public Permission_OverPermissions(Plugin plugin) - { + public Permission_OverPermissions(Plugin plugin) { super.plugin = plugin; Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin); @@ -37,20 +53,17 @@ public class Permission_OverPermissions extends Permission { } @Override - public String getName( ) - { + public String getName( ) { return name; } @Override - public boolean isEnabled( ) - { + public boolean isEnabled( ) { return (overPerms != null) && (overPerms.isEnabled()); } @Override - public boolean playerHas(String worldName, String playerName, String permission) - { + public boolean playerHas(String worldName, String playerName, String permission) { if (!userManager.doesUserExist(playerName)) { return false; } @@ -58,8 +71,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerAdd(String worldName, String playerName, String permission) - { + public boolean playerAdd(String worldName, String playerName, String permission) { if (!userManager.canUserExist(playerName)) { return false; } @@ -67,8 +79,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerRemove(String worldName, String playerName, String permission) - { + public boolean playerRemove(String worldName, String playerName, String permission) { if (!userManager.canUserExist(playerName)) { return false; } @@ -76,8 +87,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean groupHas(String worldName, String groupName, String permission) - { + public boolean groupHas(String worldName, String groupName, String permission) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -85,8 +95,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean groupAdd(String worldName, String groupName, String permission) - { + public boolean groupAdd(String worldName, String groupName, String permission) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -98,8 +107,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean groupRemove(String worldName, String groupName, String permission) - { + public boolean groupRemove(String worldName, String groupName, String permission) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -111,8 +119,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerInGroup(String worldName, String playerName, String groupName) - { + public boolean playerInGroup(String worldName, String playerName, String groupName) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -123,8 +130,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerAddGroup(String worldName, String playerName, String groupName) - { + public boolean playerAddGroup(String worldName, String playerName, String groupName) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -135,8 +141,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerRemoveGroup(String worldName, String playerName, String groupName) - { + public boolean playerRemoveGroup(String worldName, String playerName, String groupName) { if (!groupManager.doesGroupExist(groupName)) { return false; } @@ -147,8 +152,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public String[] getPlayerGroups(String worldName, String playerName) - { + public String[] getPlayerGroups(String worldName, String playerName) { ArrayList ret = new ArrayList(); if (!userManager.doesUserExist(playerName)) { return new String[0]; @@ -161,8 +165,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public String getPrimaryGroup(String worldName, String playerName) - { + public String getPrimaryGroup(String worldName, String playerName) { String[] playerGroups = getPlayerGroups(worldName, playerName); if (playerGroups.length == 0) { return null; @@ -171,8 +174,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerAddTransient(String world, String playerName, String permission) - { + public boolean playerAddTransient(String world, String playerName, String permission) { if (!userManager.doesUserExist(playerName)) { // Can't add transient permissions to an offline player. return false; } @@ -181,8 +183,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean playerRemoveTransient(String world, String playerName, String permission) - { + public boolean playerRemoveTransient(String world, String playerName, String permission) { if (!userManager.doesUserExist(playerName)) { return false; } @@ -191,8 +192,7 @@ public class Permission_OverPermissions extends Permission { } @Override - public String[] getGroups( ) - { + public String[] getGroups( ) { ArrayList groupNames = new ArrayList(); for (PermissionGroup s : groupManager.getGroups()) { groupNames.add(s.getName()); @@ -201,20 +201,17 @@ public class Permission_OverPermissions extends Permission { } @Override - public boolean hasSuperPermsCompat( ) - { + public boolean hasSuperPermsCompat( ) { return true; } @Override - public boolean hasGroupSupport( ) - { + public boolean hasGroupSupport( ) { return true; } public class PermissionServerListener - implements Listener - { + implements Listener { Permission_OverPermissions permission = null; public PermissionServerListener(Permission_OverPermissions permission) {