Merge 0e1691ee4c into 00ab20473c

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java

@@ -29,12 +29,12 @@ public class StdProtectHandler extends ProtectHandler implements ProfilesProtect
 
     @Override
     public boolean canGetProfile(ClientProfile profile, Client client) {
-        return !profile.isLimited() || isWhitelisted("launchserver.profile.%s.show", profile, client);
+        return (client.isAuth && !profile.isLimited()) || isWhitelisted("launchserver.profile.%s.show", profile, client);
     }
 
     @Override
     public boolean canChangeProfile(ClientProfile profile, Client client) {
-        return !profile.isLimited() || isWhitelisted("launchserver.profile.%s.enter", profile, client);
+        return (client.isAuth && !profile.isLimited()) || isWhitelisted("launchserver.profile.%s.enter", profile, client);
     }
 
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java

@@ -31,7 +31,6 @@ import pro.gravit.launchserver.socket.response.secure.HardwareReportResponse;
 import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse;
 import pro.gravit.launchserver.socket.response.secure.VerifySecureLevelKeyResponse;
 import pro.gravit.launchserver.socket.response.update.LauncherResponse;
-import pro.gravit.launchserver.socket.response.update.UpdateListResponse;
 import pro.gravit.launchserver.socket.response.update.UpdateResponse;
 import pro.gravit.utils.BiHookSet;
 import pro.gravit.utils.HookSet;
@@ -74,7 +73,6 @@ public class WebSocketService {
         providers.register("joinServer", JoinServerResponse.class);
         providers.register("profiles", ProfilesResponse.class);
         providers.register("launcher", LauncherResponse.class);
-        providers.register("updateList", UpdateListResponse.class);
         providers.register("setProfile", SetProfileResponse.class);
         providers.register("update", UpdateResponse.class);
         providers.register("batchProfileByUsername", BatchProfileByUsername.class);

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java

@@ -1,27 +0,0 @@
-package pro.gravit.launchserver.socket.response.update;
-
-import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.base.events.request.UpdateListRequestEvent;
-import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.socket.response.SimpleResponse;
-
-import java.util.HashSet;
-
-public class UpdateListResponse extends SimpleResponse {
-
-    @Override
-    public String getType() {
-        return "updateList";
-    }
-
-    @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
-        if (!client.isAuth) {
-            sendError("Access denied");
-            return;
-        }
-        HashSet<String> set = server.updatesManager.getUpdatesList();
-        sendResult(new UpdateListRequestEvent(set));
-    }
-
-}

LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateListRequestEvent.java

@@ -1,24 +0,0 @@
-package pro.gravit.launcher.base.events.request;
-
-import pro.gravit.launcher.core.LauncherNetworkAPI;
-import pro.gravit.launcher.base.events.RequestEvent;
-
-import java.util.HashSet;
-import java.util.UUID;
-
-
-public class UpdateListRequestEvent extends RequestEvent {
-    @SuppressWarnings("unused")
-    private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b");
-    @LauncherNetworkAPI
-    public final HashSet<String> dirs;
-
-    public UpdateListRequestEvent(HashSet<String> dirs) {
-        this.dirs = dirs;
-    }
-
-    @Override
-    public String getType() {
-        return "updateList";
-    }
-}

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateListRequest.java

@@ -1,13 +0,0 @@
-package pro.gravit.launcher.base.request.update;
-
-import pro.gravit.launcher.base.events.request.UpdateListRequestEvent;
-import pro.gravit.launcher.base.request.Request;
-import pro.gravit.launcher.base.request.websockets.WebSocketRequest;
-
-public final class UpdateListRequest extends Request<UpdateListRequestEvent> implements WebSocketRequest {
-
-    @Override
-    public String getType() {
-        return "updateList";
-    }
-}

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java

@@ -94,7 +94,6 @@ public abstract class ClientWebSocketService extends ClientJSONPoint {
             results.register("batchProfileByUsername", BatchProfileByUsernameRequestEvent.class);
             results.register("profiles", ProfilesRequestEvent.class);
             results.register("setProfile", SetProfileRequestEvent.class);
-            results.register("updateList", UpdateListRequestEvent.class);
             results.register("error", ErrorRequestEvent.class);
             results.register("update", UpdateRequestEvent.class);
             results.register("getAvailabilityAuth", GetAvailabilityAuthRequestEvent.class);

README.md

@@ -1,4 +1,6 @@
-# Modification of the launcher sashok724's v3 from Gravit [![Build Status](https://travis-ci.com/GravitLauncher/Launcher.svg?branch=master)](https://travis-ci.com/GravitLauncher/Launcher)
+# Modification of the launcher sashok724's v3 from Gravit
+[![Build Status](https://travis-ci.com/GravitLauncher/Launcher.svg?branch=master)](https://travis-ci.com/GravitLauncher/Launcher)
+[![Join our Discord](https://img.shields.io/discord/853340557522370561.svg?logo=discord&label=)](https://discord.gg/b9QG4ygY75)
 
 * [Discord channel](https://discord.gg/b9QG4ygY75)
 
@@ -9,4 +11,4 @@
 
 ```sh
 curl -s https://raw.githubusercontent.com/GravitLauncher/Launcher/master/get_it.sh | sh
-```
+```

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME