Skip to content
This repository was archived by the owner on Jan 31, 2022. It is now read-only.

Commit aad019d

Browse files
ScarletRedManScarletRedMan
committed
Убран мусор. Используются только новые методы вызова форм
Signed-off-by: qPexLegendary <terentev.andrey.2002@gmail.com>
1 parent e9c4b54 commit aad019d

8 files changed

Lines changed: 37 additions & 107 deletions

File tree

‎README.md‎

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,50 @@ SimpleForm
77
-----------------------------------
88
<br/>
99

10-
Player p = (Player) sender;
11-
Form form = new SimpleForm("Тестовая форма");
12-
((SimpleForm)form).setContent("Тут должен быть написан какой-то тестовый текст.")
13-
.addButton("Кнопа")
14-
.addButton("Кнопка с картинкой", ImageType.PAHT, "textures/items/diamond")
15-
.send(p, (player, formWindow, o, hashMap) -> {
16-
if(o == null) return;
10+
SimpleForm form = new SimpleForm("Тестовая форма")
11+
.setContent("Здесь должен быть какой-то текст, но почему-то его все-таки нет.")
12+
.addButton("Кнопочка")
13+
.addButton("Кнопоча с алмазиком", ImageType.PATH, "textures/items/diamond");
14+
15+
form.send(player, (targetPlayer, targetForm, data) -> {
16+
if(data == -1) return; //Если форма закрыта принудительно, то data будет иметь значение -1
17+
18+
targetPlayer.sendMessage(data.toString());
19+
});
1720

18-
p.sendMessage(o.toString());
19-
getLogger().info(o.toString()); //Ответ от формы
20-
});
21-
2221
![screenshot of sample](http://images.vfl.ru/ii/1576485918/351dffe3/28924854.png)
2322
<br/><br/>
2423
CustomForm
2524
-----------------------------------
2625
<br/>
2726

28-
Player p = (Player) sender;
29-
Form form = new CustomForm();
30-
List<String> list = new ArrayList<>();
31-
list.add("1 пункт");
32-
list.add("2 пункт");
33-
list.add("3 пункт");
34-
list.add("4 пункт");
35-
list.add("5 пункт");
36-
37-
((CustomForm)form).addLabel("Тут должен быть написан какой-то рандомный текст, но написано это.")
38-
.addDropDown("Выпадающий список", list)
39-
.addInput("Текстовое поле")
40-
.addSlider("Ползунок", 1, 100)
41-
.addStepSlider("Пошаговый ползунок", list)
42-
.addToggle("Переключатель")
43-
.send(p, (player, formWindow, o, hashMap) -> {
44-
if(o == null) return;
45-
46-
p.sendMessage(o.toString());
47-
getLogger().info(o.toString()); //Ответ от формы
48-
});
27+
CustomForm form = new CustomForm()
28+
.addLabel("Тут должен быть написан какой-то рандомный текст, но написано это.")
29+
.addDropDown("Выпадающий список", Arrays.asList("Вариант 1", "Вариант 2", "Вариант 3"))
30+
.addInput("Текстовое поле")
31+
.addSlider("Ползунок", 1, 100)
32+
.addStepSlider("Пошаговый ползунок", Arrays.asList("Вариант 1", "Вариант 2", "Вариант 3"))
33+
.addToggle("Переключатель", false);
34+
35+
form.send(player, (targetPlayer, targetForm, data) -> {
36+
if(data == null) return; //Если форма закрыта принудительно, то data будет иметь значение null
37+
38+
targetPlayer.sendMessage(data.toString());
39+
});
40+
4941

5042
![screenshot of sample](http://images.vfl.ru/ii/1576486356/8c9f89a6/28924955.png)
5143
<br/><br/>
5244
ModalForm
5345
-----------------------------------
5446
<br/>
5547

56-
Player p = (Player) sender;
57-
Form form = new ModalForm("Заголовок", "Текст", "Кнопка 1", "Кнопка 2");
58-
form.send(p, (player, formWindow, o, hashMap) -> {
59-
if(o == null) return;
60-
p.sendMessage(o.toString());
61-
getLogger().info(o.toString()); //Ответ от формы
62-
});
48+
ModalForm form = new ModalForm("Заголовок", "Текст", "Кнопка 1", "Кнопка 2");
49+
50+
form.send(player, (targetPlayer, targetForm, data) -> {
51+
if(data == -1) return; //Если форма закрыта принудительно, то data будет иметь значение -1
52+
53+
targetPlayer.sendMessage(data.toString());
54+
});
6355
6456
![screenshot of sample](http://images.vfl.ru/ii/1576486613/7c402664/28925022.png)
65-
<br/> <br/> <br/>
66-
67-
Подробнее в плагине: https://github.com/qPexLegendary/Example-for-ForAPI

‎src/main/java/ru/nukkitx/events/EventListener.java‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
public class EventListener implements Listener {
2626

27-
@SuppressWarnings("deprecation")
2827
@EventHandler(priority = EventPriority.HIGH)
2928
public void formResponded(PlayerFormRespondedEvent event) {
3029
Player player = event.getPlayer();
@@ -33,7 +32,7 @@ public void formResponded(PlayerFormRespondedEvent event) {
3332

3433
if (response == null) return;
3534

36-
if (Form.playersForm.containsKey(player.getName()) && Form.paramsForm.containsKey(player.getName())) {
35+
if (Form.playersForm.containsKey(player.getName())) {
3736
ru.nukkitx.forms.FormResponse temp = Form.playersForm.get(player.getName());
3837
Form.playersForm.remove(player.getName());
3938

@@ -49,40 +48,25 @@ public void formResponded(PlayerFormRespondedEvent event) {
4948
}else if(temp instanceof SimpleFormResponse){
5049
((SimpleFormResponse) temp).handle(player, window, -1);
5150

52-
}else temp.handle(player, window, null, Form.paramsForm.get(player.getName()));
53-
51+
}
5452
return;
5553
}
5654

5755
if (window instanceof FormWindowSimple) {
5856
data = ((FormResponseSimple) response).getClickedButtonId();
59-
60-
if(temp instanceof SimpleFormResponse)
61-
((SimpleFormResponse) temp).handle(player, window, (int) data);
62-
else
63-
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
64-
57+
((SimpleFormResponse) temp).handle(player, window, (int) data);
6558
return;
6659
}
6760

6861
if (window instanceof FormWindowCustom) {
6962
data = new ArrayList<>(((FormResponseCustom) response).getResponses().values());
70-
71-
if(temp instanceof CustomFormResponse)
72-
((CustomFormResponse) temp).handle(player, window, (List<Object>)data);
73-
else
74-
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
75-
63+
((CustomFormResponse) temp).handle(player, window, (List<Object>)data);
7664
return;
7765
}
7866

7967
if (window instanceof FormWindowModal) {
8068
data = ((FormResponseModal) response).getClickedButtonId();
81-
82-
if(temp instanceof ModalFormResponse)
83-
((ModalFormResponse) temp).handle(player, window, (int) data);
84-
else
85-
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
69+
((ModalFormResponse) temp).handle(player, window, (int) data);
8670
}
8771
}
8872
}
@@ -92,6 +76,5 @@ public void playerQuit(PlayerQuitEvent event) {
9276
Player player = event.getPlayer();
9377

9478
Form.playersForm.remove(player.getName());
95-
Form.paramsForm.remove(player.getName());
9679
}
9780
}

‎src/main/java/ru/nukkitx/forms/Form.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,24 @@
77

88
public abstract class Form {
99
public static HashMap<String, FormResponse> playersForm = new HashMap<>();
10-
public static HashMap<String, HashMap<String, Object>> paramsForm = new HashMap<>();
1110
protected FormWindow form;
1211

1312
public void send(Player player) {
1413
player.showFormWindow(form);
1514
}
1615

17-
@Deprecated
18-
public void send(Player player, FormResponse response) {
19-
playersForm.put(player.getName(), response);
20-
paramsForm.put(player.getName(), null);
21-
player.showFormWindow(form);
22-
}
23-
24-
@Deprecated
25-
public void send(Player player, FormResponse response, HashMap<String, Object> params) {
26-
playersForm.put(player.getName(), response);
27-
paramsForm.put(player.getName(), params);
28-
player.showFormWindow(form);
29-
}
30-
31-
@Deprecated
32-
public static void sendForm(Player player, FormWindow form, FormResponse response){
33-
playersForm.put(player.getName(), response);
34-
paramsForm.put(player.getName(), null);
35-
player.showFormWindow(form);
36-
}
37-
3816
public static void sendForm(Player player, FormWindow form, ModalFormResponse response){
3917
playersForm.put(player.getName(), response);
40-
paramsForm.put(player.getName(), null);
4118
player.showFormWindow(form);
4219
}
4320

4421
public static void sendForm(Player player, FormWindow form, CustomFormResponse response){
4522
playersForm.put(player.getName(), response);
46-
paramsForm.put(player.getName(), null);
4723
player.showFormWindow(form);
4824
}
4925

5026
public static void sendForm(Player player, FormWindow form, SimpleFormResponse response){
5127
playersForm.put(player.getName(), response);
52-
paramsForm.put(player.getName(), null);
53-
player.showFormWindow(form);
54-
}
55-
56-
@Deprecated
57-
public static void sendForm(Player player, FormWindow form, FormResponse response, HashMap<String, Object> params) {
58-
playersForm.put(player.getName(), response);
59-
paramsForm.put(player.getName(), params);
6028
player.showFormWindow(form);
6129
}
6230
}

‎src/main/java/ru/nukkitx/forms/FormResponse.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package ru.nukkitx.forms;
22

3-
import cn.nukkit.Player;
4-
import cn.nukkit.form.window.FormWindow;
5-
6-
import java.util.HashMap;
7-
83
public interface FormResponse {
94

10-
@Deprecated
11-
void handle(Player player, FormWindow window, Object data, HashMap<String, Object> params);
125
}

‎src/main/java/ru/nukkitx/forms/elements/CustomForm.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public CustomForm(String title) {
2424

2525
public void send(Player player, CustomFormResponse response){
2626
playersForm.put(player.getName(), response);
27-
paramsForm.put(player.getName(), null);
2827
player.showFormWindow(form);
2928
}
3029

‎src/main/java/ru/nukkitx/forms/elements/ModalForm.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public ModalForm(String title, String content, String trueButton, String falseBu
3333

3434
public void send(Player player, ModalFormResponse response){
3535
playersForm.put(player.getName(), response);
36-
paramsForm.put(player.getName(), null);
3736
player.showFormWindow(form);
3837
}
3938

‎src/main/java/ru/nukkitx/forms/elements/SimpleForm.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public SimpleForm(String title, String content) {
2727

2828
public void send(Player player, SimpleFormResponse response) {
2929
playersForm.put(player.getName(), response);
30-
paramsForm.put(player.getName(), null);
3130
player.showFormWindow(form);
3231
}
3332

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: FormAPI
22
main: ru.nukkitx.FormAPI
33
api: "1.0.9"
4-
version: "1.2"
4+
version: "2.0"
55
author: qPexLegendary
66
load: STARTUP
77
authors:

0 commit comments

Comments
 (0)