From ff7590187b65435f6828ada0e14ab9e6e828c9f2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 26 Nov 2014 12:27:07 +1100
Subject: [PATCH] Update to 1.8 / fix compilation with Guava 17

---
 pom.xml                                                       | 2 +-
 .../tyrannyofheaven/bukkit/util/uuid/MojangUuidResolver.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f55e68f..431e17d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.7.10-R0.1-SNAPSHOT</bukkit.version>
+    <bukkit.version>1.8-R0.1-SNAPSHOT</bukkit.version>
   </properties>
   <repositories>
     <repository>
diff --git a/src/main/java/org/tyrannyofheaven/bukkit/util/uuid/MojangUuidResolver.java b/src/main/java/org/tyrannyofheaven/bukkit/util/uuid/MojangUuidResolver.java
index 9be0331..6a19625 100644
--- a/src/main/java/org/tyrannyofheaven/bukkit/util/uuid/MojangUuidResolver.java
+++ b/src/main/java/org/tyrannyofheaven/bukkit/util/uuid/MojangUuidResolver.java
@@ -29,9 +29,9 @@
 import org.json.simple.parser.ParseException;
 
 import com.google.common.base.Charsets;
-import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Lists;
 
 public class MojangUuidResolver implements UuidResolver {
@@ -40,7 +40,7 @@ public class MojangUuidResolver implements UuidResolver {
 
     private static final UuidDisplayName NULL_UDN = new UuidDisplayName(UUID.randomUUID(), "NOT FOUND");
 
-    private final Cache<String, UuidDisplayName> cache;
+    private final LoadingCache<String, UuidDisplayName> cache;
 
     public MojangUuidResolver(int cacheMaxSize, long cacheTtl, TimeUnit cacheTtlUnits) {
         cache = CacheBuilder.newBuilder()