Use MethodHandles

For better performance

Author: TheAndrey

gradle.properties

@@ -1,3 +1,3 @@
 # Project
 group=com.gamerforea
-version=1.7.10-1.13.1
+version=1.7.10-1.13.2

src/main/java/com/gamerforea/eventhelper/EventHelper.java

@@ -45,17 +45,19 @@ public void onServerStart(FMLServerStartingEvent event)
 	}
 
 	@EventHandler
-	public final void serverStarted(FMLServerStartedEvent event)
+	public void serverStarted(FMLServerStartedEvent event)
 	{
 		Configuration cfg = ConfigUtils.getConfig("EventHelper");
 		String c = CATEGORY_GENERAL;
 		String[] plugins = cfg.getStringList("plugins", c, new String[] { "WorldGuard", "GriefPreventionPlus" }, "Plugins for sending events");
 		boolean pluginHooking = cfg.getBoolean("pluginHooking", c, true, "Hooking plugins (allow checking regions)");
-		craftPackage = Bukkit.getServer().getClass().getPackage().getName(); // TheAndrey: Automatic package detection
 		explosions = cfg.getBoolean("explosions", c, explosions, "Explosions enabled");
 		debug = cfg.getBoolean("debug", c, debug, "Debugging enabled");
 		cfg.save();
 
+		craftPackage = Bukkit.getServer().getClass().getPackage().getName(); // TheAndrey: Automatic package detection
+		LOGGER.debug("CraftBukkit package is: {}", craftPackage);
+
 		PluginManager plManager = Bukkit.getPluginManager();
 		for (String plName : plugins)
 		{

src/main/java/com/gamerforea/eventhelper/util/ConvertUtils.java

@@ -1,39 +1,77 @@
 package com.gamerforea.eventhelper.util;
 
+import com.gamerforea.eventhelper.EventHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import org.bukkit.Bukkit;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import javax.annotation.Nullable;
 
 public final class ConvertUtils
 {
-	private static final Method getBukkitEntity;
-	private static final Method asCraftMirror;
+	private static final MethodHandle getWorld;
+	private static final MethodHandle getBukkitEntity;
+	private static final MethodHandle asCraftMirror;
 
-	public static org.bukkit.entity.Entity toBukkitEntity(Entity entity) throws Exception
+	@Nullable
+	public static org.bukkit.entity.Entity toBukkitEntity(@Nullable Entity entity)
 	{
-		return (org.bukkit.entity.Entity) getBukkitEntity.invoke(entity);
+		if (entity == null)
+			return null; // TheAndrey: null -> null
+
+		try
+		{
+			return (org.bukkit.entity.Entity) getBukkitEntity.bindTo(entity).invoke();
+		}
+		catch (Throwable e)
+		{
+			throw new RuntimeException("Unable to invoke getBukkitEntity() on " + entity, e);
+		}
 	}
 
-	public static Player toBukkitEntity(EntityPlayer player) throws Exception
+	@Nullable
+	public static Player toBukkitEntity(@Nullable EntityPlayer player)
 	{
-		return (Player) getBukkitEntity.invoke(player);
+		return (Player) toBukkitEntity((Entity) player);
 	}
 
-	public static org.bukkit.World toBukkitWorld(World world)
+	@Nullable
+	public static org.bukkit.World toBukkitWorld(@Nullable World world)
 	{
-		return Bukkit.getWorld(world.getWorldInfo().getWorldName());
+		if (world == null)
+			return null; // TheAndrey: null -> null
+
+		try
+		{
+			return (org.bukkit.World) getWorld.bindTo(world).invoke();
+		}
+		catch (Throwable e)
+		{
+			throw new RuntimeException("Unable to invoke getWorld() on " + world, e);
+		}
 	}
 
-	public static org.bukkit.inventory.ItemStack toBukkitItemStackMirror(ItemStack stack) throws Exception
+	@Nullable
+	public static org.bukkit.inventory.ItemStack toBukkitItemStackMirror(@Nullable ItemStack stack)
 	{
-		return (org.bukkit.inventory.ItemStack) asCraftMirror.invoke(null, stack);
+		if (stack == null)
+			return null; // TheAndrey: null -> null
+
+		try
+		{
+			return (org.bukkit.inventory.ItemStack) asCraftMirror.invoke(stack);
+		}
+		catch (Throwable e)
+		{
+			throw new RuntimeException("Unable to invoke asCraftMirror() with " + stack, e);
+		}
 	}
 
 	public static BlockFace toBukkitFace(ForgeDirection direction)
@@ -52,8 +90,6 @@ public static BlockFace toBukkitFace(ForgeDirection direction)
 				return BlockFace.WEST;
 			case EAST:
 				return BlockFace.EAST;
-			case UNKNOWN:
-				return BlockFace.SELF;
 			default:
 				return BlockFace.SELF;
 		}
@@ -63,15 +99,24 @@ public static BlockFace toBukkitFace(ForgeDirection direction)
 	{
 		try
 		{
-			getBukkitEntity = Entity.class.getDeclaredMethod("getBukkitEntity");
-			getBukkitEntity.setAccessible(true);
+			// TheAndrey: Use MethodHandles
+			MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+			Class<?> craftWorld = getCraftClass("CraftWorld");
+			Class<?> craftEntity = getCraftClass("entity.CraftEntity");
+			Class<?> craftStack = getCraftClass("inventory.CraftItemStack");
 
-			asCraftMirror = CraftUtils.getCraftClass("inventory.CraftItemStack").getDeclaredMethod("asCraftMirror", ItemStack.class);
-			asCraftMirror.setAccessible(true);
+			getWorld = lookup.findVirtual(World.class, "getWorld", MethodType.methodType(craftWorld));
+			getBukkitEntity = lookup.findVirtual(Entity.class, "getBukkitEntity", MethodType.methodType(craftEntity));
+			asCraftMirror = lookup.findStatic(craftStack, "asCraftMirror", MethodType.methodType(craftStack, ItemStack.class));
 		}
 		catch (Throwable throwable)
 		{
 			throw new RuntimeException("Failed hooking CraftBukkit methods!", throwable);
 		}
 	}
+
+	public static Class<?> getCraftClass(String name) throws ClassNotFoundException
+	{
+		return Class.forName(EventHelper.craftPackage + '.' + name);
+	}
 }