From d4179448a0b44c4fdb84e5753179da89b9a99883 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 22 Jun 2025 00:17:51 +0200 Subject: [PATCH 1/3] merge upstream --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b8f45cbe6..0fc48217a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,5 +4,5 @@ plugins { id("buildlogic.java-conventions") - id("io.papermc.paperweight.userdev") version "2.0.0-beta.10" apply false + id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793a..002b867c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From fbc71787f9ee2bc2a2d41378c318f806cc8f1d6e Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 22 Jun 2025 15:36:38 +0200 Subject: [PATCH 2/3] Update to 1.21.6 and replace deprecated teleport flags in ISmoothTeleport --- v1_21/build.gradle.kts | 2 +- .../movecraft/compat/v1_21/IWorldHandler.java | 2 +- .../movecraft/support/v1_21/ISmoothTeleport.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/v1_21/build.gradle.kts b/v1_21/build.gradle.kts index cdc645a8d..af7d39eab 100644 --- a/v1_21/build.gradle.kts +++ b/v1_21/build.gradle.kts @@ -7,7 +7,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21) dependencies { api(project(":movecraft-api")) - paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT") } description = "Movecraft-v1_21" diff --git a/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java b/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java index bdec20a7e..bfeb3086b 100644 --- a/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java +++ b/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java @@ -52,7 +52,7 @@ public class IWorldHandler extends WorldHandler { public IWorldHandler() { String version = Bukkit.getServer().getMinecraftVersion(); - if (!version.equals("1.21.5")) + if (!version.equals("1.21.5") && !version.equals("1.21.6")) throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft: " + version); } diff --git a/v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java b/v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java index edd20345f..9cb3008f1 100644 --- a/v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java +++ b/v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java @@ -10,11 +10,11 @@ public class ISmoothTeleport extends SmoothTeleport { public void teleport(@NotNull Player player, @NotNull Location location) { player.teleport( location, - TeleportFlag.Relative.X, - TeleportFlag.Relative.Y, - TeleportFlag.Relative.Z, - TeleportFlag.Relative.PITCH, - TeleportFlag.Relative.YAW, + TeleportFlag.Relative.VELOCITY_X,//x + TeleportFlag.Relative.VELOCITY_Y,//y + TeleportFlag.Relative.VELOCITY_Z,//z + TeleportFlag.Relative.VELOCITY_ROTATION,//pitch + TeleportFlag.Relative.VELOCITY_ROTATION,//yaw TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY, TeleportFlag.EntityState.RETAIN_VEHICLE, TeleportFlag.EntityState.RETAIN_PASSENGERS From 461e76e9bae25c0e7bc4e966be7d17477bbdb22f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 22 Jun 2025 22:26:03 +0200 Subject: [PATCH 3/3] Changed to support only one version --- .../net/countercraft/movecraft/compat/v1_21/IWorldHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java b/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java index bfeb3086b..284fc9936 100644 --- a/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java +++ b/v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java @@ -52,7 +52,7 @@ public class IWorldHandler extends WorldHandler { public IWorldHandler() { String version = Bukkit.getServer().getMinecraftVersion(); - if (!version.equals("1.21.5") && !version.equals("1.21.6")) + if (!version.equals("1.21.6")) throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft: " + version); }