Skip to content

Commit 1ee5849

Browse files
HSGamerHSGamer
committed
fix incompatible dialog types in bungee
1 parent 1e981f0 commit 1ee5849

File tree

9 files changed

+44
-44
lines changed

9 files changed

+44
-44
lines changed

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/BungeeDialogManager.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@
99
import net.md_5.bungee.api.dialog.Dialog;
1010

1111
@SuppressWarnings("unchecked")
12-
public interface BungeeDialogManager<O extends BungeeDialogOpener> extends DialogManager<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder> {
12+
public interface BungeeDialogManager extends DialogManager<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder> {
1313
String getDefaultNamespace();
1414

15-
O getDialogOpener(Dialog dialog);
15+
BungeeDialogOpener getDialogOpener(Dialog dialog);
1616

1717
@Override
18-
default BungeeConfirmationDialog<O> createConfirmationDialog() {
19-
return new BungeeConfirmationDialog<>(getDefaultNamespace(), this::getDialogOpener);
18+
default BungeeConfirmationDialog createConfirmationDialog() {
19+
return new BungeeConfirmationDialog(getDefaultNamespace(), this::getDialogOpener);
2020
}
2121

2222
@Override
23-
default BungeeMultiActionDialog<O> createMultiActionDialog() {
24-
return new BungeeMultiActionDialog<>(getDefaultNamespace(), this::getDialogOpener);
23+
default BungeeMultiActionDialog createMultiActionDialog() {
24+
return new BungeeMultiActionDialog(getDefaultNamespace(), this::getDialogOpener);
2525
}
2626

2727
@Override
28-
default BungeeServerLinksDialog<O> createServerLinksDialog() {
29-
return new BungeeServerLinksDialog<>(getDefaultNamespace(), this::getDialogOpener);
28+
default BungeeServerLinksDialog createServerLinksDialog() {
29+
return new BungeeServerLinksDialog(getDefaultNamespace(), this::getDialogOpener);
3030
}
3131

3232
@Override
33-
default BungeeNoticeDialog<O> createNoticeDialog() {
34-
return new BungeeNoticeDialog<>(getDefaultNamespace(), this::getDialogOpener);
33+
default BungeeNoticeDialog createNoticeDialog() {
34+
return new BungeeNoticeDialog(getDefaultNamespace(), this::getDialogOpener);
3535
}
3636

3737
@Override
38-
default BungeeDialogListDialog<O> createDialogListDialog() {
39-
return new BungeeDialogListDialog<>(getDefaultNamespace(), this::getDialogOpener);
38+
default BungeeDialogListDialog createDialogListDialog() {
39+
return new BungeeDialogListDialog(getDefaultNamespace(), this::getDialogOpener);
4040
}
4141
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/action/BungeeDialogActionBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.md_5.bungee.api.dialog.chat.ShowDialogClickEvent;
1212
import org.jetbrains.annotations.Nullable;
1313

14-
public class BungeeDialogActionBuilder implements DialogActionBuilder<BungeeDialog<?, ?>, BungeeDialogActionBuilder> {
14+
public class BungeeDialogActionBuilder implements DialogActionBuilder<BungeeDialog<?>, BungeeDialogActionBuilder> {
1515
private final String defaultNamespace;
1616
private BaseComponent label;
1717
private @Nullable BaseComponent tooltip;
@@ -101,7 +101,7 @@ public BungeeDialogActionBuilder suggestCommand(String command) {
101101
}
102102

103103
@Override
104-
public BungeeDialogActionBuilder showDialog(BungeeDialog<?, ?> dialog) {
104+
public BungeeDialogActionBuilder showDialog(BungeeDialog<?> dialog) {
105105
return action(new StaticAction(new ShowDialogClickEvent(dialog.getDialog())));
106106
}
107107

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeConfirmationDialog.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
import java.util.function.Consumer;
1313
import java.util.function.Function;
1414

15-
public class BungeeConfirmationDialog<O extends BungeeDialogOpener> extends BungeeDialog<O, BungeeConfirmationDialog<O>> implements ConfirmationDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder, BungeeConfirmationDialog<O>> {
15+
public class BungeeConfirmationDialog extends BungeeDialog<BungeeConfirmationDialog> implements ConfirmationDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder, BungeeConfirmationDialog> {
1616
private ActionButton yesAction;
1717
private ActionButton noAction;
1818

19-
public BungeeConfirmationDialog(String defaultNamespace, Function<Dialog, O> openerFunction) {
19+
public BungeeConfirmationDialog(String defaultNamespace, Function<Dialog, BungeeDialogOpener> openerFunction) {
2020
super(defaultNamespace, openerFunction);
2121
}
2222

2323
@Override
24-
public BungeeConfirmationDialog<O> yesAction(Consumer<BungeeDialogActionBuilder> action) {
24+
public BungeeConfirmationDialog yesAction(Consumer<BungeeDialogActionBuilder> action) {
2525
this.yesAction = getAction(action);
2626
return this;
2727
}
2828

2929
@Override
30-
public BungeeConfirmationDialog<O> noAction(Consumer<BungeeDialogActionBuilder> action) {
30+
public BungeeConfirmationDialog noAction(Consumer<BungeeDialogActionBuilder> action) {
3131
this.noAction = getAction(action);
3232
return this;
3333
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeDialog.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import java.util.function.Function;
2121

2222
@SuppressWarnings("unchecked")
23-
public abstract class BungeeDialog<O extends BungeeDialogOpener, T extends BungeeDialog<O, T>> implements Dialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, T> {
23+
public abstract class BungeeDialog<T extends BungeeDialog<T>> implements Dialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, T> {
2424
private final String defaultNamespace;
25-
private final Function<net.md_5.bungee.api.dialog.Dialog, O> openerFunction;
25+
private final Function<net.md_5.bungee.api.dialog.Dialog, BungeeDialogOpener> openerFunction;
2626
private BaseComponent title;
2727
private @Nullable BaseComponent externalTitle;
2828
private List<DialogInput> inputs;
@@ -31,7 +31,7 @@ public abstract class BungeeDialog<O extends BungeeDialogOpener, T extends Bunge
3131
private boolean pause = false;
3232
private DialogBase.AfterAction afterAction;
3333

34-
public BungeeDialog(String defaultNamespace, Function<net.md_5.bungee.api.dialog.Dialog, O> openerFunction) {
34+
public BungeeDialog(String defaultNamespace, Function<net.md_5.bungee.api.dialog.Dialog, BungeeDialogOpener> openerFunction) {
3535
this.defaultNamespace = defaultNamespace;
3636
this.openerFunction = openerFunction;
3737
}
@@ -136,7 +136,7 @@ public final net.md_5.bungee.api.dialog.Dialog getDialog() {
136136
}
137137

138138
@Override
139-
public O opener() {
139+
public BungeeDialogOpener opener() {
140140
return openerFunction.apply(getDialog());
141141
}
142142
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeDialogListDialog.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import java.util.function.Consumer;
1818
import java.util.function.Function;
1919

20-
public class BungeeDialogListDialog<O extends BungeeDialogOpener> extends BungeeDialog<O, BungeeDialogListDialog<O>> implements DialogListDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder, BungeeDialogListDialog<O>> {
20+
public class BungeeDialogListDialog extends BungeeDialog<BungeeDialogListDialog> implements DialogListDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder, BungeeDialogListDialog> {
2121
private List<Dialog> dialogs;
2222
private @Nullable ActionButton exitAction;
2323
private int columns;
2424
private int buttonWidth;
2525

26-
public BungeeDialogListDialog(String defaultNamespace, Function<Dialog, O> openerFunction) {
26+
public BungeeDialogListDialog(String defaultNamespace, Function<Dialog, BungeeDialogOpener> openerFunction) {
2727
super(defaultNamespace, openerFunction);
2828
}
2929

@@ -35,18 +35,18 @@ private void addDialog(Dialog dialog) {
3535
}
3636

3737
@Override
38-
public BungeeDialogListDialog<O> dialog(BungeeDialog<?, ?> dialog) {
38+
public BungeeDialogListDialog dialog(BungeeDialog<?> dialog) {
3939
addDialog(dialog.getDialog());
4040
return this;
4141
}
4242

4343
@Override
44-
public BungeeDialogListDialog<O> dialog(String namespace, String dialogId) {
44+
public BungeeDialogListDialog dialog(String namespace, String dialogId) {
4545
throw new UnsupportedOperationException("DialogListDialog does not support dialog by namespace and ID in Bungee.");
4646
}
4747

4848
@Override
49-
public BungeeDialogListDialog<O> dialog(DialogOpener dialogOpener) {
49+
public BungeeDialogListDialog dialog(DialogOpener dialogOpener) {
5050
if (!(dialogOpener instanceof BungeeDialogOpener bungeeDialogOpener)) {
5151
throw new IllegalArgumentException("Dialog opener must be an instance of BungeeDialogOpener.");
5252
}
@@ -55,19 +55,19 @@ public BungeeDialogListDialog<O> dialog(DialogOpener dialogOpener) {
5555
}
5656

5757
@Override
58-
public BungeeDialogListDialog<O> exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
58+
public BungeeDialogListDialog exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
5959
this.exitAction = action == null ? null : getAction(action);
6060
return this;
6161
}
6262

6363
@Override
64-
public BungeeDialogListDialog<O> columns(int columns) {
64+
public BungeeDialogListDialog columns(int columns) {
6565
this.columns = columns;
6666
return this;
6767
}
6868

6969
@Override
70-
public BungeeDialogListDialog<O> buttonWidth(int buttonWidth) {
70+
public BungeeDialogListDialog buttonWidth(int buttonWidth) {
7171
this.buttonWidth = buttonWidth;
7272
return this;
7373
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeMultiActionDialog.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
import java.util.function.Consumer;
1717
import java.util.function.Function;
1818

19-
public class BungeeMultiActionDialog<O extends BungeeDialogOpener> extends BungeeDialog<O, BungeeMultiActionDialog<O>> implements MultiActionDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder, BungeeMultiActionDialog<O>> {
19+
public class BungeeMultiActionDialog extends BungeeDialog<BungeeMultiActionDialog> implements MultiActionDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder, BungeeMultiActionDialog> {
2020
private int columns;
2121
private List<ActionButton> actions;
2222
private @Nullable ActionButton exitAction;
2323

24-
public BungeeMultiActionDialog(String defaultNamespace, Function<Dialog, O> openerFunction) {
24+
public BungeeMultiActionDialog(String defaultNamespace, Function<Dialog, BungeeDialogOpener> openerFunction) {
2525
super(defaultNamespace, openerFunction);
2626
}
2727

2828
@Override
29-
public BungeeMultiActionDialog<O> columns(int columns) {
29+
public BungeeMultiActionDialog columns(int columns) {
3030
this.columns = columns;
3131
return this;
3232
}
3333

3434
@Override
35-
public BungeeMultiActionDialog<O> action(Consumer<BungeeDialogActionBuilder> action) {
35+
public BungeeMultiActionDialog action(Consumer<BungeeDialogActionBuilder> action) {
3636
if (actions == null) {
3737
actions = new ArrayList<>();
3838
}
@@ -42,7 +42,7 @@ public BungeeMultiActionDialog<O> action(Consumer<BungeeDialogActionBuilder> act
4242
}
4343

4444
@Override
45-
public BungeeMultiActionDialog<O> exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
45+
public BungeeMultiActionDialog exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
4646
this.exitAction = action == null ? null : getAction(action);
4747
return this;
4848
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeNoticeDialog.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
import java.util.function.Consumer;
1313
import java.util.function.Function;
1414

15-
public class BungeeNoticeDialog<O extends BungeeDialogOpener> extends BungeeDialog<O, BungeeNoticeDialog<O>> implements NoticeDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder, BungeeNoticeDialog<O>> {
15+
public class BungeeNoticeDialog extends BungeeDialog<BungeeNoticeDialog> implements NoticeDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder, BungeeNoticeDialog> {
1616
private ActionButton action;
1717

18-
public BungeeNoticeDialog(String defaultNamespace, Function<Dialog, O> openerFunction) {
18+
public BungeeNoticeDialog(String defaultNamespace, Function<Dialog, BungeeDialogOpener> openerFunction) {
1919
super(defaultNamespace, openerFunction);
2020
}
2121

2222
@Override
23-
public BungeeNoticeDialog<O> action(Consumer<BungeeDialogActionBuilder> action) {
23+
public BungeeNoticeDialog action(Consumer<BungeeDialogActionBuilder> action) {
2424
this.action = getAction(action);
2525
return this;
2626
}

‎bungeecord/src/main/java/io/github/projectunified/unidialog/bungeecord/dialog/BungeeServerLinksDialog.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
import java.util.function.Consumer;
1414
import java.util.function.Function;
1515

16-
public class BungeeServerLinksDialog<O extends BungeeDialogOpener> extends BungeeDialog<O, BungeeServerLinksDialog<O>> implements ServerLinksDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?, ?>, BungeeDialogActionBuilder, BungeeServerLinksDialog<O>> {
16+
public class BungeeServerLinksDialog extends BungeeDialog<BungeeServerLinksDialog> implements ServerLinksDialog<Object, BungeeDialogBodyBuilder, BungeeDialogInputBuilder, BungeeDialog<?>, BungeeDialogActionBuilder, BungeeServerLinksDialog> {
1717
private @Nullable ActionButton exitAction;
1818
private int columns;
1919
private int buttonWidth;
2020

21-
public BungeeServerLinksDialog(String defaultNamespace, Function<Dialog, O> openerFunction) {
21+
public BungeeServerLinksDialog(String defaultNamespace, Function<Dialog, BungeeDialogOpener> openerFunction) {
2222
super(defaultNamespace, openerFunction);
2323
}
2424

2525
@Override
26-
public BungeeServerLinksDialog<O> exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
26+
public BungeeServerLinksDialog exitAction(@Nullable Consumer<BungeeDialogActionBuilder> action) {
2727
this.exitAction = action == null ? null : getAction(action);
2828
return this;
2929
}
3030

3131
@Override
32-
public BungeeServerLinksDialog<O> columns(int columns) {
32+
public BungeeServerLinksDialog columns(int columns) {
3333
this.columns = columns;
3434
return this;
3535
}
3636

3737
@Override
38-
public BungeeServerLinksDialog<O> buttonWidth(int buttonWidth) {
38+
public BungeeServerLinksDialog buttonWidth(int buttonWidth) {
3939
this.buttonWidth = buttonWidth;
4040
return this;
4141
}

‎spigot/src/main/java/io/github/projectunified/unidialog/spigot/SpigotDialogManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.UUID;
2020
import java.util.function.BiConsumer;
2121

22-
public class SpigotDialogManager implements BungeeDialogManager<SpigotDialogOpener>, Listener {
22+
public class SpigotDialogManager implements BungeeDialogManager, Listener {
2323
private final Plugin plugin;
2424
private final String defaultNamespace;
2525
private final Map<NamespacedKey, BiConsumer<UUID, Map<String, String>>> customActions = new HashMap<>();

0 commit comments

Comments
 (0)