mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge pull request #274 from GravitLauncher/feature/betterStructure
Feature/better structure
This commit is contained in:
commit
ad46b99d58
67 changed files with 3 additions and 9 deletions
|
@ -41,7 +41,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
pack project(':libLauncher')
|
|
||||||
pack project(':LauncherAPI')
|
pack project(':LauncherAPI')
|
||||||
bundle project(':Radon')
|
bundle project(':Radon')
|
||||||
bundle 'mysql:mysql-connector-java:8.0.16'
|
bundle 'mysql:mysql-connector-java:8.0.16'
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
|
@ -39,7 +38,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
|
||||||
{
|
{
|
||||||
LogHelper.info("Enabled HStore feature. Find");
|
LogHelper.info("Enabled HStore feature. Find");
|
||||||
AtomicReference<NewLauncherSettings.HashedStoreEntry> lastEn = new AtomicReference<>(null);
|
AtomicReference<NewLauncherSettings.HashedStoreEntry> lastEn = new AtomicReference<>(null);
|
||||||
ArrayList<String> removed = new ArrayList<>();
|
//ArrayList<String> removed = new ArrayList<>();
|
||||||
diff.mismatch.walk(File.separator, (path, name, entry) -> {
|
diff.mismatch.walk(File.separator, (path, name, entry) -> {
|
||||||
if(entry.getType() == HashedEntry.Type.DIR) {
|
if(entry.getType() == HashedEntry.Type.DIR) {
|
||||||
Files.createDirectories(request.getDir().resolve(path));
|
Files.createDirectories(request.getDir().resolve(path));
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import ru.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.security.MessageDigest;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
|
|
||||||
public class ConsoleManager {
|
public class ConsoleManager {
|
||||||
public static CommandHandler handler;
|
public static CommandHandler handler;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
targetCompatibility = '1.8'
|
targetCompatibility = '1.8'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':libLauncher')
|
compile project(':LauncherCore')
|
||||||
compileOnly 'org.apache.httpcomponents:httpclient:4.5.7'
|
compileOnly 'org.apache.httpcomponents:httpclient:4.5.7'
|
||||||
compileOnly 'io.netty:netty-all:4.1.36.Final'
|
compileOnly 'io.netty:netty-all:4.1.36.Final'
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
import ru.gravit.launcher.request.ResultInterface;
|
import ru.gravit.launcher.request.ResultInterface;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import ru.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
include 'Launcher'
|
include 'Launcher'
|
||||||
include 'Radon'
|
include 'Radon'
|
||||||
include 'libLauncher'
|
include 'LauncherCore'
|
||||||
include 'LauncherAPI'
|
include 'LauncherAPI'
|
||||||
include 'LauncherAuthlib'
|
include 'LauncherAuthlib'
|
||||||
include 'ServerWrapper'
|
include 'ServerWrapper'
|
||||||
|
|
Loading…
Reference in a new issue