diff --git a/pom.xml b/pom.xml index bae80e3..50ec4ae 100644 --- a/pom.xml +++ b/pom.xml @@ -149,8 +149,8 @@ co.aikar acf-bukkit - 0.5.0-SNAPSHOT - compile + 0.5.1-SNAPSHOT + provided diff --git a/src/main/java/dev/brighten/ac/check/CheckManager.java b/src/main/java/dev/brighten/ac/check/CheckManager.java index 67e3573..3e5172b 100644 --- a/src/main/java/dev/brighten/ac/check/CheckManager.java +++ b/src/main/java/dev/brighten/ac/check/CheckManager.java @@ -17,8 +17,7 @@ public class CheckManager { private final Map, CheckSettings> checkSettings = new HashMap<>(); public CheckManager() { synchronized (checkClasses) { - for (WrappedClass aClass : ClassScanner.getClasses(CheckData.class, - "dev.brighten.ac.check.impl")) { + for (WrappedClass aClass : ClassScanner.getClasses(CheckData.class)) { addCheck(aClass); } } diff --git a/src/main/java/dev/brighten/ac/command/AnticheatCommand.java b/src/main/java/dev/brighten/ac/command/AnticheatCommand.java index e6ddf88..c76ae7c 100644 --- a/src/main/java/dev/brighten/ac/command/AnticheatCommand.java +++ b/src/main/java/dev/brighten/ac/command/AnticheatCommand.java @@ -18,6 +18,7 @@ import dev.brighten.ac.utils.Tuple; import dev.brighten.ac.utils.msg.ChatBuilder; import io.netty.buffer.Unpooled; import lombok.val; +import net.md_5.bungee.api.chat.TextComponent; import net.minecraft.server.v1_8_R3.PacketDataSerializer; import net.minecraft.server.v1_8_R3.PacketPlayOutCustomPayload; import net.minecraft.server.v1_8_R3.PacketPlayOutTitle; @@ -199,7 +200,7 @@ public class AnticheatCommand extends BaseCommand { Anticheat.INSTANCE.getScheduler().execute(() -> { if(player == null) { - sender.spigot().sendMessage(Messages.NULL_APLAYER); + sender.sendMessage(TextComponent.toLegacyText(Messages.NULL_APLAYER)); return; } diff --git a/src/main/java/dev/brighten/ac/data/APlayer.java b/src/main/java/dev/brighten/ac/data/APlayer.java index be13d06..043a561 100644 --- a/src/main/java/dev/brighten/ac/data/APlayer.java +++ b/src/main/java/dev/brighten/ac/data/APlayer.java @@ -33,7 +33,6 @@ import lombok.Setter; import lombok.val; import net.minecraft.server.v1_8_R3.PacketPlayOutTransaction; import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; import java.util.*; @@ -109,11 +108,6 @@ public class APlayer { this.uuid = player.getUniqueId(); this.playerConnection = MinecraftReflection.getPlayerConnection(player); - Object pluginManagerObj = gpmanager.invoke(null); - - if(method.invoke(pluginManagerObj, "EnterpriseLoader")) { - Plugin plugin = method2.invoke(pluginManagerObj, "EnterpriseLoader"); - } load(); } diff --git a/src/main/java/dev/brighten/ac/utils/ClassScanner.java b/src/main/java/dev/brighten/ac/utils/ClassScanner.java index 631cf0f..5d3f7dd 100644 --- a/src/main/java/dev/brighten/ac/utils/ClassScanner.java +++ b/src/main/java/dev/brighten/ac/utils/ClassScanner.java @@ -54,6 +54,29 @@ public class ClassScanner { return toReturn; } + public static Set getClasses(Class annotationClass) { + Map map = Anticheat.INSTANCE.getStuffs(); + Map loadedClasses = Anticheat.INSTANCE.getLoadedClasses(); + Set toReturn = new HashSet<>(); + + for (Map.Entry entry : map.entrySet()) { + boolean hasAnnotation = findClass(new ByteArrayInputStream(entry.getValue()), annotationClass) != null; + + if(hasAnnotation) { + toReturn.add(Reflections.getClass(entry.getKey())); + } + } + + for (Map.Entry entry : loadedClasses.entrySet()) { + boolean hasAnnotation = findClass(new ByteArrayInputStream(entry.getValue()), annotationClass) != null; + + if(hasAnnotation) { + toReturn.add(Reflections.getClass(entry.getKey())); + } + } + return toReturn; + } + public static Set getNames() { Map map = Anticheat.INSTANCE.getStuffs();