Skip to content

Commit 87db5a8

Browse files
Rename CraftingTableWindow to CraftingWindow
All window names should omit common suffixes such as -Table or -Stand for conciseness and because Bukkit inventories follow the same naming scheme.
1 parent 4c8bc01 commit 87db5a8

5 files changed

Lines changed: 28 additions & 29 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@ApiStatus.Internal
2020
sealed abstract class AbstractSplitWindow<M extends CustomContainerMenu>
2121
extends AbstractWindow<M>
22-
permits AnvilWindowImpl, BrewerWindowImpl, CartographyWindowImpl, CrafterWindowImpl, CraftingTableWindowImpl, FurnaceWindowImpl, GrindstoneWindowImpl, MerchantWindowImpl, NormalSplitWindowImpl, SmithingWindowImpl, StonecutterWindowImpl
22+
permits AnvilWindowImpl, BrewerWindowImpl, CartographyWindowImpl, CrafterWindowImpl, CraftingWindowImpl, FurnaceWindowImpl, GrindstoneWindowImpl, MerchantWindowImpl, NormalSplitWindowImpl, SmithingWindowImpl, StonecutterWindowImpl
2323
{
2424

2525
private final AbstractGui lowerGui;
@@ -41,7 +41,7 @@ sealed abstract class AbstractSplitWindow<M extends CustomContainerMenu>
4141
static sealed abstract class AbstractBuilder<W extends Window, S extends Builder.Split<W, S>>
4242
extends AbstractWindow.AbstractBuilder<W, S>
4343
implements Builder.Split<W, S>
44-
permits AnvilWindowImpl.BuilderImpl, BrewerWindowImpl.BuilderImpl, CartographyWindowImpl.BuilderImpl, CrafterWindowImpl.BuilderImpl, CraftingTableWindowImpl.BuilderImpl, FurnaceWindowImpl.BuilderImpl, GrindstoneWindowImpl.BuilderImpl, MerchantWindowImpl.BuilderImpl, NormalSplitWindowImpl.BuilderImpl, SmithingWindowImpl.BuilderImpl, StonecutterWindowImpl.BuilderImpl
44+
permits AnvilWindowImpl.BuilderImpl, BrewerWindowImpl.BuilderImpl, CartographyWindowImpl.BuilderImpl, CrafterWindowImpl.BuilderImpl, CraftingWindowImpl.BuilderImpl, FurnaceWindowImpl.BuilderImpl, GrindstoneWindowImpl.BuilderImpl, MerchantWindowImpl.BuilderImpl, NormalSplitWindowImpl.BuilderImpl, SmithingWindowImpl.BuilderImpl, StonecutterWindowImpl.BuilderImpl
4545
{
4646

4747
private @Nullable Supplier<? extends Gui> lowerGuiSupplier;

invui/src/main/java/xyz/xenondevs/invui/window/CraftingTableWindow.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/CraftingWindow.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
/**
88
* A {@link Window} that uses a crafter inventory.
99
*/
10-
public sealed interface CraftingTableWindow extends Window, RecipeBookPowered permits CraftingTableWindowImpl {
10+
public sealed interface CraftingWindow extends Window, RecipeBookPowered permits CraftingWindowImpl {
1111

1212
/**
13-
* Creates a new {@link Builder} for a split {@link CraftingTableWindow}.
13+
* Creates a new {@link Builder} for a split {@link CraftingWindow}.
1414
*
1515
* @return The new {@link Builder}
1616
*/
1717
static Builder builder() {
18-
return new CraftingTableWindowImpl.BuilderImpl();
18+
return new CraftingWindowImpl.BuilderImpl();
1919
}
2020

2121
/**
22-
* A {@link CraftingTableWindow} builder.
22+
* A {@link CraftingWindow} builder.
2323
*/
24-
sealed interface Builder extends Window.Builder.Split<CraftingTableWindow, Builder>, RecipeBookPowered.Builder<CraftingTableWindow.Builder> permits CraftingTableWindowImpl.BuilderImpl {
24+
sealed interface Builder extends Window.Builder.Split<CraftingWindow, Builder>, RecipeBookPowered.Builder<CraftingWindow.Builder> permits CraftingWindowImpl.BuilderImpl {
2525

2626
/**
27-
* Sets the 3x3 crafting input {@link Gui} of the {@link CraftingTableWindow}.
27+
* Sets the 3x3 crafting input {@link Gui} of the {@link CraftingWindow}.
2828
*
2929
* @param gui The 3x3 crafting input {@link Gui}
3030
* @return This {@link Builder}
@@ -35,7 +35,7 @@ default Builder setCraftingGui(Gui gui) {
3535

3636
/**
3737
* Sets the {@link Gui.Builder} for the 3x3 crafting input {@link Gui} of this {@link Builder}.
38-
* The {@link Gui.Builder} will be called every time a new {@link CraftingTableWindow} is created using this builder.
38+
* The {@link Gui.Builder} will be called every time a new {@link CraftingWindow} is created using this builder.
3939
*
4040
* @param builder The {@link Gui.Builder} for the 3x3 crafting input {@link Gui}
4141
* @return This {@link Builder}
@@ -46,17 +46,17 @@ default Builder setCraftingGui(Gui.Builder<?, ?> builder) {
4646

4747
/**
4848
* Sets the {@link Gui} {@link Supplier} for the 3x3 crafting input {@link Gui} of this {@link Builder}.
49-
* The {@link Supplier} will be called every time a new {@link CraftingTableWindow} is created using this builder.
49+
* The {@link Supplier} will be called every time a new {@link CraftingWindow} is created using this builder.
5050
*
5151
* @param guiSupplier The {@link Gui} {@link Supplier} for the 3x3 crafting input {@link Gui}
5252
* @return This {@link Builder}
5353
*/
5454
Builder setCraftingGui(Supplier<? extends Gui> guiSupplier);
5555

5656
/**
57-
* Sets the result {@link Gui} of the {@link CraftingTableWindow}.
57+
* Sets the result {@link Gui} of the {@link CraftingWindow}.
5858
*
59-
* @param gui The result input {@link Gui} of the {@link CraftingTableWindow}
59+
* @param gui The result input {@link Gui} of the {@link CraftingWindow}
6060
* @return This {@link Builder}
6161
*/
6262
default Builder setResultGui(Gui gui) {
@@ -65,7 +65,7 @@ default Builder setResultGui(Gui gui) {
6565

6666
/**
6767
* Sets the {@link Gui.Builder} for the result input {@link Gui} of this {@link Builder}.
68-
* The {@link Gui.Builder} will be called every time a new {@link CraftingTableWindow} is created using this builder.
68+
* The {@link Gui.Builder} will be called every time a new {@link CraftingWindow} is created using this builder.
6969
*
7070
* @param builder The {@link Gui.Builder} for the result input {@link Gui}
7171
* @return This {@link Builder}
@@ -76,7 +76,7 @@ default Builder setResultGui(Gui.Builder<?, ?> builder) {
7676

7777
/**
7878
* Sets the {@link Gui} {@link Supplier} for the result input {@link Gui} of this {@link Builder}.
79-
* The {@link Supplier} will be called every time a new {@link CraftingTableWindow} is created using this builder.
79+
* The {@link Supplier} will be called every time a new {@link CraftingWindow} is created using this builder.
8080
*
8181
* @param guiSupplier The {@link Gui} {@link Supplier} for the result input {@link Gui}
8282
* @return This {@link Builder}

invui/src/main/java/xyz/xenondevs/invui/window/CraftingTableWindowImpl.java renamed to invui/src/main/java/xyz/xenondevs/invui/window/CraftingWindowImpl.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77
import xyz.xenondevs.invui.gui.AbstractGui;
88
import xyz.xenondevs.invui.gui.Gui;
99
import xyz.xenondevs.invui.internal.menu.CustomCraftingTableMenu;
10-
import xyz.xenondevs.invui.internal.menu.CustomRecipeBookPoweredMenu;
1110

1211
import java.util.ArrayList;
1312
import java.util.List;
1413
import java.util.function.Consumer;
1514
import java.util.function.Supplier;
1615

17-
final class CraftingTableWindowImpl extends AbstractSplitWindow<CustomCraftingTableMenu> implements CraftingTableWindow {
16+
final class CraftingWindowImpl extends AbstractSplitWindow<CustomCraftingTableMenu> implements CraftingWindow {
1817

1918
private final AbstractGui craftingGui;
2019
private final AbstractGui resultGui;
2120
private final AbstractGui lowerGui;
2221
private final List<Consumer<? super Key>> recipeClickHandlers = new ArrayList<>();
2322

24-
public CraftingTableWindowImpl(
23+
public CraftingWindowImpl(
2524
Player player,
2625
Supplier<? extends Component> title,
2726
AbstractGui craftingGui,
@@ -76,42 +75,42 @@ public void setRecipeClickHandlers(List<? extends Consumer<? super Key>> handler
7675
}
7776

7877
public static final class BuilderImpl
79-
extends AbstractSplitWindow.AbstractBuilder<CraftingTableWindow, CraftingTableWindow.Builder>
80-
implements CraftingTableWindow.Builder
78+
extends AbstractSplitWindow.AbstractBuilder<CraftingWindow, CraftingWindow.Builder>
79+
implements CraftingWindow.Builder
8180
{
8281

8382
private final List<Consumer<? super Key>> recipeClickHandlers = new ArrayList<>();
8483
private Supplier<? extends Gui> craftingGuiSupplier = () -> Gui.empty(3, 3);
8584
private Supplier<? extends Gui> resultGuiSupplier = () -> Gui.empty(1, 1);
8685

8786
@Override
88-
public CraftingTableWindow.Builder setCraftingGui(Supplier<? extends Gui> guiSupplier) {
87+
public CraftingWindow.Builder setCraftingGui(Supplier<? extends Gui> guiSupplier) {
8988
this.craftingGuiSupplier = guiSupplier;
9089
return this;
9190
}
9291

9392
@Override
94-
public CraftingTableWindow.Builder setResultGui(Supplier<? extends Gui> guiSupplier) {
93+
public CraftingWindow.Builder setResultGui(Supplier<? extends Gui> guiSupplier) {
9594
this.resultGuiSupplier = guiSupplier;
9695
return this;
9796
}
9897

9998
@Override
100-
public CraftingTableWindow.Builder setRecipeClickHandlers(List<? extends Consumer<? super Key>> handlers) {
99+
public CraftingWindow.Builder setRecipeClickHandlers(List<? extends Consumer<? super Key>> handlers) {
101100
this.recipeClickHandlers.clear();
102101
this.recipeClickHandlers.addAll(handlers);
103102
return this;
104103
}
105104

106105
@Override
107-
public CraftingTableWindow.Builder addRecipeClickHandler(Consumer<? super Key> handler) {
106+
public CraftingWindow.Builder addRecipeClickHandler(Consumer<? super Key> handler) {
108107
this.recipeClickHandlers.add(handler);
109108
return this;
110109
}
111110

112111
@Override
113-
public CraftingTableWindow build(Player viewer) {
114-
var window = new CraftingTableWindowImpl(
112+
public CraftingWindow build(Player viewer) {
113+
var window = new CraftingWindowImpl(
115114
viewer,
116115
titleSupplier,
117116
(AbstractGui) craftingGuiSupplier.get(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* An interface for windows that have a recipe book.
1010
*/
11-
public sealed interface RecipeBookPowered permits CraftingTableWindow, FurnaceWindow {
11+
public sealed interface RecipeBookPowered permits CraftingWindow, FurnaceWindow {
1212

1313
/**
1414
* Displays a ghost recipe in the window.
@@ -46,7 +46,7 @@ public sealed interface RecipeBookPowered permits CraftingTableWindow, FurnaceWi
4646
*
4747
* @param <S> Self type of the builder, used for method chaining.
4848
*/
49-
sealed interface Builder<S extends Builder<S>> permits CraftingTableWindow.Builder, FurnaceWindow.Builder {
49+
sealed interface Builder<S extends Builder<S>> permits CraftingWindow.Builder, FurnaceWindow.Builder {
5050

5151
/**
5252
* Sets the recipe click handlers of the {@link AnvilWindow}.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* A Window is the way to show a player a {@link Gui}. Windows can only have one viewer.
1717
* To create a new {@link Window}, use the builder factory methods {@link Window#builder} and {@link Window#mergedBuilder}.
1818
*/
19-
public sealed interface Window permits AbstractWindow, AnvilWindow, BrewerWindow, CartographyWindow, CrafterWindow, CraftingTableWindow, FurnaceWindow, GrindstoneWindow, MerchantWindow, SmithingWindow, StonecutterWindow {
19+
public sealed interface Window permits AbstractWindow, AnvilWindow, BrewerWindow, CartographyWindow, CrafterWindow, CraftingWindow, FurnaceWindow, GrindstoneWindow, MerchantWindow, SmithingWindow, StonecutterWindow {
2020

2121
/**
2222
* Creates a new {@link Builder.Normal.Split Window Builder} for a normal split window.
@@ -409,7 +409,7 @@ sealed interface Merged<W extends Window, S extends Merged<W, S>>
409409
*/
410410
sealed interface Split<W extends Window, S extends Split<W, S>>
411411
extends Builder<W, S>
412-
permits AbstractSplitWindow.AbstractBuilder, AnvilWindow.Builder, BrewerWindow.Builder, CartographyWindow.Builder, CrafterWindow.Builder, CraftingTableWindow.Builder, FurnaceWindow.Builder, GrindstoneWindow.Builder, MerchantWindow.Builder, SmithingWindow.Builder, StonecutterWindow.Builder, Normal.Split
412+
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
413413
{
414414

415415
/**

0 commit comments

Comments
 (0)