mirror of
https://github.com/architectury/architectury-loom.git
synced 2026-03-28 12:17:00 -05:00
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>
This commit is contained in:
@@ -31,36 +31,85 @@ import org.gradle.api.Action;
|
||||
import org.gradle.api.NamedDomainObjectContainer;
|
||||
import org.gradle.api.artifacts.Dependency;
|
||||
import org.gradle.api.file.ConfigurableFileCollection;
|
||||
import org.gradle.api.file.RegularFileProperty;
|
||||
import org.gradle.api.provider.ListProperty;
|
||||
import org.gradle.api.provider.Property;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import net.fabricmc.loom.api.decompilers.LoomDecompiler;
|
||||
import net.fabricmc.loom.configuration.ide.RunConfigSettings;
|
||||
import net.fabricmc.loom.configuration.processors.JarProcessor;
|
||||
import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpecBuilder;
|
||||
import net.fabricmc.loom.util.DeprecationHelper;
|
||||
|
||||
/**
|
||||
* This is the public api available exposed to build scripts.
|
||||
*/
|
||||
public interface LoomGradleExtensionAPI {
|
||||
File getAccessWidener();
|
||||
@ApiStatus.Internal
|
||||
DeprecationHelper getDeprecationHelper();
|
||||
|
||||
void setAccessWidener(File file);
|
||||
RegularFileProperty getAccessWidenerPath();
|
||||
|
||||
void setShareCaches(boolean shareCaches);
|
||||
|
||||
boolean isShareCaches();
|
||||
|
||||
default void shareCaches() {
|
||||
setShareCaches(true);
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default File getAccessWidener() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("accessWidener", "accessWidenerPath");
|
||||
return getAccessWidenerPath().getAsFile().getOrNull();
|
||||
}
|
||||
|
||||
List<LoomDecompiler> getDecompilers();
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default void setAccessWidener(File file) {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("accessWidener", "accessWidenerPath");
|
||||
getAccessWidenerPath().set(file);
|
||||
}
|
||||
|
||||
void addDecompiler(LoomDecompiler decompiler);
|
||||
Property<Boolean> getShareRemapCaches();
|
||||
|
||||
List<JarProcessor> getJarProcessors();
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default void setShareCaches(boolean shareCaches) {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("shareCaches", "shareRemapCaches");
|
||||
getShareRemapCaches().set(shareCaches);
|
||||
}
|
||||
|
||||
void addJarProcessor(JarProcessor processor);
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default boolean isShareCaches() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("shareCaches", "shareRemapCaches");
|
||||
return getShareRemapCaches().get();
|
||||
}
|
||||
|
||||
default void shareCaches() {
|
||||
getShareRemapCaches().set(true);
|
||||
}
|
||||
|
||||
ListProperty<LoomDecompiler> getGameDecompilers();
|
||||
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default List<LoomDecompiler> getDecompilers() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("decompilers", "gameDecompilers");
|
||||
return getGameDecompilers().get();
|
||||
}
|
||||
|
||||
default void addDecompiler(LoomDecompiler decompiler) {
|
||||
getGameDecompilers().add(decompiler);
|
||||
}
|
||||
|
||||
ListProperty<JarProcessor> getGameJarProcessors();
|
||||
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default List<JarProcessor> getJarProcessors() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("jarProcessors", "gameJarProcessors");
|
||||
return getGameJarProcessors().get();
|
||||
}
|
||||
|
||||
default void addJarProcessor(JarProcessor processor) {
|
||||
getGameJarProcessors().add(processor);
|
||||
}
|
||||
|
||||
ConfigurableFileCollection getLog4jConfigs();
|
||||
|
||||
@@ -70,13 +119,35 @@ public interface LoomGradleExtensionAPI {
|
||||
|
||||
Dependency layered(Action<LayeredMappingSpecBuilder> action);
|
||||
|
||||
String getRefmapName();
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default String getRefmapName() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("refmapName", "mixin.defaultRefmapName");
|
||||
return getMixin().getDefaultRefmapName().get();
|
||||
}
|
||||
|
||||
void setRefmapName(String refmapName);
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default void setRefmapName(String refmapName) {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("refmapName", "mixin.defaultRefmapName");
|
||||
getMixin().getDefaultRefmapName().set(refmapName);
|
||||
}
|
||||
|
||||
boolean isRemapMod();
|
||||
Property<Boolean> getRemapArchives();
|
||||
|
||||
void setRemapMod(boolean remapMod);
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default boolean isRemapMod() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("remapMod", "remapArchives");
|
||||
return getRemapArchives().get();
|
||||
}
|
||||
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default void setRemapMod(boolean remapMod) {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("remapMod", "remapArchives");
|
||||
getRemapArchives().set(remapMod);
|
||||
}
|
||||
|
||||
void runs(Action<NamedDomainObjectContainer<RunConfigSettings>> action);
|
||||
|
||||
@@ -85,7 +156,22 @@ public interface LoomGradleExtensionAPI {
|
||||
@ApiStatus.Experimental
|
||||
void mixin(Action<MixinApExtensionAPI> action);
|
||||
|
||||
void setCustomManifest(String customManifest);
|
||||
@ApiStatus.Experimental
|
||||
MixinApExtensionAPI getMixin();
|
||||
|
||||
String getCustomManifest();
|
||||
Property<String> getCustomMinecraftManifest();
|
||||
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default void setCustomManifest(String customManifest) {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("customManifest", "customMinecraftManifest");
|
||||
getCustomMinecraftManifest().set(customManifest);
|
||||
}
|
||||
|
||||
@Deprecated(forRemoval = true)
|
||||
@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
|
||||
default String getCustomManifest() {
|
||||
getDeprecationHelper().replaceWithInLoom0_11("customManifest", "customMinecraftManifest");
|
||||
return getCustomMinecraftManifest().getOrNull();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user