Skip to content

Commit c11e4b9

Browse files
sgdc3sgdc3
committed
Remove 1.7 support
1 parent fdcbb33 commit c11e4b9

File tree

16 files changed

+45
-379
lines changed

16 files changed

+45
-379
lines changed

‎pom.xml‎

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>fr.xephi</groupId>
88
<artifactId>authme</artifactId>
9-
<version>5.5.0-SNAPSHOT</version>
9+
<version>5.5.1-SNAPSHOT</version>
1010

1111
<name>AuthMeReloaded</name>
1212
<description>The first authentication plugin for the Bukkit API!</description>
@@ -146,7 +146,7 @@
146146
<configuration>
147147
<rules>
148148
<requireMavenVersion>
149-
<version>3.3.9</version>
149+
<version>${maven.minimumVersion}</version>
150150
</requireMavenVersion>
151151
</rules>
152152
<fail>true</fail>
@@ -275,14 +275,9 @@
275275

276276
<!--
277277
Relocate all lib we use in order to fix class loading errors if we use different versions
278-
than already loaded libs (i.e. by Mojang -> gson)
278+
than already loaded libs
279279
-->
280280
<relocations>
281-
<!-- Include all google libraries, because they are not available before 1.12 -->
282-
<relocation>
283-
<pattern>com.google</pattern>
284-
<shadedPattern>fr.xephi.authme.libs.com.google</shadedPattern>
285-
</relocation>
286281
<relocation>
287282
<pattern>ch.jalu</pattern>
288283
<shadedPattern>fr.xephi.authme.libs.ch.jalu</shadedPattern>
@@ -439,22 +434,6 @@
439434
<optional>true</optional>
440435
</dependency>
441436

