mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-02-03 06:32:52 +08:00
Format code [skip actions]
This commit is contained in:
parent
cc94a21ca9
commit
69fadff479
@ -1,5 +1,8 @@
|
|||||||
package emu.grasscutter.auth;
|
package emu.grasscutter.auth;
|
||||||
|
|
||||||
|
import static emu.grasscutter.config.Configuration.ACCOUNT;
|
||||||
|
import static emu.grasscutter.utils.Language.translate;
|
||||||
|
|
||||||
import at.favre.lib.crypto.bcrypt.BCrypt;
|
import at.favre.lib.crypto.bcrypt.BCrypt;
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.Grasscutter.ServerRunMode;
|
import emu.grasscutter.Grasscutter.ServerRunMode;
|
||||||
@ -14,17 +17,13 @@ import emu.grasscutter.utils.DispatchUtils;
|
|||||||
import emu.grasscutter.utils.FileUtils;
|
import emu.grasscutter.utils.FileUtils;
|
||||||
import emu.grasscutter.utils.Utils;
|
import emu.grasscutter.utils.Utils;
|
||||||
import io.javalin.http.ContentType;
|
import io.javalin.http.ContentType;
|
||||||
|
|
||||||
import javax.crypto.Cipher;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.security.KeyFactory;
|
import java.security.KeyFactory;
|
||||||
import java.security.interfaces.RSAPrivateKey;
|
import java.security.interfaces.RSAPrivateKey;
|
||||||
import java.security.spec.PKCS8EncodedKeySpec;
|
import java.security.spec.PKCS8EncodedKeySpec;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import javax.crypto.Cipher;
|
||||||
import static emu.grasscutter.config.Configuration.ACCOUNT;
|
|
||||||
import static emu.grasscutter.utils.Language.translate;
|
|
||||||
|
|
||||||
/** A class containing default authenticators. */
|
/** A class containing default authenticators. */
|
||||||
public final class DefaultAuthenticators {
|
public final class DefaultAuthenticators {
|
||||||
@ -396,18 +395,17 @@ public final class DefaultAuthenticators {
|
|||||||
|
|
||||||
// Check to see if an IP authentication can be performed.
|
// Check to see if an IP authentication can be performed.
|
||||||
if (Grasscutter.getRunMode() == ServerRunMode.HYBRID) {
|
if (Grasscutter.getRunMode() == ServerRunMode.HYBRID) {
|
||||||
var player = Grasscutter.getGameServer()
|
var player = Grasscutter.getGameServer().getPlayerByIpAddress(ctx.ip());
|
||||||
.getPlayerByIpAddress(ctx.ip());
|
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
// Get the player's session token.
|
// Get the player's session token.
|
||||||
var sessionKey = player.getAccount().getSessionKey();
|
var sessionKey = player.getAccount().getSessionKey();
|
||||||
// Respond with the handbook auth page.
|
// Respond with the handbook auth page.
|
||||||
ctx.status(200).result(
|
ctx.status(200)
|
||||||
this.authPage
|
.result(
|
||||||
.replace("{{VALUE}}", "true")
|
this.authPage
|
||||||
.replace("{{SESSION_TOKEN}}", sessionKey)
|
.replace("{{VALUE}}", "true")
|
||||||
.replace("{{PLAYER_ID}}", String.valueOf(player.getUid()))
|
.replace("{{SESSION_TOKEN}}", sessionKey)
|
||||||
);
|
.replace("{{PLAYER_ID}}", String.valueOf(player.getUid())));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,15 +41,14 @@ import emu.grasscutter.server.packet.send.*;
|
|||||||
import emu.grasscutter.utils.KahnsSort;
|
import emu.grasscutter.utils.KahnsSort;
|
||||||
import emu.grasscutter.utils.Position;
|
import emu.grasscutter.utils.Position;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import lombok.val;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import lombok.val;
|
||||||
|
|
||||||
public final class Scene {
|
public final class Scene {
|
||||||
@Getter private final World world;
|
@Getter private final World world;
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
package emu.grasscutter.server.game;
|
package emu.grasscutter.server.game;
|
||||||
|
|
||||||
|
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
|
||||||
|
import static emu.grasscutter.config.Configuration.GAME_INFO;
|
||||||
|
import static emu.grasscutter.utils.Language.translate;
|
||||||
|
|
||||||
import emu.grasscutter.GameConstants;
|
import emu.grasscutter.GameConstants;
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.Grasscutter.ServerRunMode;
|
import emu.grasscutter.Grasscutter.ServerRunMode;
|
||||||
@ -37,22 +41,17 @@ import emu.grasscutter.server.event.internal.ServerStopEvent;
|
|||||||
import emu.grasscutter.server.event.types.ServerEvent;
|
import emu.grasscutter.server.event.types.ServerEvent;
|
||||||
import emu.grasscutter.server.scheduler.ServerTaskScheduler;
|
import emu.grasscutter.server.scheduler.ServerTaskScheduler;
|
||||||
import emu.grasscutter.task.TaskMap;
|
import emu.grasscutter.task.TaskMap;
|
||||||
import kcp.highway.ChannelConfig;
|
|
||||||
import kcp.highway.KcpServer;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import lombok.SneakyThrows;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.time.OffsetDateTime;
|
import java.time.OffsetDateTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import kcp.highway.ChannelConfig;
|
||||||
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
|
import kcp.highway.KcpServer;
|
||||||
import static emu.grasscutter.config.Configuration.GAME_INFO;
|
import lombok.Getter;
|
||||||
import static emu.grasscutter.utils.Language.translate;
|
import lombok.Setter;
|
||||||
|
import lombok.SneakyThrows;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public final class GameServer extends KcpServer {
|
public final class GameServer extends KcpServer {
|
||||||
@ -255,11 +254,12 @@ public final class GameServer extends KcpServer {
|
|||||||
*/
|
*/
|
||||||
public Player getPlayerByIpAddress(String ipAddress) {
|
public Player getPlayerByIpAddress(String ipAddress) {
|
||||||
return this.getPlayers().values().stream()
|
return this.getPlayers().values().stream()
|
||||||
.map(Player::getSession)
|
.map(Player::getSession)
|
||||||
.filter(session -> session != null &&
|
.filter(
|
||||||
session.getAddress().getHostString().equals(ipAddress))
|
session -> session != null && session.getAddress().getHostString().equals(ipAddress))
|
||||||
.map(GameSession::getPlayer)
|
.map(GameSession::getPlayer)
|
||||||
.findFirst().orElse(null);
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public SocialDetail.Builder getSocialDetailByUid(int id) {
|
public SocialDetail.Builder getSocialDetailByUid(int id) {
|
||||||
|
Loading…
Reference in New Issue
Block a user