diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-09-20 00:57:45 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-09-20 00:57:45 +0800 |
| commit | 6b1324fc5e6e3a706a7ca23ad05a8ab8e5e1250f (patch) | |
| tree | a7e9d5ca273c9cbabd57debd646940addf997298 | |
| parent | 1c8554a94775851c984d681a16372ba6fa2009e8 (diff) | |
| download | architectury-loom-6b1324fc5e6e3a706a7ca23ad05a8ab8e5e1250f.tar.gz architectury-loom-6b1324fc5e6e3a706a7ca23ad05a8ab8e5e1250f.tar.bz2 architectury-loom-6b1324fc5e6e3a706a7ca23ad05a8ab8e5e1250f.zip | |
Use architectury-mixin
Signed-off-by: shedaniel <daniel@shedaniel.me>
3 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java index 5242d624..28045071 100644 --- a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java @@ -35,7 +35,6 @@ import org.gradle.api.plugins.PluginAware; import org.jetbrains.annotations.NotNull; import net.fabricmc.loom.extension.LoomFiles; -import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.MirrorUtil; public class LoomRepositoryPlugin implements Plugin<PluginAware> { @@ -68,9 +67,7 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> { repo.setName("Architectury"); repo.setUrl("https://maven.architectury.dev/"); repo.mavenContent(content -> { - content.releasesOnly(); - String[] dep = Constants.Dependencies.FORGE_RUNTIME.split(":"); - content.includeVersion(dep[0], dep[1], Constants.Dependencies.Versions.FORGE_RUNTIME); + content.includeGroup("dev.architectury"); }); }); repositories.maven(repo -> { diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java index ec32c5e6..8cadbe2f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java @@ -115,7 +115,11 @@ public class ForgeUserdevProvider extends DependencyProvider { if (lib.getAsString().startsWith("org.spongepowered:mixin:")) { if (getExtension().isUseFabricMixin()) { - dep = addDependency("net.fabricmc:sponge-mixin:0.8.2+build.24", Constants.Configurations.FORGE_DEPENDENCIES); + if (lib.getAsString().contains("0.8.2")) { + dep = addDependency("net.fabricmc:sponge-mixin:0.8.2+build.24", Constants.Configurations.FORGE_DEPENDENCIES); + } else { + dep = addDependency("dev.architectury:mixin-patched" + lib.getAsString().substring(lib.getAsString().lastIndexOf(":")) + ".+", Constants.Configurations.FORGE_DEPENDENCIES); + } } } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index b5ab3798..614bcb4a 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -113,7 +113,7 @@ public class Constants { public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "22.0.0"; public static final String JAVAX_ANNOTATIONS = "3.0.2"; - public static final String FORGE_RUNTIME = "1.0.1"; + public static final String FORGE_RUNTIME = "1.1.3"; public static final String ACCESS_TRANSFORMERS = "3.0.1"; public static final String SPECIAL_SOURCE = "1.8.3"; public static final String VIGNETTE = "0.2.0.10"; |