From 712ded843095a6c8232b497cd6e6c6e9aae0da8d Mon Sep 17 00:00:00 2001 From: Apehum Date: Sun, 19 May 2024 06:54:20 +0800 Subject: [PATCH] Revert "feat: generate classes in the "generated" source set" This reverts commit 616ba7c025a15d26708bea3bec6ef6f2ba4c6471. --- .../su/plo/voice/plugin/entrypoint/BukkitAddonEntryPoint.kt | 2 +- .../plo/voice/plugin/entrypoint/BungeeCordAddonEntryPoint.kt | 2 +- .../su/plo/voice/plugin/entrypoint/FabricAddonEntryPoint.kt | 2 +- .../su/plo/voice/plugin/entrypoint/ForgeAddonEntryPoint.kt | 2 +- .../su/plo/voice/plugin/entrypoint/MinestomAddonEntryPoint.kt | 2 +- .../su/plo/voice/plugin/entrypoint/VelocityAddonEntryPoint.kt | 3 ++- src/main/kotlin/su/plo/voice/plugin/entrypoints.gradle.kts | 1 - 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/BukkitAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/BukkitAddonEntryPoint.kt index 23166cd..38791d8 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/BukkitAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/BukkitAddonEntryPoint.kt @@ -90,7 +90,7 @@ object BukkitAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/BungeeCordAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/BungeeCordAddonEntryPoint.kt index c80b462..d545cbf 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/BungeeCordAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/BungeeCordAddonEntryPoint.kt @@ -88,7 +88,7 @@ object BungeeCordAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/FabricAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/FabricAddonEntryPoint.kt index a9ab724..8d976bc 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/FabricAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/FabricAddonEntryPoint.kt @@ -104,7 +104,7 @@ object FabricAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/ForgeAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/ForgeAddonEntryPoint.kt index f40101f..ecc4e57 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/ForgeAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/ForgeAddonEntryPoint.kt @@ -132,7 +132,7 @@ object ForgeAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/MinestomAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/MinestomAddonEntryPoint.kt index ae66278..8fcf902 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/MinestomAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/MinestomAddonEntryPoint.kt @@ -91,7 +91,7 @@ object MinestomAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoint/VelocityAddonEntryPoint.kt b/src/main/kotlin/su/plo/voice/plugin/entrypoint/VelocityAddonEntryPoint.kt index 5d1a6b5..cf83945 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoint/VelocityAddonEntryPoint.kt +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoint/VelocityAddonEntryPoint.kt @@ -1,5 +1,6 @@ package su.plo.voice.plugin.entrypoint +import com.github.javaparser.ast.CompilationUnit import com.google.gson.GsonBuilder import com.google.gson.JsonArray import com.google.gson.JsonObject @@ -96,7 +97,7 @@ object VelocityAddonEntryPoint : AddonEntryPoint() { val packageDir = File( project.buildDir, - "generated/sources/plasmovoice/java/${packageName.replace(".", "/")}" + "classes/java/main/${packageName.replace(".", "/")}" ).also { it.mkdirs() } File( diff --git a/src/main/kotlin/su/plo/voice/plugin/entrypoints.gradle.kts b/src/main/kotlin/su/plo/voice/plugin/entrypoints.gradle.kts index 82367ed..73eec28 100644 --- a/src/main/kotlin/su/plo/voice/plugin/entrypoints.gradle.kts +++ b/src/main/kotlin/su/plo/voice/plugin/entrypoints.gradle.kts @@ -12,7 +12,6 @@ val generateLoadersEntrypoints = tasks.create("generateLoadersEntrypoints", Gene val sourceSets = extensions.getByType(SourceSetContainer::class.java) val mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME) -mainSourceSet.java.srcDir("${buildDir}/generated/sources/plasmovoice/java") mainSourceSet.resources.srcDir("${buildDir}/generated/sources/plasmovoice/resources") tasks {