From 07ab36a97d5950e86fa26bc91edf8771c186770a Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sun, 21 Apr 2019 11:48:00 +0200 Subject: [PATCH] fix IDE generation file paths assuming CWD == project root, close #72 --- src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java | 2 +- .../java/net/fabricmc/loom/task/GenVsCodeProjectTask.java | 2 +- .../java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index 81eecce..96c3d5b 100644 --- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java @@ -58,7 +58,7 @@ public class GenIdeaProjectTask extends DefaultLoomTask { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); project.getLogger().lifecycle(":Building idea workspace"); - File file = new File(project.getName() + ".iws"); + File file = project.file(project.getName() + ".iws"); DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); Document doc = docBuilder.parse(file); diff --git a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java index 56e622b..8d9cd4d 100644 --- a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java @@ -46,7 +46,7 @@ public class GenVsCodeProjectTask extends DefaultLoomTask { @TaskAction public void genRuns() { LoomGradleExtension extension = getProject().getExtensions().getByType(LoomGradleExtension.class); - File projectDir = new File(".vscode"); + File projectDir = getProject().file(".vscode"); if (!projectDir.exists()) { projectDir.mkdir(); } diff --git a/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java b/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java index 237cf06..9847e7b 100644 --- a/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java +++ b/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java @@ -38,7 +38,7 @@ public class SetupIntelijRunConfigs { public static void setup(Project project) { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - File projectDir = new File(".idea"); + File projectDir = project.file(".idea"); if(!projectDir.exists()){ return; } @@ -61,7 +61,7 @@ public class SetupIntelijRunConfigs { MinecraftAssetsProvider.provide(extension.getMinecraftProvider(), project); } - File projectDir = new File(".idea"); + File projectDir = project.file(".idea"); File runConfigsDir = new File(projectDir, "runConfigurations"); File clientRunConfigs = new File(runConfigsDir, "Minecraft_Client.xml"); File serverRunConfigs = new File(runConfigsDir, "Minecraft_Server.xml");