Skip to content

Commit

Permalink
Remove some old plugin hooks, update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgdc3
sgdc3 committed Aug 31, 2017
1 parent 1dfb357 commit b96ae61
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 284 deletions.
158 changes: 35 additions & 123 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>

<!-- Change Bukkit Version HERE! -->
<bukkit.version>1.12-R0.1-SNAPSHOT</bukkit.version>
<bukkit.version>1.12.1-R0.1-SNAPSHOT</bukkit.version>
</properties>

<!-- Jenkins profile -->
Expand Down Expand Up @@ -119,7 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
<configuration>
<source>${project.jdkVersion}</source>
<target>${project.jdkVersion}</target>
Expand All @@ -142,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<!-- Run shade goal on package phase -->
<execution>
Expand Down Expand Up @@ -254,12 +254,6 @@
<url>http://repo.ess3.net/content/groups/essentials</url>
</repository>

<!-- CombatTagPlus Repo -->
<repository>
<id>minelink-repo</id>
<url>http://repo.minelink.net/content/repositories/public</url>
</repository>

<!-- ProtocolLib Repo -->
<repository>
<id>dmulloy2-repo</id>
Expand Down Expand Up @@ -325,7 +319,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
<version>23.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand All @@ -343,7 +337,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
<version>1.4</version>
<version>1.5</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -422,14 +416,14 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.0</version>
<version>1.2</version>
</dependency>

<!-- ProtocolLib -->
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib-API</artifactId>
<version>4.2.1</version>
<version>4.4.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -483,25 +477,11 @@
</exclusions>
</dependency>

<!-- PermissionsBukkit plugin -->
<dependency>
<groupId>com.platymuus</groupId>
<artifactId>bukkit-permissions</artifactId>
<version>2.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- zPermissions plugin -->
<dependency>
<groupId>org.tyrannyofheaven.bukkit</groupId>
<artifactId>zPermissions</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -528,6 +508,30 @@
<artifactId>ToHPluginUtils</artifactId>
<groupId>org.tyrannyofheaven.bukkit</groupId>
</exclusion>
<exclusion>
<artifactId>Residence</artifactId>
<groupId>com.bekvon.bukkit</groupId>
</exclusion>
<exclusion>
<artifactId>Factions</artifactId>
<groupId>com.massivecraft</groupId>
</exclusion>
<exclusion>
<artifactId>mcore</artifactId>
<groupId>com.massivecraft</groupId>
</exclusion>
<exclusion>
<artifactId>Factoid</artifactId>
<groupId>me.tabinol.factoid</groupId>
</exclusion>
<exclusion>
<artifactId>ebean</artifactId>
<groupId>org.avaje</groupId>
</exclusion>
<exclusion>
<artifactId>persistence-api</artifactId>
<groupId>javax.persistence</groupId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -553,7 +557,7 @@
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.6.0-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
<exclusions>
Expand Down Expand Up @@ -630,98 +634,6 @@
</exclusions>
</dependency>

