Merge branch 'master' into feature/1.21.20

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

@@ -0,0 +1,45 @@
+repositories {
+    // mavenLocal()
+
+    mavenCentral()
+
+    // Floodgate, Cumulus etc.
+    maven("https://repo.opencollab.dev/main")
+
+    // Paper, Velocity
+    maven("https://repo.papermc.io/repository/maven-public")
+
+    // Spigot
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
+        mavenContent { snapshotsOnly() }
+    }
+
+    // BungeeCord
+    maven("https://oss.sonatype.org/content/repositories/snapshots") {
+        mavenContent { snapshotsOnly() }
+    }
+
+    // NeoForge
+    maven("https://maven.neoforged.net/releases") {
+        mavenContent { releasesOnly() }
+    }
+
+    // Minecraft
+    maven("https://libraries.minecraft.net") {
+        name = "minecraft"
+        mavenContent { releasesOnly() }
+    }
+
+    // ViaVersion
+    maven("https://repo.viaversion.com") {
+        name = "viaversion"
+    }
+
+    // Jitpack for e.g. MCPL
+    maven("https://jitpack.io") {
+        content { includeGroupByRegex("com\\.github\\..*") }
+    }
+
+    // For Adventure snapshots
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+}

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

@@ -5,6 +5,7 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.maven
 
 plugins {
+    id("geyser.build-logic")
     id("geyser.publish-conventions")
     id("architectury-plugin")
     id("dev.architectury.loom")
@@ -116,12 +117,3 @@ dependencies {
     minecraft(libs.minecraft)
     mappings(loom.officialMojangMappings())
 }
-
-repositories {
-    // mavenLocal()
-    maven("https://repo.opencollab.dev/main")
-    maven("https://jitpack.io")
-    maven("https://oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://maven.neoforged.net/releases")
-}

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ gson = "2.3.1" # Provided by Spigot 1.8.8
 websocket = "1.5.1"
 protocol = "3.0.0.Beta3-20240726.112706-2"
 raknet = "1.0.0.CR3-20240416.144209-1"
-minecraftauth = "4.1.0"
+minecraftauth = "4.1.1-20240806.235051-7"
 mcprotocollib = "1.21-20240725.013034-16"
 adventure = "4.14.0"
 adventure-platform = "4.3.0"

settings.gradle.kts

@@ -2,52 +2,6 @@
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-dependencyResolutionManagement {
-    repositories {
-        // mavenLocal()
-        
-        // Floodgate, Cumulus etc.
-        maven("https://repo.opencollab.dev/main")
-
-        // Paper, Velocity
-        maven("https://repo.papermc.io/repository/maven-public")
-        // Spigot
-        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
-            mavenContent { snapshotsOnly() }
-        }
-
-        // BungeeCord
-        maven("https://oss.sonatype.org/content/repositories/snapshots") {
-            mavenContent { snapshotsOnly() }
-        }
-
-        // NeoForge
-        maven("https://maven.neoforged.net/releases") {
-            mavenContent { releasesOnly() }
-        }
-
-        // Minecraft
-        maven("https://libraries.minecraft.net") {
-            name = "minecraft"
-            mavenContent { releasesOnly() }
-        }
-
-        mavenCentral()
-
-        // ViaVersion
-        maven("https://repo.viaversion.com") {
-            name = "viaversion"
-        }
-
-        maven("https://jitpack.io") {
-            content { includeGroupByRegex("com\\.github\\..*") }
-        }
-
-        // For Adventure snapshots
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    }
-}
-
 pluginManagement {
     repositories {
         gradlePluginPortal()