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

Yet another attempt to fix the annotation processor issue.

Browse source
This commit is contained in:
modmuss50 2019-12-13 18:24:01 +00:00
parent 5c2b669bb5
commit c2d61875e1
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View file

@ -241,7 +241,7 @@ public class AbstractPlugin implements Plugin<Project> {
Javadoc javadoc = (Javadoc) project.getTasks().getByName(JavaPlugin.JAVADOC_TASK_NAME); Javadoc javadoc = (Javadoc) project.getTasks().getByName(JavaPlugin.JAVADOC_TASK_NAME);
javadoc.setClasspath(main.getOutput().plus(main.getCompileClasspath())); javadoc.setClasspath(main.getOutput().plus(main.getCompileClasspath()));
if (!Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))) { if (!project.getExtensions().getByType(LoomGradleExtension.class).ideSync()) {
// Add Mixin dependencies // Add Mixin dependencies
project.getDependencies().add(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME, "net.fabricmc:fabric-mixin-compile-extensions:" + Constants.MIXIN_COMPILE_EXTENSIONS_VERSION); project.getDependencies().add(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME, "net.fabricmc:fabric-mixin-compile-extensions:" + Constants.MIXIN_COMPILE_EXTENSIONS_VERSION);
} }

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

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

7
src/main/java/net/fabricmc/loom/util/LoomDependencyManager.java
View file

@ -156,6 +156,8 @@ 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");
@ -166,7 +168,10 @@ 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,9 +59,10 @@ public class SetupIntelijRunConfigs {
} }
private static void generate(Project project) throws IOException { private static void generate(Project project) throws IOException {
//Ensures the assets are downloaded when idea is syncing a project LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
if (Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))) {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); if (extension.ideSync()) {
//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);
} }