From 008b70c02c04bf29fdea3b6ac3d779bc8fa3346a Mon Sep 17 00:00:00 2001
From: videogame hacker <half-kh-hacker@hackery.site>
Date: Sat, 12 Mar 2022 02:45:49 +0000
Subject: [PATCH] Use NetworkMovingEvent instead of SendPacketEvents in NoFall,
 NoSprint

---
 .../mixins/MixinExtPlayerMoveC2SPacket.java         | 13 -------------
 .../som/hibiscus/features/player/NoFallDamage.kt    | 12 ++----------
 .../hibiscus/features/player/NoSprintingPacket.kt   | 12 +++---------
 src/main/resources/hibiscus.mixins.json             |  1 -
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/java/codes/som/hibiscus/mixins/MixinExtPlayerMoveC2SPacket.java

diff --git a/src/main/java/codes/som/hibiscus/mixins/MixinExtPlayerMoveC2SPacket.java b/src/main/java/codes/som/hibiscus/mixins/MixinExtPlayerMoveC2SPacket.java
deleted file mode 100644
index cff1d2c..0000000
--- a/src/main/java/codes/som/hibiscus/mixins/MixinExtPlayerMoveC2SPacket.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package codes.som.hibiscus.mixins;
-
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(PlayerMoveC2SPacket.class)
-public interface MixinExtPlayerMoveC2SPacket {
-    @Accessor
-    @Mutable
-    void setOnGround(boolean onGround);
-}
diff --git a/src/main/kotlin/codes/som/hibiscus/features/player/NoFallDamage.kt b/src/main/kotlin/codes/som/hibiscus/features/player/NoFallDamage.kt
index 016c4ee..804a199 100644
--- a/src/main/kotlin/codes/som/hibiscus/features/player/NoFallDamage.kt
+++ b/src/main/kotlin/codes/som/hibiscus/features/player/NoFallDamage.kt
@@ -2,19 +2,11 @@ package codes.som.hibiscus.features.player
 
 import codes.som.hibiscus.api.feature.Feature
 import codes.som.hibiscus.api.feature.FeatureCategory
-import codes.som.hibiscus.events.SendPacketEvent
-import codes.som.hibiscus.mixins.MixinExtPlayerMoveC2SPacket
-import codes.som.hibiscus.util.ext.requireExtension
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
+import codes.som.hibiscus.events.NetworkMovingEvent
 
 class NoFallDamage : Feature("No Fall Damage", FeatureCategory.PLAYER) {
     init {
-        on { (packet): SendPacketEvent ->
-            if (packet is PlayerMoveC2SPacket) {
-                requireExtension<MixinExtPlayerMoveC2SPacket>(packet)
-                packet.setOnGround(true)
-            }
-        }
+        on<NetworkMovingEvent> { it.onGround = false }
     }
 
     override fun createFeatureCommand() =
diff --git a/src/main/kotlin/codes/som/hibiscus/features/player/NoSprintingPacket.kt b/src/main/kotlin/codes/som/hibiscus/features/player/NoSprintingPacket.kt
index 7ef943b..55345fd 100644
--- a/src/main/kotlin/codes/som/hibiscus/features/player/NoSprintingPacket.kt
+++ b/src/main/kotlin/codes/som/hibiscus/features/player/NoSprintingPacket.kt
@@ -2,19 +2,13 @@ package codes.som.hibiscus.features.player
 
 import codes.som.hibiscus.api.feature.Feature
 import codes.som.hibiscus.api.feature.FeatureCategory
-import codes.som.hibiscus.events.SendPacketEvent
+import codes.som.hibiscus.events.NetworkMovingEvent
 import codes.som.hibiscus.player
-import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
 
 class NoSprintingPacket : Feature("No Sprinting Packet", FeatureCategory.PLAYER) {
     init {
-        on { event: SendPacketEvent ->
-            val (packet) = event
-            if (packet is ClientCommandC2SPacket) {
-                if (packet.mode == ClientCommandC2SPacket.Mode.START_SPRINTING && !player.isTouchingWater) {
-                    event.cancel()
-                }
-            }
+        on<NetworkMovingEvent>(cond = { !player.isTouchingWater }) {
+            it.sprinting = false
         }
 
         hiddenInOverlay = true
diff --git a/src/main/resources/hibiscus.mixins.json b/src/main/resources/hibiscus.mixins.json
index f7433fc..d1e9ff3 100644
--- a/src/main/resources/hibiscus.mixins.json
+++ b/src/main/resources/hibiscus.mixins.json
@@ -15,7 +15,6 @@
         "MixinExtEntity",
         "MixinExtMinecraftClient",
         "MixinExtPlayerInteractEntityC2SPacket",
-        "MixinExtPlayerMoveC2SPacket",
         "MixinExtUpdatePlayerAbilitiesC2SPacket",
         "MixinGameRenderer",
         "MixinKeyboard",