diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 87891bb9..710930f0 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -180,7 +180,7 @@ io.papermc paperlib - 1.0.7 + 1.0.8 @@ -229,7 +229,7 @@ org.geysermc.floodgate api - 2.2.0-SNAPSHOT + ${floodgate.version} provided diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java index 76a6643b..50242186 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java @@ -289,7 +289,7 @@ public class VerifyResponseTask implements Runnable { Class profileHandleType = fakeProfile.getHandleType(); Class packetHandleType = PacketRegistry.getPacketClassFromType(START); ConstructorAccessor startCons = Accessors.getConstructorAccessorOrNull(packetHandleType, profileHandleType); - startPacket = new PacketContainer(START, startCons.invoke(fakeProfile)); + startPacket = new PacketContainer(START, startCons.invoke(fakeProfile.getHandle())); } //we don't want to handle our own packets so ignore filters diff --git a/bungee/pom.xml b/bungee/pom.xml index 404dcc87..36769d7f 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -105,11 +105,6 @@ https://repo.codemc.io/repository/maven-public/ - - spigotplugins-repo - https://maven.gamestrike.de/mvn/ - - jitpack.io https://jitpack.io @@ -216,18 +211,5 @@ system ${project.basedir}/lib/BungeeAuth-1.4.jar - - - de.xxschrandxx.bca - BungeeCordAuthenticator - 0.0.3 - provided - - - * - * - - - diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java index c83c14d0..7fcf8ada 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java @@ -26,7 +26,6 @@ package com.github.games647.fastlogin.bungee; import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook; -import com.github.games647.fastlogin.bungee.hook.BungeeCordAuthenticatorBungeeHook; import com.github.games647.fastlogin.bungee.listener.ConnectListener; import com.github.games647.fastlogin.bungee.listener.PluginMessageListener; import com.github.games647.fastlogin.core.AsyncScheduler; @@ -130,7 +129,8 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin>> hooks = Arrays.asList( - BungeeAuthHook.class, BungeeCordAuthenticatorBungeeHook.class); + BungeeAuthHook.class + ); for (Class> clazz : hooks) { String pluginName = clazz.getSimpleName(); diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeCordAuthenticatorBungeeHook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeCordAuthenticatorBungeeHook.java deleted file mode 100644 index 98443a63..00000000 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeCordAuthenticatorBungeeHook.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * SPDX-License-Identifier: MIT - * - * The MIT License (MIT) - * - * Copyright (c) 2015-2022 games647 and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package com.github.games647.fastlogin.bungee.hook; - -import com.github.games647.fastlogin.bungee.FastLoginBungee; -import com.github.games647.fastlogin.core.hooks.AuthPlugin; - -import de.xxschrandxx.bca.bungee.BungeeCordAuthenticatorBungee; -import de.xxschrandxx.bca.bungee.api.BungeeCordAuthenticatorBungeeAPI; - -import java.sql.SQLException; -import java.util.logging.Level; - -import net.md_5.bungee.api.connection.ProxiedPlayer; - -/** - * GitHub: - * ... - *

- * Project page: - *

- * Spigot: ... - */ -public class BungeeCordAuthenticatorBungeeHook implements AuthPlugin { - - public final BungeeCordAuthenticatorBungeeAPI api; - - public BungeeCordAuthenticatorBungeeHook(FastLoginBungee plugin) { - api = ((BungeeCordAuthenticatorBungee) plugin.getProxy().getPluginManager() - .getPlugin("BungeeCordAuthenticatorBungee")).getAPI(); - plugin.getLog().info("BungeeCordAuthenticatorHook | Hooked successful!"); - } - - @Override - public boolean forceLogin(ProxiedPlayer player) { - if (api.isAuthenticated(player)) { - return true; - } - - try { - api.setAuthenticated(player); - } catch (SQLException sqlEx) { - api.getLogger().log(Level.WARNING, "Failed to force login", sqlEx); - return false; - } - - return true; - } - - @Override - public boolean isRegistered(String playerName) { - try { - return api.getSQL().checkPlayerEntry(playerName); - } catch (SQLException sqlEx) { - api.getLogger().log(Level.WARNING, "Failed to check registration", sqlEx); - return false; - } - } - - @Override - public boolean forceRegister(ProxiedPlayer player, String password) { - try { - return api.createPlayerEntry(player, password); - } catch (SQLException sqlEx) { - api.getLogger().log(Level.WARNING, "Failed to force register", sqlEx); - return false; - } - } -} diff --git a/core/pom.xml b/core/pom.xml index 2ddb9149..4332fb9b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -44,7 +44,7 @@ luck-repo - https://ci.lucko.me/plugin/repository/everything + https://ci.lucko.me/plugin/repository/everything/ false @@ -56,7 +56,7 @@ opencollab-snapshot - https://repo.opencollab.dev/artifactory/maven-snapshots/ + https://repo.opencollab.dev/maven-snapshots/ false @@ -147,7 +147,7 @@ com.github.games647 craftapi - 0.6 + 0.6.1 diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java index 338110fa..00e05ec0 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java @@ -127,7 +127,7 @@ public class FastLoginCore

> { Set proxies = config.getStringList("proxies") .stream() .map(HostAndPort::fromString) - .map(proxy -> new InetSocketAddress(proxy.getHost(), proxy.getPort())) + .map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort())) .map(sa -> new Proxy(Type.HTTP, sa)) .collect(toSet()); diff --git a/pom.xml b/pom.xml index 4ac2b47a..d9f32f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ ${java.version} ${java.version} - 2.2.0-SNAPSHOT + development-2.2.2-SNAPSHOT 2.1.0-SNAPSHOT