[2.0.5] 修复 skipTabooLibRelocate 异常

Bkm016 · Bkm016 · commit bab569695423 · 2024-02-09T02:55:54.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.izzel.taboolib"
-version = "2.0.4"
+version = "2.0.5"
 
 configurations {
     create("embed") {
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibMainTask.groovy b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibMainTask.groovy
@@ -116,7 +116,7 @@ class TabooLibMainTask extends DefaultTask {
                     if (tabooExt.env.modules.contains(it.module)) {
                         try {
                             out.putNextEntry(new JarEntry(it.file))
-                            out.write(it.builder.build(tabooExt.des, project))
+                            out.write(it.builder.build(tabooExt.des, project, tabooExt))
                         } catch (ZipException ignored) {
                         }
                     }
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/Builder.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/Builder.groovy
@@ -4,13 +4,14 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 import java.nio.charset.StandardCharsets
 
 abstract class Builder {
 
-    abstract byte[] build(Description description, Project project)
+    abstract byte[] build(Description description, Project project, TabooLibExtension tabooLibExt)
 
     static List<String> startBukkitFile() {
         def str = []
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderBukkit.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderBukkit.groovy
@@ -1,14 +1,21 @@
 package io.izzel.taboolib.gradle.description
 
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderBukkit extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def body = startBukkitFile()
         body += "name: ${description.name ?: project.name}"
-        body += "main: ${project.group}.taboolib.platform.BukkitPlugin"
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            body += "main: taboolib.platform.BukkitPlugin"
+        } else {
+            body += "main: ${project.group}.taboolib.platform.BukkitPlugin"
+        }
+
         body += "version: ${project.version}"
         write(body, description.lin.links['homepage'], 'website')
         writeLine(body)
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderBungee.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderBungee.groovy
@@ -1,14 +1,21 @@
 package io.izzel.taboolib.gradle.description
 
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderBungee extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def body = startBukkitFile()
         body += "name: ${description.name ?: project.name}"
-        body += "main: ${project.group}.taboolib.platform.BungeePlugin"
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            body += "main: taboolib.platform.BungeePlugin"
+        } else {
+            body += "main: ${project.group}.taboolib.platform.BungeePlugin"
+        }
+
         body += "version: ${project.version}"
         write(body, description.lin.links['homepage'], 'website')
         writeLine(body)
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderCloudNetV3.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderCloudNetV3.groovy
@@ -2,6 +2,7 @@ package io.izzel.taboolib.gradle.description
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 /**
@@ -12,11 +13,17 @@ import org.gradle.api.Project
  */
 class BuilderCloudNetV3 extends Builder {
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def info = new JsonObject()
         info.addProperty('group', project.group.toString())
         info.addProperty('name', description.name ?: project.name)
-        info.addProperty('main', "${project.group}.taboolib.platform.CloudNetV3Plugin")
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            info.addProperty('main', "taboolib.platform.CloudNetV3Plugin")
+        } else {
+            info.addProperty('main', "${project.group}.taboolib.platform.CloudNetV3Plugin")
+        }
+
         info.addProperty('version', project.version.toString())
         // authors
         def con = description.con.contributors.collect { it.name }
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderNukkit.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderNukkit.groovy
@@ -1,14 +1,21 @@
 package io.izzel.taboolib.gradle.description
 
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderNukkit extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def body = startBukkitFile()
         body += "name: ${description.name ?: project.name}"
-        body += "main: ${project.group}.taboolib.platform.NukkitPlugin"
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            body += "main: taboolib.platform.NukkitPlugin"
+        } else {
+            body += "main: ${project.group}.taboolib.platform.NukkitPlugin"
+        }
+
         body += "version: ${project.version}"
         write(body, description.lin.links['homepage'], 'website')
         writeLine(body)
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderSponge7.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderSponge7.groovy
@@ -2,12 +2,13 @@ package io.izzel.taboolib.gradle.description
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderSponge7 extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def json = new JsonArray()
         def info = new JsonObject()
         info.addProperty('modid', project.name.toLowerCase())
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderSponge8.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderSponge8.groovy
@@ -2,20 +2,27 @@ package io.izzel.taboolib.gradle.description
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderSponge8 extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def json = new JsonObject()
         def plugins = new JsonArray()
         def info = new JsonObject()
         info.addProperty('loader', 'java_plain')
         info.addProperty('id', (description.name ?: project.name).toLowerCase())
         info.addProperty('name', description.name ?: project.name)
         info.addProperty('version', project.version.toString())
-        info.addProperty('main-class', "${project.group}.taboolib.platform.Sponge8Plugin")
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            info.addProperty('main-class', "taboolib.platform.Sponge8Plugin")
+        } else {
+            info.addProperty('main-class', "${project.group}.taboolib.platform.Sponge8Plugin")
+        }
+
         write(info, description.spongeDesc, 'description')
         // links
         if (description.lin.links.size() > 0) {
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderVelocity.groovy b/src/main/groovy/io/izzel/taboolib/gradle/description/BuilderVelocity.groovy
@@ -2,16 +2,23 @@ package io.izzel.taboolib.gradle.description
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import io.izzel.taboolib.gradle.TabooLibExtension
 import org.gradle.api.Project
 
 class BuilderVelocity extends Builder {
 
     @Override
-    byte[] build(Description description, Project project) {
+    byte[] build(Description description, Project project, TabooLibExtension tabooLibExt) {
         def info = new JsonObject()
         info.addProperty('id', (description.name ?: project.name).toLowerCase())
         info.addProperty('name', description.name ?: project.name)
-        info.addProperty('main', "${project.group}.taboolib.platform.VelocityPlugin")
+
+        if (tabooLibExt.version.skipTabooLibRelocate) {
+            info.addProperty('main', "taboolib.platform.VelocityPlugin")
+        } else {
+            info.addProperty('main', "${project.group}.taboolib.platform.VelocityPlugin")
+        }
+
         info.addProperty('version', project.version.toString())
         // authors
         def con = description.con.contributors.collect { it.name }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "io.izzel.taboolib"`
`11`		`-version = "2.0.4"`
	`11`	`+version = "2.0.5"`
`12`	`12`
`13`	`13`	`configurations {`
`14`	`14`	`create("embed") {`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class TabooLibMainTask extends DefaultTask {`
`116`	`116`	`if (tabooExt.env.modules.contains(it.module)) {`
`117`	`117`	`try {`
`118`	`118`	`out.putNextEntry(new JarEntry(it.file))`
`119`		`- out.write(it.builder.build(tabooExt.des, project))`
	`119`	`+ out.write(it.builder.build(tabooExt.des, project, tabooExt))`
`120`	`120`	`} catch (ZipException ignored) {`
`121`	`121`	`}`
`122`	`122`	`}`