Minor code householding
Various neglectable changes while looking at recent commits - Remove Inject annotation on ProtocolLib adapters that are no longer created via injection - Reduce ProtocolLib adapters to package private - interaction always goes via ProtocolLibService - Fix typos
This commit is contained in:
parent
a02c1c4e60
commit
1cadbd2345
4
.github/ISSUE_TEMPLATE.MD
vendored
4
.github/ISSUE_TEMPLATE.MD
vendored
@ -21,5 +21,5 @@ This can be found by running `/authme version`
|
|||||||
### Error Log:
|
### Error Log:
|
||||||
Pastebin/Hastebin/Gist link of the error logo or stacktrace (if any)
|
Pastebin/Hastebin/Gist link of the error logo or stacktrace (if any)
|
||||||
|
|
||||||
### COnfiguration:
|
### Configuration:
|
||||||
Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sesible data)
|
Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sensible data)
|
||||||
|
|||||||
@ -67,21 +67,21 @@ import org.bukkit.plugin.PluginManager;
|
|||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.bukkit.plugin.messaging.Messenger;
|
import org.bukkit.plugin.messaging.Messenger;
|
||||||
import org.bukkit.scheduler.BukkitScheduler;
|
import org.bukkit.scheduler.BukkitScheduler;
|
||||||
|
import org.bukkit.scheduler.BukkitWorker;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_ACCOUNT;
|
import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_ACCOUNT;
|
||||||
import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_PASSWORD;
|
import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_PASSWORD;
|
||||||
import static fr.xephi.authme.settings.properties.EmailSettings.RECALL_PLAYERS;
|
import static fr.xephi.authme.settings.properties.EmailSettings.RECALL_PLAYERS;
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import org.bukkit.scheduler.BukkitWorker;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The AuthMe main class.
|
* The AuthMe main class.
|
||||||
@ -114,10 +114,6 @@ public class AuthMe extends JavaPlugin {
|
|||||||
private BukkitService bukkitService;
|
private BukkitService bukkitService;
|
||||||
private AuthMeServiceInitializer initializer;
|
private AuthMeServiceInitializer initializer;
|
||||||
private GeoLiteAPI geoLiteApi;
|
private GeoLiteAPI geoLiteApi;
|
||||||
|
|
||||||
/*
|
|
||||||
* Private instances (mail and ProtocolLib)
|
|
||||||
*/
|
|
||||||
private SendMailSSL mail;
|
private SendMailSSL mail;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -32,7 +32,7 @@ import java.lang.reflect.InvocationTargetException;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
public class AuthMeInventoryPacketAdapter extends PacketAdapter {
|
class AuthMeInventoryPacketAdapter extends PacketAdapter {
|
||||||
|
|
||||||
private static final int PLAYER_INVENTORY = 0;
|
private static final int PLAYER_INVENTORY = 0;
|
||||||
// http://wiki.vg/Inventory#Inventory (0-4 crafting, 5-8 armor, 9-35 main inventory, 36-44 hotbar, 45 off hand)
|
// http://wiki.vg/Inventory#Inventory (0-4 crafting, 5-8 armor, 9-35 main inventory, 36-44 hotbar, 45 off hand)
|
||||||
|
|||||||
@ -6,16 +6,12 @@ import com.comphenix.protocol.events.ListenerPriority;
|
|||||||
import com.comphenix.protocol.events.PacketAdapter;
|
import com.comphenix.protocol.events.PacketAdapter;
|
||||||
import com.comphenix.protocol.events.PacketEvent;
|
import com.comphenix.protocol.events.PacketEvent;
|
||||||
import com.comphenix.protocol.reflect.FieldAccessException;
|
import com.comphenix.protocol.reflect.FieldAccessException;
|
||||||
|
|
||||||
import fr.xephi.authme.AuthMe;
|
import fr.xephi.authme.AuthMe;
|
||||||
import fr.xephi.authme.ConsoleLogger;
|
import fr.xephi.authme.ConsoleLogger;
|
||||||
import fr.xephi.authme.cache.auth.PlayerCache;
|
import fr.xephi.authme.cache.auth.PlayerCache;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
class AuthMeTabCompletePacketAdapter extends PacketAdapter {
|
||||||
|
|
||||||
public class AuthMeTabCompletePacketAdapter extends PacketAdapter {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public AuthMeTabCompletePacketAdapter(AuthMe plugin) {
|
public AuthMeTabCompletePacketAdapter(AuthMe plugin) {
|
||||||
super(plugin, ListenerPriority.NORMAL, PacketType.Play.Client.TAB_COMPLETE);
|
super(plugin, ListenerPriority.NORMAL, PacketType.Play.Client.TAB_COMPLETE);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,6 @@ import fr.xephi.authme.util.BukkitService;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
@ -29,12 +28,11 @@ import java.util.List;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
public class AuthMeTablistPacketAdapter extends PacketAdapter {
|
class AuthMeTablistPacketAdapter extends PacketAdapter {
|
||||||
|
|
||||||
private final BukkitService bukkitService;
|
private final BukkitService bukkitService;
|
||||||
private boolean isRegistered;
|
private boolean isRegistered;
|
||||||
|
|
||||||
@Inject
|
|
||||||
public AuthMeTablistPacketAdapter(AuthMe plugin, BukkitService bukkitService) {
|
public AuthMeTablistPacketAdapter(AuthMe plugin, BukkitService bukkitService) {
|
||||||
super(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.PLAYER_INFO);
|
super(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.PLAYER_INFO);
|
||||||
this.bukkitService = bukkitService;
|
this.bukkitService = bukkitService;
|
||||||
|
|||||||
@ -104,11 +104,9 @@ public class ProtocolLibService implements SettingsDependent {
|
|||||||
* @param player The player to send the packet to.
|
* @param player The player to send the packet to.
|
||||||
*/
|
*/
|
||||||
public void sendInventoryPacket(Player player) {
|
public void sendInventoryPacket(Player player) {
|
||||||
if (!isEnabled || inventoryPacketAdapter == null) {
|
if (isEnabled && inventoryPacketAdapter != null) {
|
||||||
return;
|
inventoryPacketAdapter.sendInventoryPacket(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
inventoryPacketAdapter.sendInventoryPacket(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -117,11 +115,9 @@ public class ProtocolLibService implements SettingsDependent {
|
|||||||
* @param player The player to send the packet to.
|
* @param player The player to send the packet to.
|
||||||
*/
|
*/
|
||||||
public void sendBlankInventoryPacket(Player player) {
|
public void sendBlankInventoryPacket(Player player) {
|
||||||
if (!isEnabled || inventoryPacketAdapter == null) {
|
if (isEnabled && inventoryPacketAdapter != null) {
|
||||||
return;
|
inventoryPacketAdapter.sendBlankInventoryPacket(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
inventoryPacketAdapter.sendBlankInventoryPacket(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -130,11 +126,9 @@ public class ProtocolLibService implements SettingsDependent {
|
|||||||
* @param player The player to send the packet to.
|
* @param player The player to send the packet to.
|
||||||
*/
|
*/
|
||||||
public void sendTabList(Player player) {
|
public void sendTabList(Player player) {
|
||||||
if (!isEnabled || tablistPacketAdapter == null) {
|
if (isEnabled && tablistPacketAdapter != null) {
|
||||||
return;
|
tablistPacketAdapter.sendTablist(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
tablistPacketAdapter.sendTablist(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user