From 7c634e1a46e29a78e70ea90a5448e1de91289d2b Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 27 Apr 2026 17:49:17 +0100 Subject: [PATCH] Stop shading and relocating Java Websockets --- mapsync-mod/build.gradle.kts | 3 +- mapsync-mod/dep-websockets/build.gradle.kts | 35 ------------------- mapsync-mod/gradle/libs.versions.toml | 5 +-- mapsync-mod/settings.gradle.kts | 2 -- .../minecraft/mapsync/mod/net/SyncClient.java | 10 +++--- .../src/main/resources/fabric.mod.json | 4 ++- 6 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 mapsync-mod/dep-websockets/build.gradle.kts diff --git a/mapsync-mod/build.gradle.kts b/mapsync-mod/build.gradle.kts index ddedf7dd..59e3bd00 100644 --- a/mapsync-mod/build.gradle.kts +++ b/mapsync-mod/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { modImplementation(libs.fabricLoader) modImplementation(libs.fabricApi) - project(":dep-websockets", configuration = "shadedElements").also { + libs.java.ws.also { implementation(it) include(it) } @@ -107,6 +107,7 @@ tasks { this@expansions["mod_issues_url"] = project_issues_url this@expansions["minecraft_version"] = libs.versions.minecraft.get() this@expansions["fabric_loader_version"] = libs.versions.fabricLoader.get() + this@expansions["java_websockets_version"] = libs.versions.java.ws.get() } inputs.properties(expansions) filesMatching("fabric.mod.json") { diff --git a/mapsync-mod/dep-websockets/build.gradle.kts b/mapsync-mod/dep-websockets/build.gradle.kts deleted file mode 100644 index 104fbeaa..00000000 --- a/mapsync-mod/dep-websockets/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id("java-library") - alias(libs.plugins.shadow) -} - -version = libs.java.ws.get().version!! - -dependencies { - implementation(libs.java.ws) -} - -repositories { - mavenCentral() -} - -tasks { - shadowJar { - include("org/java_websocket/**") - include("META-INF/LICENSE.txt") - rename("LICENSE.txt", "LICENSE_JavaWebSockets") - relocate( - "org.java_websocket", - "gjum.minecraft.mapsync.mod.deps.websockets" - ) - } -} - -val shadedElements by configurations.creating { - isCanBeConsumed = true - isCanBeResolved = false -} - -artifacts { - add(shadedElements.name, tasks.shadowJar) -} diff --git a/mapsync-mod/gradle/libs.versions.toml b/mapsync-mod/gradle/libs.versions.toml index 9cc383df..2cfa4190 100644 --- a/mapsync-mod/gradle/libs.versions.toml +++ b/mapsync-mod/gradle/libs.versions.toml @@ -4,6 +4,8 @@ minecraft = "1.21.11" fabricLoom = "1.15-SNAPSHOT" fabricLoader = "0.18.6" fabricApi = "0.141.3+1.21.11" +# https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket +java-ws = "1.6.0" [libraries] minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } @@ -22,8 +24,7 @@ voxelmap = { group = "maven.modrinth", name = "voxelmap-updated", version = "oL1 journeymap = { group = "maven.modrinth", name = "journeymap", version = "ajOMv0sc" } # https://modrinth.com/mod/xaeros-world-map/versions?l=fabric xaerosmap = { group = "maven.modrinth", name = "xaeros-world-map", version = "CkZVhVE0" } -# https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket -java-ws = { group = "org.java-websocket", name = "Java-WebSocket", version = "1.6.0" } +java-ws = { group = "org.java-websocket", name = "Java-WebSocket", version.ref = "java-ws" } [plugins] fabricLoom = { id = "fabric-loom", version.ref = "fabricLoom" } diff --git a/mapsync-mod/settings.gradle.kts b/mapsync-mod/settings.gradle.kts index a66b34a7..9c1eedef 100644 --- a/mapsync-mod/settings.gradle.kts +++ b/mapsync-mod/settings.gradle.kts @@ -10,5 +10,3 @@ pluginManagement { } rootProject.name = "MapSync" - -include(":dep-websockets"); diff --git a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClient.java b/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClient.java index 81b4e0b6..ce05cce2 100644 --- a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClient.java +++ b/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClient.java @@ -2,11 +2,6 @@ import gjum.minecraft.mapsync.mod.MapSyncMod; import gjum.minecraft.mapsync.mod.data.ChunkTile; -import gjum.minecraft.mapsync.mod.deps.websockets.client.WebSocketClient; -import gjum.minecraft.mapsync.mod.deps.websockets.drafts.Draft; -import gjum.minecraft.mapsync.mod.deps.websockets.drafts.Draft_6455; -import gjum.minecraft.mapsync.mod.deps.websockets.exceptions.WebsocketNotConnectedException; -import gjum.minecraft.mapsync.mod.deps.websockets.handshake.ServerHandshake; import gjum.minecraft.mapsync.mod.net.auth.AuthStateHolder; import gjum.minecraft.mapsync.mod.net.auth.Welcomed; import gjum.minecraft.mapsync.mod.net.buffers.BufferReader; @@ -22,6 +17,11 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import net.minecraft.world.level.ChunkPos; +import org.java_websocket.client.WebSocketClient; +import org.java_websocket.drafts.Draft; +import org.java_websocket.drafts.Draft_6455; +import org.java_websocket.exceptions.WebsocketNotConnectedException; +import org.java_websocket.handshake.ServerHandshake; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/mapsync-mod/src/main/resources/fabric.mod.json b/mapsync-mod/src/main/resources/fabric.mod.json index a2d8e03b..dbac7dab 100644 --- a/mapsync-mod/src/main/resources/fabric.mod.json +++ b/mapsync-mod/src/main/resources/fabric.mod.json @@ -24,7 +24,9 @@ "depends": { "minecraft": "${minecraft_version}", "fabricloader": ">=${fabric_loader_version}", - "fabric": "*" + "fabric": "*", + + "org_java-websocket_java-websocket": ">=${java_websockets_version}" }, "suggests": { "modmenu": "*",