Split monolithic gradle files into modular gradle snippets

Author: RaphiMC

.gitignore

@@ -12,6 +12,7 @@ hs_err_pid*
 /.idea/*
 !/.idea/copyright/
 /.gradle/
-/build/
-/out/
+/buildSrc/.gradle/
+build/
+out/
 /run/

build.gradle

@@ -1,34 +1,8 @@
 plugins {
-    id "java-library"
-    id "idea"
-}
-
-base {
-    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-    compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8"
-
-    group = project.maven_group ?: rootProject.maven_group
-    archivesName = project.maven_name ?: rootProject.maven_name
-    version = project.maven_version ?: rootProject.maven_version
-}
-
-configurations {
-    include
-
-    implementation.extendsFrom include
-    api.extendsFrom include
+    id "viaproxy.plugin-conventions"
 }
 
 repositories {
-    mavenCentral()
-    maven {
-        name = "ViaVersion"
-        url = "https://repo.viaversion.com"
-    }
-    maven {
-        name = "Lenni0451"
-        url = "https://maven.lenni0451.net/everything"
-    }
     maven {
         name = "DirtPowered Releases"
         url = "https://repo.mzga.dev/releases"
@@ -48,59 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation "net.raphimc:ViaProxy:3.3.7"
+    implementation "net.raphimc:ViaProxy:3.4.1"
 
     include "dev.mzga:Beta2Release:1.0.6-SNAPSHOT"
 }
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("viaproxy.yml") {
-        expand "version": project.version
-    }
-}
-
-jar {
-    dependsOn configurations.include
-    from {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        configurations.include.collect {
-            zipTree(it)
-        }
-    } {
-        exclude "META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA", "io/netty/", "org/apache/logging/"
-    }
-
-    from("LICENSE") {
-        rename { "${it}_${project.name ?: rootProject.name}" }
-    }
-}
-
-idea {
-    module {
-        ["run"].each {
-            excludeDirs << file("$it")
-        }
-    }
-}
-
-tasks.register("runViaProxy", JavaExec) {
-    dependsOn tasks.jar
-
-    mainClass = "net.raphimc.viaproxy.ViaProxy"
-    classpath = sourceSets.main.compileClasspath
-    workingDir = file("run")
-    jvmArgs = ["-DskipUpdateCheck"]
-
-    doFirst {
-        def pluginsDir = file("$workingDir/plugins")
-        pluginsDir.mkdirs()
-        file("$pluginsDir/${project.name}.jar").bytes = tasks.jar.archiveFile.get().asFile.bytes
-    }
-
-    doLast {
-        file("$workingDir/plugins/${project.name}.jar").delete()
-        file("$workingDir/logs").deleteDir()
-    }
-}

buildSrc/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "groovy-gradle-plugin"
+}
+
+repositories {
+    gradlePluginPortal()
+}

buildSrc/src/main/groovy/base.base-conventions.gradle

@@ -0,0 +1,26 @@
+base {
+    java.toolchain.languageVersion = JavaLanguageVersion.of(project.java_version)
+
+    group = project.maven_group
+    archivesName = project.maven_name
+    version = project.maven_version
+}
+
+repositories {
+    mavenCentral()
+}
+
+jar {
+    var projectName = project.name
+    from("LICENSE") {
+        rename { "${it}_${projectName}" }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.encoding = "UTF-8"
+}
+
+tasks.withType(Javadoc).configureEach {
+    it.options.encoding = "UTF-8"
+}

buildSrc/src/main/groovy/base.exclude-run-folder.gradle

@@ -0,0 +1,11 @@
+plugins {
+    id "idea"
+}
+
+idea {
+    module {
+        ["run"].each {
+            excludeDirs << file("$it")
+        }
+    }
+}

buildSrc/src/main/groovy/base.include-configuration.gradle

@@ -0,0 +1,18 @@
+configurations {
+    include
+
+    implementation.extendsFrom(include)
+    api.extendsFrom(include)
+}
+
+jar {
+    dependsOn(configurations.include)
+    from {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        configurations.include.collect {
+            zipTree(it)
+        }
+    } {
+        exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
+    }
+}

buildSrc/src/main/groovy/viaproxy.plugin-conventions.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id "java-library"
+    id "base.base-conventions"
+    id "base.include-configuration"
+    id "viaproxy.run-with-viaproxy-task"
+}
+
+repositories {
+    maven {
+        name = "ViaVersion"
+        url = "https://repo.viaversion.com"
+    }
+}
+
+processResources {
+    inputs.property("version", project.version)
+
+    filesMatching("viaproxy.yml") {
+        expand("version": project.version)
+    }
+}

buildSrc/src/main/groovy/viaproxy.run-with-viaproxy-task.gradle

@@ -0,0 +1,23 @@
+plugins {
+    id "base.exclude-run-folder"
+}
+
+tasks.register("runViaProxy", JavaExec) {
+    dependsOn(tasks.jar)
+
+    mainClass = "net.raphimc.viaproxy.ViaProxy"
+    classpath = sourceSets.main.compileClasspath
+    workingDir = file("run")
+    jvmArgs = ["-DskipUpdateCheck"]
+
+    doFirst {
+        def pluginsDir = file("$workingDir/plugins")
+        pluginsDir.mkdirs()
+        file("$pluginsDir/${project.name}.jar").bytes = tasks.jar.archiveFile.get().asFile.bytes
+    }
+
+    doLast {
+        file("$workingDir/plugins/${project.name}.jar").delete()
+        file("$workingDir/logs").deleteDir()
+    }
+}

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.configureondemand=true
 
+java_version=21
 maven_group=net.raphimc
 maven_name=ViaProxyBeta2Release
 maven_version=1.0.0

src/main/java/net/raphimc/b2rplugin/Beta2ReleasePlugin.java

@@ -19,7 +19,6 @@
 
 import com.github.dirtpowered.betatorelease.network.session.BetaPlayer;
 import com.mojang.authlib.GameProfile;
-import com.mojang.util.UUIDTypeAdapter;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -101,7 +100,7 @@ private void onShouldVerifyOnlineModeEvent(final ShouldVerifyOnlineModeEvent eve
 
         final BetaPlayer player = this.b2rPlayers.stream().filter(p -> p.getSession().getPlayerName().equals(username)).findFirst().orElse(null);
         if (player != null && player.getUuid() != null) {
-            event.getProxyConnection().setGameProfile(new GameProfile(UUIDTypeAdapter.fromString(player.getUuid()), username));
+            event.getProxyConnection().setGameProfile(new GameProfile(player.getUuid(), username));
             event.setCancelled(true);
         }
     }