Update

DevMunky · Jan 22, 2025 · f4d942e · f4d942e
1 parent 42f6298
commit f4d942e
Show file tree

Hide file tree

Showing 73 changed files with 11 additions and 3,155 deletions.
diff --git a/...ine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/dialogue/ConfirmationKey.kt b/...ine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/dialogue/ConfirmationKey.kt
@@ -81,7 +81,7 @@ class JumpHandler(override val player: Player, override val block: () -> Unit) :
 
     override fun initialize() {
         super.initialize()
-        player.getAttribute(Attribute.JUMP_STRENGTH)?.let { attribute ->
+        player.getAttribute(Attribute.GENERIC_JUMP_STRENGTH)?.let { attribute ->
             attribute.removeModifier(key)
             attribute.addModifier(AttributeModifier(key, -0.999, AttributeModifier.Operation.MULTIPLY_SCALAR_1))
         }
@@ -95,7 +95,7 @@ class JumpHandler(override val player: Player, override val block: () -> Unit) :
 
     override fun dispose() {
         super.dispose()
-        player.getAttribute(Attribute.JUMP_STRENGTH)?.removeModifier(key)
+        player.getAttribute(Attribute.GENERIC_JUMP_STRENGTH)?.removeModifier(key)
     }
 }
 

diff --git a/...src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt b/...src/main/kotlin/com/typewritermc/basic/entries/bound/PlayerRadiusInteractionBoundEntry.kt
@@ -69,7 +69,7 @@ class PlayerRadiusInteractionBound(
         val zoom = calculateZoom(distance)
         val modifier = AttributeModifier(key, zoom, AttributeModifier.Operation.MULTIPLY_SCALAR_1)
 
-        player.getAttribute(Attribute.MOVEMENT_SPEED)?.let { attribute ->
+        player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.let { attribute ->
             attribute.removeModifier(key)
 
             attribute.addModifier(modifier)
@@ -106,7 +106,7 @@ class PlayerRadiusInteractionBound(
 
     override suspend fun teardown() {
         if (zoom) {
-            player.getAttribute(Attribute.MOVEMENT_SPEED)?.removeModifier(key)
+            player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.removeModifier(key)
         }
         super.teardown()
     }

diff --git a/extensions/CitizensExtension/build.gradle.kts b/extensions/CitizensExtension/build.gradle.kts
diff --git a/...nsExtension/src/main/kotlin/com/typewritermc/citizens/entries/entity/ReferenceNpcEntry.kt b/...nsExtension/src/main/kotlin/com/typewritermc/citizens/entries/entity/ReferenceNpcEntry.kt
diff --git a/...zensExtension/src/main/kotlin/com/typewritermc/citizens/entries/event/NpcInteractEvent.kt b/...zensExtension/src/main/kotlin/com/typewritermc/citizens/entries/event/NpcInteractEvent.kt
diff --git a/...rc/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt b/...rc/main/kotlin/com/typewritermc/entity/entries/bound/LookAtEntityInteractionBoundEntry.kt
@@ -74,7 +74,7 @@ class LookAtNpcInteractionBound(
         val zoom = calculateZoom(distance)
         val modifier = AttributeModifier(key, zoom, AttributeModifier.Operation.MULTIPLY_SCALAR_1)
 
-        player.getAttribute(Attribute.MOVEMENT_SPEED)?.let { attribute ->
+        player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.let { attribute ->
             attribute.removeModifier(key)
 
             attribute.addModifier(modifier)
@@ -171,8 +171,8 @@ class LookAtNpcInteractionBound(
         }
     }
 
-    override suspend fun teardown() {
-        player.getAttribute(Attribute.MOVEMENT_SPEED)?.removeModifier(key)
+    override fun teardown() {
+        player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.removeModifier(key)
         super.teardown()
     }
 }

diff --git a/extensions/MythicMobsExtension/build.gradle.kts b/extensions/MythicMobsExtension/build.gradle.kts
diff --git a/...nsion/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/DespawnMobActionEntry.kt b/...nsion/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/DespawnMobActionEntry.kt
diff --git a/...ion/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/ExecuteSkillActionEntry.kt b/...ion/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/ExecuteSkillActionEntry.kt
diff --git a/...tension/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/SpawnMobActionEntry.kt b/...tension/src/main/kotlin/com/typewritermc/mythicmobs/entries/action/SpawnMobActionEntry.kt