diff --git a/common.gradle b/common.gradle
index e8c30ac..586d4ea 100644
--- a/common.gradle
+++ b/common.gradle
@@ -37,11 +37,11 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	modRuntimeOnly "carpet:fabric-carpet:${project.carpet_core_version}"
+	// modRuntimeOnly "carpet:fabric-carpet:${project.carpet_core_version}"
 	include(modImplementation("com.github.1024-byteeeee:AnnotationToolBox:${project.annotationtoolbox_version}"))
 	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
     include(implementation("top.1024byteeeee:tiny_yaml:${project.tiny_yaml_version}"))
-	modRuntimeOnly("top.1024byteeeee:carpet-ams-addition:${project.carpetamsaddition_version}")
+	// modRuntimeOnly("top.1024byteeeee:carpet-ams-addition:${project.carpetamsaddition_version}")
 }
 
 loom {
diff --git a/gradle.properties b/gradle.properties
index e4eb11a..b4fb85c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ loader_version = 0.18.2
 # Mod Properties
 mod_id = fuzz
 mod_name = Fuzz
-mod_version = 1.6.7
+mod_version = 1.6.8-beta.1
 maven_group = top.1024byteeeee
 archives_base_name = Fuzz
 
diff --git a/src/main/java/top/byteeeee/fuzz/mixin/rule/cobwebSlowDownDisabled/CobwebMixin.java b/src/main/java/top/byteeeee/fuzz/mixin/rule/cobwebSlowDownDisabled/CobwebMixin.java
index 76d0701..ede9958 100644
--- a/src/main/java/top/byteeeee/fuzz/mixin/rule/cobwebSlowDownDisabled/CobwebMixin.java
+++ b/src/main/java/top/byteeeee/fuzz/mixin/rule/cobwebSlowDownDisabled/CobwebMixin.java
@@ -20,7 +20,8 @@
 
 package top.byteeeee.fuzz.mixin.rule.cobwebSlowDownDisabled;
 
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CobwebBlock;
@@ -31,17 +32,23 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 import top.byteeeee.fuzz.FuzzSettings;
+import top.byteeeee.fuzz.helpers.Noop;
+import top.byteeeee.fuzz.utils.ClientUtil;
 
 @Mixin(CobwebBlock.class)
 public abstract class CobwebMixin {
-    @WrapWithCondition(
+    @WrapOperation(
         method = "onEntityCollision",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/entity/Entity;slowMovement(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V"
         )
     )
-    private boolean slowDownDisabled(Entity entity, BlockState state, Vec3d multiplier) {
-        return !FuzzSettings.cobwebSlowDownDisabled;
+    private void slowDownDisabled(Entity entity, BlockState state, Vec3d multiplier, Operation<Void> original) {
+        if (FuzzSettings.cobwebSlowDownDisabled && entity.equals(ClientUtil.getCurrentPlayer())) {
+            Noop.noop();
+        } else {
+            original.call(entity, state, multiplier);
+        }
     }
 }
diff --git a/src/main/java/top/byteeeee/fuzz/mixin/rule/fluidPushDisabled/PlayerEntityMixin.java b/src/main/java/top/byteeeee/fuzz/mixin/rule/fluidPushDisabled/PlayerEntityMixin.java
index 3a3db10..0ca047a 100644
--- a/src/main/java/top/byteeeee/fuzz/mixin/rule/fluidPushDisabled/PlayerEntityMixin.java
+++ b/src/main/java/top/byteeeee/fuzz/mixin/rule/fluidPushDisabled/PlayerEntityMixin.java
@@ -31,6 +31,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 import top.byteeeee.fuzz.FuzzSettings;
+import top.byteeeee.fuzz.utils.ClientUtil;
 
 @SuppressWarnings("SimplifiableConditionalExpression")
 @Environment(EnvType.CLIENT)
@@ -38,6 +39,7 @@
 public abstract class PlayerEntityMixin {
     @ModifyReturnValue(method = "isPushedByFluids", at = @At("RETURN"))
     public boolean isPushedByFluids(boolean original) {
-        return FuzzSettings.fluidPushDisabled ? false : original;
+        PlayerEntity player = (PlayerEntity) (Object) this;
+        return FuzzSettings.fluidPushDisabled && player.equals(ClientUtil.getCurrentPlayer()) ? false : original;
     }
 }
diff --git a/versions/1.16.5/gradle.properties b/versions/1.16.5/gradle.properties
index bbef9ec..6fd9b72 100644
--- a/versions/1.16.5/gradle.properties
+++ b/versions/1.16.5/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.42.0+1.16
 game_versions = 1.16.5
 
 fabric_api_version = 0.42.0+1.16
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.16.5-1.4.44+v210714
-carpetamsaddition_version = 2.62.0-mc1.16.5
diff --git a/versions/1.17.1/gradle.properties b/versions/1.17.1/gradle.properties
index c03d7ce..41622fb 100644
--- a/versions/1.17.1/gradle.properties
+++ b/versions/1.17.1/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.46.1+1.17
 game_versions = 1.17.1
 
 fabric_api_version = 0.46.1+1.17
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.17.1-1.4.57+v220119
-carpetamsaddition_version = 2.62.0-mc1.17.1
\ No newline at end of file
diff --git a/versions/1.18.2/gradle.properties b/versions/1.18.2/gradle.properties
index c0b5620..761aad5 100644
--- a/versions/1.18.2/gradle.properties
+++ b/versions/1.18.2/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.76.0+1.18.2
 game_versions = 1.18.2
 
 fabric_api_version = 0.76.0+1.18.2
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.18.2-1.4.69+v220331
-carpetamsaddition_version = 2.62.0-mc1.18.2
\ No newline at end of file
diff --git a/versions/1.19.4/gradle.properties b/versions/1.19.4/gradle.properties
index 4a6d50f..cd831e1 100644
--- a/versions/1.19.4/gradle.properties
+++ b/versions/1.19.4/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.85.0+1.19.4
 game_versions = 1.19.4
 
 fabric_api_version = 0.85.0+1.19.4
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.19.4-1.4.100+v230314
-carpetamsaddition_version = 2.62.0-mc1.19.4
diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties
index cfed7be..97c1cfa 100644
--- a/versions/1.20.6/gradle.properties
+++ b/versions/1.20.6/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.97.8+1.20.6
 game_versions = 1.20.6
 
 fabric_api_version = 0.97.8+1.20.6
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.20.6-1.4.141+v240429
-carpetamsaddition_version = 2.62.0-mc1.20.6
diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties
index a7f400f..ccd3205 100644
--- a/versions/1.21.1/gradle.properties
+++ b/versions/1.21.1/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.102.0+1.21.1
 game_versions = 1.21.1
 
 fabric_api_version = 0.102.0+1.21.1
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21-1.4.147+v240613
-carpetamsaddition_version = 2.62.0-mc1.21.1
diff --git a/versions/1.21.10/gradle.properties b/versions/1.21.10/gradle.properties
index 00f72cf..76384f8 100644
--- a/versions/1.21.10/gradle.properties
+++ b/versions/1.21.10/gradle.properties
@@ -12,7 +12,3 @@ game_versions = 1.21.10
 
 fabric_api_version = 0.134.1+1.21.10
 # fabric_module_version = 0.133.10+1.21.9
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.9-pre1-1.4.184+v250916
-carpetamsaddition_version = 2.62.0-mc1.21.10
diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties
index b1e4072..fca9450 100644
--- a/versions/1.21.11/gradle.properties
+++ b/versions/1.21.11/gradle.properties
@@ -12,7 +12,3 @@ game_versions = 1.21.11
 
 fabric_api_version = 0.139.5+1.21.11
 # fabric_module_version = 0.133.10+1.21.9
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.11-1.4.193+v251211
-carpetamsaddition_version = 2.62.0-mc1.21.11
diff --git a/versions/1.21.2/gradle.properties b/versions/1.21.2/gradle.properties
index 0e85278..ea2193b 100644
--- a/versions/1.21.2/gradle.properties
+++ b/versions/1.21.2/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.106.1+1.21.2
 game_versions = 1.21.2
 
 fabric_api_version = 0.106.1+1.21.2
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.2-1.4.158+v241022
-carpetamsaddition_version = 2.62.0-mc1.21.2
diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties
index 27cb039..1f19080 100644
--- a/versions/1.21.3/gradle.properties
+++ b/versions/1.21.3/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.106.1+1.21.3
 game_versions = 1.21.3
 
 fabric_api_version = 0.106.1+1.21.3
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.2-1.4.158+v241022
-carpetamsaddition_version = 2.62.0-mc1.21.3
diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties
index 3c11e8c..53d3adb 100644
--- a/versions/1.21.4/gradle.properties
+++ b/versions/1.21.4/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.115.0+1.21.4
 game_versions = 1.21.4
 
 fabric_api_version = 0.115.0+1.21.4
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.4-1.4.161+v241203
-carpetamsaddition_version = 2.62.0-mc1.21.4
diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties
index a3569ad..5a8afd2 100644
--- a/versions/1.21.5/gradle.properties
+++ b/versions/1.21.5/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.119.6+1.21.5
 game_versions = 1.21.5
 
 fabric_api_version = 0.119.6+1.21.5
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.5-1.4.169+v250325
-carpetamsaddition_version = 2.62.0-mc1.21.5
diff --git a/versions/1.21.6/gradle.properties b/versions/1.21.6/gradle.properties
index dc64020..de8c2f9 100644
--- a/versions/1.21.6/gradle.properties
+++ b/versions/1.21.6/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.127.1+1.21.6
 game_versions = 1.21.6
 
 fabric_api_version = 0.127.1+1.21.6
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.6-1.4.176+v250617
-carpetamsaddition_version = 2.62.0-mc1.21.6
diff --git a/versions/1.21.7/gradle.properties b/versions/1.21.7/gradle.properties
index 6ce4cb4..b768a66 100644
--- a/versions/1.21.7/gradle.properties
+++ b/versions/1.21.7/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.128.2+1.21.7
 game_versions = 1.21.7
 
 fabric_api_version = 0.128.2+1.21.7
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.7-1.4.177+v250630
-carpetamsaddition_version = 2.62.0-mc1.21.7
diff --git a/versions/1.21.8/gradle.properties b/versions/1.21.8/gradle.properties
index 4683c1a..76ac256 100644
--- a/versions/1.21.8/gradle.properties
+++ b/versions/1.21.8/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.129.0+1.21.8
 game_versions = 1.21.8
 
 fabric_api_version = 0.129.0+1.21.8
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.7-1.4.177+v250630
-carpetamsaddition_version = 2.62.0-mc1.21.8
diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties
index a670fc1..4e2a0d8 100644
--- a/versions/1.21.9/gradle.properties
+++ b/versions/1.21.9/gradle.properties
@@ -12,7 +12,3 @@ game_versions = 1.21.9
 
 fabric_api_version = 0.133.14+1.21.9
 # fabric_module_version = 0.133.10+1.21.9
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21.9-pre1-1.4.184+v250916
-carpetamsaddition_version = 2.62.0-mc1.21.9
diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties
index c4d1964..dfcc95f 100644
--- a/versions/1.21/gradle.properties
+++ b/versions/1.21/gradle.properties
@@ -11,7 +11,3 @@ fabric_api_dependency = >=0.100.1+1.21
 game_versions = 1.21
 
 fabric_api_version = 0.100.1+1.21
-
-# https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version = 1.21-1.4.147+v240613
-carpetamsaddition_version = 2.62.0-mc1.21