[BLEEDING] Guards for activation of IAtributeAccess implementations.

NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/BukkitAttributeAccess.java

@@ -10,9 +10,16 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 
 public class BukkitAttributeAccess implements IAttributeAccess {
 
+    public BukkitAttributeAccess() {
+        if (ReflectionUtil.getClass("org.bukkit.attribute.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     private int operationToInt(final Operation operation) {
         switch (operation) {
             case ADD_NUMBER:

NCPCompatCB2794/src/main/java/fr/neatmonster/nocheatplus/compat/cb2794/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_6_R1.AttributeInstance;
 import net.minecraft.server.v1_6_R1.AttributeModifier;
 import net.minecraft.server.v1_6_R1.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_6_R1.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().a(GenericAttributes.d);

NCPCompatCB2808/src/main/java/fr/neatmonster/nocheatplus/compat/cb2808/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_6_R2.AttributeInstance;
 import net.minecraft.server.v1_6_R2.AttributeModifier;
 import net.minecraft.server.v1_6_R2.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_6_R2.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCB2882/src/main/java/fr/neatmonster/nocheatplus/compat/cb2882/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_6_R3.AttributeInstance;
 import net.minecraft.server.v1_6_R3.AttributeModifier;
 import net.minecraft.server.v1_6_R3.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_6_R3.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCB2922/src/main/java/fr/neatmonster/nocheatplus/compat/cb2922/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_7_R1.AttributeInstance;
 import net.minecraft.server.v1_7_R1.AttributeModifier;
 import net.minecraft.server.v1_7_R1.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_7_R1.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCB3026/src/main/java/fr/neatmonster/nocheatplus/compat/cb3026/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_7_R2.AttributeInstance;
 import net.minecraft.server.v1_7_R2.AttributeModifier;
 import net.minecraft.server.v1_7_R2.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_7_R2.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCB3043/src/main/java/fr/neatmonster/nocheatplus/compat/cb3043/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_7_R3.AttributeInstance;
 import net.minecraft.server.v1_7_R3.AttributeModifier;
 import net.minecraft.server.v1_7_R3.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_7_R3.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCB3100/src/main/java/fr/neatmonster/nocheatplus/compat/cb3100/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_7_R4.AttributeInstance;
 import net.minecraft.server.v1_7_R4.AttributeModifier;
 import net.minecraft.server.v1_7_R4.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_7_R4.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(final Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_10_R1.AttributeInstance;
 import net.minecraft.server.v1_10_R1.AttributeModifier;
 import net.minecraft.server.v1_10_R1.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_10_R1.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);

NCPCompatSpigotCB1_8_R1/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8_R1/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_8_R1.AttributeInstance;
 import net.minecraft.server.v1_8_R1.AttributeModifier;
 import net.minecraft.server.v1_8_R1.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_8_R1.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatSpigotCB1_8_R2/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8_R2/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_8_R2.AttributeInstance;
 import net.minecraft.server.v1_8_R2.AttributeModifier;
 import net.minecraft.server.v1_8_R2.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_8_R2.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.d);

NCPCompatSpigotCB1_8_R3/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8_R3/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_8_R3.AttributeInstance;
 import net.minecraft.server.v1_8_R3.AttributeModifier;
 import net.minecraft.server.v1_8_R3.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_8_R3.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);

NCPCompatSpigotCB1_9_R1/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_9_R1/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_9_R1.AttributeInstance;
 import net.minecraft.server.v1_9_R1.AttributeModifier;
 import net.minecraft.server.v1_9_R1.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_9_R1.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);

NCPCompatSpigotCB1_9_R2/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_9_R2/AttributeAccess.java

@@ -5,12 +5,19 @@ import org.bukkit.entity.Player;
 
 import fr.neatmonster.nocheatplus.components.modifiers.IAttributeAccess;
 import fr.neatmonster.nocheatplus.utilities.AttribUtil;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 import net.minecraft.server.v1_9_R2.AttributeInstance;
 import net.minecraft.server.v1_9_R2.AttributeModifier;
 import net.minecraft.server.v1_9_R2.GenericAttributes;
 
 public class AttributeAccess implements IAttributeAccess {
 
+    public AttributeAccess() {
+        if (ReflectionUtil.getClass("net.minecraft.server.v1_9_R2.AttributeInstance") == null) {
+            throw new RuntimeException("Service not available.");
+        }
+    }
+
     @Override
     public double getSpeedAttributeMultiplier(Player player) {
         final AttributeInstance attr = ((CraftLivingEntity) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);

NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/AttributeAccessFactory.java

@@ -22,7 +22,7 @@ public class AttributeAccessFactory {
         }
         catch (Throwable t) {}
         RegistryHelper.setupGenericInstance(new String[] {
-                "fr.neatmonster.nocheatplus.compat.cbdev",
+                "fr.neatmonster.nocheatplus.compat.cbdev.AttributeAccess",
                 "fr.neatmonster.nocheatplus.compat.spigotcb1_9_R2.AttributeAccess",
                 "fr.neatmonster.nocheatplus.compat.spigotcb1_9_R1.AttributeAccess",
                 "fr.neatmonster.nocheatplus.compat.spigotcb1_8_R3.AttributeAccess",