Merge remote-tracking branch 'origin/2.0' into flatten-complexcollisionboxes

# Conflicts:
#	src/main/java/ac/grim/grimac/utils/collisions/HitboxData.java

build.gradle.kts

@@ -35,10 +35,7 @@ java {
 
 // Set to false for debug builds
 // You cannot live reload classes if the jar relocates dependencies
-// Checks Project properties -> environment variable -> defaults true
-val relocate: Boolean = project.findProperty("relocate")?.toString()?.toBoolean()
-    ?: System.getenv("RELOCATE_JAR")?.toBoolean()
-    ?: true
+var relocate = true;
 
 repositories {
     mavenLocal()

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsZ.java

@@ -16,7 +16,7 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPl
 import static ac.grim.grimac.events.packets.patch.ResyncWorldUtil.resyncPosition;
 import static ac.grim.grimac.utils.nmsutil.BlockBreakSpeed.getBlockDamage;
 
-@CheckData(name = "BadPacketsZ")
+@CheckData(name = "BadPacketsZ", experimental = true)
 public class BadPacketsZ extends Check implements PacketCheck {
     public BadPacketsZ(final GrimPlayer player) {
         super(player);

src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java

@@ -59,7 +59,7 @@ public class MultiInteractA extends Check implements PostPredictionCheck {
         // we don't need to check pre-1.9 players here (no tick skipping)
         if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;
 
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
+        if (player.isTickingReliablyFor(3)) {
             for (String verbose : flags) {
                 flagAndAlert(verbose);
             }

src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java

@@ -60,7 +60,7 @@ public class MultiInteractB extends Check implements PostPredictionCheck {
         // we don't need to check pre-1.9 players here (no tick skipping)
         if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;
 
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
+        if (player.isTickingReliablyFor(3)) {
             for (String verbose : flags) {
                 flagAndAlert(verbose);
             }

src/main/java/ac/grim/grimac/checks/impl/post/PostCheck.java

@@ -43,7 +43,7 @@ public class PostCheck extends Check implements PacketCheck, PostPredictionCheck
             // Okay, the user might be cheating, let's double check
             // 1.8 clients have the idle packet, and this shouldn't false on 1.8 clients
             // 1.9+ clients have predictions, which will determine if hidden tick skipping occurred
-            if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
+            if (player.isTickingReliablyFor(3)) {
                 for (String flag : flags) {
                     flagAndAlert(flag);
                 }

src/main/java/ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java

@@ -63,7 +63,7 @@ public class MultiPlace extends BlockPlaceCheck {
 
     @Override
     public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (player.getClientVersion().isNewerThan(ClientVersion.V_1_8) && player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
+        if (player.getClientVersion().isNewerThan(ClientVersion.V_1_8) && player.isTickingReliablyFor(3)) {
             for (String verbose : flags) {
                 flagAndAlert(verbose);
             }