Merge 0e1691ee4c into bda6a35945

LaunchServer/build.gradle

@@ -129,7 +129,7 @@
 
 tasks.register('dumpProguard', Copy) {
     duplicatesStrategy = 'EXCLUDE'
-    into "$buildDir/libs/proguard-libraries"
+    into "$buildDir/libs/proguard"
     from configurations.proguardPack
 }
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/profiles/LocalProfilesProvider.java

@@ -113,9 +113,7 @@ public CompletedProfile pushUpdate(UncompletedProfile profile, String tag, Clien
                 if(!Files.exists(assetDirPath)) {
                     Files.createDirectories(assetDirPath);
                 }
-                var assetsHDir = new HashedDir(assetDirPath, null, true, true);
+                updatesDirMap.put("assets", new HashedDir(assetDirPath, null, true, true));
-                updatesDirMap.put("assets", assetsHDir);
-                localProfile.assetDir = assetsHDir;
             }
         }
         if(assetActions != null && !assetActions.isEmpty()) {
@@ -184,7 +182,7 @@ private void writeCache(Path file) throws IOException {
     }
 
     private void readCache(Path file) throws IOException {
-        Map<String, HashedDir> updatesDirMap = new ConcurrentHashMap<>(16);
+        Map<String, HashedDir> updatesDirMap = new HashMap<>(16);
         try (HInput input = new HInput(IOHelper.newInput(file))) {
             int size = input.readLength(0);
             for (int i = 0; i < size; ++i) {
@@ -194,7 +192,7 @@ private void readCache(Path file) throws IOException {
             }
         }
         logger.debug("Found {} updates from cache", updatesDirMap.size());
-        this.updatesDirMap = updatesDirMap;
+        this.updatesDirMap = Collections.unmodifiableMap(updatesDirMap);
     }
 
     public void readProfilesDir() throws IOException {
@@ -250,7 +248,7 @@ public void sync(Collection<String> dirs) throws IOException {
                 newUpdatesDirMap.put(name, updateHDir);
             }
         }
-        updatesDirMap = newUpdatesDirMap;
+        updatesDirMap = Collections.unmodifiableMap(newUpdatesDirMap);
         if (cacheUpdates) {
             try {
                 writeCache(Path.of(cacheFile));

LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java

@@ -129,6 +129,7 @@ protected void initProps(BuildContext context) {
         String unlockSecret = SecurityHelper.randomStringToken();
         context.pipelineContext.putProperty("unlockSecret", unlockSecret);
         context.properties.put("runtimeconfig.unlockSecret", unlockSecret);
+        context.properties.put("runtimeconfig.buildNumber", 1);
     }
 
     public byte[] transformClass(byte[] bytes, String classname, BuildContext context) {

LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java

@@ -44,7 +44,7 @@ protected boolean showApplyDialog(String text) throws IOException {
         return response.equals("y");
     }
 
-    public static Downloader downloadWithProgressBar(String taskName, List<Downloader.SizedFile> list, String baseUrl, Path targetDir) throws Exception {
+    protected static Downloader downloadWithProgressBar(String taskName, List<Downloader.SizedFile> list, String baseUrl, Path targetDir) throws Exception {
         long total = 0;
         for (Downloader.SizedFile file : list) {
             if(file.size < 0) {

LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java

@@ -297,9 +297,6 @@ public UUID getUUID() {
 
     @Override
     public String getMinecraftVersion() {
-        if(version == null) {
-            return null;
-        }
         return version.toString();
     }
 
@@ -319,6 +316,8 @@ public boolean hasFlag(CompatibilityFlags flag) {
 
     public void verify() {
         // Version
+        getMinecraftVersion();
+        IOHelper.verifyFileName(getAssetIndex());
 
         // Client
         VerifyHelper.verify(getTitle(), VerifyHelper.NOT_EMPTY, "Profile title can't be empty");

modules

@@ -1 +1 @@
-Subproject commit e6b8af9b107ea8c7dab4fc5968cfd0cff05b7d61
+Subproject commit 3ce7d4feb1b95152917c9ed85a5186c145a9376c