Add IItemDb#isReady to check if item database is available

EssentialsX · Jan 12, 2019 · 32540c2 · 32540c2
1 parent d24b061
commit 32540c2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/com/earth2me/essentials/api/IItemDb.java
@@ -153,4 +153,11 @@ default Material getFromLegacy(String item) {
     default Material getFromLegacy(final int id, final byte damage) {
         return MaterialUtil.convertFromLegacy(id, damage);
     }
+
+    /**
+     * Check whether the item database is loaded and ready for use.
+     *
+     * @return Whether items have finished loading
+     */
+    boolean isReady();
 }
diff --git a/Essentials/src/com/earth2me/essentials/items/AbstractItemDb.java b/Essentials/src/com/earth2me/essentials/items/AbstractItemDb.java
@@ -27,6 +27,8 @@
 
 public abstract class AbstractItemDb implements IConf, net.ess3.api.IItemDb {
 
+    protected boolean ready = false;
+
     @Override
     public List<ItemStack> getMatching(User user, String[] args) throws Exception {
         List<ItemStack> is = new ArrayList<>();
@@ -224,4 +226,9 @@ public String serialize(ItemStack is) {
 
         return sb.toString().trim().replaceAll("§", "&");
     }
+
+    @Override
+    public boolean isReady() {
+        return ready;
+    }
 }
diff --git a/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java b/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java
@@ -59,9 +59,12 @@ private void rebuild() {
             .collect(Collectors.joining());
 
         this.loadJSON(String.join("\n", json));
+
+        ready = true;
     }
 
     private void reset() {
+        ready = false;
         items.clear();
         itemAliases.clear();
         allAliases.clear();

diff --git a/Essentials/src/com/earth2me/essentials/items/LegacyItemDb.java b/Essentials/src/com/earth2me/essentials/items/LegacyItemDb.java
@@ -44,6 +44,7 @@ public void reloadConfig() {
             return;
         }
 
+        ready = false;
         durabilities.clear();
         items.clear();
         names.clear();
@@ -115,6 +116,8 @@ public void reloadConfig() {
         }
 
         LOGGER.info(String.format("Loaded %s items from items.csv.", listNames().size()));
+
+        ready = true;
     }
 
     @Override