diff --git a/build.gradle b/build.gradle index 56f234c..020cf0d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'maven-publish' id("io.freefair.lombok") version "8.6" - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "9.3.1" id 'fabric-loom' version '1.10.1' } @@ -50,7 +50,7 @@ remapJar { dependsOn(shadowJar) mustRunAfter(shadowJar) // Set the input jar for the task. Here use the shadow Jar that include the .class of the transitive dependency - inputFile = file(shadowJar.archivePath) + inputFile = shadowJar.archiveFile } processResources { @@ -93,12 +93,6 @@ loom { accessWidenerPath = file("src/main/resources/sfcraft.accesswidener") } -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } - } -} - // configure the maven publication publishing { publications { diff --git a/src/main/java/io/ib67/sfcraft/config/SFConfig.java b/src/main/java/io/ib67/sfcraft/config/SFConfig.java index ac777ab..cf0162d 100644 --- a/src/main/java/io/ib67/sfcraft/config/SFConfig.java +++ b/src/main/java/io/ib67/sfcraft/config/SFConfig.java @@ -10,6 +10,7 @@ import java.util.concurrent.ThreadLocalRandom; public class SFConfig { public boolean enableOfflineExempt = true; public String domain = "localhost"; + public int port = 25565; public String webApiBase = "localhost"; public String serverSecret = RandomStringUtils.random(32); public int httpPort = 8080; diff --git a/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java b/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java index 08c7e13..1a82768 100644 --- a/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java +++ b/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java @@ -57,7 +57,7 @@ public class RoomTeleporter { ) ); networkHandler.send(new StoreCookieS2CPacket(ROOM_COOKIE, cookie), PacketCallbacks.always(() -> { - networkHandler.sendPacket(new ServerTransferS2CPacket(config.domain, serverSupplier.get().getServerPort())); + networkHandler.sendPacket(new ServerTransferS2CPacket(config.domain, config.port)); })); } }