Skip to content

Commit

Permalink
Support NeoForge userdev plugin
Browse files Browse the repository at this point in the history
Closes #59
  • Loading branch information
triphora committed Nov 14, 2023
1 parent baf4b4b commit 41d19e6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'com.gradle.plugin-publish' version '1.2.0'
}

version = '2.8.4'
version = '2.8.5'
group = 'com.modrinth.minotaur'
archivesBaseName = 'Minotaur'
description = 'Modrinth plugin for publishing builds to the website!'
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/com/modrinth/minotaur/TaskModrinthUpload.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public void apply() {
Map<String, String> pluginLoaderMap = new HashMap<>();
pluginLoaderMap.put("net.minecraftforge.gradle", "forge");
pluginLoaderMap.put("net.neoforged.gradle", "neoforge");
pluginLoaderMap.put("net.neoforged.gradle.userdev", "neoforge");
pluginLoaderMap.put("org.quiltmc.loom", "quilt");
pluginLoaderMap.put("org.spongepowered.gradle.plugin", "sponge");
pluginLoaderMap.put("io.papermc.paperweight.userdev", "paper");
Expand Down Expand Up @@ -141,14 +142,18 @@ && getProject().getExtensions().findByName("loom") != null) {
// Attempt to automatically resolve the game version if none were specified.
if (ext.getGameVersions().get().isEmpty()) {
if (pluginManager.hasPlugin("net.minecraftforge.gradle") ||
pluginManager.hasPlugin("net.neoforged.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");
pluginManager.hasPlugin("net.neoforged.gradle") ||
pluginManager.hasPlugin("net.neoforged.gradle.userdev")) {

if (version != null) {
getLogger().debug("Adding fallback game version {} from ForgeGradle/NeoGradle.", version);
add(ext.getGameVersions(), version);
String[] props = {"MC_VERSION", "minecraftVersion"};

for (String prop : props) {
String version = (String) getProject().getExtensions().getExtraProperties().get(prop);
if (version != null) {
getLogger().debug("Adding fallback game version {} from ForgeGradle/NeoGradle.", version);
add(ext.getGameVersions(), version);
break;
}
}
}

Expand Down

0 comments on commit 41d19e6

Please sign in to comment.