From 23d7594b6708ebb32ccef5c853ea9915546e21af Mon Sep 17 00:00:00 2001 From: games647 Date: Thu, 30 Mar 2023 17:18:41 +0200 Subject: [PATCH 1/5] Fix 404 for cracked handling Fixes #998 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 4332fb9b..86b36e09 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -147,7 +147,7 @@ com.github.games647 craftapi - 0.6.1 + 0.6.2 From 487bc24a8a9b1a7a81bb73c2e2f1111a15084e41 Mon Sep 17 00:00:00 2001 From: games647 Date: Thu, 30 Mar 2023 17:25:46 +0200 Subject: [PATCH 2/5] Fix breaking ProtocolLib Minecraft version change Fixes #1008 --- .../bukkit/listener/protocollib/ProtocolLibListener.java | 6 +++--- .../bukkit/listener/protocollib/VerifyResponseTask.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java index 122f5027..c198552a 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java @@ -179,8 +179,8 @@ public class ProtocolLibListener extends PacketAdapter { private boolean verifyNonce(Player sender, PacketContainer packet, ClientPublicKey clientPublicKey, byte[] expectedToken) { try { - if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0)) - && !MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) { + if (new MinecraftVersion(1, 19, 0).atOrAbove() + && !(new MinecraftVersion(1, 19, 3).atOrAbove())) { Either either = packet.getSpecificModifier(Either.class).read(0); if (clientPublicKey == null) { Optional left = either.left(); @@ -224,7 +224,7 @@ public class ProtocolLibListener extends PacketAdapter { PacketContainer packet = packetEvent.getPacket(); Optional clientKey = Optional.empty(); - if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) { + if (new MinecraftVersion(1, 19, 3).atOrAbove()) { // public key sent separate clientKey = Optional.empty(); } else { 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 50242186..387f04dd 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 @@ -272,7 +272,7 @@ public class VerifyResponseTask implements Runnable { //fake a new login packet in order to let the server handle all the other stuff private void receiveFakeStartPacket(String username, ClientPublicKey clientKey) { PacketContainer startPacket; - if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0))) { + if (new MinecraftVersion(1, 19, 0).atOrAbove()) { startPacket = new PacketContainer(START); startPacket.getStrings().write(0, username); From 546bbede0b98aee0388cc3efb7231c59e30b8701 Mon Sep 17 00:00:00 2001 From: games647 Date: Fri, 31 Mar 2023 13:06:12 +0200 Subject: [PATCH 3/5] Fix compatibility with older guava versions like Minecraft < 1.19 --- .../games647/fastlogin/core/shared/FastLoginCore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 00e05ec0..fc84381d 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 @@ -40,7 +40,6 @@ import com.github.games647.fastlogin.core.storage.MySQLStorage; import com.github.games647.fastlogin.core.storage.SQLStorage; import com.github.games647.fastlogin.core.storage.SQLiteStorage; import com.google.common.base.Ticker; -import com.google.common.net.HostAndPort; import com.zaxxer.hikari.HikariConfig; import java.io.IOException; @@ -126,8 +125,8 @@ public class FastLoginCore

> { antiBot = createAntiBotService(config.getSection("anti-bot")); Set proxies = config.getStringList("proxies") .stream() - .map(HostAndPort::fromString) - .map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort())) + .map(proxy -> proxy.split(":")) + .map(proxy -> new InetSocketAddress(proxy[0], Integer.parseInt(proxy[1]))) .map(sa -> new Proxy(Type.HTTP, sa)) .collect(toSet()); @@ -269,6 +268,7 @@ public class FastLoginCore

> { return passwordGenerator; } + @SuppressWarnings("unused") public void setPasswordGenerator(PasswordGenerator

passwordGenerator) { this.passwordGenerator = passwordGenerator; } From 46bfbb9ca07d0e85fef9ee35db64cd928fe1bd57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 07:57:40 +0000 Subject: [PATCH 4/5] Bump actions/cache from 3.2.6 to 3.3.1 Bumps [actions/cache](https://github.com/actions/cache) from 3.2.6 to 3.3.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.6...v3.3.1) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5ed76eef..82eb9e2c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,7 +50,7 @@ jobs: languages: ${{ matrix.language }} # Cache build process too like in the maven config - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 42911e978f1e18066c561a379b0b35d13f751619 Mon Sep 17 00:00:00 2001 From: games647 Date: Sat, 1 Apr 2023 14:24:51 +0200 Subject: [PATCH 5/5] Rephrase auto-login documentation Fixes #465 --- core/src/main/resources/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml index 5132bb2b..c99facbe 100644 --- a/core/src/main/resources/config.yml +++ b/core/src/main/resources/config.yml @@ -202,8 +202,8 @@ mojang-request-limit: 600 # https://github.com/games647/FastLogin/issues/85 auto-register-unknown: false -# This disables the auto login from fastlogin. So a premium (like a paid account) authentication is requested, but -# the player won't be auto logged into the account. +# By setting this option to false, you can disable the auto login from fastlogin. So a premium (like a paid account) +# authentication is requested, but the player won't be auto logged into the account from the auth plugin. # # This can be used as 2Factor authentication for better security of your accounts. A hacker then needs both passwords. # The password of your Minecraft and the password to login in with your auth plugin