Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Small fixes

Browse source
This commit is contained in:
Gravita 2022-06-29 17:36:45 +07:00
parent 08fe9b2eb4
commit afd147f92e
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java
View file

@ -8,7 +8,6 @@
import pro.gravit.launcher.events.request.AuthRequestEvent; import pro.gravit.launcher.events.request.AuthRequestEvent;
import pro.gravit.launcher.profiles.ClientProfile; import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launcher.profiles.PlayerProfile; import pro.gravit.launcher.profiles.PlayerProfile;
import pro.gravit.launcher.profiles.Texture;
import pro.gravit.launcher.request.auth.AuthRequest; import pro.gravit.launcher.request.auth.AuthRequest;
import pro.gravit.launcher.request.auth.password.*; import pro.gravit.launcher.request.auth.password.*;
import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.LaunchServer;
@ -84,7 +83,7 @@ public boolean accept(Client client, AuthProviderPair pair, String extendedToken
if(client.permissions == null) client.permissions = new ClientPermissions(); if(client.permissions == null) client.permissions = new ClientPermissions();
client.permissions.addPerm("launchserver.checkserver"); client.permissions.addPerm("launchserver.checkserver");
client.permissions.addPerm(String.format("launchserver.profile.%s.show", info.serverName)); client.permissions.addPerm(String.format("launchserver.profile.%s.show", info.serverName));
client.setSerializableProperty("launchserver.serverName", info.serverName); client.setProperty("launchserver.serverName", info.serverName);
return true; return true;
} }
} }

16
LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java
View file

@ -10,7 +10,6 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
public class Client { public class Client {
public String auth_id; public String auth_id;
@ -32,7 +31,7 @@ public class Client {
public transient Map<String, Object> properties; public transient Map<String, Object> properties;
public Map<String, String> serializableProperties; public Map<String, Object> staticProperties;
public Client() { public Client() {
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
@ -65,14 +64,15 @@ public <T> void setProperty(String name, T object) {
properties.put(name, object); properties.put(name, object);
} }
public String getSerializableProperty(String name) { @SuppressWarnings("unchecked")
if (serializableProperties == null) serializableProperties = new HashMap<>(); public<T> T getStaticProperty(String name) {
return serializableProperties.get(name); if (staticProperties == null) staticProperties = new HashMap<>();
return (T) staticProperties.get(name);
} }
public void setSerializableProperty(String name, String value) { public<T> void setStaticProperty(String name, T value) {
if (serializableProperties == null) serializableProperties = new HashMap<>(); if (staticProperties == null) staticProperties = new HashMap<>();
serializableProperties.put(name, value); staticProperties.put(name, value);
} }
public pro.gravit.launchserver.auth.core.User getUser() { public pro.gravit.launchserver.auth.core.User getUser() {

5
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java
View file

@ -11,6 +11,8 @@
import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler; import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler;
import pro.gravit.launchserver.socket.response.SimpleResponse; import pro.gravit.launchserver.socket.response.SimpleResponse;
import java.util.HashMap;
public class ExitResponse extends SimpleResponse { public class ExitResponse extends SimpleResponse {
public boolean exitAll; public boolean exitAll;
public String username; public String username;
@ -20,6 +22,9 @@ public static void exit(LaunchServer server, WebSocketFrameHandler wsHandler, Ch
Client chClient = wsHandler.getClient(); Client chClient = wsHandler.getClient();
Client newCusClient = new Client(); Client newCusClient = new Client();
newCusClient.checkSign = chClient.checkSign; newCusClient.checkSign = chClient.checkSign;
if(chClient.staticProperties != null) {
newCusClient.staticProperties = new HashMap<>(chClient.staticProperties);
}
wsHandler.setClient(newCusClient); wsHandler.setClient(newCusClient);
ExitRequestEvent event = new ExitRequestEvent(reason); ExitRequestEvent event = new ExitRequestEvent(reason);
event.requestUUID = RequestEvent.eventUUID; event.requestUUID = RequestEvent.eventUUID;

2
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
View file

@ -200,7 +200,7 @@ public static void main(String[] args) throws Throwable {
CommonHelper.newThread("Asset Directory Watcher", true, assetWatcher).start(); CommonHelper.newThread("Asset Directory Watcher", true, assetWatcher).start();
CommonHelper.newThread("Client Directory Watcher", true, clientWatcher).start(); CommonHelper.newThread("Client Directory Watcher", true, clientWatcher).start();
if (javaWatcher != null) if (javaWatcher != null)
CommonHelper.newThread("Java Directory Watcher", true, clientWatcher).start(); CommonHelper.newThread("Java Directory Watcher", true, javaWatcher).start();
verifyHDir(assetDir, params.assetHDir, assetMatcher, digest); verifyHDir(assetDir, params.assetHDir, assetMatcher, digest);
verifyHDir(clientDir, params.clientHDir, clientMatcher, digest); verifyHDir(clientDir, params.clientHDir, clientMatcher, digest);
if (javaWatcher != null) if (javaWatcher != null)

2
props.gradle
View file

@ -1,7 +1,7 @@
project.ext { project.ext {
verAsm = '9.2' verAsm = '9.2'
verNetty = '4.1.75.Final' verNetty = '4.1.75.Final'
verOshiCore = '6.1.5' verOshiCore = '6.2.0'
verJunit = '5.8.2' verJunit = '5.8.2'
verGuavaC = '30.1.1-jre' verGuavaC = '30.1.1-jre'
verJansi = '2.4.0' verJansi = '2.4.0'