Bump version to 3.1.2 for release

Closes #62

api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

assembly/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

common/src/main/java/com/lishid/openinv/util/Cache.java

@@ -9,7 +9,7 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 
 /**
- * A minimal time-based cache implementation backed by a HashMap and TreeMultimap.
+ * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
  * 
  * @author Jikoo
  */
@@ -59,8 +59,10 @@ public class Cache<K, V> {
         // Invalidate key - runs lazy check and ensures value won't be cleaned up early
         invalidate(key);
 
-        internal.put(key, value);
+        synchronized (internal) {
-        expiry.put(System.currentTimeMillis() + retention, key);
+            internal.put(key, value);
+            expiry.put(System.currentTimeMillis() + retention, key);
+        }
     }
 
     /**
@@ -70,10 +72,12 @@ public class Cache<K, V> {
      * @return the value to which the specified key is mapped, or null if no value is mapped for the key
      */
     public V get(K key) {
-        // Run lazy check to clean cache
+        synchronized (internal) {
-        lazyCheck();
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        return internal.get(key);
+            return internal.get(key);
+        }
     }
 
     /**
@@ -83,10 +87,12 @@ public class Cache<K, V> {
      * @return true if a mapping exists for the specified key
      */
     public boolean containsKey(K key) {
-        // Run lazy check to clean cache
+        synchronized (internal) {
-        lazyCheck();
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        return internal.containsKey(key);
+            return internal.containsKey(key);
+        }
     }
 
     /**
@@ -95,22 +101,24 @@ public class Cache<K, V> {
      * @param key key to invalidate
      */
     public void invalidate(K key) {
-        // Run lazy check to clean cache
+        synchronized (internal) {
-        lazyCheck();
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        if (!internal.containsKey(key)) {
+            if (!internal.containsKey(key)) {
-            // Value either not present or cleaned by lazy check. Either way, we're good
+                // Value either not present or cleaned by lazy check. Either way, we're good
-            return;
+                return;
-        }
+            }
 
-        // Remove stored object
+            // Remove stored object
-        internal.remove(key);
+            internal.remove(key);
 
-        // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
+            // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
-        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
+            for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
-            if (key.equals(iterator.next().getValue())) {
+                if (key.equals(iterator.next().getValue())) {
-                iterator.remove();
+                    iterator.remove();
-                break;
+                    break;
+                }
             }
         }
     }
@@ -119,11 +127,13 @@ public class Cache<K, V> {
      * Forcibly invalidates all keys, even if they are considered to be in use.
      */
     public void invalidateAll() {
-        for (V value : internal.values()) {
+        synchronized (internal) {
-            postRemoval.run(value);
+            for (V value : internal.values()) {
+                postRemoval.run(value);
+            }
+            expiry.clear();
+            internal.clear();
         }
-        expiry.clear();
-        internal.clear();
     }
 
     /**

internal/1_4_5/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/1_4_6/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>

internal/v1_10_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_11_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java

@@ -123,7 +123,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             try {
                 // 1.11.2
                 return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            } catch (Exception e) {
+            } catch (NoSuchMethodError e) {
                 // 1.11
                 return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
             }

internal/v1_4_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R2</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R3</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R4/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R4</artifactId>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R2</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R3</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

internal/v1_9_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 </project>

internal/v1_9_R2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R2</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

plugin/plugin-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvpluginv1_10_r1</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

plugin/plugin-v1_10_R1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvpluginv1_10_r1</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvplugin</artifactId>

pom.xml

@@ -6,7 +6,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInvParent</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>3.1.0</version>
+  <version>3.1.2</version>
 
   <packaging>pom</packaging>