Skip to content

Commit ce4bb43

Browse files
sgdc3sgdc3
committed
Remove bPermissions support
1 parent 2aee86f commit ce4bb43

File tree

7 files changed

+111
-98
lines changed

7 files changed

+111
-98
lines changed

‎pom.xml‎

Lines changed: 108 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -382,36 +382,102 @@
382382
<repository>
383383
<id>spigotmc-repo</id>
384384
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
385+
<releases>
386+
<enabled>false</enabled>
387+
</releases>
388+
<snapshots>
389+
<enabled>true</enabled>
390+
</snapshots>
385391
</repository>
386392

387393
<!-- CodeMC Repo (Contains many required libraries) -->
388394
<repository>
389395
<id>codemc-repo</id>
390396
<url>https://repo.codemc.org/repository/maven-public/</url>
397+
<releases>
398+
<enabled>true</enabled>
399+
</releases>
400+
<snapshots>
401+
<enabled>true</enabled>
402+
</snapshots>
391403
</repository>
392404

393405
<!-- EssentialsX Repo -->
394406
<repository>
395407
<id>enderzone-repo</id>
396-
<url>https://ci.ender.zone/plugin/repository/everything</url>
408+
<url>https://ci.ender.zone/plugin/repository/everything/</url>
409+
<releases>
410+
<enabled>true</enabled>
411+
</releases>
412+
<snapshots>
413+
<enabled>true</enabled>
414+
</snapshots>
397415
</repository>
398416

399417
<!-- ProtocolLib Repo -->
400418
<repository>
401-
<id>dmulloy2-repo</id>
402-
<url>http://repo.dmulloy2.net/content/groups/public/</url>
419+
<id>dmulloy2-repo-releases</id>
420+
<url>http://repo.dmulloy2.net/nexus/repository/releases/</url>
421+
<releases>
422+
<enabled>true</enabled>
423+
</releases>
424+
<snapshots>
425+
<enabled>false</enabled>
426+
</snapshots>
427+
</repository>
428+
<repository>
429+
<id>dmulloy2-repo-snapshots</id>
430+
<url>http://repo.dmulloy2.net/nexus/repository/snapshots/</url>
431+
<releases>
432+
<enabled>false</enabled>
433+
</releases>
434+
<snapshots>
435+
<enabled>true</enabled>
436+
</snapshots>
403437
</repository>
404438

405439
<!-- Multiverse Repo -->
406440
<repository>
407-
<id>onarandombox-repo</id>
408-
<url>http://repo.onarandombox.com/content/groups/public</url>
441+
<id>onarandombox-repo-releases</id>
442+
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
443+
<releases>
444+
<enabled>true</enabled>
445+
</releases>
446+
<snapshots>
447+
<enabled>false</enabled>
448+
</snapshots>
449+
</repository>
450+
<repository>
451+
<id>onarandombox-repo-snapshots</id>
452+
<url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
453+
<releases>
454+
<enabled>false</enabled>
455+
</releases>
456+
<snapshots>
457+
<enabled>true</enabled>
458+
</snapshots>
409459
</repository>
410460

411461
<!-- Vault Repo -->
412462
<repository>
413-
<id>vault-repo</id>
463+
<id>vault-repo-releases</id>
414464
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
465+
<releases>
466+
<enabled>true</enabled>
467+
</releases>
468+
<snapshots>
469+
<enabled>false</enabled>
470+
</snapshots>
471+
</repository>
472+
<repository>
473+
<id>vault-repo-snapshots</id>
474+
<url>http://nexus.hc.to/content/repositories/pub_snapshots</url>
475+
<releases>
476+
<enabled>false</enabled>
477+
</releases>
478+
<snapshots>
479+
<enabled>true</enabled>
480+
</snapshots>
415481
</repository>
416482
</repositories>
417483

@@ -622,20 +688,6 @@
622688
</exclusions>
623689
</dependency>
624690

625-
<!-- bPermissions plugin -->
626-
<dependency>
627-
<groupId>de.bananaco</groupId>
628-
<artifactId>bPermissions</artifactId>
629-
<version>2.12-DEV</version>
630-
<scope>provided</scope>
631-
<exclusions>
632-
<exclusion>
633-
<groupId>org.bukkit</groupId>
634-
<artifactId>bukkit</artifactId>
635-
</exclusion>
636-
</exclusions>
637-
</dependency>
638-
639691
<!-- zPermissions plugin -->
640692
<dependency>
641693
<groupId>org.tyrannyofheaven.bukkit</groupId>
@@ -672,7 +724,7 @@
672724
<dependency>
673725
<groupId>com.onarandombox.multiversecore</groupId>
674726
<artifactId>Multiverse-Core</artifactId>
675-
<version>2.6.0</version>
727+
<version>3.0.0-SNAPSHOT</version>
676728
<type>jar</type>
677729
<scope>provided</scope>
678730
<exclusions>
@@ -735,8 +787,42 @@
735787
<dependency>
736788
<groupId>net.ess3</groupId>
737789
<artifactId>EssentialsX</artifactId>
738-
<version>2.15.0</version>
790+
<version>2.16.1</version>
739791
<scope>provided</scope>
792+
<exclusions>
793+
<exclusion>
794+
<groupId>io.papermc</groupId>
795+
<artifactId>paperlib</artifactId>
796+
</exclusion>
797+
<exclusion>
798+
<groupId>net.ess3</groupId>
799+
<artifactId>NMSProvider</artifactId>
800+
</exclusion>
801+
<exclusion>
802+
<groupId>net.ess3</groupId>
803+
<artifactId>UpdatedMetaProvider</artifactId>
804+
</exclusion>
805+
<exclusion>
806+
<groupId>net.ess3</groupId>
807+
<artifactId>1_8_R1Provider</artifactId>
808+
</exclusion>
809+
<exclusion>
810+
<groupId>net.ess3</groupId>
811+
<artifactId>1_8_R2Provider</artifactId>
812+
</exclusion>
813+
<exclusion>
814+
<groupId>net.ess3</groupId>
815+
<artifactId>LegacyProvider</artifactId>
816+
</exclusion>
817+
<exclusion>
818+
<groupId>net.ess3</groupId>
819+
<artifactId>ReflectionProvider</artifactId>
820+
</exclusion>
821+
<exclusion>
822+
<groupId>net.ess3</groupId>
823+
<artifactId>FlattenedProvider</artifactId>
824+
</exclusion>
825+
</exclusions>
740826
</dependency>
741827

