diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 801eb81f..cf487ca5 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -85,7 +85,7 @@ pack project(':LauncherAPI') bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm'] bundle group: 'io.netty', name: 'netty-all', version: rootProject['verNetty'] bundle group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j'] - bundle group: 'mysql', name: 'mysql-connector-java', version: rootProject['verMySQLConn'] + bundle group: 'com.mysql', name: 'mysql-connector-j', version: rootProject['verMySQLConn'] bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn'] bundle group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard'] bundle group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j'] diff --git a/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java b/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java index 02168315..e7019d0a 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java @@ -10,33 +10,8 @@ import java.util.Map; public class NewLauncherSettings { - @LauncherNetworkAPI - public final transient List lastHDirs = new ArrayList<>(16); @LauncherNetworkAPI public Map userSettings = new HashMap<>(); @LauncherNetworkAPI - public List features = new ArrayList<>(); - @LauncherNetworkAPI public String consoleUnlockKey; - - public void putHDir(String name, Path path, HashedDir dir) { - String fullPath = path.toAbsolutePath().toString(); - lastHDirs.removeIf((e) -> e.fullPath.equals(fullPath) && e.name.equals(name)); - HashedStoreEntry e = new HashedStoreEntry(dir, name, fullPath); - e.needSave = true; - lastHDirs.add(e); - } - - public static class HashedStoreEntry { - public final HashedDir hdir; - public final String name; - public final String fullPath; - public transient boolean needSave = false; - - public HashedStoreEntry(HashedDir hdir, String name, String fullPath) { - this.hdir = hdir; - this.name = name; - this.fullPath = fullPath; - } - } } diff --git a/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java b/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java index d545c54a..54185d6f 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java @@ -44,48 +44,4 @@ public void setConfig(NewLauncherSettings config) { public NewLauncherSettings getDefaultConfig() { return new NewLauncherSettings(); } - - public void loadHDirStore(Path storePath) throws IOException { - Files.createDirectories(storePath); - IOHelper.walk(storePath, new StoreFileVisitor(), false); - } - - public void saveHDirStore(Path storeProjectPath) throws IOException { - Files.createDirectories(storeProjectPath); - for (NewLauncherSettings.HashedStoreEntry e : settings.lastHDirs) { - if (!e.needSave) continue; - Path file = storeProjectPath.resolve(e.name.concat(".bin")); - if (!Files.exists(file)) Files.createFile(file); - try (HOutput output = new HOutput(IOHelper.newOutput(file))) { - output.writeString(e.name, 128); - output.writeString(e.fullPath, 1024); - e.hdir.write(output); - } - } - } - - public void loadHDirStore() throws IOException { - loadHDirStore(DirBridge.dirStore); - } - - public void saveHDirStore() throws IOException { - saveHDirStore(DirBridge.dirProjectStore); - } - - public static class StoreFileVisitor extends SimpleFileVisitor { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException { - try (HInput input = new HInput(IOHelper.newInput(file))) { - String dirName = input.readString(128); - String fullPath = input.readString(1024); - HashedDir dir = new HashedDir(input); - settings.lastHDirs.add(new NewLauncherSettings.HashedStoreEntry(dir, dirName, fullPath)); - } catch (IOException e) { - LogHelper.error("Skip file %s exception: %s", file.toAbsolutePath().toString(), e.getMessage()); - } - return super.visitFile(file, attrs); - } - - } } diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java index 348815e5..397c056d 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java @@ -19,10 +19,6 @@ public class DirBridge { public static Path dir; - public static Path dirStore; - - public static Path dirProjectStore; - public static Path dirUpdates; public static Path defaultUpdatesDir; @@ -36,10 +32,6 @@ public class DirBridge { if (!IOHelper.exists(DirBridge.dir)) Files.createDirectories(DirBridge.dir); DirBridge.defaultUpdatesDir = DirBridge.dir.resolve("updates"); if (!IOHelper.exists(DirBridge.defaultUpdatesDir)) Files.createDirectories(DirBridge.defaultUpdatesDir); - DirBridge.dirStore = getStoreDir(projectName); - if (!IOHelper.exists(DirBridge.dirStore)) Files.createDirectories(DirBridge.dirStore); - DirBridge.dirProjectStore = getProjectStoreDir(projectName); - if (!IOHelper.exists(DirBridge.dirProjectStore)) Files.createDirectories(DirBridge.dirProjectStore); } catch (IOException e) { LogHelper.error(e); } @@ -95,19 +87,6 @@ public static Path getLauncherDir(String projectname) throws IOException { return getAppDataDir().resolve(projectname); } - public static Path getStoreDir(String projectname) throws IOException { - if (JVMHelper.OS_TYPE == JVMHelper.OS.LINUX) - return getAppDataDir().resolve("store"); - else if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) - return getAppDataDir().resolve("GravitLauncherStore"); - else - return getAppDataDir().resolve("minecraftStore"); - } - - public static Path getProjectStoreDir(String projectname) throws IOException { - return getStoreDir(projectname).resolve(projectname); - } - public static Path getGuardDir() { return dir.resolve("guard"); } diff --git a/props.gradle b/props.gradle index df32b125..f3dc3530 100644 --- a/props.gradle +++ b/props.gradle @@ -1,7 +1,7 @@ project.ext { - verAsm = '9.5' - verNetty = '4.1.94.Final' - verOshiCore = '6.4.4' + verAsm = '9.6' + verNetty = '4.1.99.Final' + verOshiCore = '6.4.6' verJunit = '5.9.3' verGuavaC = '30.1.1-jre' verJansi = '2.4.0' @@ -11,10 +11,9 @@ verGson = '2.10.1' verBcpkix = '1.70' verSlf4j = '1.7.36' - verLog4j = '2.19.0' - verMySQLConn = '8.0.33' + verLog4j = '2.20.0' + verMySQLConn = '8.1.0' verPostgreSQLConn = '42.6.0' - verProguard = '7.3.2' + verProguard = '7.4.0-beta02' verLaunch4j = '3.50' - verHibernate = '5.5.6.Final' }