diff --git a/proxies/bungeecord/bungeecord-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java b/proxies/bungeecord/bungeecord-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java index 77c8817..f349383 100644 --- a/proxies/bungeecord/bungeecord-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java +++ b/proxies/bungeecord/bungeecord-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java @@ -19,6 +19,7 @@ import net.md_5.bungee.api.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.List; import java.util.UUID; /** @@ -102,6 +103,54 @@ public class RedisBungeeAPI extends AbstractRedisBungeeAPI { ((ApiPlatformSupport) this.plugin).kickPlayer(player, message); } + /** + * Get the current BungeeCord / Velocity proxy ID for this server. + * + * @return the current server ID + * @see #getAllServers() + * @since 0.2.5 + * @deprecated to avoid confusion between A server and A proxy see #getProxyId() + */ + @Deprecated(forRemoval = true) + public final String getServerId() { + return getProxyId(); + } + + /** + * Get all the linked proxies in this network. + * + * @return the list of all proxies + * @see #getServerId() + * @since 0.2.5 + * @deprecated to avoid confusion between A server and A proxy see see {@link #getAllProxies()} + */ + @Deprecated(forRemoval = true) + public final List getAllServers() { + return getAllProxies(); + } + + /** + * Register (a) PubSub channel(s), so that you may handle PubSubMessageEvent for it. + * + * @param channels the channels to register + * @since 0.3 + * @deprecated No longer required + */ + @Deprecated(forRemoval = true) + public final void registerPubSubChannels(String... channels) { + } + + /** + * Unregister (a) PubSub channel(s). + * + * @param channels the channels to unregister + * @since 0.3 + * @deprecated No longer required + */ + @Deprecated(forRemoval = true) + public final void unregisterPubSubChannels(String... channels) { + } + /** * Api instance * diff --git a/proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java index ccedfcb..d39c6ed 100644 --- a/proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java +++ b/proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java @@ -21,6 +21,7 @@ import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerChangedServerNe import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerJoinedNetworkEvent; import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerLeftNetworkEvent; import com.imaginarycode.minecraft.redisbungee.api.events.IPubSubMessageEvent; +import com.imaginarycode.minecraft.redisbungee.api.summoners.JedisPooledSummoner; import com.imaginarycode.minecraft.redisbungee.api.summoners.Summoner; import com.imaginarycode.minecraft.redisbungee.api.util.InitialUtils; import com.imaginarycode.minecraft.redisbungee.api.util.uuid.UUIDTranslator; @@ -40,6 +41,7 @@ import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.scheduler.ScheduledTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import redis.clients.jedis.JedisPool; import java.io.IOException; import java.lang.reflect.Field; @@ -53,6 +55,7 @@ import java.util.logging.Level; public class RedisBungee extends Plugin implements RedisBungeePlugin, ConfigLoader, LangConfigLoader, ApiPlatformSupport { + private static RedisBungeeAPI apiStatic; private AbstractRedisBungeeAPI api; private RedisBungeeMode redisBungeeMode; private ProxyDataManager proxyDataManager; @@ -230,6 +233,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin