Rename BrewerWindow to BrewingWindow

Author: NichtStudioCode

…s/invui/window/BrewerWindowExtensions.kt …/invui/window/BrewingWindowExtensions.ktinvui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/BrewerWindowExtensions.kt renamed to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/BrewingWindowExtensions.kt invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/BrewerWindowExtensions.kt renamed to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/BrewingWindowExtensions.kt

@@ -5,17 +5,17 @@ import xyz.xenondevs.invui.ExperimentalReactiveApi
 import xyz.xenondevs.invui.PropertyAdapter
 
 @ExperimentalReactiveApi
-fun <T> BrewerWindow.Builder.setBrewProgress(provider: Provider<T>, transform: (T) -> Double): BrewerWindow.Builder =
+fun <T> BrewingWindow.Builder.setBrewProgress(provider: Provider<T>, transform: (T) -> Double): BrewingWindow.Builder =
     setBrewProgress(provider.map(transform))
 
 @ExperimentalReactiveApi
-fun BrewerWindow.Builder.setBrewProgress(progress: Provider<Double>): BrewerWindow.Builder =
+fun BrewingWindow.Builder.setBrewProgress(progress: Provider<Double>): BrewingWindow.Builder =
     setBrewProgress(PropertyAdapter(progress))
 
 @ExperimentalReactiveApi
-fun <T> BrewerWindow.Builder.setFuelProgress(provider: Provider<T>, transform: (T) -> Double): BrewerWindow.Builder =
+fun <T> BrewingWindow.Builder.setFuelProgress(provider: Provider<T>, transform: (T) -> Double): BrewingWindow.Builder =
     setFuelProgress(provider.map(transform))
 
 @ExperimentalReactiveApi
-fun BrewerWindow.Builder.setFuelProgress(progress: Provider<Double>): BrewerWindow.Builder =
+fun BrewingWindow.Builder.setFuelProgress(progress: Provider<Double>): BrewingWindow.Builder =
     setFuelProgress(PropertyAdapter(progress))

invui/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java

@@ -21,7 +21,7 @@
 @ApiStatus.Internal
 sealed abstract class AbstractSplitWindow<M extends CustomContainerMenu>
     extends AbstractWindow<M>
