Merge branch 'fix/cache_barrels' into feature/crafting

# Conflicts: # src/main/java/io/github/sefiraat/networks/network/NetworkRoot.java
Sefiraat · Jan 14, 2022 · b57045c · b57045c
2 parents 1fb058d + 100c6fe
commit b57045c
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/io/github/sefiraat/networks/network/NetworkRoot.java b/src/main/java/io/github/sefiraat/networks/network/NetworkRoot.java
@@ -51,6 +51,7 @@ public class NetworkRoot extends NetworkNode {
     protected final Set<Location> networkPurgers = new HashSet<>();
     protected final Set<Location> networkPowerNodes = new HashSet<>();
     protected final Set<Location> networkCrafters = new HashSet<>();
+    protected Set<BarrelIdentity> barrels = null;
 
     private long totalPower = 0;
 
@@ -180,8 +181,13 @@ public Map<ItemStack, Integer> getAllNetworkItems() {
 
     @Nonnull
     public Set<BarrelIdentity> getBarrels() {
+
+        if (this.barrels != null) {
+            return this.barrels;
+        }
+
         final Set<Location> addedLocations = new HashSet<>();
-        final Set<BarrelIdentity> barrelItemMap = new HashSet<>();
+        final Set<BarrelIdentity> barrelSet = new HashSet<>();
 
         for (Location cellLocation : networkMonitors) {
             final BlockFace face = NetworkDirectional.getSelectedFace(cellLocation);
@@ -206,7 +212,7 @@ public Set<BarrelIdentity> getBarrels() {
                 BlockMenu menu = BlockStorage.getInventory(testLocation);
                 InfinityBarrel infinityBarrel = getInfinityBarrel(menu, unit);
                 if (infinityBarrel != null) {
-                    barrelItemMap.add(infinityBarrel);
+                    barrelSet.add(infinityBarrel);
                 }
                 continue;
             }
@@ -215,13 +221,14 @@ public Set<BarrelIdentity> getBarrels() {
                 BlockMenu menu = BlockStorage.getInventory(testLocation);
                 NetworkShell shell = getShell(menu);
                 if (shell != null) {
-                    barrelItemMap.add(shell);
+                    barrelSet.add(shell);
                 }
             }
 
         }
 
-        return barrelItemMap;
+        this.barrels = barrelSet;
+        return barrelSet;
     }
 
     @Nullable