mirror of
https://github.com/ViaVersion/ViaVersion.git
synced 2024-10-31 23:59:33 +01:00
Set some object fields to finals, use lambdas
This commit is contained in:
parent
c4b23b8c87
commit
4542e9511b
@ -28,17 +28,17 @@ import java.util.UUID;
|
||||
|
||||
public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform {
|
||||
|
||||
private BukkitCommandHandler commandHandler;
|
||||
private final BukkitCommandHandler commandHandler;
|
||||
private boolean compatSpigotBuild = false;
|
||||
private boolean spigot = true;
|
||||
private boolean lateBind = false;
|
||||
private boolean protocolSupport = false;
|
||||
@Getter
|
||||
private BukkitViaConfig conf;
|
||||
private final BukkitViaConfig conf;
|
||||
@Getter
|
||||
private ViaAPI<Player> api = new BukkitViaAPI(this);
|
||||
private List<Runnable> queuedTasks = new ArrayList<>();
|
||||
private List<Runnable> asyncQueuedTasks = new ArrayList<>();
|
||||
private final ViaAPI<Player> api = new BukkitViaAPI(this);
|
||||
private final List<Runnable> queuedTasks = new ArrayList<>();
|
||||
private final List<Runnable> asyncQueuedTasks = new ArrayList<>();
|
||||
|
||||
public ViaVersionPlugin() {
|
||||
// Command handler
|
||||
@ -238,7 +238,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform {
|
||||
if (Bukkit.getPluginManager().getPlugin("ProtocolLib") != null) {
|
||||
getLogger().severe("ViaVersion is already loaded, we're going to kick all the players... because otherwise we'll crash because of ProtocolLib.");
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
player.kickPlayer(ChatColor.translateAlternateColorCodes('&', getConf().getReloadDisconnectMsg()));
|
||||
player.kickPlayer(ChatColor.translateAlternateColorCodes('&', conf.getReloadDisconnectMsg()));
|
||||
}
|
||||
|
||||
} else {
|
||||
|
@ -9,7 +9,7 @@ import java.util.UUID;
|
||||
|
||||
@AllArgsConstructor
|
||||
public class BukkitCommandSender implements ViaCommandSender {
|
||||
private CommandSender sender;
|
||||
private final CommandSender sender;
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(String permission) {
|
||||
|
@ -23,12 +23,13 @@ public class PlayerSneakListener extends ViaBukkitListener {
|
||||
private static final float HEIGHT_1_9 = 1.6F;
|
||||
private static final float DEFAULT_WIDTH = 0.6F;
|
||||
|
||||
private final boolean is1_9Fix;
|
||||
private final boolean is1_14Fix;
|
||||
private Map<Player, Boolean> sneaking; // true = 1.14+, else false
|
||||
private Set<UUID> sneakingUuids;
|
||||
private Method getHandle;
|
||||
private Method setSize;
|
||||
private boolean is1_9Fix;
|
||||
private boolean is1_14Fix;
|
||||
|
||||
private boolean useCache;
|
||||
|
||||
public PlayerSneakListener(ViaVersionPlugin plugin, boolean is1_9Fix, boolean is1_14Fix) {
|
||||
|
@ -13,12 +13,7 @@ import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class HandItemCache extends BukkitRunnable {
|
||||
public static boolean CACHE = false;
|
||||
private static Map<UUID, Item> handCache = new ConcurrentHashMap<>();
|
||||
|
||||
public static Item getHandItem(UUID player) {
|
||||
return handCache.get(player);
|
||||
}
|
||||
private final Map<UUID, Item> handCache = new ConcurrentHashMap<>();
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
@ -34,6 +29,10 @@ public class HandItemCache extends BukkitRunnable {
|
||||
}
|
||||
}
|
||||
|
||||
public Item getHandItem(UUID player) {
|
||||
return handCache.get(player);
|
||||
}
|
||||
|
||||
public static Item convert(ItemStack itemInHand) {
|
||||
if (itemInHand == null) return new Item((short) 0, (byte) 0, (short) 0, null);
|
||||
return new Item((short) itemInHand.getTypeId(), (byte) itemInHand.getAmount(), itemInHand.getDurability(), null);
|
||||
|
@ -7,5 +7,5 @@ import us.myles.ViaVersion.api.platform.TaskId;
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class BukkitTaskId implements TaskId {
|
||||
private Integer object;
|
||||
private final Integer object;
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ import java.util.UUID;
|
||||
|
||||
@AllArgsConstructor
|
||||
public class BukkitViaAPI implements ViaAPI<Player>, ViaVersionAPI {
|
||||
private ViaVersionPlugin plugin;
|
||||
private final ViaVersionPlugin plugin;
|
||||
|
||||
@Override
|
||||
public int getPlayerVersion(@NonNull Player player) {
|
||||
|
@ -21,8 +21,8 @@ import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
|
||||
public class BukkitViaInjector implements ViaInjector {
|
||||
private List<ChannelFuture> injectedFutures = new ConcurrentList<>();
|
||||
private List<Pair<Field, Object>> injectedLists = new ConcurrentList<>();
|
||||
private final List<ChannelFuture> injectedFutures = new ConcurrentList<>();
|
||||
private final List<Pair<Field, Object>> injectedLists = new ConcurrentList<>();
|
||||
|
||||
@Override
|
||||
public void inject() throws Exception {
|
||||
|
@ -37,10 +37,12 @@ import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class BukkitViaLoader implements ViaPlatformLoader {
|
||||
private ViaVersionPlugin plugin;
|
||||
private final ViaVersionPlugin plugin;
|
||||
|
||||
private Set<Listener> listeners = new HashSet<>();
|
||||
private Set<BukkitTask> tasks = new HashSet<>();
|
||||
private final Set<Listener> listeners = new HashSet<>();
|
||||
private final Set<BukkitTask> tasks = new HashSet<>();
|
||||
|
||||
private HandItemCache handItemCache;
|
||||
|
||||
public BukkitViaLoader(ViaVersionPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
@ -94,8 +96,8 @@ public class BukkitViaLoader implements ViaPlatformLoader {
|
||||
storeListener(new PaperPatch(plugin)).register();
|
||||
}
|
||||
if (plugin.getConf().isItemCache()) {
|
||||
tasks.add(new HandItemCache().runTaskTimerAsynchronously(plugin, 2L, 2L)); // Updates player's items :)
|
||||
HandItemCache.CACHE = true;
|
||||
handItemCache = new HandItemCache();
|
||||
tasks.add(handItemCache.runTaskTimerAsynchronously(plugin, 2L, 2L)); // Updates player's items :)
|
||||
}
|
||||
|
||||
/* Providers */
|
||||
@ -110,8 +112,8 @@ public class BukkitViaLoader implements ViaPlatformLoader {
|
||||
Via.getManager().getProviders().use(HandItemProvider.class, new HandItemProvider() {
|
||||
@Override
|
||||
public Item getHandItem(final UserConnection info) {
|
||||
if (HandItemCache.CACHE) {
|
||||
return HandItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
|
||||
if (handItemCache != null) {
|
||||
return handItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
|
||||
} else {
|
||||
try {
|
||||
return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<Item>() {
|
||||
|
@ -26,8 +26,8 @@ import java.util.logging.Level;
|
||||
|
||||
public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider {
|
||||
|
||||
private static Map<UUID, BukkitInventoryUpdateTask> updateTasks = new ConcurrentHashMap<UUID, BukkitInventoryUpdateTask>();
|
||||
private boolean supported;
|
||||
private static final Map<UUID, BukkitInventoryUpdateTask> UPDATE_TASK = new ConcurrentHashMap<>();
|
||||
private final boolean supported;
|
||||
// packet class
|
||||
private Class<?> windowClickPacketClass;
|
||||
private Object clickTypeEnum;
|
||||
@ -65,11 +65,11 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
|
||||
}
|
||||
ProtocolInfo info = userConnection.get(ProtocolInfo.class);
|
||||
UUID uuid = info.getUuid();
|
||||
BukkitInventoryUpdateTask updateTask = updateTasks.get(uuid);
|
||||
BukkitInventoryUpdateTask updateTask = UPDATE_TASK.get(uuid);
|
||||
final boolean registered = updateTask != null;
|
||||
if (!registered) {
|
||||
updateTask = new BukkitInventoryUpdateTask(this, uuid);
|
||||
updateTasks.put(uuid, updateTask);
|
||||
UPDATE_TASK.put(uuid, updateTask);
|
||||
}
|
||||
// http://wiki.vg/index.php?title=Protocol&oldid=13223#Click_Window
|
||||
updateTask.addItem(windowId, slotId, actionId);
|
||||
@ -93,7 +93,7 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
|
||||
if (tinvtype == InventoryType.BREWING) {
|
||||
// 1.9 added the blaze powder slot to brewing stand fix for 1.8 servers
|
||||
if (slotId >= 5 && slotId <= 40) {
|
||||
slotId = (short) (slotId - 1);
|
||||
slotId -= 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -147,7 +147,7 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
|
||||
}
|
||||
|
||||
public void onTaskExecuted(UUID uuid) {
|
||||
updateTasks.remove(uuid);
|
||||
UPDATE_TASK.remove(uuid);
|
||||
}
|
||||
|
||||
private void setupReflection() {
|
||||
|
@ -12,7 +12,7 @@ import java.util.UUID;
|
||||
|
||||
public class BukkitInventoryUpdateTask implements Runnable {
|
||||
|
||||
private BukkitInventoryQuickMoveProvider provider;
|
||||
private final BukkitInventoryQuickMoveProvider provider;
|
||||
private final UUID uuid;
|
||||
private final List<ItemTransaction> items;
|
||||
|
||||
|
@ -3,8 +3,8 @@ package us.myles.ViaVersion.bukkit.util;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
public class NMSUtil {
|
||||
private static String BASE = Bukkit.getServer().getClass().getPackage().getName();
|
||||
private static String NMS = BASE.replace("org.bukkit.craftbukkit", "net.minecraft.server");
|
||||
private static final String BASE = Bukkit.getServer().getClass().getPackage().getName();
|
||||
private static final String NMS = BASE.replace("org.bukkit.craftbukkit", "net.minecraft.server");
|
||||
|
||||
public static Class<?> nms(String className) throws ClassNotFoundException {
|
||||
return Class.forName(NMS + "." + className);
|
||||
|
@ -8,7 +8,7 @@ import java.util.List;
|
||||
|
||||
public abstract class AbstractViaConfig extends Config implements ViaVersionConfig {
|
||||
|
||||
public AbstractViaConfig(File configFile) {
|
||||
protected AbstractViaConfig(File configFile) {
|
||||
super(configFile);
|
||||
}
|
||||
|
||||
|
@ -21,14 +21,14 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
@Getter
|
||||
public class ViaManager {
|
||||
private final Map<UUID, UserConnection> portedPlayers = new ConcurrentHashMap<>();
|
||||
private ViaPlatform platform;
|
||||
private ViaProviders providers = new ViaProviders();
|
||||
private final ViaPlatform platform;
|
||||
private final ViaProviders providers = new ViaProviders();
|
||||
@Setter
|
||||
private boolean debug = false;
|
||||
// Internals
|
||||
private ViaInjector injector;
|
||||
private ViaCommandHandler commandHandler;
|
||||
private ViaPlatformLoader loader;
|
||||
private final ViaInjector injector;
|
||||
private final ViaCommandHandler commandHandler;
|
||||
private final ViaPlatformLoader loader;
|
||||
|
||||
@Builder
|
||||
public ViaManager(ViaPlatform platform, ViaInjector injector, ViaCommandHandler commandHandler, ViaPlatformLoader loader) {
|
||||
@ -52,19 +52,14 @@ public class ViaManager {
|
||||
try {
|
||||
injector.inject();
|
||||
} catch (Exception e) {
|
||||
getPlatform().getLogger().severe("ViaVersion failed to inject:");
|
||||
platform.getLogger().severe("ViaVersion failed to inject:");
|
||||
e.printStackTrace();
|
||||
return;
|
||||
}
|
||||
// Mark as injected
|
||||
System.setProperty("ViaVersion", getPlatform().getPluginVersion());
|
||||
System.setProperty("ViaVersion", platform.getPluginVersion());
|
||||
// If successful
|
||||
platform.runSync(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
onServerLoaded();
|
||||
}
|
||||
});
|
||||
platform.runSync(this::onServerLoaded);
|
||||
|
||||
}
|
||||
|
||||
@ -73,14 +68,14 @@ public class ViaManager {
|
||||
try {
|
||||
ProtocolRegistry.SERVER_PROTOCOL = injector.getServerProtocolVersion();
|
||||
} catch (Exception e) {
|
||||
getPlatform().getLogger().severe("ViaVersion failed to get the server protocol!");
|
||||
platform.getLogger().severe("ViaVersion failed to get the server protocol!");
|
||||
e.printStackTrace();
|
||||
}
|
||||
// Check if there are any pipes to this version
|
||||
if (ProtocolRegistry.SERVER_PROTOCOL != -1) {
|
||||
getPlatform().getLogger().info("ViaVersion detected server version: " + ProtocolVersion.getProtocol(ProtocolRegistry.SERVER_PROTOCOL));
|
||||
platform.getLogger().info("ViaVersion detected server version: " + ProtocolVersion.getProtocol(ProtocolRegistry.SERVER_PROTOCOL));
|
||||
if (!ProtocolRegistry.isWorkingPipe()) {
|
||||
getPlatform().getLogger().warning("ViaVersion does not have any compatible versions for this server version, please read our resource page carefully.");
|
||||
platform.getLogger().warning("ViaVersion does not have any compatible versions for this server version, please read our resource page carefully.");
|
||||
}
|
||||
}
|
||||
// Load Listeners / Tasks
|
||||
@ -95,11 +90,11 @@ public class ViaManager {
|
||||
|
||||
public void destroy() {
|
||||
// Uninject
|
||||
getPlatform().getLogger().info("ViaVersion is disabling, if this is a reload and you experience issues consider rebooting.");
|
||||
platform.getLogger().info("ViaVersion is disabling, if this is a reload and you experience issues consider rebooting.");
|
||||
try {
|
||||
injector.uninject();
|
||||
} catch (Exception e) {
|
||||
getPlatform().getLogger().severe("ViaVersion failed to uninject:");
|
||||
platform.getLogger().severe("ViaVersion failed to uninject:");
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
@ -6,5 +6,5 @@ import lombok.Getter;
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class StoredObject {
|
||||
private UserConnection user;
|
||||
private final UserConnection user;
|
||||
}
|
||||
|
@ -23,7 +23,6 @@ public abstract class MetadataRewriter<T extends EntityType> {
|
||||
metadataMap = Collections.unmodifiableMap(metadataMap);
|
||||
|
||||
for (Metadata metadata : new ArrayList<>(metadatas)) {
|
||||
int oldId = metadata.getId();
|
||||
try {
|
||||
handleMetadata(entityId, type, metadata, metadatas, metadataMap, connection);
|
||||
} catch (Exception e) {
|
||||
|
@ -107,7 +107,7 @@ public abstract class ViaCommandHandler implements ViaVersionCommand {
|
||||
*/
|
||||
public void showHelp(ViaCommandSender sender) {
|
||||
Set<ViaSubCommand> allowed = calculateAllowedCommands(sender);
|
||||
if (allowed.size() == 0) {
|
||||
if (allowed.isEmpty()) {
|
||||
sender.sendMessage(color("&cYou are not allowed to use these commands!"));
|
||||
return;
|
||||
}
|
||||
|
@ -4,8 +4,8 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class InformativeException extends Exception {
|
||||
final Map<String, Object> info = new HashMap<>();
|
||||
int sources = 0;
|
||||
private final Map<String, Object> info = new HashMap<>();
|
||||
private int sources = 0;
|
||||
|
||||
public InformativeException(Throwable cause) {
|
||||
super(cause);
|
||||
@ -34,7 +34,7 @@ public class InformativeException extends Exception {
|
||||
builder.append("Please post this error to http://github.com/ViaVersion/ViaVersion/issues\n{");
|
||||
int i = 0;
|
||||
for (Map.Entry<String, Object> entry : info.entrySet()) {
|
||||
builder.append((i == 0 ? "" : ", ") + entry.getKey() + ": " + entry.getValue().toString());
|
||||
builder.append(i == 0 ? "" : ", ").append(entry.getKey()).append(": ").append(entry.getValue().toString());
|
||||
i++;
|
||||
}
|
||||
builder.append("}\nActual Error: ");
|
||||
|
@ -10,8 +10,8 @@ import io.netty.util.concurrent.EventExecutor;
|
||||
import java.net.SocketAddress;
|
||||
|
||||
public class ChannelHandlerContextWrapper implements ChannelHandlerContext {
|
||||
private ChannelHandlerContext base;
|
||||
private ViaHandler handler;
|
||||
private final ChannelHandlerContext base;
|
||||
private final ViaHandler handler;
|
||||
|
||||
public ChannelHandlerContextWrapper(ChannelHandlerContext base, ViaHandler handler) {
|
||||
this.base = base;
|
||||
|
@ -150,10 +150,10 @@ public enum PacketType {
|
||||
}
|
||||
}
|
||||
|
||||
private State state;
|
||||
private Direction direction;
|
||||
private int packetID;
|
||||
private int newPacketID = -1;
|
||||
private final State state;
|
||||
private final Direction direction;
|
||||
private final int packetID;
|
||||
private final int newPacketID;
|
||||
|
||||
PacketType(State state, Direction direction, int packetID) {
|
||||
this.state = state;
|
||||
|
@ -17,45 +17,25 @@ import java.util.UUID;
|
||||
|
||||
public class UpdateUtil {
|
||||
|
||||
public final static String PREFIX = ChatColor.GREEN + "" + ChatColor.BOLD + "[ViaVersion] " + ChatColor.GREEN;
|
||||
private final static String URL = "https://api.spiget.org/v2/resources/";
|
||||
private final static int PLUGIN = 19254;
|
||||
private final static String LATEST_VERSION = "/versions/latest";
|
||||
public static final String PREFIX = ChatColor.GREEN + "" + ChatColor.BOLD + "[ViaVersion] " + ChatColor.GREEN;
|
||||
private static final String URL = "https://api.spiget.org/v2/resources/";
|
||||
private static final int PLUGIN = 19254;
|
||||
private static final String LATEST_VERSION = "/versions/latest";
|
||||
|
||||
public static void sendUpdateMessage(final UUID uuid) {
|
||||
Via.getPlatform().runAsync(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
final String message = getUpdateMessage(false);
|
||||
if (message != null) {
|
||||
Via.getPlatform().runSync(
|
||||
new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Via.getPlatform().sendMessage(uuid, PREFIX + message);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
Via.getPlatform().runAsync(() -> {
|
||||
final String message = getUpdateMessage(false);
|
||||
if (message != null) {
|
||||
Via.getPlatform().runSync(() -> Via.getPlatform().sendMessage(uuid, PREFIX + message));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static void sendUpdateMessage() {
|
||||
Via.getPlatform().runAsync(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
final String message = getUpdateMessage(true);
|
||||
if (message != null) {
|
||||
Via.getPlatform().runSync(
|
||||
new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Via.getPlatform().getLogger().warning(message);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
Via.getPlatform().runAsync(() -> {
|
||||
final String message = getUpdateMessage(true);
|
||||
if (message != null) {
|
||||
Via.getPlatform().runSync(() -> Via.getPlatform().getLogger().warning(message));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -14,18 +14,15 @@ import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentSkipListMap;
|
||||
|
||||
public abstract class Config implements ConfigurationProvider {
|
||||
private static final ThreadLocal<Yaml> YAML = new ThreadLocal<Yaml>() {
|
||||
@Override
|
||||
protected Yaml initialValue() {
|
||||
DumperOptions options = new DumperOptions();
|
||||
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
|
||||
options.setPrettyFlow(false);
|
||||
options.setIndent(2);
|
||||
return new Yaml(new YamlConstructor(), new Representer(), options);
|
||||
}
|
||||
};
|
||||
private static final ThreadLocal<Yaml> YAML = ThreadLocal.withInitial(() -> {
|
||||
DumperOptions options = new DumperOptions();
|
||||
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
|
||||
options.setPrettyFlow(false);
|
||||
options.setIndent(2);
|
||||
return new Yaml(new YamlConstructor(), new Representer(), options);
|
||||
});
|
||||
|
||||
private CommentStore commentStore = new CommentStore('.', 2);
|
||||
private final CommentStore commentStore = new CommentStore('.', 2);
|
||||
private final File configFile;
|
||||
private ConcurrentSkipListMap<String, Object> config;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user