Skip to content

Simplify file cache checks #8

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
PaintNinja wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Simplify file cache checks #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e029417
Simplify file cache checks
PaintNinja Mar 6, 2026
92dd5fe
Use `!=` instead of `>`
PaintNinja Mar 6, 2026
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
10 changes: 5 additions & 5 deletions src/main/java/net/minecraftforge/launcher/DownloadAssets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ static void download(String repo, File assetsDir, MinecraftVersion versionJson)
AssetsIndex.Asset asset = entry.getValue();
String assetDest = getAssetDest(asset.hash);
File file = new File(objectsDir, assetDest);
if (file.exists()) {
Main.LOGGER.debug("Considering existing file with size " + file.length() + " for " + name);
if (file.length() == asset.size) {
long fileLength = file.length();
if (fileLength != 0) {
Main.LOGGER.debug("Considering existing file with size " + fileLength + " for " + name);
if (fileLength == asset.size) {
Main.LOGGER.debug("Size check succeeded. Skipping.");
continue;
}
Expand Down Expand Up @@ -64,9 +65,8 @@ private static String getAssetDest(String hash) {

private static File downloadIndex(MinecraftVersion versionJson, File assetsDir) {
File index = new File(assetsDir, "indexes/" + versionJson.assetIndex.id + ".json");
if (index.exists() && index.length() == versionJson.assetIndex.size) {
if (index.length() == versionJson.assetIndex.size)
return index;
}

if (!index.getParentFile().getAbsoluteFile().exists() && !index.getParentFile().getAbsoluteFile().mkdirs())
throw new IllegalArgumentException("Failed to create index directory: " + index.getParentFile());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/launcher/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private SplitArgs(String[] args) {
// we're looking for the first "--"
int splitIdx = -1;
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--")) {
if ("--".equals(args[i])) {
splitIdx = i;
break;
}
Expand Down