TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-29 18:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #659 from AlbeMiglio/main

Browse Source 
Added latest Guava and SLF4J compatibility
This commit is contained in:
games647
2021-12-01 16:34:14 +01:00
committed by GitHub
parent 15fee92937 1dd27ff529
commit 829ba79400
7 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/pom.xml
View File

@ -68,6 +68,10 @@
<pattern>com.google.gson</pattern>
<shadedPattern>fastlogin.gson</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>fastlogin.guava</shadedPattern>
</relocation>
<relocation>
<pattern>io.papermc.lib</pattern>
<shadedPattern>fastlogin.paperlib</shadedPattern>

1
bungee/pom.xml
View File

@ -57,6 +57,7 @@
<!--Those classes are already present in BungeeCord version-->
<exclude>net.md-5:bungeecord-config</exclude>
<exclude>com.google.code.gson:gson</exclude>
<exclude>com.google.guava:guava</exclude>
</excludes>
</artifactSet>
<relocations>

47
core/pom.xml
View File

@ -74,14 +74,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.32</version>
<version>2.0.0-alpha5</version>
</dependency>
<!-- snakeyaml is present in Bungee, Spigot, Cauldron and so we could use this independent implementation -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-config</artifactId>
<version>1.12-SNAPSHOT</version>
<version>1.16-R0.4</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@ -113,18 +113,53 @@
<version>0.4</version>
</dependency>
<!-- APIs we can use because they are available in all platforms (Spigot, Bungee) -->
<!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
<scope>provided</scope>
<!-- Old version for velocity -->
<version>25.1-jre</version>
<!-- Exclude compile time deps not marked as such on upstream -->
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.0-alpha5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.0-alpha5</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

2
core/src/main/java/com/github/games647/fastlogin/core/CommonUtil.java
View File

@ -35,7 +35,7 @@ import java.util.logging.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.JDK14LoggerAdapter;
import org.slf4j.jul.JDK14LoggerAdapter;
public class CommonUtil {

2
core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java
View File

@ -126,7 +126,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
Set<Proxy> proxies = config.getStringList("proxies")
.stream()
.map(HostAndPort::fromString)
.map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort()))
.map(proxy -> new InetSocketAddress(proxy.getHost(), proxy.getPort()))
.map(sa -> new Proxy(Type.HTTP, sa))
.collect(toSet());

3
core/src/main/java/com/github/games647/fastlogin/core/shared/LoginSession.java
View File

@ -26,6 +26,7 @@
package com.github.games647.fastlogin.core.shared;
import com.github.games647.fastlogin.core.StoredProfile;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.util.UUID;
@ -91,7 +92,7 @@ public abstract class LoginSession {
@Override
public synchronized String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("profile", profile)
.add("requestUsername", requestUsername)
.add("username", username)

2
velocity/pom.xml
View File

@ -85,6 +85,8 @@
<excludes>
<exclude>org.slf4j:*</exclude>
<exclude>com.google.code.gson:gson</exclude>
<!-- Ships the same old version -->
<exclude>com.google.guava:guava</exclude>
</excludes>
</artifactSet>
</configuration>