From 5baceb365a004203d998187c2b5415cde08deb52 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 11 Dec 2019 15:46:42 +0000 Subject: [PATCH] Revert last 2 commits. --- src/main/java/net/fabricmc/loom/LoomGradleExtension.java | 4 ---- .../java/net/fabricmc/loom/util/LoomDependencyManager.java | 6 +----- .../net/fabricmc/loom/util/SetupIntelijRunConfigs.java | 7 +++---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 7a05416..959f573 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -290,8 +290,4 @@ public class LoomGradleExtension { return refmapName; } - - public boolean ideSync() { - return Boolean.parseBoolean(System.getProperty("idea.sync.active", "false")); - } } diff --git a/src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java b/src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java index 4893573..fce9a26 100644 --- a/src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java +++ b/src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java @@ -156,7 +156,6 @@ public class LoomDependencyManager { } private static void handleInstallerJson(JsonObject jsonObject, Project project) { - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); JsonObject libraries = jsonObject.get("libraries").getAsJsonObject(); Configuration mcDepsConfig = project.getConfigurations().getByName(Constants.MINECRAFT_DEPENDENCIES); Configuration apDepsConfig = project.getConfigurations().getByName("annotationProcessor"); @@ -167,10 +166,7 @@ public class LoomDependencyManager { ExternalModuleDependency modDep = (ExternalModuleDependency) project.getDependencies().create(name); modDep.setTransitive(false); mcDepsConfig.getDependencies().add(modDep); - - if (!extension.ideSync()) { - apDepsConfig.getDependencies().add(modDep); - } + apDepsConfig.getDependencies().add(modDep); project.getLogger().debug("Loom adding " + name + " from installer JSON"); diff --git a/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java b/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java index 5066746..018eb0c 100644 --- a/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java +++ b/src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java @@ -59,10 +59,9 @@ public class SetupIntelijRunConfigs { } private static void generate(Project project) throws IOException { - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - - if (extension.ideSync()) { - //Ensures the assets are downloaded when idea is syncing a project + //Ensures the assets are downloaded when idea is syncing a project + if (Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))) { + LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); MinecraftAssetsProvider.provide(extension.getMinecraftProvider(), project); MinecraftNativesProvider.provide(extension.getMinecraftProvider(), project); }