Skip to content

Fix getAssetsIndex task for ForgeGradle 1.0 #1074

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
zeng-github01 wants to merge 1 commit into
base: FG_1.0
Choose a base branch
from
Open

Fix getAssetsIndex task for ForgeGradle 1.0 #1074

Show file tree
Hide file tree
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
31 changes: 31 additions & 0 deletions src/main/java/net/minecraftforge/gradle/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package net.minecraftforge.gradle;

import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Objects;

public class FileUtils {
public static String readString(File file) throws IOException {
return readString(file, StandardCharsets.UTF_8);
}

public static String readString(File file, Charset charset) throws IOException {
return new String(Files.readAllBytes(file.toPath()), charset);
}

public static void updateDate(File file) throws IOException {
if (!file.createNewFile() && !file.setLastModified(System.currentTimeMillis())) {
throw new IOException("Unable to update modification time of " + file);
}
}

public static String getFileExtension(String fullName) {
Objects.requireNonNull(fullName);
String fileName = new File(fullName).getName();
int dotIndex = fileName.lastIndexOf('.');
return (dotIndex == -1) ? "" : fileName.substring(dotIndex + 1);
}
}
151 changes: 127 additions & 24 deletions src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.List;
import java.util.function.Function;

import net.minecraftforge.gradle.FileLogListenner;
import net.minecraftforge.gradle.common.version.AssetIndex;
Expand All @@ -14,10 +18,13 @@
import net.minecraftforge.gradle.delayed.DelayedFile;
import net.minecraftforge.gradle.delayed.DelayedFileTree;
import net.minecraftforge.gradle.delayed.DelayedString;
import net.minecraftforge.gradle.json.MCVersionManifest;
import net.minecraftforge.gradle.json.version.VersionToString;
import net.minecraftforge.gradle.tasks.DownloadAssetsTask;
import net.minecraftforge.gradle.tasks.ObtainFernFlowerTask;
import net.minecraftforge.gradle.tasks.abstractutil.DownloadTask;

import net.minecraftforge.gradle.tasks.abstractutil.EtagDownloadTask;
import org.gradle.api.Action;
import org.gradle.api.DefaultTask;
import org.gradle.api.Plugin;
Expand Down Expand Up @@ -63,7 +70,7 @@ public final void apply(Project arg)
@Override
public void execute(Project proj)
{
addMavenRepo(proj, "forge", "http://files.minecraftforge.net/maven");
addMavenRepo(proj, "forge", "https://files.minecraftforge.net/maven");
proj.getRepositories().mavenCentral();
addMavenRepo(proj, "minecraft", Constants.LIBRARY_URL);
}
Expand Down Expand Up @@ -129,48 +136,144 @@ private void makeObtainTasks()
// download tasks
DownloadTask task;

EtagDownloadTask etagDlTask;
etagDlTask = makeTask("getVersionJsonIndex", EtagDownloadTask.class);
{
etagDlTask.setUri(delayedString(Constants.MC_JSON_INDEX_URL));
etagDlTask.setFile(delayedFile(Constants.VERSION_JSON_INDEX));
etagDlTask.setDieWithError(false);
}

etagDlTask = makeTask("getVersionJson", EtagDownloadTask.class);
{
class GetVersionJsonUrl extends DelayedString {
public GetVersionJsonUrl() {
super(BasePlugin.this.project, "");
}

@Override
public String call() {
try {
MCVersionManifest manifest = JsonFactory.loadMCVersionManifest(delayedFile(Constants.VERSION_JSON_INDEX).call());
MCVersionManifest.Version version = manifest.findVersion(delayedString("{MC_VERSION}").call());
return version.url;
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
etagDlTask.dependsOn("getVersionJsonIndex");
etagDlTask.getInputs().file(delayedFile(Constants.VERSION_JSON_INDEX));
etagDlTask.setUri(new GetVersionJsonUrl());
etagDlTask.setFile(delayedFile(Constants.VERSION_JSON_INDEX));
etagDlTask.setDieWithError(false);
//TODO: this is not necessary?
etagDlTask.doLast(new Action<Task>() { // normalizes to linux endings
@Override
public void execute(Task task) {
try {
File json = delayedFile(Constants.VERSION_JSON_INDEX).call();
if (!json.exists())
return;

List<String> lines = Files.readAllLines(json.toPath());
StringBuilder buf = new StringBuilder();
for (String line : lines) {
buf.append(line).append('\n');
}
Files.write(json.toPath(), buf.toString().getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
});
}

class GetDataFromJson extends DelayedString {
private final VersionToString function;

public GetDataFromJson(VersionToString function) {
super(BasePlugin.this.project, "");
this.function = function;
}

@Override
public String call() {
try {
Version manifest = JsonFactory.loadVersion(delayedFile(Constants.VERSION_JSON_INDEX).call());
return function.apply(manifest);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

task = makeTask("downloadClient", DownloadTask.class);
{
task.getInputs().file(delayedFile(Constants.VERSION_JSON_INDEX));
task.dependsOn("getVersionJson");

task.setOutput(delayedFile(Constants.JAR_CLIENT_FRESH));
task.setUrl(delayedString(Constants.MC_JAR_URL));
task.setUrl(new GetDataFromJson(new VersionToString() {
@Override
public String apply(Version json) {
return json.downloads.client.url;
}
}));


}

task = makeTask("downloadServer", DownloadTask.class);
{
task.getInputs().file(delayedFile(Constants.VERSION_JSON_INDEX));
task.dependsOn("getVersionJson");

task.setOutput(delayedFile(Constants.JAR_SERVER_FRESH));
task.setUrl(delayedString(Constants.MC_SERVER_URL));
task.setUrl(new GetDataFromJson(new VersionToString() {
@Override
public String apply(Version json) {
return json.downloads.server.url;
}
}));


}

ObtainFernFlowerTask mcpTask = makeTask("downloadMcpTools", ObtainFernFlowerTask.class);
{
mcpTask.setMcpUrl(delayedString(Constants.MCP_URL));
mcpTask.setFfJar(delayedFile(Constants.FERNFLOWER));
}
DownloadTask getAssetsIndex = makeTask("getAssetsIndex", DownloadTask.class);

etagDlTask = makeTask("getAssetsIndex", EtagDownloadTask.class);
{
getAssetsIndex.setUrl(delayedString(Constants.ASSETS_INDEX_URL));
getAssetsIndex.setOutput(delayedFile(Constants.ASSETS + "/indexes/{ASSET_INDEX}.json"));
getAssetsIndex.setDoesCache(false);
task.getInputs().file(delayedFile(Constants.VERSION_JSON_INDEX));
task.dependsOn("getVersionJson");

getAssetsIndex.doLast(new Action<Task>() {
public void execute(Task task)
{
try
{
etagDlTask.setUrl(new GetDataFromJson(new VersionToString() {
@Override
public String apply(Version json) {
return json.assetIndex.url;
}
}));


etagDlTask.setFile(delayedFile(Constants.ASSETS + "/indexes/{ASSET_INDEX}.json"));
etagDlTask.setDieWithError(false);

etagDlTask.doLast(new Action<Task>() {
@Override
public void execute(Task task1) {
try {
parseAssetIndex();
} catch (JsonSyntaxException e) {
throw new RuntimeException(e);
} catch (JsonIOException e) {
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
catch (Exception e)
{
Throwables.propagate(e);
}
}
});

getAssetsIndex.getOutputs().upToDateWhen(new Closure<Boolean>(this, null) {
public Boolean call(Object... obj)
{
return false;
}
});
}
Expand Down
Loading