Skip to content

Commit b96ae61

Browse files
sgdc3sgdc3
committed
Remove some old plugin hooks, update dependencies
1 parent 1dfb357 commit b96ae61

File tree

13 files changed

+48
-284
lines changed

13 files changed

+48
-284
lines changed

‎pom.xml‎

Lines changed: 35 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>
6262

6363
<!-- Change Bukkit Version HERE! -->
64-
<bukkit.version>1.12-R0.1-SNAPSHOT</bukkit.version>
64+
<bukkit.version>1.12.1-R0.1-SNAPSHOT</bukkit.version>
6565
</properties>
6666

6767
<!-- Jenkins profile -->
@@ -119,7 +119,7 @@
119119
<plugin>
120120
<groupId>org.apache.maven.plugins</groupId>
121121
<artifactId>maven-compiler-plugin</artifactId>
122-
<version>3.6.1</version>
122+
<version>3.6.2</version>
123123
<configuration>
124124
<source>${project.jdkVersion}</source>
125125
<target>${project.jdkVersion}</target>
@@ -142,7 +142,7 @@
142142
<plugin>
143143
<groupId>org.apache.maven.plugins</groupId>
144144
<artifactId>maven-shade-plugin</artifactId>
145-
<version>3.0.0</version>
145+
<version>3.1.0</version>
146146
<executions>
147147
<!-- Run shade goal on package phase -->
148148
<execution>
@@ -254,12 +254,6 @@
254254
<url>http://repo.ess3.net/content/groups/essentials</url>
255255
</repository>
256256

257-
<!-- CombatTagPlus Repo -->
258-
<repository>
259-
<id>minelink-repo</id>
260-
<url>http://repo.minelink.net/content/repositories/public</url>
261-
</repository>
262-
263257
<!-- ProtocolLib Repo -->
264258
<repository>
265259
<id>dmulloy2-repo</id>
@@ -325,7 +319,7 @@
325319
<dependency>
326320
<groupId>com.google.guava</groupId>
327321
<artifactId>guava</artifactId>
328-
<version>22.0</version>
322+
<version>23.0</version>
329323
<scope>compile</scope>
330324
<optional>true</optional>
331325
</dependency>
@@ -343,7 +337,7 @@
343337
<dependency>
344338
<groupId>org.apache.commons</groupId>
345339
<artifactId>commons-email</artifactId>
346-
<version>1.4</version>
340+
<version>1.5</version>
347341
<scope>compile</scope>
348342
<optional>true</optional>
349343
</dependency>
@@ -422,14 +416,14 @@
422416
<dependency>
423417
<groupId>org.bstats</groupId>
424418
<artifactId>bstats-bukkit</artifactId>
425-
<version>1.0</version>
419+
<version>1.2</version>
426420
</dependency>
427421

428422
<!-- ProtocolLib -->
429423
<dependency>
430424
<groupId>com.comphenix.protocol</groupId>
431425
<artifactId>ProtocolLib-API</artifactId>
432-
<version>4.2.1</version>
426+
<version>4.4.0-SNAPSHOT</version>
433427
<scope>provided</scope>
434428
<exclusions>
435429
<exclusion>
@@ -483,25 +477,11 @@
483477
</exclusions>
484478
</dependency>
485479

