diff options
author | shedaniel <daniel@shedaniel.me> | 2021-07-27 03:08:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-26 20:08:03 +0100 |
commit | 75234f4cbde7392f47a593b670b51cdda821e030 (patch) | |
tree | bc90728671a966097da36329ba643c43d1c78cd4 /src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java | |
parent | b558ee1a4604a0fbf0eba8edab401f2a831e4fb6 (diff) | |
download | architectury-loom-75234f4cbde7392f47a593b670b51cdda821e030.tar.gz architectury-loom-75234f4cbde7392f47a593b670b51cdda821e030.tar.bz2 architectury-loom-75234f4cbde7392f47a593b670b51cdda821e030.zip |
Use Property in LoomGradleExtension & Move task groups to constants (#445)
* Use Property in LoomGradleExtension
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Fix customMinecraftManifest
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Add deprecation messages, let's wait for the tests to run to fix the tests that are using deprecated apis
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Apply license
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Update src/main/java/net/fabricmc/loom/util/DeprecationHelper.java
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
* Fix some tests, move mixinRefmapName -> mixin.defaultRefmapName
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Move back to the api
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Fix some tests
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Apply reviews
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Update src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java')
-rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java index c4326a92..97fa0013 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java @@ -121,7 +121,7 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra } private void downloadMcJson(boolean offline) throws IOException { - if (getExtension().isShareCaches() && !getExtension().isRootProject() && versionManifestJson.exists() && !isRefreshDeps()) { + if (getExtension().getShareRemapCaches().get() && !getExtension().isRootProject() && versionManifestJson.exists() && !isRefreshDeps()) { return; } @@ -145,10 +145,10 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra Optional<ManifestVersion.Versions> optionalVersion = Optional.empty(); - if (getExtension().getCustomManifest() != null) { + if (getExtension().getCustomMinecraftManifest().isPresent()) { ManifestVersion.Versions customVersion = new ManifestVersion.Versions(); customVersion.id = minecraftVersion; - customVersion.url = getExtension().getCustomManifest(); + customVersion.url = getExtension().getCustomMinecraftManifest().get(); optionalVersion = Optional.of(customVersion); getProject().getLogger().lifecycle("Using custom minecraft manifest"); } @@ -212,7 +212,7 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra } private boolean hasRecentValidManifest() throws IOException { - if (getExtension().getCustomManifest() != null) { + if (getExtension().getCustomMinecraftManifest().isPresent()) { return false; } @@ -233,7 +233,7 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra } private void downloadJars(Logger logger) throws IOException { - if (getExtension().isShareCaches() && !getExtension().isRootProject() && minecraftClientJar.exists() && minecraftServerJar.exists() && !isRefreshDeps()) { + if (getExtension().getShareRemapCaches().get() && !getExtension().isRootProject() && minecraftClientJar.exists() && minecraftServerJar.exists() && !isRefreshDeps()) { return; } |