From 9b111cc9774daed1d754c55b1745faeb32809e0a Mon Sep 17 00:00:00 2001
From: Harrison <yunyangdeng@gmail.com>
Date: Thu, 30 Apr 2020 15:50:14 -0500
Subject: [PATCH] Cache value now has convenience constructor.

Implemented the changes.

Also placed putting data in hashmap priority so for faster access.
---
 .../java/ca/recrown/islandsurvivalcraft/caching/Cache.java  | 6 ++----
 .../ca/recrown/islandsurvivalcraft/caching/CacheValue.java  | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/caching/Cache.java b/src/main/java/ca/recrown/islandsurvivalcraft/caching/Cache.java
index 63455fe..e8a1c97 100644
--- a/src/main/java/ca/recrown/islandsurvivalcraft/caching/Cache.java
+++ b/src/main/java/ca/recrown/islandsurvivalcraft/caching/Cache.java
@@ -32,11 +32,9 @@ public class Cache<K, V> {
             lock.lock();
             try {
                 if (data.containsKey(key)) return;
-                CacheValue<K, V> val = new CacheValue<>();
-                val.key = key;
-                val.value = value;
-                usage.add(val);
+                CacheValue<K, V> val = new CacheValue<>(key, value);
                 data.put(key, val);
+                usage.add(val);
                 if (data.size() > maxSize) {
                     data.remove(usage.pop().key);
                 }
diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/caching/CacheValue.java b/src/main/java/ca/recrown/islandsurvivalcraft/caching/CacheValue.java
index 027b558..49b691e 100644
--- a/src/main/java/ca/recrown/islandsurvivalcraft/caching/CacheValue.java
+++ b/src/main/java/ca/recrown/islandsurvivalcraft/caching/CacheValue.java
@@ -21,4 +21,9 @@ class CacheValue<KeyType, ValueType> {
      */
     public volatile boolean detached = true;
 
+    public CacheValue(KeyType key, ValueType value) {
+        this.key = key;
+        this.value = value;
+    }
+
 }
\ No newline at end of file