Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve loader and game version detection #45

Merged
merged 4 commits into from
Mar 4, 2023
Merged

Improve loader and game version detection #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4485ce
Improve loader detection
jpenilla Mar 3, 2023
3d455d0
Improve version detection
jpenilla Mar 4, 2023
4d07a87
Apply changes from review
jpenilla Mar 4, 2023
fdfc55a
Re-inline version and platform detection
jpenilla Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ targetCompatibility = JavaVersion.VERSION_1_8

repositories {
mavenCentral()
gradlePluginPortal()
}

dependencies {
compileOnly gradleApi()
compileOnly group: 'org.jetbrains', name: 'annotations', version: '+'
api group: 'dev.masecla', name: 'Modrinth4J', version: '2.0.1'
compileOnly group: 'io.papermc.paperweight', name: 'paperweight-userdev', version: '1.5.2'
}

gradlePlugin {
Expand Down
60 changes: 45 additions & 15 deletions src/main/java/com/modrinth/minotaur/TaskModrinthUpload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.google.gson.GsonBuilder;
import com.modrinth.minotaur.dependencies.Dependency;
import com.modrinth.minotaur.responses.ResponseUpload;
import io.papermc.paperweight.userdev.PaperweightUserExtension;
import masecla.modrinth4j.endpoints.version.CreateVersion.CreateVersionRequest;
import masecla.modrinth4j.main.ModrinthAPI;
import masecla.modrinth4j.model.version.ProjectVersion;
Expand All @@ -13,6 +14,7 @@
import org.gradle.api.GradleException;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.plugins.PluginManager;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.TaskAction;
Expand Down Expand Up @@ -100,17 +102,31 @@ public void apply() {
if (ext.getLoaders().get().isEmpty() && ext.getDetectLoaders().get()) {
Map<String, String> pluginLoaderMap = new HashMap<>();
pluginLoaderMap.put("net.minecraftforge.gradle", "forge");
pluginLoaderMap.put("fabric-loom", "fabric");
pluginLoaderMap.put("org.quiltmc.loom", "quilt");
pluginLoaderMap.put("org.spongepowered.gradle.plugin", "sponge");
pluginLoaderMap.put("io.papermc.paperweight.userdev", "paper");
pluginLoaderMap.put("xyz.jpenilla.run-paper", "paper");
pluginLoaderMap.put("xyz.jpenilla.run-waterfall", "waterfall");
pluginLoaderMap.put("xyz.jpenilla.run-velocity", "velocity");

pluginLoaderMap.forEach((plugin, loader) -> {
if (pluginManager.hasPlugin(plugin)) {
getLogger().debug("Adding loader {} because plugin {} was found.", loader, plugin);
ext.getLoaders().add(loader);
getLogger().debug("Adding loader '{}' because plugin '{}' was found.", loader, plugin);
add(ext.getLoaders(), loader);
}
});

if (!ext.getLoaders().get().contains("quilt") // don't count quilt-loom twice
&& getProject().getExtensions().findByName("loom") != null) {
String loomPlatform = getProject().getProviders().gradleProperty("loom.platform").getOrNull();
if (loomPlatform != null) {
getLogger().debug("Adding loader '{}' because 'loom' extension was found and loom.platform={}.", loomPlatform, loomPlatform);
add(ext.getLoaders(), loomPlatform);
} else {
getLogger().debug("Adding loader 'fabric' because 'loom' extension was found.");
add(ext.getLoaders(), "fabric");
}
}
}

if (ext.getLoaders().get().isEmpty()) {
Expand All @@ -119,30 +135,37 @@ public void apply() {

// Attempt to automatically resolve the game version if none were specified.
if (ext.getGameVersions().get().isEmpty()) {
if (ext.getLoaders().get().contains("forge")) {
if (pluginManager.hasPlugin("net.minecraftforge.gradle")) {
// ForgeGradle will store the game version here.
// https://github.com/MinecraftForge/ForgeGradle/blob/FG_5.0/src/userdev/java/net/minecraftforge/gradle/userdev/MinecraftUserRepo.java#L199
String version = (String) getProject().getExtensions().getExtraProperties().get("MC_VERSION");
assert version != null;
if (ext.getLoaders().get().contains("forge") && pluginManager.hasPlugin("net.minecraftforge.gradle")) {
// ForgeGradle will store the game version here.
// https://github.com/MinecraftForge/ForgeGradle/blob/FG_5.0/src/userdev/java/net/minecraftforge/gradle/userdev/MinecraftUserRepo.java#L199
String version = (String) getProject().getExtensions().getExtraProperties().get("MC_VERSION");

if (version != null) {
getLogger().debug("Adding fallback game version {} from ForgeGradle.", version);
ext.getGameVersions().add(version);
add(ext.getGameVersions(), version);
}
}

if (ext.getLoaders().get().contains("fabric") || ext.getLoaders().get().contains("quilt")) {
if (pluginManager.hasPlugin("fabric-loom") || pluginManager.hasPlugin("org.quiltmc.loom")) {
if (ext.getLoaders().get().contains("fabric") || ext.getLoaders().get().contains("quilt")
|| (ext.getLoaders().get().contains("forge") && !pluginManager.hasPlugin("net.minecraftforge.gradle"))) {
if (getProject().getExtensions().findByName("loom") != null) {
// Use the same method Loom uses to get the version.
// https://github.com/FabricMC/fabric-loom/blob/97f594da8e132c3d33cf39fe8d7cc0e76d84aeb6/src/main/java/net/fabricmc/loom/configuration/DependencyInfo.java#LL60C26-L60C56
String version = getProject().getConfigurations().getByName("minecraft")
.getDependencies().iterator().next().getVersion();
assert version != null;

getLogger().debug("Adding fallback game version {} from Loom.", version);
ext.getGameVersions().add(version);
if (version != null) {
getLogger().debug("Adding fallback game version {} from Loom.", version);
add(ext.getGameVersions(), version);
}
}
}

if (ext.getLoaders().get().contains("paper") && getProject().getExtensions().findByName("paperweight") != null) {
final String mcVer = getProject().getExtensions().getByType(PaperweightUserExtension.class).getMinecraftVersion().get();
getLogger().debug("Adding fallback game version {} from paperweight-userdev.", mcVer);
add(ext.getGameVersions(), mcVer);
}
}

if (ext.getGameVersions().get().isEmpty()) {
Expand Down Expand Up @@ -221,4 +244,11 @@ public void apply() {
}
}
}

// avoid adding duplicates to `ListProperty`s
private static <T> void add(final ListProperty<T> list, final T element) {
if (!list.get().contains(element)) {
list.add(element);
}
}
}