486-
<!-- PermissionsBukkit plugin -->
487-
<dependency>
488-
<groupId>com.platymuus</groupId>
489-
<artifactId>bukkit-permissions</artifactId>
490-
<version>2.5</version>
491-
<scope>provided</scope>
492-
<exclusions>
493-
<exclusion>
494-
<groupId>org.bukkit</groupId>
495-
<artifactId>bukkit</artifactId>
496-
</exclusion>
497-
</exclusions>
498-
</dependency>
499-
500480
<!-- zPermissions plugin -->
501481
<dependency>
502482
<groupId>org.tyrannyofheaven.bukkit</groupId>
503483
<artifactId>zPermissions</artifactId>
504-
<version>1.3.1-SNAPSHOT</version>
484+
<version>1.4-SNAPSHOT</version>
505485
<scope>provided</scope>
506486
<exclusions>
507487
<exclusion>
@@ -528,6 +508,30 @@
528508
<artifactId>ToHPluginUtils</artifactId>
529509
<groupId>org.tyrannyofheaven.bukkit</groupId>
530510
</exclusion>
511+
<exclusion>
512+
<artifactId>Residence</artifactId>
513+
<groupId>com.bekvon.bukkit</groupId>
514+
</exclusion>
515+
<exclusion>
516+
<artifactId>Factions</artifactId>
517+
<groupId>com.massivecraft</groupId>
518+
</exclusion>
519+
<exclusion>
520+
<artifactId>mcore</artifactId>
521+
<groupId>com.massivecraft</groupId>
522+
</exclusion>
523+
<exclusion>
524+
<artifactId>Factoid</artifactId>
525+
<groupId>me.tabinol.factoid</groupId>
526+
</exclusion>
527+
<exclusion>
528+
<artifactId>ebean</artifactId>
529+
<groupId>org.avaje</groupId>
530+
</exclusion>
531+
<exclusion>
532+
<artifactId>persistence-api</artifactId>
533+
<groupId>javax.persistence</groupId>
534+
</exclusion>
531535
</exclusions>
532536
</dependency>
533537

@@ -553,7 +557,7 @@
553557
<dependency>
554558
<groupId>com.onarandombox.multiversecore</groupId>
555559
<artifactId>Multiverse-Core</artifactId>
556-
<version>2.5.0-SNAPSHOT</version>
560+
<version>2.6.0-SNAPSHOT</version>
557561
<type>jar</type>
558562
<scope>provided</scope>
559563
<exclusions>
@@ -630,98 +634,6 @@
630634
</exclusions>
631635
</dependency>
632636

