fix(barrel): Build issue

Author: Thorinwasher

src/main/java/com/dre/brewery/Barrel.java

@@ -164,6 +164,11 @@ public static void onUpdate() {
         }
     }
 
+    public static @NotNull List<Barrel> getBarrels(UUID worldUuid) {
+        List<Barrel> worldBarrels = barrels.get(worldUuid);
+        return worldBarrels == null ? List.of() : worldBarrels;
+    }
+
     public boolean hasPermsOpen(Player player, PlayerInteractEvent event) {
         if (isLarge()) {
             if (!player.hasPermission("brewery.openbarrel.big")) {

src/main/java/com/dre/brewery/commands/subcommands/ShowStatsCommand.java

@@ -40,7 +40,7 @@ public void execute(BreweryPlugin breweryPlugin, Lang lang, CommandSender sender
 
         Logging.msg(sender, "Drunk Players: " + BPlayer.numDrunkPlayers());
         Logging.msg(sender, "Brews created: " + BreweryPlugin.getInstance().getBreweryStats().brewsCreated);
-        Logging.msg(sender, "Barrels built: " + Barrel.barrels.size());
+        Logging.msg(sender, "Barrels built: " + Barrel.getAllBarrels().size());
         Logging.msg(sender, "Cauldrons boiling: " + BCauldron.bcauldrons.size());
         Logging.msg(sender, "Number of Recipes: " + BRecipe.getAllRecipes().size());
         Logging.msg(sender, "Wakeups: " + Wakeup.wakeups.size());

src/main/java/com/dre/brewery/integration/bstats/BreweryStats.java

@@ -79,7 +79,7 @@ public void setupBStats() {
             Metrics metrics = new Metrics(BreweryPlugin.getInstance(), BSTATS_ID);
             metrics.addCustomChart(new SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
             metrics.addCustomChart(new SingleLineChart("brews_in_existence", () -> brewsCreated));
-            metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.barrels::size));
+            metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.getAllBarrels()::size));
             metrics.addCustomChart(new SingleLineChart("cauldrons_boiling", BCauldron.bcauldrons::size));
             metrics.addCustomChart(new AdvancedPie("brew_quality", () -> {
                 Map<String, Integer> map = new HashMap<>(8);

src/main/java/com/dre/brewery/integration/bstats/BreweryXStats.java

@@ -108,7 +108,7 @@ public void setupBStats() {
             metrics.addCustomChart(new SimplePie("branch", this::getBranch));
 
             metrics.addCustomChart(new SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
-            metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.barrels::size));
+            metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.getAllBarrels()::size));
             metrics.addCustomChart(new SingleLineChart("cauldrons_boiling", BCauldron.bcauldrons::size));
 
         } catch (Exception | LinkageError e) {

src/main/java/com/dre/brewery/integration/listeners/movecraft/MovecraftUtil.java

@@ -39,7 +39,7 @@ public class MovecraftUtil {
     public static Set<Barrel> barrelsOnCraft(HitBox hitBox, World craftWorld) {
         Set<Barrel> output = new HashSet<>();
 
-        for (Barrel barrel : Barrel.barrels) {
+        for (Barrel barrel : Barrel.getBarrels(craftWorld.getUID())) {
             Location location = barrel.getSpigot().getLocation();
 
             if (!Objects.equals(location.getWorld(), craftWorld)) {

src/main/java/com/dre/brewery/integration/listeners/movecraft/SinkListener.java

@@ -35,7 +35,7 @@ public class SinkListener implements Listener {
     @EventHandler
     public void onSink(CraftSinkEvent event) {
         HitBox hitBox = event.getCraft().getHitBox();
-        ArrayList<Barrel> list = new ArrayList<>(Barrel.barrels);
+        ArrayList<Barrel> list = new ArrayList<>(Barrel.getBarrels(event.getCraft().getWorld().getUID()));
 
         for (Barrel barrel : list) {
             Location location = barrel.getSpigot().getLocation().clone();

src/main/java/com/dre/brewery/listeners/WorldListener.java

@@ -35,16 +35,12 @@ public void onWorldLoad(WorldLoadEvent event) {
         dataManager.getAllBarrels()
             .thenAcceptAsync(barrels -> barrels.stream()
                 .filter(barrel -> barrel.getSpigot().getWorld().equals(event.getWorld()))
-                .forEach(Barrel.getBarrels()::add)
+                .forEach(Barrel::registerBarrel)
             );
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onWorldLoad(WorldUnloadEvent event) {
-        dataManager.getAllBarrels()
-            .thenAcceptAsync(barrels -> barrels.stream()
-                .filter(barrel -> barrel.getSpigot().getWorld().equals(event.getWorld()))
-                .forEach(Barrel.getBarrels()::remove)
-            );
+        Barrel.onUnload(event.getWorld());
     }
 }

src/main/java/com/dre/brewery/storage/BData.java

@@ -477,7 +477,7 @@ public static void loadWorldData(String uuid, World world) {
         }
         if (!initBarrelFutures.isEmpty()) {
             FutureUtil.mergeFutures(initBarrelFutures)
-                .thenAcceptAsync(Barrel.barrels::addAll);
+                .thenAcceptAsync(barrels -> barrels.forEach(Barrel::registerBarrel));
         }
         if (!initWakeups.isEmpty()) {
             Wakeup.wakeups.addAll(initWakeups);