added inventory a and exempt geyser players

JustDoom · JustDoom · commit afb83e197a19 · 2021-09-13T16:12:29.000+10:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.justdoom</groupId>
     <artifactId>FlappyAnticheat</artifactId>
-    <version>1.7.4-BETA</version>
+    <version>1.7.5-BETA</version>
     <packaging>jar</packaging>
 
     <name>FlappyAnticheat</name>
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/CheckManager.java b/src/main/java/com/justdoom/flappyanticheat/checks/CheckManager.java
@@ -8,13 +8,13 @@
 import com.justdoom.flappyanticheat.checks.movement.groundspoof.GroundSpoofA;
 import com.justdoom.flappyanticheat.checks.movement.jump.JumpA;
 import com.justdoom.flappyanticheat.checks.movement.speed.SpeedA;
-import com.justdoom.flappyanticheat.checks.player.anticactus.AntiCactusA;
 import com.justdoom.flappyanticheat.checks.player.badpackets.BadPacketsA;
 import com.justdoom.flappyanticheat.checks.player.badpackets.BadPacketsB;
 import com.justdoom.flappyanticheat.checks.player.badpackets.BadPacketsC;
 import com.justdoom.flappyanticheat.checks.player.badpackets.BadPacketsD;
 import com.justdoom.flappyanticheat.checks.player.blockplace.BlockPlaceA;
 import com.justdoom.flappyanticheat.checks.player.blockplace.BlockPlaceB;
+import com.justdoom.flappyanticheat.checks.player.inventory.InventoryA;
 import com.justdoom.flappyanticheat.checks.player.skinblinker.SkinBlinkerA;
 import com.justdoom.flappyanticheat.checks.player.timer.TimerA;
 import com.justdoom.flappyanticheat.checks.player.timer.TimerB;
@@ -40,15 +40,14 @@ public void loadChecks(){
         PacketEvents.get().registerListener(new BadPacketsD());
         //PacketEvents.get().registerListener(new NoSlowA());
         PacketEvents.get().registerListener(new SkinBlinkerA());
-        PacketEvents.get().registerListener(new AntiCactusA());
         PacketEvents.get().registerListener(new TimerA());
         PacketEvents.get().registerListener(new TimerB());
         PacketEvents.get().registerListener(new ForcefieldA());
         PacketEvents.get().registerListener(new ReachA());
+        PacketEvents.get().registerListener(new InventoryA());
 
         Bukkit.getPluginManager().registerEvents(new BlockPlaceA(), plugin);
         Bukkit.getPluginManager().registerEvents(new BlockPlaceB(), plugin);
         Bukkit.getPluginManager().registerEvents(new SpeedA(), plugin);
-        //Bukkit.getPluginManager().registerEvents(new InventoryA(), plugin);
     }
 }
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/combat/forcefield/ForcefieldA.java b/src/main/java/com/justdoom/flappyanticheat/checks/combat/forcefield/ForcefieldA.java
@@ -1,6 +1,7 @@
 package com.justdoom.flappyanticheat.checks.combat.forcefield;
 
 import com.justdoom.flappyanticheat.checks.Check;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.useentity.WrappedPacketInUseEntity;
