Use weave

Update to gradle 3.1
Add new maven handling
This commit is contained in:
modmuss50
2016-09-22 20:33:47 +01:00
parent a32b94a657
commit c322cbd3de
10 changed files with 40 additions and 82 deletions

View File

@@ -147,7 +147,7 @@ public class DownloadTask extends DefaultTask {
if (!Constants.MINECRAFT_JSON.get(extension).exists()) {
logger.lifecycle(":downloading minecraft json");
FileUtils.copyURLToFile(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json"), Constants.VERSION_MANIFEST.get(extension));
ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST.get(extension), Charset.defaultCharset()), ManifestVersion.class);
ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST.get(extension), "UTF-8"), ManifestVersion.class);
Optional<ManifestVersion.Versions> optionalVersion = mcManifest.versions.stream().filter(versions -> versions.id.equalsIgnoreCase(extension.version)).findFirst();
if (optionalVersion.isPresent()) {

View File

@@ -77,7 +77,7 @@ public class GenVSCodeProjectTask extends DefaultTask {
element = new JsonPrimitive("vscode");
jsonObject.add("outputDirectory", element);
FileUtils.write(configFile, gson.toJson(jsonObject), Charset.defaultCharset());
FileUtils.writeStringToFile(configFile, gson.toJson(jsonObject), "UF-8");
}
}

View File

@@ -24,9 +24,9 @@
package net.fabricmc.loom.task;
import net.fabricmc.blendingjar.JarMerger;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.weave.merge.JarMerger;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.TaskAction;