Skip to content

Commit 41d19e6

Browse files
committed
Support NeoForge userdev plugin
Closes #59
1 parent baf4b4b commit 41d19e6

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.gradle.plugin-publish' version '1.2.0'
33
}
44

5-
version = '2.8.4'
5+
version = '2.8.5'
66
group = 'com.modrinth.minotaur'
77
archivesBaseName = 'Minotaur'
88
description = 'Modrinth plugin for publishing builds to the website!'

src/main/java/com/modrinth/minotaur/TaskModrinthUpload.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public void apply() {
107107
Map<String, String> pluginLoaderMap = new HashMap<>();
108108
pluginLoaderMap.put("net.minecraftforge.gradle", "forge");
109109
pluginLoaderMap.put("net.neoforged.gradle", "neoforge");
110+
pluginLoaderMap.put("net.neoforged.gradle.userdev", "neoforge");
110111
pluginLoaderMap.put("org.quiltmc.loom", "quilt");
111112
pluginLoaderMap.put("org.spongepowered.gradle.plugin", "sponge");
112113
pluginLoaderMap.put("io.papermc.paperweight.userdev", "paper");
@@ -141,14 +142,18 @@ && getProject().getExtensions().findByName("loom") != null) {
141142
// Attempt to automatically resolve the game version if none were specified.
142143
if (ext.getGameVersions().get().isEmpty()) {
143144
if (pluginManager.hasPlugin("net.minecraftforge.gradle") ||
144-
pluginManager.hasPlugin("net.neoforged.gradle")) {
145-
// ForgeGradle will store the game version here.
146-
// https://github.com/MinecraftForge/ForgeGradle/blob/FG_5.0/src/userdev/java/net/minecraftforge/gradle/userdev/MinecraftUserRepo.java#L199
147-
String version = (String) getProject().getExtensions().getExtraProperties().get("MC_VERSION");
145+
pluginManager.hasPlugin("net.neoforged.gradle") ||
146+
pluginManager.hasPlugin("net.neoforged.gradle.userdev")) {
148147

149-
if (version != null) {
150-
getLogger().debug("Adding fallback game version {} from ForgeGradle/NeoGradle.", version);
151-
add(ext.getGameVersions(), version);
148+
String[] props = {"MC_VERSION", "minecraftVersion"};
149+
150+
for (String prop : props) {
151+
String version = (String) getProject().getExtensions().getExtraProperties().get(prop);
152+
if (version != null) {
153+
getLogger().debug("Adding fallback game version {} from ForgeGradle/NeoGradle.", version);
154+
add(ext.getGameVersions(), version);
155+
break;
156+
}
152157
}
153158
}
154159

0 commit comments

Comments
 (0)