hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert last 2 commits.

dev/0.11
modmuss50 2019-12-11 15:46:42 +00:00
parent cffb10a420
commit 5baceb365a
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@ -290,8 +290,4 @@ public class LoomGradleExtension {
return refmapName; return refmapName;
} }
public boolean ideSync() {
return Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"));
}
} }

6
src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java
View File

@ -156,7 +156,6 @@ public class LoomDependencyManager {
} }
private static void handleInstallerJson(JsonObject jsonObject, Project project) { private static void handleInstallerJson(JsonObject jsonObject, Project project) {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
JsonObject libraries = jsonObject.get("libraries").getAsJsonObject(); JsonObject libraries = jsonObject.get("libraries").getAsJsonObject();
Configuration mcDepsConfig = project.getConfigurations().getByName(Constants.MINECRAFT_DEPENDENCIES); Configuration mcDepsConfig = project.getConfigurations().getByName(Constants.MINECRAFT_DEPENDENCIES);
Configuration apDepsConfig = project.getConfigurations().getByName("annotationProcessor"); Configuration apDepsConfig = project.getConfigurations().getByName("annotationProcessor");
@ -167,10 +166,7 @@ public class LoomDependencyManager {
ExternalModuleDependency modDep = (ExternalModuleDependency) project.getDependencies().create(name); ExternalModuleDependency modDep = (ExternalModuleDependency) project.getDependencies().create(name);
modDep.setTransitive(false); modDep.setTransitive(false);
mcDepsConfig.getDependencies().add(modDep); mcDepsConfig.getDependencies().add(modDep);
apDepsConfig.getDependencies().add(modDep);
if (!extension.ideSync()) {
apDepsConfig.getDependencies().add(modDep);
}
project.getLogger().debug("Loom adding " + name + " from installer JSON"); project.getLogger().debug("Loom adding " + name + " from installer JSON");

7
src/main/java/net/fabricmc/loom/util/SetupIntelijRunConfigs.java
View File

@ -59,10 +59,9 @@ public class SetupIntelijRunConfigs {
} }
private static void generate(Project project) throws IOException { private static void generate(Project project) throws IOException {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); //Ensures the assets are downloaded when idea is syncing a project
if (Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))) {
if (extension.ideSync()) { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
//Ensures the assets are downloaded when idea is syncing a project
MinecraftAssetsProvider.provide(extension.getMinecraftProvider(), project); MinecraftAssetsProvider.provide(extension.getMinecraftProvider(), project);
MinecraftNativesProvider.provide(extension.getMinecraftProvider(), project); MinecraftNativesProvider.provide(extension.getMinecraftProvider(), project);
} }