Skip to content

Commit

Permalink
Remove bPermissions support
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgdc3
sgdc3 committed May 2, 2019
1 parent 2aee86f commit ce4bb43
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 98 deletions.
130 changes: 108 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,36 +382,102 @@
<repository>
<id>spigotmc-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- CodeMC Repo (Contains many required libraries) -->
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- EssentialsX Repo -->
<repository>
<id>enderzone-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything</url>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- ProtocolLib Repo -->
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/content/groups/public/</url>
<id>dmulloy2-repo-releases</id>
<url>http://repo.dmulloy2.net/nexus/repository/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>dmulloy2-repo-snapshots</id>
<url>http://repo.dmulloy2.net/nexus/repository/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- Multiverse Repo -->
<repository>
<id>onarandombox-repo</id>
<url>http://repo.onarandombox.com/content/groups/public</url>
<id>onarandombox-repo-releases</id>
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>onarandombox-repo-snapshots</id>
<url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- Vault Repo -->
<repository>
<id>vault-repo</id>
<id>vault-repo-releases</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>vault-repo-snapshots</id>
<url>http://nexus.hc.to/content/repositories/pub_snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

Expand Down Expand Up @@ -622,20 +688,6 @@
</exclusions>
</dependency>

<!-- bPermissions plugin -->
<dependency>
<groupId>de.bananaco</groupId>
<artifactId>bPermissions</artifactId>
<version>2.12-DEV</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- zPermissions plugin -->
<dependency>
<groupId>org.tyrannyofheaven.bukkit</groupId>
Expand Down Expand Up @@ -672,7 +724,7 @@
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>2.6.0</version>
<version>3.0.0-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
<exclusions>
Expand Down Expand Up @@ -735,8 +787,42 @@
<dependency>
<groupId>net.ess3</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.15.0</version>
<version>2.16.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>NMSProvider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>UpdatedMetaProvider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>1_8_R1Provider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>1_8_R2Provider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>LegacyProvider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>ReflectionProvider</artifactId>
</exclusion>
<exclusion>
<groupId>net.ess3</groupId>
<artifactId>FlattenedProvider</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- BCrypt implementation -->
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/fr/xephi/authme/permission/PermissionsManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.listener.JoiningPlayer;
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
import fr.xephi.authme.permission.handlers.LuckPermsHandler;
import fr.xephi.authme.permission.handlers.PermissionHandler;
import fr.xephi.authme.permission.handlers.PermissionHandlerException;
Expand Down Expand Up @@ -139,8 +138,6 @@ private PermissionHandler createPermissionHandler(PermissionsSystemType type) th
return new ZPermissionsHandler();
case VAULT:
return new VaultHandler(server);
case B_PERMISSIONS:
return new BPermissionsHandler();
default:
throw new IllegalStateException("Unhandled permission type '" + type + "'");
}
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ public enum PermissionsSystemType {
*/
PERMISSIONS_EX("PermissionsEx", "PermissionsEx"),

/**
* bPermissions.
*/
B_PERMISSIONS("bPermissions", "bPermissions"),

/**
* zPermissions.
*/
Expand Down
62 changes: 0 additions & 62 deletions src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java
View file

This file was deleted.

5 changes: 1 addition & 4 deletions src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
import fr.xephi.authme.permission.handlers.LuckPermsHandler;
import fr.xephi.authme.permission.handlers.PermissionHandler;
import fr.xephi.authme.permission.handlers.PermissionsExHandler;
Expand Down Expand Up @@ -33,7 +32,6 @@
import java.util.stream.Collectors;

import static com.google.common.collect.Sets.newHashSet;
import static fr.xephi.authme.permission.PermissionsSystemType.B_PERMISSIONS;
import static fr.xephi.authme.permission.PermissionsSystemType.LUCK_PERMS;
import static fr.xephi.authme.permission.PermissionsSystemType.PERMISSIONS_EX;
import static fr.xephi.authme.permission.PermissionsSystemType.VAULT;
Expand Down Expand Up @@ -147,7 +145,6 @@ public static Collection<Object[]> createParameters() {
Map<PermissionsSystemType, Class<?>> handlersByPermissionSystemType = ImmutableMap.of(
LUCK_PERMS, LuckPermsHandler.class,
PERMISSIONS_EX, PermissionsExHandler.class,
B_PERMISSIONS, BPermissionsHandler.class,
Z_PERMISSIONS, ZPermissionsHandler.class,
VAULT, VaultHandler.class);

Expand Down Expand Up @@ -175,7 +172,7 @@ private void setUpForPermissionSystemTest() {
given(servicesManager.load(ZPermissionsService.class)).willReturn(zPermissionsService);
} else if (permissionsSystemType == VAULT) {
setUpForVault();
} else if (permissionsSystemType != B_PERMISSIONS) {
} else {
throw new IllegalStateException("Unhandled permission systems type: " + permissionsSystemType);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/tools/helptranslation/HelpTranslationVerifier.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package tools.helptranslation;

import com.google.common.collect.Sets;
import de.bananaco.bpermissions.imp.YamlConfiguration;
import fr.xephi.authme.command.CommandDescription;
import fr.xephi.authme.command.CommandInitializer;
import fr.xephi.authme.command.CommandUtils;
import fr.xephi.authme.command.help.HelpMessage;
import fr.xephi.authme.command.help.HelpSection;
import org.bukkit.configuration.MemorySection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import java.io.File;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/tools/messages/VerifyMessagesTask.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tools.messages;

import com.google.common.collect.Multimap;
import de.bananaco.bpermissions.imp.YamlConfiguration;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.util.StringUtils;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import tools.utils.ToolTask;
import tools.utils.ToolsConstants;

Expand Down

3 comments on commit ce4bb43

@ljacqu
Copy link
Member

@ljacqu ljacqu commented on ce4bb43 May 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you add an entry to the breaking changes for this?

@sgdc3
Copy link
Member Author

@sgdc3 sgdc3 commented on ce4bb43 May 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you add an entry to the breaking changes for this?

Done ;)

@ljacqu
Copy link
Member

@ljacqu ljacqu commented on ce4bb43 May 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 😊

Please sign in to comment.