-    permits AnvilWindowImpl, BrewerWindowImpl, CartographyWindowImpl, CrafterWindowImpl, CraftingWindowImpl, FurnaceWindowImpl, GrindstoneWindowImpl, MerchantWindowImpl, NormalSplitWindowImpl, SmithingWindowImpl, StonecutterWindowImpl
+    permits AnvilWindowImpl, BrewingWindowImpl, CartographyWindowImpl, CrafterWindowImpl, CraftingWindowImpl, FurnaceWindowImpl, GrindstoneWindowImpl, MerchantWindowImpl, NormalSplitWindowImpl, SmithingWindowImpl, StonecutterWindowImpl
 {
 
     private final AbstractGui lowerGui;
@@ -43,7 +43,7 @@ sealed abstract class AbstractSplitWindow<M extends CustomContainerMenu>
     static sealed abstract class AbstractBuilder<W extends Window, S extends Builder.Split<W, S>>
         extends AbstractWindow.AbstractBuilder<W, S>
         implements Builder.Split<W, S>
-        permits AnvilWindowImpl.BuilderImpl, BrewerWindowImpl.BuilderImpl, CartographyWindowImpl.BuilderImpl, CrafterWindowImpl.BuilderImpl, CraftingWindowImpl.BuilderImpl, FurnaceWindowImpl.BuilderImpl, GrindstoneWindowImpl.BuilderImpl, MerchantWindowImpl.BuilderImpl, NormalSplitWindowImpl.BuilderImpl, SmithingWindowImpl.BuilderImpl, StonecutterWindowImpl.BuilderImpl
+        permits AnvilWindowImpl.BuilderImpl, BrewingWindowImpl.BuilderImpl, CartographyWindowImpl.BuilderImpl, CrafterWindowImpl.BuilderImpl, CraftingWindowImpl.BuilderImpl, FurnaceWindowImpl.BuilderImpl, GrindstoneWindowImpl.BuilderImpl, MerchantWindowImpl.BuilderImpl, NormalSplitWindowImpl.BuilderImpl, SmithingWindowImpl.BuilderImpl, StonecutterWindowImpl.BuilderImpl
     {
 
         private @Nullable Supplier<? extends Gui> lowerGuiSupplier;

…xenondevs/invui/window/BrewerWindow.java …enondevs/invui/window/BrewingWindow.javainvui/src/main/java/xyz/xenondevs/invui/window/BrewerWindow.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/BrewingWindow.java invui/src/main/java/xyz/xenondevs/invui/window/BrewerWindow.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/BrewingWindow.java

@@ -8,15 +8,15 @@
 /**
  * A {@link Window} that uses a brewing stand inventory.
  */
-public sealed interface BrewerWindow extends Window permits BrewerWindowImpl {
+public sealed interface BrewingWindow extends Window permits BrewingWindowImpl {
 
     /**
-     * Creates a new {@link Builder} for a split {@link BrewerWindow}.
+     * Creates a new {@link Builder} for a split {@link BrewingWindow}.
      *
      * @return The new {@link Builder}
      */
     static Builder builder() {
-        return new BrewerWindowImpl.BuilderImpl();
+        return new BrewingWindowImpl.BuilderImpl();
     }
 
     /**
@@ -49,12 +49,12 @@ static Builder builder() {
     double getFuelProgress();
 
     /**
-     * A {@link BrewerWindow} builder.
+     * A {@link BrewingWindow} builder.
      */
-    sealed interface Builder extends Window.Builder.Split<BrewerWindow, BrewerWindow.Builder> permits BrewerWindowImpl.BuilderImpl {
+    sealed interface Builder extends Window.Builder.Split<BrewingWindow, BrewingWindow.Builder> permits BrewingWindowImpl.BuilderImpl {
 
         /**
-         * Sets the 1x1 input {@link Gui} of the {@link BrewerWindow}.
+         * Sets the 1x1 input {@link Gui} of the {@link BrewingWindow}.
          *
          * @param gui The 1x1 input {@link Gui}
          * @return This {@link Builder}
@@ -65,7 +65,7 @@ default Builder setInputGui(Gui gui) {
 
         /**
          * Sets the {@link Gui.Builder} for the 1x1 input {@link Gui} of this {@link Builder}.
-         * The {@link Gui.Builder} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Gui.Builder} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param builder The {@link Gui.Builder} for the 1x1 input {@link Gui}
          * @return This {@link Builder}
@@ -76,15 +76,15 @@ default Builder setInputGui(Gui.Builder<?, ?> builder) {
 
         /**
          * Sets the {@link Gui} {@link Supplier} for the 1x1 input {@link Gui} of this {@link Builder}.
-         * The {@link Supplier} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Supplier} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param guiSupplier The {@link Gui} {@link Supplier} for the 1x1 input {@link Gui}
          * @return This {@link Builder}
          */
         Builder setInputGui(Supplier<? extends Gui> guiSupplier);
 
         /**
-         * Sets the 1x1 fuel {@link Gui} of the {@link BrewerWindow}.
+         * Sets the 1x1 fuel {@link Gui} of the {@link BrewingWindow}.
          *
          * @param gui The 1x1 fuel {@link Gui}
          * @return This {@link Builder}
@@ -95,7 +95,7 @@ default Builder setFuelGui(Gui gui) {
 
         /**
          * Sets the {@link Gui.Builder} for the 1x1 fuel {@link Gui} of this {@link Builder}.
-         * The {@link Gui.Builder} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Gui.Builder} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param builder The {@link Gui.Builder} for the 1x1 fuel {@link Gui}
          * @return This {@link Builder}
@@ -106,15 +106,15 @@ default Builder setFuelGui(Gui.Builder<?, ?> builder) {
 
         /**
          * Sets the {@link Gui} {@link Supplier} for the 1x1 fuel {@link Gui} of this {@link Builder}.
-         * The {@link Supplier} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Supplier} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param guiSupplier The {@link Gui} {@link Supplier} for the 1x1 fuel {@link Gui}
          * @return This {@link Builder}
          */
         Builder setFuelGui(Supplier<? extends Gui> guiSupplier);
 
         /**
-         * Sets the 3x1 result {@link Gui} of the {@link BrewerWindow}.
+         * Sets the 3x1 result {@link Gui} of the {@link BrewingWindow}.
          *
          * @param gui The 3x1 result {@link Gui}
          * @return This {@link Builder}
@@ -125,7 +125,7 @@ default Builder setResultGui(Gui gui) {
 
         /**
          * Sets the {@link Gui.Builder} for the 3x1 result {@link Gui} of this {@link Builder}.
-         * The {@link Gui.Builder} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Gui.Builder} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param builder The {@link Gui.Builder} for the 3x1 result {@link Gui}
          * @return This {@link Builder}
@@ -136,7 +136,7 @@ default Builder setResultGui(Gui.Builder<?, ?> builder) {
 
         /**
          * Sets the {@link Gui} {@link Supplier} for the 3x1 result {@link Gui} of this {@link Builder}.
-         * The {@link Supplier} will be called every time a new {@link BrewerWindow} is created using this builder.
+         * The {@link Supplier} will be called every time a new {@link BrewingWindow} is created using this builder.
          *
          * @param guiSupplier The {@link Gui} {@link Supplier} for the 3x1 result {@link Gui}
          * @return This {@link Builder}

…ndevs/invui/window/BrewerWindowImpl.java …devs/invui/window/BrewingWindowImpl.javainvui/src/main/java/xyz/xenondevs/invui/window/BrewerWindowImpl.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/BrewingWindowImpl.java invui/src/main/java/xyz/xenondevs/invui/window/BrewerWindowImpl.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/BrewingWindowImpl.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-final class BrewerWindowImpl extends AbstractSplitWindow<CustomBrewingStandMenu> implements BrewerWindow {
+final class BrewingWindowImpl extends AbstractSplitWindow<CustomBrewingStandMenu> implements BrewingWindow {
 
     private final AbstractGui inputGui;
     private final AbstractGui fuelGui;
@@ -20,7 +20,7 @@ final class BrewerWindowImpl extends AbstractSplitWindow<CustomBrewingStandMenu>
     private Property<? extends Double> brewProgress;
     private Property<? extends Double> fuelProgress;
 
-    public BrewerWindowImpl(
+    public BrewingWindowImpl(
         Player player,
         Supplier<? extends Component> title,
         AbstractGui inputGui,
@@ -88,8 +88,8 @@ public double getFuelProgress() {
     }
 
     public static final class BuilderImpl
-        extends AbstractSplitWindow.AbstractBuilder<BrewerWindow, BrewerWindow.Builder>
-        implements BrewerWindow.Builder
+        extends AbstractSplitWindow.AbstractBuilder<BrewingWindow, BrewingWindow.Builder>
+        implements BrewingWindow.Builder
     {
 
         private Supplier<? extends Gui> inputGuiSupplier = () -> Gui.empty(1, 1);
@@ -99,38 +99,38 @@ public static final class BuilderImpl
         private Property<? extends Double> fuelProgress = Property.of(0.0);
 
         @Override
-        public BrewerWindow.Builder setInputGui(Supplier<? extends Gui> guiSupplier) {
+        public BrewingWindow.Builder setInputGui(Supplier<? extends Gui> guiSupplier) {
             this.inputGuiSupplier = guiSupplier;
             return this;
         }
 
         @Override
-        public BrewerWindow.Builder setFuelGui(Supplier<? extends Gui> guiSupplier) {
+        public BrewingWindow.Builder setFuelGui(Supplier<? extends Gui> guiSupplier) {
             this.fuelGuiSupplier = guiSupplier;
             return this;
         }
 
         @Override
-        public BrewerWindow.Builder setResultGui(Supplier<? extends Gui> guiSupplier) {
+        public BrewingWindow.Builder setResultGui(Supplier<? extends Gui> guiSupplier) {
             this.resultGuiSupplier = guiSupplier;
             return this;
         }
 
         @Override
-        public BrewerWindow.Builder setBrewProgress(Property<? extends Double> progress) {
+        public BrewingWindow.Builder setBrewProgress(Property<? extends Double> progress) {
             this.brewProgress = progress;
             return this;
         }
 
         @Override
-        public BrewerWindow.Builder setFuelProgress(Property<? extends Double> progress) {
+        public BrewingWindow.Builder setFuelProgress(Property<? extends Double> progress) {
             this.fuelProgress = progress;
             return this;
         }
 
         @Override
-        public BrewerWindow build(Player viewer) {
-            var window = new BrewerWindowImpl(
+        public BrewingWindow build(Player viewer) {
+            var window = new BrewingWindowImpl(
                 viewer,
                 titleSupplier,
                 (AbstractGui) inputGuiSupplier.get(),

invui/src/main/java/xyz/xenondevs/invui/window/Window.java

@@ -1,6 +1,5 @@
 package xyz.xenondevs.invui.window;
 
-import com.fasterxml.jackson.databind.annotation.JsonAppend;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent.Reason;
@@ -19,7 +18,7 @@
  * A Window is the way to show a player a {@link Gui}. Windows can only have one viewer.
  * To create a new {@link Window}, use the builder factory methods {@link Window#builder} and {@link Window#mergedBuilder}.
  */
-public sealed interface Window permits AbstractWindow, AnvilWindow, BrewerWindow, CartographyWindow, CrafterWindow, CraftingWindow, FurnaceWindow, GrindstoneWindow, MerchantWindow, SmithingWindow, StonecutterWindow {
+public sealed interface Window permits AbstractWindow, AnvilWindow, BrewingWindow, CartographyWindow, CrafterWindow, CraftingWindow, FurnaceWindow, GrindstoneWindow, MerchantWindow, SmithingWindow, StonecutterWindow {
 
     /**
      * Creates a new {@link Builder.Normal.Split Window Builder} for a normal split window.
@@ -448,7 +447,7 @@ sealed interface Merged<W extends Window, S extends Merged<W, S>>
          */
         sealed interface Split<W extends Window, S extends Split<W, S>>
             extends Builder<W, S>
-            permits AbstractSplitWindow.AbstractBuilder, AnvilWindow.Builder, BrewerWindow.Builder, CartographyWindow.Builder, CrafterWindow.Builder, CraftingWindow.Builder, FurnaceWindow.Builder, GrindstoneWindow.Builder, MerchantWindow.Builder, SmithingWindow.Builder, StonecutterWindow.Builder, Normal.Split
+            permits AbstractSplitWindow.AbstractBuilder, AnvilWindow.Builder, BrewingWindow.Builder, CartographyWindow.Builder, CrafterWindow.Builder, CraftingWindow.Builder, FurnaceWindow.Builder, GrindstoneWindow.Builder, MerchantWindow.Builder, SmithingWindow.Builder, StonecutterWindow.Builder, Normal.Split
         {
 
             /**