@@ -17,6 +18,8 @@ public ForcefieldA() {
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         if(event.getPacketId() == PacketType.Play.Client.FLYING ||
                 event.getPacketId() == PacketType.Play.Client.POSITION_LOOK ||
                 event.getPacketId() == PacketType.Play.Client.POSITION) { //packets sended every ticks
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/combat/reach/ReachA.java b/src/main/java/com/justdoom/flappyanticheat/checks/combat/reach/ReachA.java
@@ -4,6 +4,7 @@
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.data.PlayerData;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.event.impl.PacketPlaySendEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
@@ -42,6 +43,8 @@ public ReachA() {
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
         PlayerData data = FlappyAnticheat.getInstance().dataManager.getData(event.getPlayer().getUniqueId());
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         if (event.getPacketId() == PacketType.Play.Client.USE_ENTITY) {
             WrappedPacketInUseEntity packet = new WrappedPacketInUseEntity(event.getNMSPacket());
             if (packet.getAction() == WrappedPacketInUseEntity.EntityUseAction.ATTACK) {
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/fly/FlyA.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/fly/FlyA.java
@@ -3,6 +3,7 @@
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.flying.WrappedPacketInFlying;
@@ -30,6 +31,8 @@ public FlyA(){
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         Player player = event.getPlayer();
         UUID uuid = player.getUniqueId();
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/fly/FlyB.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/fly/FlyB.java
@@ -3,6 +3,7 @@
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.flying.WrappedPacketInFlying;
@@ -26,6 +27,8 @@ public FlyB(){
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         Player player = event.getPlayer();
         UUID uuid = player.getUniqueId();
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/groundspoof/GroundSpoofA.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/groundspoof/GroundSpoofA.java
@@ -5,6 +5,7 @@
 import com.justdoom.flappyanticheat.data.PlayerData;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.flying.WrappedPacketInFlying;
@@ -37,6 +38,7 @@ public GroundSpoofA() {
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent e) {
         Player player = e.getPlayer();
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(e.getPlayer().getPlayer())) return;
 
         if (e.getPacketId() == PacketType.Play.Client.POSITION || e.getPacketId() == PacketType.Play.Client.POSITION_LOOK) {
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/jump/JumpA.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/jump/JumpA.java
@@ -3,6 +3,7 @@
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.flying.WrappedPacketInFlying;
@@ -33,6 +34,8 @@ public JumpA(){
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         Player player = event.getPlayer();
         UUID uuid = player.getUniqueId();
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/noslow/NoSlowA.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/noslow/NoSlowA.java
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/movement/speed/SpeedA.java b/src/main/java/com/justdoom/flappyanticheat/checks/movement/speed/SpeedA.java
@@ -5,6 +5,7 @@
 import com.justdoom.flappyanticheat.data.PlayerData;
 import com.justdoom.flappyanticheat.utils.PlayerUtil;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -29,6 +30,8 @@ public void onPacketPlayReceive(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         PlayerData data = FlappyAnticheat.getInstance().dataManager.getData(event.getPlayer().getUniqueId());
 
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
+
         //pos stuff
         data.lastOnGround = data.onGround;
         data.onGround = player.isOnGround();
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/anticactus/AntiCactusA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/anticactus/AntiCactusA.java
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsA.java
@@ -1,6 +1,7 @@
 package com.justdoom.flappyanticheat.checks.player.badpackets;
 
 import com.justdoom.flappyanticheat.checks.Check;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 
@@ -12,6 +13,7 @@ public BadPacketsA(){
 
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
 
         if (event.getPacketId() == PacketType.Play.Client.POSITION || event.getPacketId() == PacketType.Play.Client.POSITION_LOOK) {
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsB.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsB.java
@@ -2,6 +2,7 @@
 
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.useentity.WrappedPacketInUseEntity;
@@ -16,6 +17,7 @@ public BadPacketsB(){
 
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
 
         if (event.getPacketId() == PacketType.Play.Client.USE_ENTITY){
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsC.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsC.java
@@ -4,6 +4,7 @@
 package com.justdoom.flappyanticheat.checks.player.badpackets;
 
 import com.justdoom.flappyanticheat.checks.Check;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.steervehicle.WrappedPacketInSteerVehicle;
@@ -16,7 +17,7 @@ public BadPacketsC(){
 
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
-
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
         if (event.getPacketId() == PacketType.Play.Client.STEER_VEHICLE){
 
             WrappedPacketInSteerVehicle wrapper = new WrappedPacketInSteerVehicle(event.getNMSPacket());
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsD.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/badpackets/BadPacketsD.java
@@ -4,6 +4,7 @@
 package com.justdoom.flappyanticheat.checks.player.badpackets;
 
 import com.justdoom.flappyanticheat.checks.Check;
+import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
 import io.github.retrooper.packetevents.packettype.PacketType;
 import io.github.retrooper.packetevents.packetwrappers.play.in.steervehicle.WrappedPacketInSteerVehicle;
@@ -22,7 +23,7 @@ public BadPacketsD(){
 
     @Override
     public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
-
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
         if (event.getPacketId() == PacketType.Play.Client.STEER_VEHICLE){
 
             WrappedPacketInSteerVehicle wrapper = new WrappedPacketInSteerVehicle(event.getNMSPacket());
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/blockplace/BlockPlaceA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/blockplace/BlockPlaceA.java
@@ -3,6 +3,7 @@
 import com.justdoom.flappyanticheat.FlappyAnticheat;
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -23,7 +24,7 @@ public BlockPlaceA() {
 
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
-
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
         if(ServerUtil.lowTPS(("checks." + check + "." + checkType).toLowerCase()))
             return;
 
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/blockplace/BlockPlaceB.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/blockplace/BlockPlaceB.java
@@ -3,6 +3,7 @@
 import com.justdoom.flappyanticheat.FlappyAnticheat;
 import com.justdoom.flappyanticheat.checks.Check;
 import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.PacketEvents;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -20,7 +21,7 @@ public BlockPlaceB() {
 
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
-
+        if(PacketEvents.get().getPlayerUtils().isGeyserPlayer(event.getPlayer().getPlayer())) return;
         Player player = event.getPlayer();
 
         Block block = event.getBlock();
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/inventory/InventoryA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/inventory/InventoryA.java
@@ -1,19 +1,29 @@
 package com.justdoom.flappyanticheat.checks.player.inventory;
 
 import com.justdoom.flappyanticheat.checks.Check;
+import com.justdoom.flappyanticheat.utils.ServerUtil;
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 
-public class InventoryA extends Check implements Listener {
+public class InventoryA extends Check {
 
     public InventoryA(){
         super("Inventory", "A", true);
     }
 
-    @EventHandler
-    public void onBlockPlace(InventoryMoveItemEvent event) {
-        //Player player = (Player) event.getDestination().get;
-        //player.sendMessage("e");
+    @Override
+    public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+        if(event.getPacketId() != PacketType.Play.Client.WINDOW_CLICK) return;
+        if(ServerUtil.lowTPS(("checks." + check + "." + checkType).toLowerCase()))
+            return;
+
+        final Player player = event.getPlayer();
+        if(player.isSprinting() || player.isSneaking()) {
+            fail("No Info", player);
+        }
     }
 }
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/skinblinker/SkinBlinkerA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/skinblinker/SkinBlinkerA.java
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/timer/TimerA.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/timer/TimerA.java
diff --git a/src/main/java/com/justdoom/flappyanticheat/checks/player/timer/TimerB.java b/src/main/java/com/justdoom/flappyanticheat/checks/player/timer/TimerB.java
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
