From 5eb3c72fd96e8b306403fce73c3a749e3368d27a Mon Sep 17 00:00:00 2001 From: Gabber235 Date: Mon, 16 Dec 2024 16:58:06 +0100 Subject: [PATCH] Update version --- .../build-development-jars-and-publish.yml | 2 +- engine/engine-paper/build.gradle.kts | 14 ++++++-------- .../bound/PlayerRadiusInteractionBoundEntry.kt | 6 ++++-- .../bound/LookAtEntityInteractionBoundEntry.kt | 4 ++-- extensions/WorldGuardExtension/build.gradle.kts | 6 +++++- version.txt | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-development-jars-and-publish.yml b/.github/workflows/build-development-jars-and-publish.yml index eb7f9f621a..d73cdf7f6e 100644 --- a/.github/workflows/build-development-jars-and-publish.yml +++ b/.github/workflows/build-development-jars-and-publish.yml @@ -72,7 +72,7 @@ jobs: loaders: | paper game-versions: | - [1.21, 1.21.1] + 1.21.3 dependencies: | packetevents diff --git a/engine/engine-paper/build.gradle.kts b/engine/engine-paper/build.gradle.kts index 8552b4f8d6..a140ca0093 100644 --- a/engine/engine-paper/build.gradle.kts +++ b/engine/engine-paper/build.gradle.kts @@ -32,16 +32,16 @@ dependencies { for (dependency in centralDependencies) { compileOnlyApi(dependency) } - compileOnlyApi("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT") + compileOnlyApi("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") api(project(":engine-core")) api(project(":engine-loader")) - api("me.tofaa.entitylib:spigot:3.0.3-SNAPSHOT") + api("me.tofaa.entitylib:spigot:+39cce79-SNAPSHOT") api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.20.0") api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.20.0") - api("dev.jorel:commandapi-bukkit-shade:9.6.1") - api("dev.jorel:commandapi-bukkit-kotlin:9.6.1") + api("dev.jorel:commandapi-bukkit-shade:9.7.0") + api("dev.jorel:commandapi-bukkit-kotlin:9.7.0") // Doesn't want to load properly using the spigot api. implementation("io.ktor:ktor-server-core-jvm:2.3.12") @@ -56,12 +56,10 @@ dependencies { compileOnlyApi("net.kyori:adventure-text-serializer-legacy:$adventureVersion") compileOnlyApi("net.kyori:adventure-text-serializer-gson:$adventureVersion") - compileOnlyApi("com.github.retrooper:packetevents-api:2.6.0-SNAPSHOT") - compileOnlyApi("com.github.retrooper:packetevents-spigot:2.6.0-SNAPSHOT") + compileOnlyApi("com.github.retrooper:packetevents-api:2.7.0-SNAPSHOT") + compileOnlyApi("com.github.retrooper:packetevents-spigot:2.7.0-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.6") compileOnlyApi("org.geysermc.floodgate:api:2.2.3-SNAPSHOT") - - testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.3.1") } tasks.withType { diff --git a/extensions/BasicExtension/src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt b/extensions/BasicExtension/src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt index 3f31026088..b9dd54119d 100644 --- a/extensions/BasicExtension/src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt +++ b/extensions/BasicExtension/src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt @@ -61,7 +61,7 @@ class PlayerRadiusInteractionBound( val zoom = calculateZoom(distance) val modifier = AttributeModifier(key, zoom, AttributeModifier.Operation.MULTIPLY_SCALAR_1) - player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.let { attribute -> + player.getAttribute(Attribute.MOVEMENT_SPEED)?.let { attribute -> attribute.removeModifier(key) attribute.addModifier(modifier) @@ -97,7 +97,9 @@ class PlayerRadiusInteractionBound( } override fun teardown() { - player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.removeModifier(key) + if (zoom) { + player.getAttribute(Attribute.MOVEMENT_SPEED)?.removeModifier(key) + } super.teardown() } } \ No newline at end of file diff --git a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt index 422de375c4..5528beef35 100644 --- a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt +++ b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt @@ -71,7 +71,7 @@ class LookAtNpcInteractionBound( val zoom = calculateZoom(distance) val modifier = AttributeModifier(key, zoom, AttributeModifier.Operation.MULTIPLY_SCALAR_1) - player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.let { attribute -> + player.getAttribute(Attribute.MOVEMENT_SPEED)?.let { attribute -> attribute.removeModifier(key) attribute.addModifier(modifier) @@ -169,7 +169,7 @@ class LookAtNpcInteractionBound( } override fun teardown() { - player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.removeModifier(key) + player.getAttribute(Attribute.MOVEMENT_SPEED)?.removeModifier(key) super.teardown() } } diff --git a/extensions/WorldGuardExtension/build.gradle.kts b/extensions/WorldGuardExtension/build.gradle.kts index 4ee6156a05..d9d18684f1 100644 --- a/extensions/WorldGuardExtension/build.gradle.kts +++ b/extensions/WorldGuardExtension/build.gradle.kts @@ -3,7 +3,11 @@ repositories { } dependencies { - compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.11-SNAPSHOT") + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.13-SNAPSHOT") { + exclude(group = "com.google.guava") + exclude(group = "com.google.code.gson") + exclude(group = "it.unimi.dsi") + } } typewriter { diff --git a/version.txt b/version.txt index faef31a435..a3df0a6959 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.7.0 +0.8.0