Merge pull request #379 from PseudoKnight/master

Use method detection instead of version detection when possible

Author: LadyCailin

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCObjective.java

@@ -5,9 +5,7 @@
 import com.laytonsmith.abstraction.MCScore;
 import com.laytonsmith.abstraction.MCScoreboard;
 import com.laytonsmith.abstraction.enums.MCDisplaySlot;
-import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDisplaySlot;
-import com.laytonsmith.core.Static;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scoreboard.DisplaySlot;
@@ -47,9 +45,10 @@ public String getName() {
 
 	@Override
 	public MCScore getScore(String entry) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_7_10)){
+		if(ReflectionUtils.hasMethod(o.getClass(), "getScore", null, String.class)){
 			return new BukkitMCScore(o.getScore(entry));
 		} else {
+			// Probably 1.7.8 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			return new BukkitMCScore((Score) ReflectionUtils.invokeMethod(o, "getScore", player));
 		}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCScoreboard.java

@@ -7,9 +7,7 @@
 import com.laytonsmith.abstraction.MCScoreboard;
 import com.laytonsmith.abstraction.MCTeam;
 import com.laytonsmith.abstraction.enums.MCDisplaySlot;
-import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDisplaySlot;
-import com.laytonsmith.core.Static;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scoreboard.Objective;
@@ -74,10 +72,10 @@ public Set<MCObjective> getObjectivesByCriteria(String criteria) {
 
 	@Override
 	public Set<String> getEntries() {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_7_10)){
+		if(ReflectionUtils.hasMethod(s.getClass(), "getEntries", null)){
 			return s.getEntries();
 		} else {
-			// Old style, where we have to build it from the list of players
+			// Probably 1.7.8 or prior
 			Set<String> ret = new HashSet<>();
 			for (OfflinePlayer o : (Set<OfflinePlayer>) ReflectionUtils.invokeMethod(s, "getPlayers")) {
 				ret.add(o.getName());
@@ -98,11 +96,12 @@ public MCTeam getPlayerTeam(MCOfflinePlayer player) {
 	@Override
 	public Set<MCScore> getScores(String entry) {
 		Set<MCScore> ret = new HashSet<>();
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_7_10)){
+		if(ReflectionUtils.hasMethod(s.getClass(), "getScores", null, String.class)){
 			for (Score o : s.getScores(entry)) {
 				ret.add(new BukkitMCScore(o));
 			}
 		} else {
+			// Probably 1.7.8 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			for (Score o : (Set<Score>) ReflectionUtils.invokeMethod(s, "getScores", player)) {
 				ret.add(new BukkitMCScore(o));
@@ -141,9 +140,10 @@ public MCTeam registerNewTeam(String name) {
 
 	@Override
 	public void resetScores(String entry) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_7_10)){
+		if(ReflectionUtils.hasMethod(s.getClass(), "resetScores", null, String.class)){
 			s.resetScores(entry);
 		} else {
+			// Probably 1.7.8 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			ReflectionUtils.invokeMethod(s, "resetScores", player);
 		}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCTeam.java

@@ -7,9 +7,7 @@
 import java.util.Set;
 
 import com.laytonsmith.abstraction.enums.MCNameTagVisibility;
-import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCNameTagVisibility;
-import com.laytonsmith.core.Static;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scoreboard.NameTagVisibility;
@@ -24,9 +22,10 @@ public BukkitMCTeam(Team team) {
 
 	@Override
 	public void addEntry(String entry) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)){
+		if(ReflectionUtils.hasMethod(t.getClass(), "addEntry", null, String.class)){
 			t.addEntry(entry);
 		} else {
+			// Probably 1.8.5 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			ReflectionUtils.invokeMethod(t, "addPlayer", player);
 		}
@@ -61,11 +60,12 @@ public MCNameTagVisibility getNameTagVisibility() {
 	@Override
 	public Set<String> getEntries() {
 		Set<String> ret = new HashSet<String>();
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)){
+		if(ReflectionUtils.hasMethod(t.getClass(), "getEntries", null)){
 			for (String e : t.getEntries()) {
 				ret.add(e);
 			}
 		} else {
+			// Probably 1.8.5 or prior
 			for (OfflinePlayer o : (Set<OfflinePlayer>) ReflectionUtils.invokeMethod(t, "getPlayers")) {
 				ret.add(o.getName());
 			}
@@ -95,19 +95,21 @@ public String getSuffix() {
 
 	@Override
 	public boolean hasEntry(String entry) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)){
+		if(ReflectionUtils.hasMethod(t.getClass(), "hasEntry", null, String.class)){
 			return t.hasEntry(entry);
 		} else {
+			// Probably 1.8.5 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			return (boolean) ReflectionUtils.invokeMethod(t, "hasPlayer", player);
 		}
 	}
 
 	@Override
 	public boolean removeEntry(String entry) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)){
+		if(ReflectionUtils.hasMethod(t.getClass(), "removeEntry", null, String.class)){
 			return t.removeEntry(entry);
 		} else {
+			// Probably 1.8.5 or prior
 			OfflinePlayer player = Bukkit.getOfflinePlayer(entry);
 			return (boolean) ReflectionUtils.invokeMethod(t, "removePlayer", player);
 		}

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArmorStand.java

@@ -1,14 +1,13 @@
 package com.laytonsmith.abstraction.bukkit.entities;
 
+import com.laytonsmith.PureUtilities.Common.ReflectionUtils;
 import com.laytonsmith.PureUtilities.Vector3D;
 import com.laytonsmith.abstraction.MCArmorStand;
 import com.laytonsmith.abstraction.MCEntityEquipment;
 import com.laytonsmith.abstraction.MCItemStack;
 import com.laytonsmith.abstraction.bukkit.BukkitMCEntityEquipment;
 import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack;
 import com.laytonsmith.abstraction.enums.MCBodyPart;
-import com.laytonsmith.abstraction.enums.MCVersion;
-import com.laytonsmith.core.Static;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -265,15 +264,17 @@ public void setSmall(boolean small) {
 
 	@Override
 	public Boolean isMarker() {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)) {
+		// Added in 1.8.7
+		if(ReflectionUtils.hasMethod(as.getClass(), "isMarker", null)){
 			return as.isMarker();
 		}
 		return null;
 	}
 
 	@Override
 	public void setMarker(boolean marker) {
-		if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8_7)) {
+		// Added in 1.8.7
+		if(ReflectionUtils.hasMethod(as.getClass(), "setMarker", null, boolean.class)){
 			as.setMarker(marker);
 		}
 	}

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java

@@ -401,7 +401,8 @@ public void setRemainingFireTicks(int i) {
 
 	@Override
 	public void setSpectatorTarget(MCEntity entity) {
-		if(Static.getServer().getMinecraftVersion().lt(MCVersion.MC1_8_7)) {
+		if(!ReflectionUtils.hasMethod(p.getClass(), "setSpectatorTarget", null, Entity.class)){
+			// Probably 1.8.6 or prior
 			return;
 		}
 		if(entity == null) {
@@ -413,7 +414,8 @@ public void setSpectatorTarget(MCEntity entity) {
 
 	@Override
 	public MCEntity getSpectatorTarget() {
-		if(Static.getServer().getMinecraftVersion().lt(MCVersion.MC1_8_7)) {
+		if(!ReflectionUtils.hasMethod(p.getClass(), "getSpectatorTarget", null)){
+			// Probably 1.8.6 or prior
 			return null;
 		}
 		return BukkitConvertor.BukkitGetCorrectEntity(p.getSpectatorTarget());