chore(1.20.5): Don't reobfuscate jars for paper plugins

MineInAbyss · May 2, 2024 · 9d00e2f · 9d00e2f
1 parent 9c0445c
commit 9d00e2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.copyjar.gradle.kts b/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.copyjar.gradle.kts
@@ -25,7 +25,7 @@ if (pluginPath != null) {
             val dest = copyJar.destPath.orNull ?: pluginPath
             val jarName = copyJar.jarName.orNull ?: "${project.name}-${project.version}.jar"
 
-            from(findByName("reobfJar") ?: findByName("shadowJar") ?: findByName("jar"))
+            from(findByName("shadowJar") ?: findByName("jar"))
             into(dest)
             doLast {
                 println("Copied to plugin directory $dest")

diff --git a/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.nms.gradle.kts b/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.nms.gradle.kts
@@ -7,10 +7,7 @@ val libs = idofrontLibsRef
 
 dependencies {
     paperweight.paperDevBundle(libs.findVersion("minecraft").get().toString())
-}
 
-tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
 }
+
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION