Merge pull request #132 from EngineHub/chore/use-published-protocol

Author: me4502

HEADER-PROTOCOL

@@ -14,22 +14,20 @@ allprojects {
 
     repositories {
         // mirrors:
-        // - https://maven.enginehub.org/repo/
-        // - https://maven.terraformersmc.com/releases/
         // - https://maven.minecraftforge.net/
         // - https://maven.neoforged.net/
         // - https://maven.parchmentmc.org/
-        // - https://repo.viaversion.com/
-        maven(url = "https://repo.stellardrift.ca/repository/stable/") {
-            name = "stellardriftReleases"
+        maven(url = "https://maven.enginehub.org/repo/") {
+            name = "enginehub"
             mavenContent {
-                releasesOnly()
                 excludeGroup("org.lwjgl") // workaround for lwjgl-freetype
             }
         }
-        maven(url = "https://repo.stellardrift.ca/repository/snapshots/") {
-            name = "stellardriftSnapshots"
-            mavenContent { snapshotsOnly() }
+        maven(url = "https://maven.terraformersmc.com/releases/") {
+            name = "terraformersmc"
+        }
+        maven(url = "https://repo.viaversion.com/") {
+            name = "viaversion"
         }
     }
 }

build.gradle.kts

@@ -9,6 +9,7 @@ fabricApi = "0.98.0+1.20.6"
 modmenu = "10.0.0-beta.1"
 viafabricplus = "3.3.0"
 vineflower = "1.10.1"
+cuiProtocol = "4.0.0"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -36,3 +37,11 @@ publishGithubRelease = { id = "ca.stellardrift.publish-github-release", version
 shadow = { id = "io.github.goooler.shadow", version = "8.1.7" }
 spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
 versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
+
+[libraries.cuiProtocol-fabric]
+module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.20.6"
+version.ref = "cuiProtocol"
+
+[libraries.cuiProtocol-neoforge]
+module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.20.6"
+version.ref = "cuiProtocol"

gradle/libs.versions.toml

@@ -5,25 +5,16 @@ pluginManagement {
         // mirrors:
         // - https://maven.architectury.dev/
         // - https://maven.fabricmc.net/
-        // - gradlePluginPortal
-        maven(url = "https://repo.stellardrift.ca/repository/stable/") {
-            name = "stellardriftReleases"
-            mavenContent { releasesOnly() }
-        }
-        maven(url = "https://repo.stellardrift.ca/repository/snapshots/") {
-            name = "stellardriftSnapshots"
-            mavenContent { snapshotsOnly() }
+        maven(url = "https://maven.enginehub.org/repo/") {
+            name = "enginehub"
         }
         // maven("https://maven.fabricmc.net/")
-        // gradlePluginPortal()
+         gradlePluginPortal()
     }
 }
 
 sequenceOf(
     "fabric",
-    "protocol-common",
-    "protocol-fabric",
-    "protocol-neoforge",
 ).forEach {
     include("worldeditcui-$it")
 }

settings.gradle.kts

@@ -35,9 +35,8 @@ loom {
 
 val fabricApi by configurations.creating
 dependencies {
-    implementation(project(":worldeditcui-protocol-fabric", configuration = "namedElements")) { isTransitive = false }
-    implementation(project(":worldeditcui-protocol-common", configuration = "namedElements")) { isTransitive = false }
-    include(project(":worldeditcui-protocol-fabric"))
+    "include"(libs.cuiProtocol.fabric)
+    "modImplementation"(libs.cuiProtocol.fabric)
     modImplementation(libs.fabric.loader)
     modImplementation(libs.modmenu)
     modCompileOnly(libs.viafabricplus.api) {