Skip to content

Commit eb0decf

Browse files
Rename CartographyWindow outputGui to resultGui
1 parent 9f83edc commit eb0decf

2 files changed

Lines changed: 21 additions & 19 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,34 +106,34 @@ default Builder setInputGui(Gui.Builder<?, ?> builder) {
106106
Builder setInputGui(Supplier<? extends Gui> guiSupplier);
107107

108108
/**
109-
* Sets the 1x1 output {@link Gui} of the {@link CartographyWindow}.
109+
* Sets the 1x1 result {@link Gui} of the {@link CartographyWindow}.
110110
*
111-
* @param gui The 1x1 output {@link Gui}
111+
* @param gui The 1x1 result {@link Gui}
112112
* @return This {@link Builder}
113113
*/
114-
default Builder setOutputGui(Gui gui) {
115-
return setOutputGui(() -> gui);
114+
default Builder setResultGui(Gui gui) {
115+
return setResultGui(() -> gui);
116116
}
117117

118118
/**
119-
* Sets the {@link Gui.Builder} for the 1x1 output {@link Gui} of this {@link Builder}.
119+
* Sets the {@link Gui.Builder} for the 1x1 result {@link Gui} of this {@link Builder}.
120120
* The {@link Gui.Builder} will be called every time a new {@link CartographyWindow} is created using this builder.
121121
*
122-
* @param builder The {@link Gui.Builder} for the 1x1 output {@link Gui}
122+
* @param builder The {@link Gui.Builder} for the 1x1 result {@link Gui}
123123
* @return This {@link Builder}
124124
*/
125-
default Builder setOutputGui(Gui.Builder<?, ?> builder) {
126-
return setOutputGui(builder::build);
125+
default Builder setResultGui(Gui.Builder<?, ?> builder) {
126+
return setResultGui(builder::build);
127127
}
128128

129129
/**
130-
* Sets the {@link Gui} {@link Supplier} for the 1x1 output {@link Gui} of this {@link Builder}.
130+
* Sets the {@link Gui} {@link Supplier} for the 1x1 result {@link Gui} of this {@link Builder}.
131131
* The {@link Supplier} will be called every time a new {@link CartographyWindow} is created using this builder.
132132
*
133-
* @param guiSupplier The {@link Gui} {@link Supplier} for the 1x1 output {@link Gui}
133+
* @param guiSupplier The {@link Gui} {@link Supplier} for the 1x1 result {@link Gui}
134134
* @return This {@link Builder}
135135
*/
136-
Builder setOutputGui(Supplier<? extends Gui> guiSupplier);
136+
Builder setResultGui(Supplier<? extends Gui> guiSupplier);
137137

138138
/**
139139
* Adds a {@link MapIcon} to the map.

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,25 @@ final class CartographyWindowImpl extends AbstractSplitWindow<CustomCartographyM
2121

2222
private static final int MAP_SIZE = 128;
2323
private final AbstractGui inputGui;
24-
private final AbstractGui outputGui;
24+
private final AbstractGui resultGui;
2525
private final AbstractGui lowerGui;
2626

2727
public CartographyWindowImpl(
2828
Player player,
2929
Supplier<? extends Component> title,
3030
AbstractGui inputGui,
31-
AbstractGui outputGui,
31+
AbstractGui resultGui,
3232
AbstractGui lowerGui,
3333
boolean closeable
3434
) {
3535
super(player, title, lowerGui, 3 + 36, new CustomCartographyMenu(player), closeable);
3636
if (inputGui.getWidth() != 1 || inputGui.getHeight() != 2)
3737
throw new IllegalArgumentException("Input gui must be of dimensions 1x2");
38+
if (resultGui.getWidth() != 1 || resultGui.getHeight() != 1)
39+
throw new IllegalArgumentException("Result gui must be of dimensions 1x1");
3840

3941
this.inputGui = inputGui;
40-
this.outputGui = outputGui;
42+
this.resultGui = resultGui;
4143
this.lowerGui = lowerGui;
4244
}
4345

@@ -77,7 +79,7 @@ public void setIcons(Collection<? extends MapIcon> icons) {
7779

7880
@Override
7981
public @Unmodifiable List<Gui> getGuis() {
80-
return List.of(inputGui, outputGui, lowerGui);
82+
return List.of(inputGui, resultGui, lowerGui);
8183
}
8284

8385
public static final class BuilderImpl
@@ -86,7 +88,7 @@ public static final class BuilderImpl
8688
{
8789

8890
private Supplier<? extends Gui> inputGuiSupplier = () -> Gui.empty(1, 2);
89-
private Supplier<? extends Gui> outputGuiSupplier = () -> Gui.empty(1, 1);
91+
private Supplier<? extends Gui> resultGuiSupplier = () -> Gui.empty(1, 1);
9092
private final Set<MapIcon> icons = new HashSet<>();
9193
private byte @Nullable [] canvas;
9294

@@ -97,8 +99,8 @@ public CartographyWindow.Builder setInputGui(Supplier<? extends Gui> guiSupplier
9799
}
98100

99101
@Override
100-
public CartographyWindow.Builder setOutputGui(Supplier<? extends Gui> guiSupplier) {
101-
this.outputGuiSupplier = guiSupplier;
102+
public CartographyWindow.Builder setResultGui(Supplier<? extends Gui> guiSupplier) {
103+
this.resultGuiSupplier = guiSupplier;
102104
return this;
103105
}
104106

@@ -136,7 +138,7 @@ public CartographyWindow build(Player viewer) {
136138
viewer,
137139
titleSupplier,
138140
(AbstractGui) inputGuiSupplier.get(),
139-
(AbstractGui) outputGuiSupplier.get(),
141+
(AbstractGui) resultGuiSupplier.get(),
140142
supplyLowerGui(viewer),
141143
closeable
142144
);

0 commit comments

Comments
 (0)