Remove 1.16-1.18 Reflection Checks (#7832)

* cleanup 1.17 & 1.18

* 1.16

* rollback clamp

Author: erenkarakal

src/main/java/ch/njol/skript/aliases/AliasesProvider.java

@@ -1,6 +1,5 @@
 package ch.njol.skript.aliases;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.bukkitutil.BukkitUnsafe;
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.bukkitutil.block.BlockCompat;
@@ -11,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -24,9 +22,6 @@
  */
 public class AliasesProvider {
 
-	// not supported on Spigot versions older than 1.18
-	private static final boolean FASTER_SET_SUPPORTED = Skript.classExists("it.unimi.dsi.fastutil.objects.ObjectOpenHashSet");
-
 	/**
 	 * When an alias is not found, it will requested from this provider.
 	 * Null when this is global aliases provider.
@@ -66,13 +61,7 @@ public AliasesProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		this.aliases = new HashMap<>(expectedCount);
 		this.variations = new HashMap<>(expectedCount / 20);
 		this.aliasesMap = new AliasesMap();
-
-		if (FASTER_SET_SUPPORTED) {
-			this.materials = new ObjectOpenHashSet<>();
-		} else {
-			this.materials = new HashSet<>();
-		}
-
+		this.materials = new ObjectOpenHashSet<>();
 		this.gson = new Gson();
 	}
 

src/main/java/ch/njol/skript/bukkitutil/WorldUtils.java

@@ -69,6 +69,8 @@
 
 public class BukkitClasses {
 
+	// TODO - remove unnecessary classExists checks when Spigot support is dropped
+
 	public BukkitClasses() {}
 
 	static {
@@ -1262,39 +1264,36 @@ public String toVariableNameString(FireworkEffect effect) {
 						"See the <a href='#EffPlaySound'>play sound</a> and <a href='#EffStopSound'>stop sound</a> effects.")
 				.since("2.4"));
 
-		if (Skript.classExists("org.bukkit.entity.Panda$Gene")) {
-			Classes.registerClass(new EnumClassInfo<>(Gene.class, "gene", "genes")
-					.user("(panda )?genes?")
-					.name("Gene")
-					.description("Represents a Panda's main or hidden gene. " +
-							"See <a href='https://minecraft.wiki/w/Panda#Genetics'>genetics</a> for more info.")
-					.since("2.4")
-					.requiredPlugins("Minecraft 1.14 or newer"));
-		}
+		Classes.registerClass(new EnumClassInfo<>(Gene.class, "gene", "genes")
+				.user("(panda )?genes?")
+				.name("Gene")
+				.description("Represents a Panda's main or hidden gene. " +
+					"See <a href='https://minecraft.wiki/w/Panda#Genetics'>genetics</a> for more info.")
+				.since("2.4")
+				.requiredPlugins("Minecraft 1.14 or newer"));
 
 		Classes.registerClass(new EnumClassInfo<>(RegainReason.class, "healreason", "heal reasons")
 				.user("(regen|heal) (reason|cause)")
 				.name("Heal Reason")
 				.description("The health regain reason in a <a href='#heal'>heal</a> event.")
 				.since("2.5"));
 
-		if (Skript.classExists("org.bukkit.entity.Cat$Type")) {
-			ClassInfo<Cat.Type> catTypeClassInfo;
-			if (BukkitUtils.registryExists("CAT_VARIANT")) {
-				catTypeClassInfo = new RegistryClassInfo<>(Cat.Type.class, Registry.CAT_VARIANT, "cattype", "cat types");
-			} else {
-				//noinspection unchecked, rawtypes - it is an enum on other versions
-				catTypeClassInfo = new EnumClassInfo<>((Class) Cat.Type.class, "cattype", "cat types");
-			}
-			Classes.registerClass(catTypeClassInfo
-					.user("cat ?(type|race)s?")
-					.name("Cat Type")
-					.description("Represents the race/type of a cat entity.",
-						"NOTE: Minecraft namespaces are supported, ex: 'minecraft:british_shorthair'.")
-					.since("2.4")
-					.requiredPlugins("Minecraft 1.14 or newer")
-					.documentationId("CatType"));
+		ClassInfo<Cat.Type> catTypeClassInfo;
+		if (BukkitUtils.registryExists("CAT_VARIANT")) {
+			catTypeClassInfo = new RegistryClassInfo<>(Cat.Type.class, Registry.CAT_VARIANT, "cattype", "cat types");
+		} else {
+			//noinspection unchecked, rawtypes - it is an enum on other versions
+			catTypeClassInfo = new EnumClassInfo<>((Class) Cat.Type.class, "cattype", "cat types");
 		}
+		Classes.registerClass(catTypeClassInfo
+			.user("cat ?(type|race)s?")
+			.name("Cat Type")
+			.description("Represents the race/type of a cat entity.",
+				"NOTE: Minecraft namespaces are supported, ex: 'minecraft:british_shorthair'.")
+			.since("2.4")
+			.requiredPlugins("Minecraft 1.14 or newer")
+			.documentationId("CatType"));
+
 
 		Classes.registerClass(new ClassInfo<>(GameRule.class, "gamerule")
 			.user("gamerules?")

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -541,11 +541,15 @@ public Player[] executeSimple(Object[][] params) {
 				}
 				return CollectionUtils.array(uuid != null ? Bukkit.getPlayer(uuid) : (isExact ? Bukkit.getPlayerExact(name) : Bukkit.getPlayer(name)));
 			}
-		}).description("Returns an online player from their name or UUID, if player is offline function will return nothing.", "Setting 'getExactPlayer' parameter to true will return the player whose name is exactly equal to the provided name instead of returning a player that their name starts with the provided name.")
-			.examples("set {_p} to player(\"Notch\") # will return an online player whose name is or starts with 'Notch'", "set {_p} to player(\"Notch\", true) # will return the only online player whose name is 'Notch'", "set {_p} to player(\"069a79f4-44e9-4726-a5be-fca90e38aaf5\") # <none> if player is offline")
+		}).description("Returns an online player from their name or UUID, if player is offline function will return nothing.",
+				"Setting 'getExactPlayer' parameter to true will return the player whose name is exactly equal to the provided name instead of returning a player that their name starts with the provided name.")
+			.examples("set {_p} to player(\"Notch\") # will return an online player whose name is or starts with 'Notch'",
+				"set {_p} to player(\"Notch\", true) # will return the only online player whose name is 'Notch'",
+				"set {_p} to player(\"069a79f4-44e9-4726-a5be-fca90e38aaf5\") # <none> if player is offline")
 			.since("2.8.0");
 
 		{ // offline player function
+			// TODO - remove this when Spigot support is dropped
 			boolean hasIfCached = Skript.methodExists(Bukkit.class, "getOfflinePlayerIfCached", String.class);
 
 			List<Parameter<?>> params = new ArrayList<>();

src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java

@@ -22,8 +22,7 @@
 public class CondAnchorWorks extends Condition {
 
 	static {
-		if (Skript.classExists("org.bukkit.block.data.type.RespawnAnchor"))
-			Skript.registerCondition(CondAnchorWorks.class, "respawn anchors [do[1:(n't| not)]] work in %worlds%");
+		Skript.registerCondition(CondAnchorWorks.class, "respawn anchors [do[1:(n't| not)]] work in %worlds%");
 	}
 
 	@SuppressWarnings("NotNullFieldNotInitialized")

src/main/java/ch/njol/skript/conditions/CondAnchorWorks.java

@@ -22,12 +22,10 @@ public class CondEntityIsInLiquid extends PropertyCondition<Entity> {
 
 	static {
 		StringBuilder patterns = new StringBuilder();
-		if (Skript.methodExists(Entity.class, "isInWater")) {
-			patterns.append("1¦water");
-			if (Skript.methodExists(Entity.class, "isInLava")) // Paper - All added at the same time + isInWater
-				patterns.append("|2¦lava|3¦[a] bubble[ ]column|4¦rain");
-			register(CondEntityIsInLiquid.class, "in (" + patterns + ")", "entities");
-		}
+		patterns.append("1¦water");
+		if (Skript.methodExists(Entity.class, "isInLava")) // TODO - remove this when Spigot support is dropped
+			patterns.append("|2¦lava|3¦[a] bubble[ ]column|4¦rain");
+		register(CondEntityIsInLiquid.class, "in (" + patterns + ")", "entities");
 	}
 
 	private static final int IN_WATER = 1, IN_LAVA = 2, IN_BUBBLE_COLUMN = 3, IN_RAIN = 4;
@@ -45,34 +43,24 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	public boolean check(Entity entity) {
-		switch (mark) {
-			case IN_WATER:
-				return entity.isInWater();
-			case IN_LAVA:
-				return entity.isInLava();
-			case IN_BUBBLE_COLUMN:
-				return entity.isInBubbleColumn();
-			case IN_RAIN:
-				return entity.isInRain();
-			default:
-				throw new IllegalStateException();
-		}
+		return switch (mark) {
+			case IN_WATER -> entity.isInWater();
+			case IN_LAVA -> entity.isInLava();
+			case IN_BUBBLE_COLUMN -> entity.isInBubbleColumn();
+			case IN_RAIN -> entity.isInRain();
+			default -> throw new IllegalStateException();
+		};
 	}
 
 	@Override
 	protected String getPropertyName() {
-		switch (mark) {
-			case IN_WATER:
-				return "in water";
-			case IN_LAVA:
-				return "in lava";
-			case IN_BUBBLE_COLUMN:
-				return "in bubble column";
-			case IN_RAIN:
-				return "in rain";
-			default:
-				throw new IllegalStateException();
-		}
+		return switch (mark) {
+			case IN_WATER -> "in water";
+			case IN_LAVA -> "in lava";
+			case IN_BUBBLE_COLUMN -> "in bubble column";
+			case IN_RAIN -> "in rain";
+			default -> throw new IllegalStateException();
+		};
 	}
 
 }

src/main/java/ch/njol/skript/conditions/CondEntityIsInLiquid.java

@@ -13,6 +13,7 @@
 public class CondEntityIsWet extends PropertyCondition<Entity> {
 
 	static {
+		// TODO - remove this when Spigot support is dropped
 		if (Skript.methodExists(Entity.class, "isInWaterOrRainOrBubbleColumn"))
 			register(CondEntityIsWet.class, "wet", "entities");
 	}

src/main/java/ch/njol/skript/conditions/CondEntityIsWet.java

@@ -1,14 +1,9 @@
 package ch.njol.skript.conditions;
 
+import ch.njol.skript.doc.*;
 import org.bukkit.entity.LivingEntity;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.conditions.base.PropertyCondition;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
 
 @Name("Is Climbing")
 @Description("Whether a living entity is climbing, such as a spider up a wall or a player on a ladder.")
@@ -23,8 +18,7 @@
 public class CondIsClimbing extends PropertyCondition<LivingEntity> {
 
 	static {
-		if (Skript.methodExists(LivingEntity.class, "isClimbing"))
-			register(CondIsClimbing.class, "climbing", "livingentities");
+		register(CondIsClimbing.class, "climbing", "livingentities");
 	}
 
 	@Override

src/main/java/ch/njol/skript/conditions/CondIsClimbing.java

@@ -29,6 +29,7 @@
 @RequiredPlugins("Paper 1.17.1+ (entities)")
 public class CondIsLeftHanded extends PropertyCondition<LivingEntity> {
 
+	// TODO - remove this when Spigot support is dropped
 	private static final boolean CAN_USE_ENTITIES = Skript.methodExists(Mob.class, "isLeftHanded");
 
 	static {

src/main/java/ch/njol/skript/conditions/CondIsLeftHanded.java

@@ -35,6 +35,7 @@
 public class CondIsPreferredTool extends Condition {
 
 	static {
+		// TODO - remove this when Spigot support is dropped
 		String types = "blocks";
 		if (Skript.methodExists(BlockData.class, "isPreferredTool", ItemStack.class))
 			types += "/blockdatas";