442-
<!-- GSON (required to provide 1.7.10 and below compatibility) -->
443-
<dependency>
444-
<groupId>com.google.code.gson</groupId>
445-
<artifactId>gson</artifactId>
446-
<version>2.8.5</version>
447-
<optional>true</optional>
448-
</dependency>
449-
450-
<!-- Guava (required to allow compatibility with any version since 1.7.10) -->
451-
<dependency>
452-
<groupId>com.google.guava</groupId>
453-
<artifactId>guava</artifactId>
454-
<version>27.0.1-jre</version>
455-
<optional>true</optional>
456-
</dependency>
457-
458437
<!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency -->
459438
<!-- GSON is already included and therefore it reduces the file size in comparison to the original version -->
460439
<dependency>
@@ -550,22 +529,10 @@
550529
<artifactId>junit</artifactId>
551530
<groupId>junit</groupId>
552531
</exclusion>
553-
<exclusion>
554-
<artifactId>persistence-api</artifactId>
555-
<groupId>javax.persistence</groupId>
556-
</exclusion>
557-
<exclusion>
558-
<artifactId>guava</artifactId>
559-
<groupId>com.google.guava</groupId>
560-
</exclusion>
561532
<exclusion>
562533
<artifactId>bungeecord-chat</artifactId>
563534
<groupId>net.md-5</groupId>
564535
</exclusion>
565-
<exclusion>
566-
<artifactId>gson</artifactId>
567-
<groupId>com.google.code.gson</groupId>
568-
</exclusion>
569536
</exclusions>
570537
</dependency>
571538

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,8 @@
66
import fr.xephi.authme.api.v3.AuthMeApi;
77
import fr.xephi.authme.command.CommandHandler;
88
import fr.xephi.authme.datasource.DataSource;
9-
import fr.xephi.authme.initialization.DataFolder;
10-
import fr.xephi.authme.initialization.DataSourceProvider;
11-
import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
12-
import fr.xephi.authme.initialization.OnStartupTasks;
13-
import fr.xephi.authme.initialization.SettingsProvider;
14-
import fr.xephi.authme.initialization.TaskCloser;
15-
import fr.xephi.authme.listener.BlockListener;
16-
import fr.xephi.authme.listener.EntityListener;
17-
import fr.xephi.authme.listener.PlayerListener;
18-
import fr.xephi.authme.listener.PlayerListener111;
19-
import fr.xephi.authme.listener.PlayerListener16;
20-
import fr.xephi.authme.listener.PlayerListener18;
21-
import fr.xephi.authme.listener.PlayerListener19;
22-
import fr.xephi.authme.listener.PlayerListener19Spigot;
23-
import fr.xephi.authme.listener.ServerListener;
9+
import fr.xephi.authme.initialization.*;
10+
import fr.xephi.authme.listener.*;
2411
import fr.xephi.authme.security.crypts.Sha256;
2512
import fr.xephi.authme.service.BackupService;
2613
import fr.xephi.authme.service.BukkitService;
@@ -121,7 +108,7 @@ public void onEnable() {
121108
loadPluginInfo(getDescription().getVersion());
122109

123110
// Prevent running AuthMeBridge due to major exploit issues
124-
if(getServer().getPluginManager().isPluginEnabled("AuthMeBridge")) {
111+
if (getServer().getPluginManager().isPluginEnabled("AuthMeBridge")) {
125112
ConsoleLogger.warning("Detected AuthMeBridge, support for it has been dropped as it was "
126113
+ "causing exploit issues, please use AuthMeBungee instead! Aborting!");
127114
stopOrUnload();
@@ -272,16 +259,6 @@ void registerEventListeners(Injector injector) {
272259
pluginManager.registerEvents(injector.getSingleton(EntityListener.class), this);
273260
pluginManager.registerEvents(injector.getSingleton(ServerListener.class), this);
274261

275-
// Try to register 1.6 player listeners
276-
if (isClassLoaded("org.bukkit.event.player.PlayerEditBookEvent")) {
277-
pluginManager.registerEvents(injector.getSingleton(PlayerListener16.class), this);
278-
}
279-
280-
// Try to register 1.8 player listeners
281-
if (isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) {
282-
pluginManager.registerEvents(injector.getSingleton(PlayerListener18.class), this);
283-
}
284-
285262
// Try to register 1.9 player listeners
286263
if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
287264
pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
@@ -341,7 +318,6 @@ public void onDisable() {
341318
* @param cmd The command (Bukkit).
342319
* @param commandLabel The command label (Bukkit).
343320
* @param args The command arguments (Bukkit).
344-
*
345321
* @return True if the command was executed, false otherwise.
346322
*/
347323
@Override

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

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,7 @@
3535
import org.bukkit.event.entity.EntityDamageByEntityEvent;
3636
import org.bukkit.event.inventory.InventoryClickEvent;
3737
import org.bukkit.event.inventory.InventoryOpenEvent;
38-
import org.bukkit.event.player.AsyncPlayerChatEvent;
39-
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
40-
import org.bukkit.event.player.PlayerBedEnterEvent;
41-
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
42-
import org.bukkit.event.player.PlayerDropItemEvent;
43-
import org.bukkit.event.player.PlayerFishEvent;
44-
import org.bukkit.event.player.PlayerInteractEntityEvent;
45-
import org.bukkit.event.player.PlayerInteractEvent;
46-
import org.bukkit.event.player.PlayerItemConsumeEvent;
47-
import org.bukkit.event.player.PlayerItemHeldEvent;
48-
import org.bukkit.event.player.PlayerJoinEvent;
49-
import org.bukkit.event.player.PlayerKickEvent;
50-
import org.bukkit.event.player.PlayerLoginEvent;
51-
import org.bukkit.event.player.PlayerMoveEvent;
52-
import org.bukkit.event.player.PlayerPickupItemEvent;
53-
import org.bukkit.event.player.PlayerQuitEvent;
54-
import org.bukkit.event.player.PlayerRespawnEvent;
55-
import org.bukkit.event.player.PlayerShearEntityEvent;
38+
import org.bukkit.event.player.*;
5639
import org.bukkit.inventory.Inventory;
5740

5841
import javax.inject.Inject;
@@ -285,11 +268,7 @@ public void onAsyncPlayerPreLoginEvent(AsyncPlayerPreLoginEvent event) {
285268

286269
// Keep pre-UUID compatibility
287270
try {
288-
try {
289-
permissionsManager.loadUserData(event.getUniqueId());
290-
} catch (NoSuchMethodError e) {
291-
permissionsManager.loadUserData(name);
292-
}
271+
permissionsManager.loadUserData(event.getUniqueId());
293272
} catch (PermissionLoadUserException e) {
294273
ConsoleLogger.logException("Unable to load the permission data of user " + name, e);
295274
}
@@ -520,4 +499,18 @@ public void onPlayerFish(PlayerFishEvent event) {
520499
}
521500
}
522501

502+
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
503+
public void onPlayerEditBook(PlayerEditBookEvent event) {
504+
if (listenerService.shouldCancelEvent(event)) {
505+
event.setCancelled(true);
506+
}
507+
}
508+
509+
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
510+
public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
511+
if (listenerService.shouldCancelEvent(event)) {
512+
event.setCancelled(true);
513+
}
514+
}
515+
523516
}

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

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

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

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

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,7 @@ public boolean removeAllGroups(OfflinePlayer player) {
455455
*/
456456
public boolean loadUserData(OfflinePlayer offlinePlayer) {
457457
try {
458-
try {
459-
loadUserData(offlinePlayer.getUniqueId());
460-
} catch (NoSuchMethodError e) {
461-
loadUserData(offlinePlayer.getName());
462-
}
458+
loadUserData(offlinePlayer.getUniqueId());
463459
} catch (PermissionLoadUserException e) {
464460
ConsoleLogger.logException("Unable to load the permission data of user " + offlinePlayer.getName(), e);
465461
return false;
@@ -480,16 +476,4 @@ public void loadUserData(UUID uuid) throws PermissionLoadUserException {
480476
handler.loadUserData(uuid);
481477
}
482478

483-
/**
484-
* Loads the permission data of the given player name.
485-
*
486-
* @param name the name of the player.
487-
* @throws PermissionLoadUserException if the action failed.
488-
*/
489-
public void loadUserData(String name) throws PermissionLoadUserException {
490-
if (!isEnabled()) {
491-
return;
492-
}
493-
handler.loadUserData(name);
494-
}
495479
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,4 @@ public void loadUserData(UUID uuid) throws PermissionLoadUserException {
197197
}
198198
}
199199

200-
@Override
201-
public void loadUserData(String name) throws PermissionLoadUserException {
202-
try {
203-
UUID uuid = luckPermsApi.getUserManager().lookupUuid(name).get(5, TimeUnit.SECONDS);
204-
loadUserData(uuid);
205-
} catch (InterruptedException | ExecutionException | TimeoutException e) {
206-
throw new PermissionLoadUserException("Unable to load the permission data of the user " + name, e);
207-
}
208-
}
209200
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,4 @@ default String getPrimaryGroup(OfflinePlayer player) {
110110
default void loadUserData(UUID uuid) throws PermissionLoadUserException {
111111
}
112112

113-
default void loadUserData(String name) throws PermissionLoadUserException {
114-
}
115113
}

0 commit comments

Comments
 (0)