feat: allow phaser to go into codespace

Author: RedVortexDev

src/main/java/dev/dfonline/codeclient/dev/BuildPhaser.java

@@ -7,10 +7,8 @@
 import dev.dfonline.codeclient.config.Config;
 import dev.dfonline.codeclient.config.KeyBinds;
 import dev.dfonline.codeclient.location.Creator;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerAbilities;
-import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
@@ -77,9 +75,9 @@ public void tick() {
                 var player = CodeClient.MC.player;
                 var size = plot.assumeSize();
                 player.setPos(
-                        Math.min(Math.max(player.getX(), plot.getX()), plot.getX() + plot.assumeSize().size + 1),
+                        Math.min(Math.max(player.getX(), plot.getX() - plot.assumeSize().codeWidth), plot.getX() + plot.assumeSize().size + 1),
                         player.getY(),
-                        Math.min(Math.max(player.getZ(), plot.getZ()), plot.getZ() + plot.assumeSize().size + 1)
+                        Math.min(Math.max(player.getZ(), plot.getZ() - plot.assumeSize().codeLength), plot.getZ() + plot.assumeSize().size + 1)
                 );
                 allowPacket = true;
                 CodeClient.MC.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(lastPos.x, lastPos.y, lastPos.z, false, true));
@@ -156,9 +154,9 @@ private void finishClipping() {
 
             var size = plot.assumeSize();
 
-            var x = Math.min(Math.max(player.getX(), plot.getX()), plot.getX() + size.size + 1);
+            var x = Math.min(Math.max(player.getX(), plot.getX() - plot.assumeSize().codeLength), plot.getX() + size.size + 1);
             var y = player.getY();
-            var z = Math.min(Math.max(player.getZ(), plot.getZ()), plot.getZ() + size.size + 1);
+            var z = Math.min(Math.max(player.getZ(), plot.getZ() - plot.assumeSize().codeWidth), plot.getZ() + size.size + 1);
             var pitch = player.getPitch();
             var yaw = player.getYaw();
 

src/main/java/dev/dfonline/codeclient/dev/NoClip.java

@@ -14,6 +14,8 @@
 import net.minecraft.util.shape.VoxelShapes;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
+
 public class NoClip extends Feature {
     public static final double PLAYER_FREEDOM = 0.621;
     /**
@@ -32,7 +34,8 @@ public boolean enabled() {
     }
 
     public boolean isIgnoringWalls() {
-        return CodeClient.location instanceof Dev dev && CodeClient.noClipOn() && dev.isInDevSpace();
+        Optional<BuildPhaser> buildPhaser = CodeClient.getFeature(BuildPhaser.class);
+        return CodeClient.location instanceof Dev dev && CodeClient.noClipOn() && dev.isInDevSpace() && !buildPhaser.get().isClipping();
     }
 
     public Vec3d handleClientPosition(Vec3d movement) {