Skip to content

feat: 启动游戏5秒内没下载好资源包则不再等待下载 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dogdie233 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: 启动游戏5秒内没下载好资源包则不再等待下载 #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 69 additions & 16 deletions src/main/java/i18nupdatemod/I18nUpdateMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class I18nUpdateMod {
private static final int DOWNLOAD_WAIT_SECONDS = 10;
public static final String MOD_ID = "i18nupdatemod";
public static String MOD_VERSION;

Expand Down Expand Up @@ -55,37 +58,72 @@ public static void init(Path minecraftPath, String minecraftVersion, String load

int minecraftMajorVersion = Integer.parseInt(minecraftVersion.split("\\.")[1]);

try {
CompletableFuture<DownloadTaskResult> downloadTask = CompletableFuture.supplyAsync(() -> {
//Get asset
GameAssetDetail assets = I18nConfig.getAssetDetail(minecraftVersion, loader);
if (assets.downloads.isEmpty()) {
Log.info("No resource pack found for " + minecraftVersion + " with loader " + loader);
return new DownloadTaskResult(true, assets, "", null);
}

//Update resource pack
List<ResourcePack> languagePacks = new ArrayList<>();
List<CompletableFuture<Void>> downloadTasks = new ArrayList<>();
boolean convertNotNeed = assets.downloads.size() == 1 && assets.downloads.get(0).targetVersion.equals(minecraftVersion);
String applyFileName = assets.downloads.get(0).fileName;
for (GameAssetDetail.AssetDownloadDetail it : assets.downloads) {
FileUtil.setTemporaryDirPath(Paths.get(localStorage, "." + MOD_ID, it.targetVersion));
ResourcePack languagePack = new ResourcePack(it.fileName, convertNotNeed);
languagePack.checkUpdate(it.fileUrl, it.md5Url);
downloadTasks.add(CompletableFuture.runAsync(() -> {
try {
languagePack.checkUpdate(it.fileUrl, it.md5Url);
} catch (Exception e) {
throw new RuntimeException(e);
}
}));
languagePacks.add(languagePack);
}

//Convert resourcepack
if (!convertNotNeed) {
FileUtil.setTemporaryDirPath(Paths.get(localStorage, "." + MOD_ID, minecraftVersion));
applyFileName = assets.covertFileName;
ResourcePackConverter converter = new ResourcePackConverter(languagePacks, applyFileName);
converter.convert(assets.covertPackFormat, getResourcePackDescription(assets.downloads));
// Wait for all download tasks to complete
CompletableFuture.allOf(downloadTasks.toArray(new CompletableFuture[0])).join();
return new DownloadTaskResult(convertNotNeed, assets, applyFileName, languagePacks);
});

// Convert and apply resource pack
Consumer<DownloadTaskResult> convertAndApply = (result) -> {
if (result.assets.downloads.isEmpty()) {
return;
}

//Apply resource pack
GameConfig config = new GameConfig(minecraftPath.resolve("options.txt"));
config.addResourcePack("Minecraft-Mod-Language-Modpack",
(minecraftMajorVersion <= 12 ? "" : "file/") + applyFileName);
config.writeToFile();
} catch (Exception e) {
Log.warning(String.format("Failed to update resource pack: %s", e));
// e.printStackTrace();
try {
//Convert resourcepack
if (!result.convertNotNeed) {
FileUtil.setTemporaryDirPath(Paths.get(localStorage, "." + MOD_ID, minecraftVersion));
result.applyFileName = result.assets.covertFileName;
ResourcePackConverter converter = new ResourcePackConverter(result.languagePacks, result.applyFileName);
converter.convert(result.assets.covertPackFormat, getResourcePackDescription(result.assets.downloads));
}

//Apply resource pack
GameConfig config = new GameConfig(minecraftPath.resolve("options.txt"));
config.addResourcePack("Minecraft-Mod-Language-Modpack",
(minecraftMajorVersion <= 12 ? "" : "file/") + result.applyFileName);
config.writeToFile();
} catch (Exception e) {
Log.warning(String.format("Failed to convert and apply resource pack: %s", e));
//e.printStackTrace();
}
};

// Handle the download task result, if it completes within the timeout, apply the resource pack
try {
DownloadTaskResult r = downloadTask.get(DOWNLOAD_WAIT_SECONDS, TimeUnit.SECONDS); // Wait for the download task to complete
convertAndApply.accept(r);
} catch (TimeoutException ex) {
downloadTask.thenAccept(convertAndApply);
Log.info("Resource pack download take too long, will apply it when download finished.");
} catch (ExecutionException | InterruptedException ex) {
Log.warning(String.format("Failed to download resource pack: %s", ex.getCause()));
}
}

Expand Down Expand Up @@ -121,4 +159,19 @@ public static String getLocalStoragePos(Path minecraftPath) {
Objects::nonNull
).findFirst().orElse(xdgDataHome);
}

private static class DownloadTaskResult
{
public boolean convertNotNeed;
public GameAssetDetail assets;
public String applyFileName;
public List<ResourcePack> languagePacks;

public DownloadTaskResult(boolean convertNotNeed, GameAssetDetail assets, String applyFileName, List<ResourcePack> languagePacks) {
this.convertNotNeed = convertNotNeed;
this.assets = assets;
this.applyFileName = applyFileName;
this.languagePacks = languagePacks;
}
}
}