742828
<!-- BCrypt implementation -->

‎src/main/java/fr/xephi/authme/permission/PermissionsManager.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import fr.xephi.authme.ConsoleLogger;
55
import fr.xephi.authme.initialization.Reloadable;
66
import fr.xephi.authme.listener.JoiningPlayer;
7-
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
87
import fr.xephi.authme.permission.handlers.LuckPermsHandler;
98
import fr.xephi.authme.permission.handlers.PermissionHandler;
109
import fr.xephi.authme.permission.handlers.PermissionHandlerException;
@@ -139,8 +138,6 @@ private PermissionHandler createPermissionHandler(PermissionsSystemType type) th
139138
return new ZPermissionsHandler();
140139
case VAULT:
141140
return new VaultHandler(server);
142-
case B_PERMISSIONS:
143-
return new BPermissionsHandler();
144141
default:
145142
throw new IllegalStateException("Unhandled permission type '" + type + "'");
146143
}

‎src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ public enum PermissionsSystemType {
1515
*/
1616
PERMISSIONS_EX("PermissionsEx", "PermissionsEx"),
1717

18-
/**
19-
* bPermissions.
20-
*/
21-
B_PERMISSIONS("bPermissions", "bPermissions"),
22-
2318
/**
2419
* zPermissions.
2520
*/

‎src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.common.collect.ImmutableMap;
44
import fr.xephi.authme.ReflectionTestUtils;
55
import fr.xephi.authme.TestHelper;
6-
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
76
import fr.xephi.authme.permission.handlers.LuckPermsHandler;
87
import fr.xephi.authme.permission.handlers.PermissionHandler;
98
import fr.xephi.authme.permission.handlers.PermissionsExHandler;
@@ -33,7 +32,6 @@
3332
import java.util.stream.Collectors;
3433

3534
import static com.google.common.collect.Sets.newHashSet;
36-
import static fr.xephi.authme.permission.PermissionsSystemType.B_PERMISSIONS;
3735
import static fr.xephi.authme.permission.PermissionsSystemType.LUCK_PERMS;
3836
import static fr.xephi.authme.permission.PermissionsSystemType.PERMISSIONS_EX;
3937
import static fr.xephi.authme.permission.PermissionsSystemType.VAULT;
@@ -147,7 +145,6 @@ public static Collection<Object[]> createParameters() {
147145
Map<PermissionsSystemType, Class<?>> handlersByPermissionSystemType = ImmutableMap.of(
148146
LUCK_PERMS, LuckPermsHandler.class,
149147
PERMISSIONS_EX, PermissionsExHandler.class,
150-
B_PERMISSIONS, BPermissionsHandler.class,
151148
Z_PERMISSIONS, ZPermissionsHandler.class,
152149
VAULT, VaultHandler.class);
153150

@@ -175,7 +172,7 @@ private void setUpForPermissionSystemTest() {
175172
given(servicesManager.load(ZPermissionsService.class)).willReturn(zPermissionsService);
176173
} else if (permissionsSystemType == VAULT) {
177174
setUpForVault();
178-
} else if (permissionsSystemType != B_PERMISSIONS) {
175+
} else {
179176
throw new IllegalStateException("Unhandled permission systems type: " + permissionsSystemType);
180177
}
181178
}

‎src/test/java/tools/helptranslation/HelpTranslationVerifier.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package tools.helptranslation;
22

33
import com.google.common.collect.Sets;
4-
import de.bananaco.bpermissions.imp.YamlConfiguration;
54
import fr.xephi.authme.command.CommandDescription;
65
import fr.xephi.authme.command.CommandInitializer;
76
import fr.xephi.authme.command.CommandUtils;
87
import fr.xephi.authme.command.help.HelpMessage;
98
import fr.xephi.authme.command.help.HelpSection;
109
import org.bukkit.configuration.MemorySection;
1110
import org.bukkit.configuration.file.FileConfiguration;
11+
import org.bukkit.configuration.file.YamlConfiguration;
1212

1313
import java.io.File;
1414
import java.util.ArrayList;

‎src/test/java/tools/messages/VerifyMessagesTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package tools.messages;
22

33
import com.google.common.collect.Multimap;
4-
import de.bananaco.bpermissions.imp.YamlConfiguration;
54
import fr.xephi.authme.message.MessageKey;
65
import fr.xephi.authme.util.StringUtils;
76
import org.bukkit.configuration.file.FileConfiguration;
7+
import org.bukkit.configuration.file.YamlConfiguration;
88
import tools.utils.ToolTask;
99
import tools.utils.ToolsConstants;
1010

0 commit comments

Comments
 (0)