633-
<!-- Anti-PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
634-
<dependency>
635-
<groupId>net.minelink</groupId>
636-
<artifactId>CombatTagPlus</artifactId>
637-
<version>1.3.0-SNAPSHOT</version>
638-
<scope>provided</scope>
639-
<exclusions>
640-
<exclusion>
641-
<groupId>org.bukkit</groupId>
642-
<artifactId>bukkit</artifactId>
643-
</exclusion>
644-
<exclusion>
645-
<groupId>org.bukkit</groupId>
646-
<artifactId>craftbukkit</artifactId>
647-
</exclusion>
648-
<exclusion>
649-
<artifactId>CombatTagPlusHook</artifactId>
650-
<groupId>net.minelink</groupId>
651-
</exclusion>
652-
<exclusion>
653-
<artifactId>CombatTagPlusFactions-v1_6</artifactId>
654-
<groupId>net.minelink</groupId>
655-
</exclusion>
656-
<exclusion>
657-
<artifactId>CombatTagPlusCompat-v1_7_R3</artifactId>
658-
<groupId>net.minelink</groupId>
659-
</exclusion>
660-
<exclusion>
661-
<artifactId>CombatTagPlusFactions-v1_8</artifactId>
662-
<groupId>net.minelink</groupId>
663-
</exclusion>
664-
<exclusion>
665-
<artifactId>CombatTagPlusCompat-v1_7_R4</artifactId>
666-
<groupId>net.minelink</groupId>
667-
</exclusion>
668-
<exclusion>
669-
<artifactId>CombatTagPlusWG-v5</artifactId>
670-
<groupId>net.minelink</groupId>
671-
</exclusion>
672-
<exclusion>
673-
<artifactId>CombatTagPlusWG-v6</artifactId>
674-
<groupId>net.minelink</groupId>
675-
</exclusion>
676-
<exclusion>
677-
<artifactId>CombatTagPlusCompat-API</artifactId>
678-
<groupId>net.minelink</groupId>
679-
</exclusion>
680-
<exclusion>
681-
<artifactId>CombatTagPlusFactions-v2_6</artifactId>
682-
<groupId>net.minelink</groupId>
683-
</exclusion>
684-
<exclusion>
685-
<artifactId>CombatTagPlusCompat-v1_8_R3</artifactId>
686-
<groupId>net.minelink</groupId>
687-
</exclusion>
688-
<exclusion>
689-
<artifactId>CombatTagPlusFactions-v2_7</artifactId>
690-
<groupId>net.minelink</groupId>
691-
</exclusion>
692-
<exclusion>
693-
<artifactId>CombatTagPlusCompat-v1_8_R2</artifactId>
694-
<groupId>net.minelink</groupId>
695-
</exclusion>
696-
<exclusion>
697-
<artifactId>CombatTagPlusCompat-v1_8_R1</artifactId>
698-
<groupId>net.minelink</groupId>
699-
</exclusion>
700-
<exclusion>
701-
<artifactId>metrics-lite</artifactId>
702-
<groupId>org.mcstats.bukkit</groupId>
703-
</exclusion>
704-
<exclusion>
705-
<groupId>net.minelink</groupId>
706-
<artifactId>CombatTagPlusCompat-v1_9_R1</artifactId>
707-
</exclusion>
708-
<exclusion>
709-
<groupId>net.minelink</groupId>
710-
<artifactId>CombatTagPlusCompat-v1_9_R2</artifactId>
711-
</exclusion>
712-
<exclusion>
713-
<groupId>net.minelink</groupId>
714-
<artifactId>
715-
CombatTagPlusCompat-v1_10_R1
716-
</artifactId>
717-
</exclusion>
718-
<exclusion>
719-
<groupId>com.google.code.findbugs</groupId>
720-
<artifactId>jsr305</artifactId>
721-
</exclusion>
722-
</exclusions>
723-
</dependency>
724-
725637
<!-- XAuth, another authentication plugin, required by the database converter -->
726638
<dependency>
727639
<groupId>de.luricos.bukkit</groupId>
@@ -799,7 +711,7 @@
799711
<groupId>org.mockito</groupId>
800712
<artifactId>mockito-core</artifactId>
801713
<scope>test</scope>
802-
<version>2.8.47</version>
714+
<version>2.9.0</version>
803715
<exclusions>
804716
<exclusion>
805717
<artifactId>hamcrest-core</artifactId>
@@ -812,7 +724,7 @@
812724
<dependency>
813725
<groupId>org.xerial</groupId>
814726
<artifactId>sqlite-jdbc</artifactId>
815-
<version>3.19.3</version>
727+
<version>3.20.0</version>
816728
<scope>test</scope>
817729
</dependency>
818730
<dependency>

