Also keep support for WorldGuard 5

src/com/dre/brewery/integration/WGBarrel.java

@@ -4,25 +4,6 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import com.dre.brewery.P;
-import com.sk89q.worldguard.bukkit.RegionQuery;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-
-public class WGBarrel {
-
-	public static boolean checkAccess(Player player, Block spigot, Plugin plugin) {
-		WorldGuardPlugin wg = (WorldGuardPlugin) plugin;
-
-		if (!wg.getGlobalRegionManager().hasBypass(player, player.getWorld())) {
-			RegionQuery query = wg.getRegionContainer().createQuery();
-			
-			if(!query.testState(player.getLocation(), player, DefaultFlag.CHEST_ACCESS, DefaultFlag.BUILD)){
-				P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess"));
-				return false;
-			}
-		}
-		
-		return true;
-	}
+public interface WGBarrel {
+	public abstract boolean checkAccess(Player player, Block spigot, Plugin plugin);
 }

src/com/dre/brewery/integration/WGBarrelNew.java

@@ -0,0 +1,32 @@
+package com.dre.brewery.integration;
+
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.dre.brewery.P;
+import com.sk89q.worldguard.bukkit.RegionQuery;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.bukkit.permission.RegionPermissionModel;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+public class WGBarrelNew implements WGBarrel {
+
+	public boolean checkAccess(Player player, Block spigot, Plugin plugin) {
+		WorldGuardPlugin wg = (WorldGuardPlugin) plugin;
+
+		if (!wg.getGlobalStateManager().get(spigot.getWorld()).useRegions) return true; // Region support disabled
+		if (new RegionPermissionModel(wg, player).mayIgnoreRegionProtection(spigot.getWorld())) return true; // Whitelisted cause
+
+		RegionQuery query = wg.getRegionContainer().createQuery();
+
+		if (!query.testBuild(spigot.getLocation(), player, DefaultFlag.USE, DefaultFlag.CHEST_ACCESS)) {
+			P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess"));
+			return false;
+		}
+
+		return true;
+	}
+
+}

src/com/dre/brewery/integration/WGBarrelOld.java

@@ -0,0 +1,63 @@
+package com.dre.brewery.integration;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.dre.brewery.P;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+
+
+public class WGBarrelOld implements WGBarrel {
+
+	private Method allows;
+	private Method canBuild;
+
+	public WGBarrelOld() {
+		try {
+			allows = ApplicableRegionSet.class.getMethod("allows", StateFlag.class, LocalPlayer.class);
+			canBuild = ApplicableRegionSet.class.getMethod("canBuild", LocalPlayer.class);
+		} catch (NoSuchMethodException e) {
+			P.p.errorLog("Failed to Hook WorldGuard for Barrel Open Permissions!");
+			P.p.errorLog("Brewery was tested with version 5.8 to 6.0 of WorldGuard!");
+			P.p.errorLog("Disable the WorldGuard support in the config and do /brew reload");
+			e.printStackTrace();
+		}
+	}
+
+	public boolean checkAccess(Player player, Block spigot, Plugin plugin) {
+		WorldGuardPlugin wg = (WorldGuardPlugin) plugin;
+		if (!wg.getGlobalRegionManager().hasBypass(player, player.getWorld())) {
+
+			Object region = wg.getRegionManager(player.getWorld()).getApplicableRegions(spigot.getLocation());
+
+			if (region != null) {
+				LocalPlayer localPlayer = wg.wrapPlayer(player);
+				try {
+
+					if (!(Boolean) allows.invoke(region, DefaultFlag.CHEST_ACCESS, localPlayer)) {
+						if (!(Boolean) canBuild.invoke(region, localPlayer)) {
+							P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess"));
+							return false;
+						}
+					}
+
+				} catch (IllegalAccessException e) {
+					e.printStackTrace();
+					return false;
+				} catch (InvocationTargetException e) {
+					e.printStackTrace();
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+}