Track brewer

api/src/main/java/dev/jsinco/brewery/api/brew/Brew.java

@@ -6,8 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -51,6 +50,26 @@ public interface Brew {
      */
     Brew withStep(BrewingStep step);
 
+    /**
+     * @param steps A collection brewing steps
+     * @return A new brew instance with the brewing step added in the chain
+     */
+    Brew withSteps(Collection<BrewingStep> steps);
+
+    /**
+     * @param steps A collection of brewing steps
+     * @return A new brew instance with the brewing steps replacing the existing steps
+     */
+    Brew withStepsReplaced(Collection<BrewingStep> steps);
+
+    /**
+     * @param index Index of the step in {@link #getSteps()}
+     * @param modifier Function that modifies the step
+     * @return A new brew instance with the modified step
+     * @throws IndexOutOfBoundsException If the index is out of bounds
+     */
+    Brew withModifiedStep(int index, Function<BrewingStep, BrewingStep> modifier);
+
     /**
      * @param modifier Function that modifies the last step
      * @return A new brew instance with the modified last step
@@ -78,6 +97,13 @@ public interface Brew {
      */
     List<BrewingStep> getSteps();
 
+    /**
+     * All players who contributed to this brew, in their order of contribution.
+     *
+     * @return All brewers, may be empty
+     */
+    SequencedSet<UUID> getBrewers();
+
     /**
      * A state of a brew, mainly indicates how the data should be written when converting into an item
      */

api/src/main/java/dev/jsinco/brewery/api/brew/BrewingStep.java

@@ -8,8 +8,7 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.minimessage.translation.Argument;
 
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 public interface BrewingStep {
 
@@ -37,6 +36,12 @@ public interface BrewingStep {
      */
     Map<ScoreType, PartialBrewScore> failedScores();
 
+    /**
+     * All players who contributed to this brewing step, in their order of contribution.
+     * @return All brewers, may be empty
+     */
+    SequencedSet<UUID> brewers();
+
     /**
      * @param state    The state of the brew
      * @param resolver A tag resolver for this step
@@ -50,21 +55,38 @@ default Component infoDisplay(Brew.State state, TagResolver resolver) {
         }, Argument.tagResolver(resolver));
     }
 
-    interface TimedStep {
+    interface TimedStep extends BrewingStep {
         /**
          * @return The time for this step (ticks)
          */
         Moment time();
     }
 
-    interface IngredientsStep {
+    interface IngredientsStep extends BrewingStep {
         /**
          * @return The ingredients for this step
          */
         Map<? extends Ingredient, Integer> ingredients();
     }
 
-    interface Cook extends BrewingStep, TimedStep, IngredientsStep {
+    interface AuthoredStep<SELF extends AuthoredStep<SELF>> extends BrewingStep {
+
+        /**
+         * @param brewer A brewer's UUID
+         * @return A new instance of this step with the specified brewer
+         */
+        SELF withBrewer(UUID brewer);
+
+        /**
+         * @param brewers A collection of brewer UUIDs
+         * @return A new instance of this step with the specified brewers
+         */
+        SELF withBrewers(SequencedCollection<UUID> brewers);
+
+        SELF withBrewersReplaced(SequencedCollection<UUID> brewers);
+    }
+
+    interface Cook extends TimedStep, IngredientsStep, AuthoredStep<Cook> {
 
         /**
          * @return The type of the cauldron
@@ -84,7 +106,7 @@ interface Cook extends BrewingStep, TimedStep, IngredientsStep {
         Cook withIngredients(Map<Ingredient, Integer> ingredients);
     }
 
-    interface Distill extends BrewingStep {
+    interface Distill extends AuthoredStep<Distill> {
 
         /**
          * @return The amount of distill runs for this step
@@ -97,7 +119,7 @@ interface Distill extends BrewingStep {
         Distill incrementRuns();
     }
 
-    interface Age extends BrewingStep, TimedStep {
+    interface Age extends TimedStep, AuthoredStep<Age> {
 
         /**
          * @return The type of the barrel
@@ -111,7 +133,7 @@ interface Age extends BrewingStep, TimedStep {
         Age withAge(Moment age);
     }
 
-    interface Mix extends BrewingStep, TimedStep, IngredientsStep {
+    interface Mix extends TimedStep, IngredientsStep, AuthoredStep<Mix> {
 
         /**
          * @param ingredients A map of ingredients with amount

api/src/main/java/dev/jsinco/brewery/api/breweries/Barrel.java

@@ -2,6 +2,13 @@
 
 import dev.jsinco.brewery.api.structure.StructureType;
 
+/**
+ * Due to using too much generics complexity, replaced with {@link BarrelAccess}
+ * @param <B> Self
+ * @param <IS> ItemStack
+ * @param <I> Inventory
+ */
+@Deprecated(forRemoval = true)
 public interface Barrel<B extends Barrel<B, IS, I>, IS, I> extends StructureHolder<B>, InventoryAccessible<IS, I> {
 
     @Override

api/src/main/java/dev/jsinco/brewery/api/breweries/BarrelAccess.java

@@ -0,0 +1,42 @@
+package dev.jsinco.brewery.api.breweries;
+
+import dev.jsinco.brewery.api.structure.MultiblockStructure;
+import dev.jsinco.brewery.api.util.CancelState;
+import dev.jsinco.brewery.api.util.Holder;
+import dev.jsinco.brewery.api.vector.BreweryLocation;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public interface BarrelAccess {
+
+    /**
+     * Open this barrels inventory for the player with the specified UUID
+     * @param location The location to open from
+     * @param player The player
+     * @return The resulting state
+     */
+    CancelState open(@NotNull BreweryLocation location, @NotNull Holder.Player player);
+
+    /**
+     * Closes the barrel inventory for all viewers
+     * @param silent Whether to play a barrel sound or not
+     */
+    void close(boolean silent);
+
+    /**
+     * Destroy the barrel, dropping all contained items
+     * @param breweryLocation The location to destroy from
+     */
+    void destroy(BreweryLocation breweryLocation);
+
+    /**
+     * @return The barrels inventory
+     */
+    BrewInventory getBrewInventory();
+
+    /**
+     * @return The underlying barrel structure
+     */
+    MultiblockStructure<? extends BarrelAccess> getStructure();
+}

api/src/main/java/dev/jsinco/brewery/api/breweries/BrewInventory.java

@@ -0,0 +1,71 @@
+package dev.jsinco.brewery.api.breweries;
+
+import dev.jsinco.brewery.api.brew.Brew;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+public interface BrewInventory {
+
+    /**
+     * Gets a view of brews in the inventory, where each index of the array corresponds to a position in the inventory.
+     * Empty slots are represented by null.
+     *
+     * @return All brews in this inventory
+     */
+    Brew[] getBrews();
+
+    /**
+     * Gets a snapshot of all brews currently in the inventory. The list does not update as the inventory updates.
+     *
+     * @return All brews in this inventory
+     */
+    default List<Brew> getBrewSnapshot() {
+        return Arrays.stream(getBrews())
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    /**
+     * Set an item in the inventory without changing the database
+     *
+     * @param brew The brew to set
+     * @param position The position of the brew to set
+     */
+    void set(@Nullable Brew brew, int position);
+
+    /**
+     * Update the inventory GUI from brew inventory
+     */
+    void updateInventoryFromBrews();
+
+    /**
+     * Update the brew inventory from inventory GUI
+     * @return True if inventory GUI had any changes
+     */
+    boolean updateBrewsFromInventory();
+
+    /**
+     * Store an item in the inventory, also modify the database
+     * @param brew The brew to store
+     * @param position The position to store the brew
+     */
+    void store(Brew brew, int position);
+
+    /**
+     * @return True if inventory is empty
+     */
+    boolean isEmpty();
+
+    /**
+     * @return True if inventory is full
+     */
+    boolean isFull();
+
+    /**
+     * @return The amount of brews in this inventory
+     */
+    int brewAmount();
+}

api/src/main/java/dev/jsinco/brewery/api/breweries/Cauldron.java

@@ -1,7 +1,14 @@
 package dev.jsinco.brewery.api.breweries;
 
+import dev.jsinco.brewery.api.brew.Brew;
 import dev.jsinco.brewery.api.structure.SinglePositionStructure;
+import org.jetbrains.annotations.NotNull;
 
 public interface Cauldron extends Tickable, SinglePositionStructure {
 
+    long getTime();
+
+    boolean isHot();
+
+    @NotNull Brew getBrew();
 }

api/src/main/java/dev/jsinco/brewery/api/breweries/Distillery.java

@@ -2,6 +2,7 @@
 
 import dev.jsinco.brewery.api.structure.StructureType;
 
+@Deprecated(forRemoval = true)
 public interface Distillery<D extends Distillery<D, IS, I>, IS, I> extends StructureHolder<D>, InventoryAccessible<IS, I>, Tickable {
 
     /**

api/src/main/java/dev/jsinco/brewery/api/breweries/DistilleryAccess.java

@@ -0,0 +1,47 @@
+package dev.jsinco.brewery.api.breweries;
+
+import dev.jsinco.brewery.api.structure.MultiblockStructure;
+import dev.jsinco.brewery.api.util.CancelState;
+import dev.jsinco.brewery.api.util.Holder;
+import dev.jsinco.brewery.api.vector.BreweryLocation;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public interface DistilleryAccess {
+    /**
+     * Open this distillery inventory for the player with the specified UUID
+     * @param location The location to open from
+     * @param player The player UUID
+     * @return True if canceled
+     */
+    CancelState open(@NotNull BreweryLocation location, @NotNull Holder.Player player);
+
+    /**
+     * Closes the distillery inventory for all viewers
+     * @param silent Whether to play a close sound or not
+     */
+    void close(boolean silent);
+
+    /**
+     * Destroy the distillery, dropping all contained items
+     * @param breweryLocation The location to destroy from
+     */
+    void destroy(BreweryLocation breweryLocation);
+
+    /**
+     * @return This distillery mixture inventory
+     */
+    BrewInventory getMixture();
+
+    /**
+     * @return This distillery distillate inventory
+     */
+    BrewInventory getDistillate();
+
+    /**
+     * @return The underlying distillery structure
+     */
+    MultiblockStructure<? extends DistilleryAccess> getStructure();
+
+}

api/src/main/java/dev/jsinco/brewery/api/breweries/StructureHolder.java

@@ -12,7 +12,7 @@ public interface StructureHolder<H extends StructureHolder<H>> {
     MultiblockStructure<H> getStructure();
 
     /**
-     * Persistently destroy the structure
+     * Persistently destroy the structure, dropping all contained items
      *
      * @param breweryLocation The location to destroy from
      */

api/src/main/java/dev/jsinco/brewery/api/util/CancelState.java

@@ -0,0 +1,24 @@
+package dev.jsinco.brewery.api.util;
+
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;
+
+public sealed interface CancelState {
+
+    record Cancelled() implements CancelState {
+    }
+
+    record PermissionDenied(Component message) implements CancelState {
+
+        public void sendMessage(@Nullable Audience audience) {
+            if(audience == null) {
+                return;
+            }
+            audience.sendMessage(message);
+        }
+    }
+
+    record Allowed() implements CancelState {
+    }
+}