diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-08-14 02:31:16 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-08-14 02:31:16 +0800 |
| commit | 83de8bbc9afaa8da8ec0df95de9430da6678a3c4 (patch) | |
| tree | 86cdd94797bf046a609fbebfb5fd233c04bbc220 /src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java | |
| parent | ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4 (diff) | |
| parent | 159e573cade48ee649fc0dc2c9111cda77dd7816 (diff) | |
| download | architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.tar.gz architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.tar.bz2 architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/JarRemapper.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
# src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
# src/test/resources/projects/kotlin/build.gradle.kts
Diffstat (limited to 'src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java index e97a6e3c..feb6bc21 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java @@ -63,7 +63,8 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen public LoomGradleExtensionImpl(Project project, LoomFiles files) { super(project, files); this.project = project; - this.mixinApExtension = new MixinApExtensionImpl(project); + // Initiate with newInstance to allow gradle to decorate our extension + this.mixinApExtension = project.getObjects().newInstance(MixinApExtensionImpl.class, project); this.loomFiles = files; this.unmappedMods = project.files(); } @@ -166,7 +167,7 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen } @Override - public MixinApExtension getMixinApExtension() { + public MixinApExtension getMixin() { return this.mixinApExtension; } |