From 8d50a143718ff57c9d0cb4bcdf9477899c26e3b1 Mon Sep 17 00:00:00 2001 From: games647 Date: Tue, 7 Jun 2022 18:26:24 +0200 Subject: [PATCH] Drop SodionAuth plugin, because it's no longer reachable in Maven --- bukkit/pom.xml | 14 ---- .../fastlogin/bukkit/hook/SodionAuthHook.java | 78 ------------------- .../bukkit/task/DelayedAuthHook.java | 5 +- bungee/pom.xml | 14 ---- .../fastlogin/bungee/hook/SodionAuthHook.java | 78 ------------------- 5 files changed, 2 insertions(+), 187 deletions(-) delete mode 100644 bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/SodionAuthHook.java delete mode 100644 bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 25e137e2..9c16220a 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -351,19 +351,5 @@ system ${project.basedir}/lib/UltraAuth v2.1.2.jar - - - com.github.Mohist-Community.SodionAuth - SodionAuth-Bukkit - 2bdfdc854b - - - com.github.Mohist-Community.SodionAuth - SodionAuth-Libs - - - true - provided - diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/SodionAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/SodionAuthHook.java deleted file mode 100644 index c44e4fc7..00000000 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/SodionAuthHook.java +++ /dev/null @@ -1,78 +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.bukkit.hook; - -import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.core.hooks.AuthPlugin; -import org.bukkit.entity.Player; -import red.mohist.sodionauth.bukkit.implementation.BukkitPlayer; -import red.mohist.sodionauth.core.SodionAuthApi; -import red.mohist.sodionauth.core.exception.AuthenticatedException; - -/** - * GitHub: https://github.com/Mohist-Community/SodionAuth - *

- * Project page: https://gitea.e-loli.com/SodionAuth/SodionAuth - *

- * Bukkit: Unknown - *

- * Spigot: https://www.spigotmc.org/resources/sodionauth.76944/ - */ -public class SodionAuthHook implements AuthPlugin { - - private final FastLoginBukkit plugin; - - public SodionAuthHook(FastLoginBukkit plugin) { - this.plugin = plugin; - } - - @Override - public boolean forceLogin(Player player) { - try { - SodionAuthApi.login(new BukkitPlayer(player)); - } catch (AuthenticatedException e) { - plugin.getLog().warn(ALREADY_AUTHENTICATED, player); - return false; - } - return true; - } - - @Override - public boolean forceRegister(Player player, String password) { - try{ - return SodionAuthApi.register(new BukkitPlayer(player), password); - } catch (UnsupportedOperationException e){ - plugin.getLog().warn("Currently SodionAuth is not accepting forceRegister, " + - "It may be caused by unsupported AuthBackend"); - return false; - } - } - - @Override - public boolean isRegistered(String playerName) { - return SodionAuthApi.isRegistered(playerName); - } -} diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java index a84e1592..a4fde7ab 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java @@ -32,7 +32,6 @@ import com.github.games647.fastlogin.bukkit.hook.LogItHook; import com.github.games647.fastlogin.bukkit.hook.LoginSecurityHook; import com.github.games647.fastlogin.bukkit.hook.UltraAuthHook; import com.github.games647.fastlogin.bukkit.hook.xAuthHook; -import com.github.games647.fastlogin.bukkit.hook.SodionAuthHook; import com.github.games647.fastlogin.core.hooks.AuthPlugin; import java.lang.reflect.Constructor; @@ -95,8 +94,8 @@ public class DelayedAuthHook implements Runnable { private AuthPlugin getAuthHook() { try { List>> hooks = Arrays.asList(AuthMeHook.class, - CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, - SodionAuthHook.class, UltraAuthHook.class, xAuthHook.class); + CrazyLoginHook.class, LogItHook.class, LoginSecurityHook.class, UltraAuthHook.class, + xAuthHook.class); for (Class> clazz : hooks) { String pluginName = clazz.getSimpleName(); diff --git a/bungee/pom.xml b/bungee/pom.xml index 19eb9051..a99eaa44 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -201,19 +201,5 @@ - - - com.github.Mohist-Community.SodionAuth - SodionAuth-Bungee - 2bdfdc854b - - - com.github.Mohist-Community.SodionAuth - SodionAuth-Libs - - - true - provided - diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java deleted file mode 100644 index f0759eac..00000000 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java +++ /dev/null @@ -1,78 +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 net.md_5.bungee.api.connection.ProxiedPlayer; -import red.mohist.sodionauth.bungee.implementation.BungeePlayer; -import red.mohist.sodionauth.core.SodionAuthApi; -import red.mohist.sodionauth.core.exception.AuthenticatedException; - -/** - * GitHub: https://github.com/Mohist-Community/SodionAuth - *

- * Project page: https://gitea.e-loli.com/SodionAuth/SodionAuth - *

- * Bukkit: Unknown - *

- * Spigot: https://www.spigotmc.org/resources/sodionauth.76944/ - */ -public class SodionAuthHook implements AuthPlugin { - - private final FastLoginBungee plugin; - - public SodionAuthHook(FastLoginBungee plugin) { - this.plugin = plugin; - } - - @Override - public boolean forceLogin(ProxiedPlayer player) { - try { - SodionAuthApi.login(new BungeePlayer(player)); - } catch (AuthenticatedException e) { - plugin.getLog().warn(ALREADY_AUTHENTICATED, player); - return false; - } - return true; - } - - @Override - public boolean forceRegister(ProxiedPlayer player, String password) { - try{ - return SodionAuthApi.register(new BungeePlayer(player), password); - } catch (UnsupportedOperationException e){ - plugin.getLog().warn("Currently SodionAuth is not accepting forceRegister, " + - "It may be caused by unsupported AuthBackend"); - return false; - } - } - - @Override - public boolean isRegistered(String playerName) { - return SodionAuthApi.isRegistered(playerName); - } -}