Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove native support for ancient chat and permissions plugins #930

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove native support for ancient chat and permissions plugins #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,33 +76,16 @@ to add your own connector within your plugin as Vault no longer maintains
new plugin connectors.

* Permissions
- bPermissions
- bPermissions 2 (https://dev.bukkit.org/projects/bpermissions)
- DroxPerms
- Group Manager (Essentials) (https://forums.bukkit.org/threads/15312/)
- LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
- OverPermissions (https://dev.bukkit.org/projects/overpermissions)
- Permissions 3 (https://forums.bukkit.org/threads/18430/)
- PermissionsBukkit
- Permissions Ex (PEX) (https://forums.bukkit.org/threads/18140/)
- Privileges
- rscPermissions
- SimplyPerms
- SuperPerms (Bukkit's default)
- TotalPermissions (https://dev.bukkit.org/projects/totalpermissions)
- XPerms
- zPermissions

* Chat
- bPermissions
- bPermissions 2 (https://dev.bukkit.org/projects/bpermissions)
- Group Manager (Essentials) (https://forums.bukkit.org/threads/15312/)
- iChat
- LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
- mChat
- mChatSuite
- OverPermissions (https://dev.bukkit.org/projects/overpermissions)
- Permissions 3 (https://forums.bukkit.org/threads/18430/)
- Permissions Ex (PEX) (https://forums.bukkit.org/threads/18140/)
- rscPermissions
- TotalPermissions (https://dev.bukkit.org/projects/totalpermissions)
- zPermissions
Binary file removed lib/CommandsEX.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/DroxPerms.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/KPerms.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/Permissions.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/PermissionsBukkit.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/Privileges.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/SimplyPerms.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/Starburst.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/TotalPermissions.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/Xperms.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/bpermissions.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/iChat.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/mChat.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/mChatSuite.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/overpermissions-2.0.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/rscPermissions.jar
View file
Open in desktop
Binary file not shown.
128 changes: 0 additions & 128 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,38 +85,6 @@
<artifactId>bstats-bukkit</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>de.hydrox.bukkit</groupId>
<artifactId>DroxPerms</artifactId>
<version>0.5.0</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/DroxPerms.jar</systemPath>
</dependency>
<dependency>
<groupId>net.krinsoft</groupId>
<artifactId>Privileges</artifactId>
<version>1.8.1</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Privileges.jar</systemPath>
</dependency>
<dependency>
<groupId>de.bananaco.permissions.Permissions</groupId>
<artifactId>bPermissions</artifactId>
<version>2.0.9a</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/bpermissions.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.sebc722</groupId>
<artifactId>xPerms</artifactId>
<version>1.1</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Xperms.jar</systemPath>
</dependency>
<dependency>
<groupId>org.anjocaido.groupmanager.GroupManager</groupId>
<artifactId>GroupManager</artifactId>
Expand All @@ -125,46 +93,6 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/EssentialsGroupManager.jar</systemPath>
</dependency>
<dependency>
<groupId>net.TheDgtl.iChat.iChat</groupId>
<artifactId>iChat</artifactId>
<version>2.5.7</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/iChat.jar</systemPath>
</dependency>
<dependency>
<groupId>net.D3GN.MiracleM4n.mChat.mChat</groupId>
<artifactId>mChat</artifactId>
<version>1.8.5</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/mChat.jar</systemPath>
</dependency>
<dependency>
<groupId>in.mDev</groupId>
<artifactId>mChatSuite</artifactId>
<version>DEV-b275</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/mChatSuite.jar</systemPath>
</dependency>
<dependency>
<groupId>com.nijikokun.bukkit.Permissions.Permissions</groupId>
<artifactId>Permissions</artifactId>
<version>3.1.6</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Permissions.jar</systemPath>
</dependency>
<dependency>
<groupId>com.platymuus.bukkit.permissions.PermissionsPlugin</groupId>
<artifactId>PermissionsBukkit</artifactId>
<version>2.3</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/PermissionsBukkit.jar</systemPath>
</dependency>
<dependency>
<groupId>ru.tehkode</groupId>
<artifactId>PermissionsEx</artifactId>
Expand All @@ -181,62 +109,6 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/bpermissions25.jar</systemPath>
</dependency>
<dependency>
<groupId>com.dthielke.starburst</groupId>
<artifactId>Starburst</artifactId>
<version>1.0.0</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Starburst.jar</systemPath>
</dependency>
<dependency>
<groupId>net.crystalyx.bukkit.simplyperms</groupId>
<artifactId>SimplyPerms</artifactId>
<version>1.6.2</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/SimplyPerms.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.zathrus_writer.commandsex</groupId>
<artifactId>CommandsEX</artifactId>
<version>1.98</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/CommandsEX.jar</systemPath>
</dependency>
<dependency>
<groupId>net.ae97</groupId>
<artifactId>TotalPermissions</artifactId>
<version>0.3.1</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/TotalPermissions.jar</systemPath>
</dependency>
<dependency>
<groupId>ru.simsonic</groupId>
<artifactId>rscPermissions</artifactId>
<version>1.0</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rscPermissions.jar</systemPath>
</dependency>
<dependency>
<groupId>KPerms</groupId>
<artifactId>KPerms</artifactId>
<version>1.0</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/KPerms.jar</systemPath>
</dependency>
<dependency>
<groupId>com.overmc</groupId>
<artifactId>overpermissions</artifactId>
<version>2.0.0</version>
<optional>true</optional>
<scope>system</scope>
<systemPath>${project.basedir}/lib/overpermissions-2.0.0.jar</systemPath>
</dependency>
</dependencies>

<build>
Expand Down
89 changes: 0 additions & 89 deletions src/net/milkbowl/vault/Vault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,15 @@
import java.util.logging.Logger;

import net.milkbowl.vault.chat.Chat;
import net.milkbowl.vault.chat.plugins.Chat_DroxPerms;
import net.milkbowl.vault.chat.plugins.Chat_GroupManager;
import net.milkbowl.vault.chat.plugins.Chat_OverPermissions;
import net.milkbowl.vault.chat.plugins.Chat_Permissions3;
import net.milkbowl.vault.chat.plugins.Chat_PermissionsEx;
import net.milkbowl.vault.chat.plugins.Chat_Privileges;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions2;
import net.milkbowl.vault.chat.plugins.Chat_iChat;
import net.milkbowl.vault.chat.plugins.Chat_mChat;
import net.milkbowl.vault.chat.plugins.Chat_mChatSuite;
import net.milkbowl.vault.chat.plugins.Chat_rscPermissions;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
import net.milkbowl.vault.permission.plugins.Permission_DroxPerms;
import net.milkbowl.vault.permission.plugins.Permission_GroupManager;
import net.milkbowl.vault.permission.plugins.Permission_OverPermissions;
import net.milkbowl.vault.permission.plugins.Permission_Permissions3;
import net.milkbowl.vault.permission.plugins.Permission_PermissionsBukkit;
import net.milkbowl.vault.permission.plugins.Permission_PermissionsEx;
import net.milkbowl.vault.permission.plugins.Permission_Privileges;
import net.milkbowl.vault.permission.plugins.Permission_SimplyPerms;
import net.milkbowl.vault.permission.plugins.Permission_Starburst;
import net.milkbowl.vault.permission.plugins.Permission_SuperPerms;
import net.milkbowl.vault.permission.plugins.Permission_Xperms;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions2;
import net.milkbowl.vault.permission.plugins.Permission_TotalPermissions;
import net.milkbowl.vault.permission.plugins.Permission_rscPermissions;
import net.milkbowl.vault.permission.plugins.Permission_KPerms;

import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
Expand All @@ -76,8 +55,6 @@
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;

import net.milkbowl.vault.chat.plugins.Chat_TotalPermissions;

public class Vault extends JavaPlugin {

private static final String VAULT_BUKKIT_URL = "https://dev.bukkit.org/projects/Vault";
Expand Down Expand Up @@ -169,92 +146,26 @@ private void loadChat() {
// Try to load PermissionsEx
hookChat("PermissionsEx", Chat_PermissionsEx.class, ServicePriority.Highest, "ru.tehkode.permissions.bukkit.PermissionsEx");

// Try to load mChatSuite
hookChat("mChatSuite", Chat_mChatSuite.class, ServicePriority.Highest, "in.mDev.MiracleM4n.mChatSuite.mChatSuite");

// Try to load mChat
hookChat("mChat", Chat_mChat.class, ServicePriority.Highest, "net.D3GN.MiracleM4n.mChat");

// Try to load OverPermissions
hookChat("OverPermissions", Chat_OverPermissions.class, ServicePriority.Highest, "com.overmc.overpermissions.internal.OverPermissions");

// Try to load DroxPerms Chat
hookChat("DroxPerms", Chat_DroxPerms.class, ServicePriority.Lowest, "de.hydrox.bukkit.DroxPerms.DroxPerms");

// Try to load bPermssions 2
hookChat("bPermssions2", Chat_bPermissions2.class, ServicePriority.Highest, "de.bananaco.bpermissions.api.ApiLayer");

// Try to load bPermissions 1
hookChat("bPermissions", Chat_bPermissions.class, ServicePriority.Normal, "de.bananaco.permissions.info.InfoReader");

// Try to load GroupManager
hookChat("GroupManager", Chat_GroupManager.class, ServicePriority.Normal, "org.anjocaido.groupmanager.GroupManager");

// Try to load Permissions 3 (Yeti)
hookChat("Permissions3", Chat_Permissions3.class, ServicePriority.Normal, "com.nijiko.permissions.ModularControl");

// Try to load iChat
hookChat("iChat", Chat_iChat.class, ServicePriority.Low, "net.TheDgtl.iChat.iChat");

// Try to load Privileges
hookChat("Privileges", Chat_Privileges.class, ServicePriority.Normal, "net.krinsoft.privileges.Privileges");

// Try to load rscPermissions
hookChat("rscPermissions", Chat_rscPermissions.class, ServicePriority.Normal, "ru.simsonic.rscPermissions.MainPluginClass");

//Try to load TotalPermissions
hookChat("TotalPermissions", Chat_TotalPermissions.class, ServicePriority.Normal, "net.ar97.totalpermissions.TotalPermissions");
}

/**
* Attempts to load Permission Addons
*/
private void loadPermission() {
// Try to load Starburst
hookPermission("Starburst", Permission_Starburst.class, ServicePriority.Highest, "com.dthielke.starburst.StarburstPlugin");

// Try to load PermissionsEx
hookPermission("PermissionsEx", Permission_PermissionsEx.class, ServicePriority.Highest, "ru.tehkode.permissions.bukkit.PermissionsEx");

// Try to load OverPermissions
hookPermission("OverPermissions", Permission_OverPermissions.class, ServicePriority.Highest, "com.overmc.overpermissions.internal.OverPermissions");

// Try to load PermissionsBukkit
hookPermission("PermissionsBukkit", Permission_PermissionsBukkit.class, ServicePriority.Normal, "com.platymuus.bukkit.permissions.PermissionsPlugin");

// Try to load DroxPerms
hookPermission("DroxPerms", Permission_DroxPerms.class, ServicePriority.High, "de.hydrox.bukkit.DroxPerms.DroxPerms");

// Try to load SimplyPerms
hookPermission("SimplyPerms", Permission_SimplyPerms.class, ServicePriority.Highest, "net.crystalyx.bukkit.simplyperms.SimplyPlugin");

// Try to load bPermissions2
hookPermission("bPermissions 2", Permission_bPermissions2.class, ServicePriority.Highest, "de.bananaco.bpermissions.api.WorldManager");

// Try to load Privileges
hookPermission("Privileges", Permission_Privileges.class, ServicePriority.Highest, "net.krinsoft.privileges.Privileges");

// Try to load bPermissions
hookPermission("bPermissions", Permission_bPermissions.class, ServicePriority.High, "de.bananaco.permissions.SuperPermissionHandler");

// Try to load GroupManager
hookPermission("GroupManager", Permission_GroupManager.class, ServicePriority.High, "org.anjocaido.groupmanager.GroupManager");

// Try to load Permissions 3 (Yeti)
hookPermission("Permissions 3 (Yeti)", Permission_Permissions3.class, ServicePriority.Normal, "com.nijiko.permissions.ModularControl");

// Try to load Xperms
hookPermission("Xperms", Permission_Xperms.class, ServicePriority.Low, "com.github.sebc722.Xperms");

//Try to load TotalPermissions
hookPermission("TotalPermissions", Permission_TotalPermissions.class, ServicePriority.Normal, "net.ae97.totalpermissions.TotalPermissions");

// Try to load rscPermissions
hookPermission("rscPermissions", Permission_rscPermissions.class, ServicePriority.Normal, "ru.simsonic.rscPermissions.MainPluginClass");

// Try to load KPerms
hookPermission("KPerms", Permission_KPerms.class, ServicePriority.Normal, "com.lightniinja.kperms.KPermsPlugin");

Permission perms = new Permission_SuperPerms(this);
sm.register(Permission.class, perms, this, ServicePriority.Lowest);
log.info(String.format("[Permission] SuperPermissions loaded as backup permission system."));
Expand Down
Loading