Repo-Mirror/GeyserUtils
9
0
Fork 0
mirror of https://github.com/GeyserExtensionists/GeyserUtils.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

fix sth

Browse Source
This commit is contained in:
zimzaza4
2023-12-24 22:28:04 +08:00
parent 6d32e654bb
commit 4cf469f762
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/zimzaza4/geyserutils/common/form/element/NpcDialogueButton.java
View File

@@ -15,7 +15,7 @@ public class NpcDialogueButton {
private String text;
private List<String> commands;
private ButtonMode mode;
private boolean hasNextForm;
public enum ButtonMode {
BUTTON_MODE,
ON_ENTER,

7
geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java
View File

@@ -1,7 +1,7 @@
package me.zimzaza4.geyserutils.geyser;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCustomPayloadPacket;
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCustomPayloadPacket;
import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket;
import com.github.steveice10.packetlib.Session;
import com.github.steveice10.packetlib.event.session.SessionAdapter;
import com.github.steveice10.packetlib.packet.Packet;
@@ -112,8 +112,7 @@ public class GeyserUtils implements Extension {
if (button.mode() == NpcDialogueButton.ButtonMode.BUTTON_MODE) {
session.sendDownstreamPacket(new ServerboundCustomPayloadPacket(GeyserUtilsChannels.MAIN, packetManager.encodePacket(new NpcFormResponseCustomPayloadPacket(formData.formId(), finalI))));
}
}
));
}, button.hasNextForm()));
i++;
}
}

3
geyser/src/main/java/me/zimzaza4/geyserutils/geyser/form/element/Button.java
View File

@@ -16,8 +16,7 @@ public class Button {
List<String> commands;
NpcDialogueButton.ButtonMode mode;
Runnable click;
boolean hasNextForm;
public JsonObject toJsonObject() {
JsonObject button = new JsonObject();

21
geyser/src/main/java/me/zimzaza4/geyserutils/geyser/translator/NPCFormResponseTranslator.java
View File

@@ -15,35 +15,36 @@ public class NPCFormResponseTranslator extends PacketTranslator<NpcRequestPacket
@Override
public void translate(GeyserSession geyserSession, NpcRequestPacket packet) {
// System.out.println(packet);
NpcDialogueForm form = NpcDialogueForms.getOpenNpcDialogueForms(geyserSession);
if (form == null) {
return;
}
if (form.dialogueButtons().isEmpty()) {
if (packet.getRequestType().equals(NpcRequestType.EXECUTE_CLOSING_COMMANDS)) {
NpcDialogueForms.removeNpcDialogueForm(geyserSession, form);
if (packet.getRequestType().equals(NpcRequestType.EXECUTE_CLOSING_COMMANDS)) {
if (packet.getSceneName().equals(form.sceneName())) {
// System.out.println("CLOSE FORM");
form.close(geyserSession);
return;
}
return;
}
Button button = form.dialogueButtons().get(packet.getActionType());
if (button == null) {
return;
}
if ((button.mode().equals(NpcDialogueButton.ButtonMode.ON_ENTER) && packet.getRequestType().equals(NpcRequestType.EXECUTE_OPENING_COMMANDS)) ||
(button.mode().equals(NpcDialogueButton.ButtonMode.BUTTON_MODE) && packet.getRequestType().equals(NpcRequestType.EXECUTE_COMMAND_ACTION)) ||
(button.mode().equals(NpcDialogueButton.ButtonMode.ON_EXIT) && packet.getRequestType().equals(NpcRequestType.EXECUTE_CLOSING_COMMANDS))) {
if (button.mode().equals(NpcDialogueButton.ButtonMode.BUTTON_MODE) && packet.getRequestType().equals(NpcRequestType.EXECUTE_COMMAND_ACTION)) {
button.click().run();
if (!form.hasNextForm()) {
if (!button.hasNextForm()) {
form.close(geyserSession);
}
}
}
}

21
spigot/src/main/java/me/zimzaza4/geyserutils/spigot/GeyserUtils.java
View File

@@ -33,13 +33,22 @@ public final class GeyserUtils extends JavaPlugin {
NpcFormResponseCustomPayloadPacket response = (NpcFormResponseCustomPayloadPacket) packet;
if (NpcDialogueForm.FORMS.containsKey(response.getFormId())) {
BiConsumer<String, Integer> handler = NpcDialogueForm.FORMS.get(response.getFormId()).handler();
if (handler != null) {
handler.accept(response.getFormId(), response.getButtonId());
}
NpcDialogueForm.FORMS.remove(response.getFormId());
}
NpcDialogueForm form = NpcDialogueForm.FORMS.get(response.getFormId());
if (form.handler() != null) {
if (response.getButtonId() != -1) {
form.handler().accept(response.getFormId(), response.getButtonId());
}
}
if (response.getButtonId() == -1) {
if (form.closeHandler() != null) {
form.closeHandler().accept(response.getFormId());
}
NpcDialogueForm.FORMS.remove(response.getFormId());
}
}
}
}
});

2
spigot/src/main/java/me/zimzaza4/geyserutils/spigot/api/form/NpcDialogueForm.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@NoArgsConstructor
@AllArgsConstructor
@@ -38,6 +39,7 @@ public class NpcDialogueForm {
boolean hasNextForm = false;
List<NpcDialogueButton> buttons;
BiConsumer<String, Integer> handler;
Consumer<String> closeHandler;
public void send(FloodgatePlayer floodgatePlayer) {
UUID formId = UUID.randomUUID();