diff --git a/pom.xml b/pom.xml index 8a9e654..4923bf5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,11 @@ 1.3.1 Brewery + + UTF-8 + UTF-8 + + src @@ -30,8 +35,9 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.6 + 1.6 + UTF-8 @@ -67,6 +73,11 @@ + + mcstats-repo + http://repo.mcstats.org/content/repositories/public + + sk89q-repo http://maven.sk89q.com/artifactory/repo/ @@ -86,8 +97,8 @@ - junction-repo - http://junction.at/repo/ + ChestShop-repo + https://github.com/Acrobot/ChestShop-3/tree/master/repo true always @@ -103,19 +114,6 @@ - - mcstats-repo - http://repo.mcstats.org/content/repositories/public - - - - sacredlabyrinth-repo - http://repo.sacredlabyrinth.net/artifactory/repo/ - - true - always - - @@ -130,7 +128,7 @@ com.sk89q worldguard - 6.0.0-beta-01 + 6.0.0-SNAPSHOT @@ -143,7 +141,7 @@ com.griefcraft - LWC + lwc 4.3.1 compile jar diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 8e29e2f..4beed48 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -211,10 +211,8 @@ public class P extends JavaPlugin { try { try { Class.forName("com.sk89q.worldguard.bukkit.RegionContainer"); - log("Using New WorldGuard!"); wg = new WGBarrelNew(); } catch (ClassNotFoundException e) { - log("Using Old WorldGuard!"); wg = new WGBarrelOld(); } } catch (Throwable e) { diff --git a/src/com/dre/brewery/integration/WGBarrelOld.java b/src/com/dre/brewery/integration/WGBarrelOld.java index 3a18e9e..ed5ccf9 100644 --- a/src/com/dre/brewery/integration/WGBarrelOld.java +++ b/src/com/dre/brewery/integration/WGBarrelOld.java @@ -25,7 +25,7 @@ public class WGBarrelOld implements WGBarrel { 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("Failed to Hook WorldGuard for Barrel Open Permissions! Opening Barrels will NOT work!"); 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();