- yeet application plugin from mod/plugin build scripts, set main class manifest attribute directly

- fix viaproxy plugin plugin warnings
- update languages module

bootstrap/bungeecord/build.gradle.kts

@@ -16,8 +16,8 @@ platformRelocate("org.yaml") // Broken as of 1.20
 // These dependencies are already present on the platform
 provided(libs.bungeecord.proxy)
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.bungeecord.GeyserBungeeMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.bungeecord.GeyserBungeeMain"
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

bootstrap/mod/fabric/build.gradle.kts

@@ -1,7 +1,3 @@
-plugins {
-    application
-}
-
 architectury {
     platformSetupLoomIde()
     fabric()
@@ -42,8 +38,8 @@ dependencies {
     include(libs.cloud.fabric)
 }
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.fabric.GeyserFabricMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.fabric.GeyserFabricMain"
 }
 
 relocate("org.cloudburstmc.netty")

bootstrap/mod/neoforge/build.gradle.kts

@@ -1,7 +1,3 @@
-plugins {
-    application
-}
-
 // This is provided by "org.cloudburstmc.math.mutable" too, so yeet.
 // NeoForge's class loader is *really* annoying.
 provided("org.cloudburstmc.math", "api")
@@ -40,19 +36,11 @@ dependencies {
     include(libs.cloud.neoforge)
 }
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.forge.GeyserNeoForgeMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.neoforge.GeyserNeoForgeMain"
 }
 
 tasks {
-    // Cloud-NeoForge is currently providing cloud-core twice (once directly, once indirectly via modded-common)
-    distTar {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-    distZip {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-
     remapJar {
         archiveBaseName.set("Geyser-NeoForge")
     }

bootstrap/spigot/build.gradle.kts

@@ -30,8 +30,8 @@ platformRelocate("org.yaml") // Broken as of 1.20
 // These dependencies are already present on the platform
 provided(libs.viaversion)
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.spigot.GeyserSpigotMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.spigot.GeyserSpigotMain"
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

bootstrap/standalone/build.gradle.kts

@@ -1,5 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 
+plugins {
+    application
+}
+
 val terminalConsoleVersion = "1.2.0"
 val jlineVersion = "3.21.0"
 

bootstrap/velocity/build.gradle.kts

@@ -39,8 +39,8 @@ exclude("net.kyori:adventure-nbt:*")
 // These dependencies are already present on the platform
 provided(libs.velocity.api)
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.velocity.GeyserVelocityMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.velocity.GeyserVelocityMain"
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

bootstrap/viaproxy/build.gradle.kts

@@ -13,8 +13,8 @@ platformRelocate("org.incendo")
 // These dependencies are already present on the platform
 provided(libs.viaproxy)
 
-application {
-    mainClass.set("org.geysermc.geyser.platform.viaproxy.GeyserViaProxyMain")
+tasks.withType<Jar> {
+    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.viaproxy.GeyserViaProxyMain"
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyMain.java

@@ -25,7 +25,6 @@
 
 package org.geysermc.geyser.platform.viaproxy;
 
-import net.raphimc.viaproxy.plugins.PluginManager;
 import org.geysermc.geyser.GeyserMain;
 
 public class GeyserViaProxyMain extends GeyserMain {
@@ -39,7 +38,7 @@ public class GeyserViaProxyMain extends GeyserMain {
     }
 
     public String getPluginFolder() {
-        return PluginManager.PLUGINS_DIR.getName();
+        return "plugins";
     }
 
 }

build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts

@@ -1,4 +1,3 @@
 plugins {
-    application
     id("geyser.publish-conventions")
 }

core/src/main/resources/languages

@@ -1 +1 @@
-Subproject commit afbf78bbe0b39d0a076a42c228828c12f7f7da90
+Subproject commit 6704730a0ad611efdc5a71c3bc958511a66abf11