Fix regression in behavior of NeoFormRuntimeSpecification#getNeoFormV…

…ersion (#123)
neoforged · Feb 27, 2024 · 6b4435a · 6b4435a
1 parent da5be81
commit 6b4435a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy b/...groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy
@@ -12,7 +12,8 @@ import org.jetbrains.annotations.NotNull;
 interface NeoFormSpecification extends Specification {
 
     /**
-     * The version of NeoForm that shall be used.
+     * The version of NeoForm that shall be used. Does not include the minecraft version as a prefix, unlike
+     * {@link Specification#getVersion()}.
      * 
      * @return The NeoForm version.
      */

diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java b/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java
@@ -74,8 +74,8 @@ private static Optional<DependencyReplacementResult> replaceDependency(Context c
                         runtime.getSourceJarTask(),
                         runtime.getRawJarTask(),
                         runtime.getMinecraftDependenciesConfiguration(),
-                        builder -> builder.setVersion(runtime.getSpecification().getNeoFormVersion()),
-                        builder -> builder.setVersion(runtime.getSpecification().getNeoFormVersion()),
+                        builder -> builder.setVersion(runtime.getSpecification().getVersion()),
+                        builder -> builder.setVersion(runtime.getSpecification().getVersion()),
                         runtime::setReplacedDependency,
                         runtime::onRepoWritten,
                         Sets::newHashSet

diff --git a/.../java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java b/.../java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java
@@ -52,9 +52,9 @@ public NeoFormConfigConfigurationSpecV2 getConfig() {
     public String getMinecraftVersion() {
         return config.getVersion();
     }
-    
+
     public String getNeoFormVersion() {
-        return getVersion();
+        return getVersion().substring(getVersion().lastIndexOf("-") + 1);
     }
 
     public File getNeoFormArchive() {

diff --git a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java
@@ -167,7 +167,7 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re
         });
         // The NeoForm version that's passed into this method can be a version range or '+', but to build userdev and installer profiles safely,
         // we need the actual version it was resolved to. Otherwise the NeoForm version used by installer & userdev could change over time.
-        String neoformDependency = "net.neoforged:neoform:" + neoFormRuntimeDefinition.getSpecification().getNeoFormVersion() + "@zip";
+        String neoformDependency = "net.neoforged:neoform:" + neoFormRuntimeDefinition.getSpecification().getVersion() + "@zip";
 
         final RuntimeDevRuntimeExtension runtimeDevRuntimeExtension = project.getExtensions().getByType(RuntimeDevRuntimeExtension.class);
         final RuntimeDevRuntimeDefinition runtimeDefinition = runtimeDevRuntimeExtension.create(builder -> {