mirror of
https://github.com/GravitLauncher/Launcher
synced 2025-07-07 08:19:45 +03:00
Compare commits
No commits in common. "b1929f7927ea916d222b88e934eaa7fb0141a7c3" and "846ab7779599c9704ce54ed58bfbe44a197b0558" have entirely different histories.
b1929f7927
...
846ab77795
5 changed files with 9 additions and 12 deletions
|
@ -129,7 +129,7 @@
|
|||
|
||||
tasks.register('dumpProguard', Copy) {
|
||||
duplicatesStrategy = 'EXCLUDE'
|
||||
into "$buildDir/libs/proguard-libraries"
|
||||
into "$buildDir/libs/proguard"
|
||||
from configurations.proguardPack
|
||||
}
|
||||
|
||||
|
|
|
@ -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", assetsHDir);
|
||||
localProfile.assetDir = assetsHDir;
|
||||
updatesDirMap.put("assets", new HashedDir(assetDirPath, null, true, true));
|
||||
}
|
||||
}
|
||||
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));
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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");
|
||||
|
|
2
modules
2
modules
|
@ -1 +1 @@
|
|||
Subproject commit e6b8af9b107ea8c7dab4fc5968cfd0cff05b7d61
|
||||
Subproject commit 3ce7d4feb1b95152917c9ed85a5186c145a9376c
|
Loading…
Reference in a new issue