‎src/main/java/fr/xephi/authme/AuthMe.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ public void onEnable() {
147147
// Show settings warnings
148148
showSettingsWarnings();
149149

150-
// If server is using PermissionsBukkit, print a warning that some features may not be supported
151-
if (PermissionsSystemType.PERMISSIONS_BUKKIT.equals(permsMan.getPermissionSystem())) {
152-
ConsoleLogger.warning("Warning! This server uses PermissionsBukkit for permissions. Some permissions "
153-
+ "features may not be supported!");
154-
}
155-
156150
// Do a backup on start
157151
backupService.doBackup(BackupService.BackupCause.START);
158152

‎src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import fr.xephi.authme.settings.properties.PluginSettings;
1818
import fr.xephi.authme.settings.properties.SecuritySettings;
1919
import org.apache.logging.log4j.LogManager;
20-
import org.bstats.Metrics;
20+
import org.bstats.bukkit.Metrics;
2121
import org.bukkit.Bukkit;
2222
import org.bukkit.entity.Player;
2323

@@ -53,19 +53,8 @@ public class OnStartupTasks {
5353
public static void sendMetrics(AuthMe plugin, Settings settings) {
5454
final Metrics metrics = new Metrics(plugin);
5555

56-
metrics.addCustomChart(new Metrics.SimplePie("messages_language") {
57-
@Override
58-
public String getValue() {
59-
return settings.getProperty(PluginSettings.MESSAGES_LANGUAGE);
60-
}
61-
});
62-
63-
metrics.addCustomChart(new Metrics.SimplePie("database_backend") {
64-
@Override
65-
public String getValue() {
66-
return settings.getProperty(DatabaseSettings.BACKEND).toString();
67-
}
68-
});
56+
metrics.addCustomChart(new Metrics.SimplePie("messages_language", () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
57+
metrics.addCustomChart(new Metrics.SimplePie("database_backend", () -> settings.getProperty(DatabaseSettings.BACKEND).toString()));
6958
}
7059

7160
/**
@@ -103,14 +92,11 @@ public void scheduleRecallEmailTask() {
10392
if (!settings.getProperty(RECALL_PLAYERS)) {
10493
return;
10594
}
106-
bukkitService.runTaskTimerAsynchronously(new Runnable() {
107-
@Override
108-
public void run() {
109-
for (String playerWithoutMail : dataSource.getLoggedPlayersWithEmptyMail()) {
110-
Player player = bukkitService.getPlayerExact(playerWithoutMail);
111-
if (player != null) {
112-
messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
113-
}
95+
bukkitService.runTaskTimerAsynchronously(() -> {
96+
for (String playerWithoutMail : dataSource.getLoggedPlayersWithEmptyMail()) {
97+
Player player = bukkitService.getPlayerExact(playerWithoutMail);
98+
if (player != null) {
99+
messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
114100
}
115101
}
116102
}, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));

‎src/main/java/fr/xephi/authme/listener/ServerListener.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ public void onPluginDisable(PluginDisableEvent event) {
4343
} else if ("Multiverse-Core".equalsIgnoreCase(pluginName)) {
4444
pluginHookService.unhookMultiverse();
4545
ConsoleLogger.info("Multiverse-Core has been disabled: unhooking");
46-
} else if ("CombatTagPlus".equalsIgnoreCase(pluginName)) {
47-
pluginHookService.unhookCombatPlus();
48-
ConsoleLogger.info("CombatTagPlus has been disabled: unhooking");
4946
} else if ("EssentialsSpawn".equalsIgnoreCase(pluginName)) {
5047
spawnLoader.unloadEssentialsSpawn();
5148
ConsoleLogger.info("EssentialsSpawn has been disabled: unhooking");
@@ -71,8 +68,6 @@ public void onPluginEnable(PluginEnableEvent event) {
7168
pluginHookService.tryHookToEssentials();
7269
} else if ("Multiverse-Core".equalsIgnoreCase(pluginName)) {
7370
pluginHookService.tryHookToMultiverse();
74-
} else if ("CombatTagPlus".equalsIgnoreCase(pluginName)) {
75-
pluginHookService.tryHookToCombatPlus();
7671
} else if ("EssentialsSpawn".equalsIgnoreCase(pluginName)) {
7772
spawnLoader.loadEssentialsSpawn();
7873
} else if ("ProtocolLib".equalsIgnoreCase(pluginName)) {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
66
import fr.xephi.authme.permission.handlers.PermissionHandler;
77
import fr.xephi.authme.permission.handlers.PermissionHandlerException;
8-
import fr.xephi.authme.permission.handlers.PermissionsBukkitHandler;
98
import fr.xephi.authme.permission.handlers.PermissionsExHandler;
109
import fr.xephi.authme.permission.handlers.VaultHandler;
1110
import fr.xephi.authme.permission.handlers.ZPermissionsHandler;
@@ -120,8 +119,6 @@ private PermissionHandler createPermissionHandler(PermissionsSystemType type) th
120119
return new VaultHandler(server);
121120
case B_PERMISSIONS:
122121
return new BPermissionsHandler();
123-
case PERMISSIONS_BUKKIT:
124-
return new PermissionsBukkitHandler(pluginManager);
125122
default:
126123
throw new IllegalStateException("Unhandled permission type '" + type + "'");
127124
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ public enum PermissionsSystemType {
1010
*/
1111
PERMISSIONS_EX("PermissionsEx", "PermissionsEx"),
1212

13-
/**
14-
* Permissions Bukkit.
15-
*/
16-
PERMISSIONS_BUKKIT("Permissions Bukkit", "PermissionsBukkit"),
17-
1813
/**
1914
* bPermissions.
2015
*/

0 commit comments

Comments
 (0)