clean up a little more stuff

unimined · Nov 24, 2024 · 9959254 · 9959254
1 parent 1cac12a
commit 9959254
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -464,34 +464,34 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
                 inputTask = project.tasks.create(inputTaskNameSS, Jar::class.java) {
                     it.group = "build"
                     defaultTaskConfiguration(it)
-                }
+                } as Jar
             } else {
                 project.logger.warn(
                     "[Unimined/Minecraft ${project.path}:${sourceSet.name}] Could not find default task '${inputTaskName.withSourceSet(sourceSet)} for $sourceSet."
                 )
                 project.logger.warn("[Unimined/Minecraft ${project.path}:${sourceSet.name}] add manually with `remap(task)` in the minecraft block for $sourceSet")
                 return
             }
-        } else {
-            if (inputTask !is Jar) {
-                project.logger.warn("[Unimined/Minecraft ${project.path}:${sourceSet.name}] task $inputTaskName for $sourceSet is not an instance of ${Jar::class.qualifiedName}")
-                return
-            }
+        } else if (inputTask !is Jar) {
+            project.logger.warn("[Unimined/Minecraft ${project.path}:${sourceSet.name}] task $inputTaskName for $sourceSet is not an instance of ${Jar::class.qualifiedName}")
+            return
         }
 
-        inputTask as Jar
-
         val oldClassifier = inputTask.archiveClassifier.orNull
         inputTask.apply {
             archiveClassifier.set(if(!oldClassifier.isNullOrEmpty()) "$oldClassifier-dev" else "dev")
         }
 
+        var remapTask: JarInterface<AbstractRemapJarTask>? = null
+
         remappingFunction(inputTask) {
+            remapTask = this
             group = "unimined"
             description = "Remaps $inputTask's output jar"
             asJar.archiveClassifier.set(oldClassifier)
         }
-        project.tasks.getByName("build").dependsOn("remap" + inputTask.name.capitalized())
+
+        project.tasks.getByName("build").dependsOn(remapTask)
     }
 
     fun applyRunConfigs() {