From 60af8475f3663dd14163b58349ac3c1bac7e6256 Mon Sep 17 00:00:00 2001
From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:49:41 +0200
Subject: [PATCH] 1.21.1 update

- also fix accidental regression
---
 gradle.properties                                 | 15 +++++++--------
 .../commands/commands/EnchantCommand.java         |  4 +++-
 .../systems/modules/movement/Velocity.java        |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 75a09a970c..d5f9db597e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.1
 loader_version=0.15.11
-fapi_version=0.100.3+1.21
+fapi_version=0.102.0+1.21.1
 
 # Mod Properties
 mod_version=0.5.8
@@ -17,17 +17,16 @@ archives_base_name=meteor-client
 baritone_version=1.21
 
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21-0.5.9
+sodium_version=mc1.21-0.5.11
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
 lithium_version=mc1.21-0.12.7
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.7.1+1.20.6
-# 1.7.1+1.21 seems to cause loom remapping issues atm
+iris_version=1.7.3+1.21
 
 # Indium (https://github.com/comp500/Indium)
-indium_version=1.0.33+mc1.21
+indium_version=1.0.34+mc1.21
 
 # Orbit (https://github.com/MeteorDevelopment/orbit)
 orbit_version=0.2.4
@@ -45,7 +44,7 @@ reflections_version=0.10.2
 netty_version=4.1.90.Final
 
 # ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus_version=3.4.1
+viafabricplus_version=3.4.4
 
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib_version=1.0.1
diff --git a/src/main/java/meteordevelopment/meteorclient/commands/commands/EnchantCommand.java b/src/main/java/meteordevelopment/meteorclient/commands/commands/EnchantCommand.java
index aaa3fc2962..6091cdb05f 100644
--- a/src/main/java/meteordevelopment/meteorclient/commands/commands/EnchantCommand.java
+++ b/src/main/java/meteordevelopment/meteorclient/commands/commands/EnchantCommand.java
@@ -98,7 +98,9 @@ private void all(boolean onlyPossible, ToIntFunction<Enchantment> level) throws
 
         REGISTRY_ACCESS.getOptionalWrapper(RegistryKeys.ENCHANTMENT).ifPresent(registry -> {
             registry.streamEntries().forEach(enchantment -> {
-                Utils.addEnchantment(itemStack, enchantment, level.applyAsInt(enchantment.value()));
+                if (!onlyPossible || enchantment.value().isAcceptableItem(itemStack)) {
+                    Utils.addEnchantment(itemStack, enchantment, level.applyAsInt(enchantment.value()));
+                }
             });
         });
 
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Velocity.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Velocity.java
index f10a263548..f4b31b8b5f 100644
--- a/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Velocity.java
+++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Velocity.java
@@ -150,7 +150,7 @@ private void onTick(TickEvent.Post event) {
     @EventHandler
     private void onPacketReceive(PacketEvent.Receive event) {
         if (knockback.get() && event.packet instanceof EntityVelocityUpdateS2CPacket packet
-            && packet.getId() == mc.player.getId()) {
+            && packet.getEntityId() == mc.player.getId()) {
             double velX = (packet.getVelocityX() / 8000d - mc.player.getVelocity().x) * knockbackHorizontal.get();
             double velY = (packet.getVelocityY() / 8000d - mc.player.getVelocity().y) * knockbackVertical.get();
             double velZ = (packet.getVelocityZ() / 8000d - mc.player.getVelocity().z) * knockbackHorizontal.get();