<!-- Anti-PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
<dependency>
<groupId>net.minelink</groupId>
<artifactId>CombatTagPlus</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusHook</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusFactions-v1_6</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-v1_7_R3</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusFactions-v1_8</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-v1_7_R4</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusWG-v5</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusWG-v6</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-API</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusFactions-v2_6</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-v1_8_R3</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusFactions-v2_7</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-v1_8_R2</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>CombatTagPlusCompat-v1_8_R1</artifactId>
<groupId>net.minelink</groupId>
</exclusion>
<exclusion>
<artifactId>metrics-lite</artifactId>
<groupId>org.mcstats.bukkit</groupId>
</exclusion>
<exclusion>
<groupId>net.minelink</groupId>
<artifactId>CombatTagPlusCompat-v1_9_R1</artifactId>
</exclusion>
<exclusion>
<groupId>net.minelink</groupId>
<artifactId>CombatTagPlusCompat-v1_9_R2</artifactId>
</exclusion>
<exclusion>
<groupId>net.minelink</groupId>
<artifactId>
CombatTagPlusCompat-v1_10_R1
</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- XAuth, another authentication plugin, required by the database converter -->
<dependency>
<groupId>de.luricos.bukkit</groupId>
Expand Down Expand Up @@ -799,7 +711,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<version>2.8.47</version>
<version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
Expand All @@ -812,7 +724,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.19.3</version>
<version>3.20.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/fr/xephi/authme/AuthMe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,6 @@ public void onEnable() {
// Show settings warnings
showSettingsWarnings();

// If server is using PermissionsBukkit, print a warning that some features may not be supported
if (PermissionsSystemType.PERMISSIONS_BUKKIT.equals(permsMan.getPermissionSystem())) {
ConsoleLogger.warning("Warning! This server uses PermissionsBukkit for permissions. Some permissions "
+ "features may not be supported!");
}

// Do a backup on start
backupService.doBackup(BackupService.BackupCause.START);

Expand Down
30 changes: 8 additions & 22 deletions src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import org.apache.logging.log4j.LogManager;
import org.bstats.Metrics;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

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

metrics.addCustomChart(new Metrics.SimplePie("messages_language") {
@Override
public String getValue() {
return settings.getProperty(PluginSettings.MESSAGES_LANGUAGE);
}
});

metrics.addCustomChart(new Metrics.SimplePie("database_backend") {
@Override
public String getValue() {
return settings.getProperty(DatabaseSettings.BACKEND).toString();
}
});
metrics.addCustomChart(new Metrics.SimplePie("messages_language", () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
metrics.addCustomChart(new Metrics.SimplePie("database_backend", () -> settings.getProperty(DatabaseSettings.BACKEND).toString()));
}

/**
Expand Down Expand Up @@ -103,14 +92,11 @@ public void scheduleRecallEmailTask() {
if (!settings.getProperty(RECALL_PLAYERS)) {
return;
}
bukkitService.runTaskTimerAsynchronously(new Runnable() {
@Override
public void run() {
for (String playerWithoutMail : dataSource.getLoggedPlayersWithEmptyMail()) {
Player player = bukkitService.getPlayerExact(playerWithoutMail);
if (player != null) {
messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
}
bukkitService.runTaskTimerAsynchronously(() -> {
for (String playerWithoutMail : dataSource.getLoggedPlayersWithEmptyMail()) {
Player player = bukkitService.getPlayerExact(playerWithoutMail);
if (player != null) {
messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
}
}
}, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/fr/xephi/authme/listener/ServerListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ public void onPluginDisable(PluginDisableEvent event) {
} else if ("Multiverse-Core".equalsIgnoreCase(pluginName)) {
pluginHookService.unhookMultiverse();
ConsoleLogger.info("Multiverse-Core has been disabled: unhooking");
} else if ("CombatTagPlus".equalsIgnoreCase(pluginName)) {
pluginHookService.unhookCombatPlus();
ConsoleLogger.info("CombatTagPlus has been disabled: unhooking");
} else if ("EssentialsSpawn".equalsIgnoreCase(pluginName)) {
spawnLoader.unloadEssentialsSpawn();
ConsoleLogger.info("EssentialsSpawn has been disabled: unhooking");
Expand All @@ -71,8 +68,6 @@ public void onPluginEnable(PluginEnableEvent event) {
pluginHookService.tryHookToEssentials();
} else if ("Multiverse-Core".equalsIgnoreCase(pluginName)) {
pluginHookService.tryHookToMultiverse();
} else if ("CombatTagPlus".equalsIgnoreCase(pluginName)) {
pluginHookService.tryHookToCombatPlus();
} else if ("EssentialsSpawn".equalsIgnoreCase(pluginName)) {
spawnLoader.loadEssentialsSpawn();
} else if ("ProtocolLib".equalsIgnoreCase(pluginName)) {
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 @@ -5,7 +5,6 @@
import fr.xephi.authme.permission.handlers.BPermissionsHandler;
import fr.xephi.authme.permission.handlers.PermissionHandler;
import fr.xephi.authme.permission.handlers.PermissionHandlerException;
import fr.xephi.authme.permission.handlers.PermissionsBukkitHandler;
import fr.xephi.authme.permission.handlers.PermissionsExHandler;
import fr.xephi.authme.permission.handlers.VaultHandler;
import fr.xephi.authme.permission.handlers.ZPermissionsHandler;
Expand Down Expand Up @@ -120,8 +119,6 @@ private PermissionHandler createPermissionHandler(PermissionsSystemType type) th
return new VaultHandler(server);
case B_PERMISSIONS:
return new BPermissionsHandler();
case PERMISSIONS_BUKKIT:
return new PermissionsBukkitHandler(pluginManager);
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 @@ -10,11 +10,6 @@ public enum PermissionsSystemType {
*/
PERMISSIONS_EX("PermissionsEx", "PermissionsEx"),

/**
* Permissions Bukkit.
*/
PERMISSIONS_BUKKIT("Permissions Bukkit", "PermissionsBukkit"),

/**
* bPermissions.
*/
Expand Down

0 comments on commit b96ae61

Please sign in to comment.