Skip to content

Commit

Permalink
chore: remove use of deprecated Cumulus API
Browse files Browse the repository at this point in the history 
Signed-off-by: Thatsmusic99 <25277367+thatsmusic99@users.noreply.github.com>
  • Loading branch information
@Thatsmusic99
Thatsmusic99 committed Jul 14, 2024
1 parent 5d23e69 commit e41d74e
Showing 1 changed file with 67 additions and 69 deletions.
136 changes: 67 additions & 69 deletions ...ort-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATFloodgatePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import io.github.niestrat99.advancedteleport.CoreClass;
import io.github.niestrat99.advancedteleport.config.CustomMessages;
import io.github.niestrat99.advancedteleport.config.MainConfig;
import io.github.niestrat99.advancedteleport.managers.PluginHookManager;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.geysermc.cumulus.CustomForm;
import org.geysermc.cumulus.SimpleForm;
import org.geysermc.cumulus.response.CustomFormResponse;
import org.geysermc.cumulus.response.SimpleFormResponse;
import org.geysermc.cumulus.form.CustomForm;
import org.geysermc.cumulus.form.SimpleForm;
import org.geysermc.floodgate.api.FloodgateApi;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -57,32 +57,29 @@ private void sendDropdownForm(@NotNull String command, @NotNull Collection<Strin
items[index++] = input;
}

if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}

// Builds the form
CustomForm form =
CustomForm.builder()
.title(CustomMessages.asString("Forms." + command + "-title"))
.dropdown(
CustomMessages.asString("Forms." + command + "-description"), items)
.build();

form.setResponseHandler(
responseData -> {

// Gets the response
CustomFormResponse response = form.parseResponse(responseData);
if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}
.closedOrInvalidResultHandler(() -> CustomMessages.sendMessage(getPlayer(), "Error.noPlayerInput"))
.validResultHandler(response -> {

// Gets the chosen item
int i = response.getDropdown(0);
String result = items[i];
// Gets the chosen item
int i = response.asDropdown();
String result = items[i];

getPlayer().performCommand("advancedteleport:" + command + " " + result);
});
getPlayer().performCommand("advancedteleport:" + command + " " + result);
})
.build();

// Sends the form
FloodgateApi.getInstance().sendForm(floodgateUuid, form);
Expand Down Expand Up @@ -116,36 +113,41 @@ private void sendDropdownForm(@NotNull String command, @NotNull Collection<Strin
public void sendRequestFormTPA(@NotNull final Player sender) {

// Set up the form
SimpleForm form =
SimpleForm.Builder form =
SimpleForm.builder()
.title(CustomMessages.asString("Forms.tpa-received-title"))
.content(
CustomMessages.asString(
"Forms.tpa-received-description",
Placeholder.unparsed("player", sender.getDisplayName())))
.button(CustomMessages.asString("Forms.tpa-received-accept"))
.button(CustomMessages.asString("Forms.tpa-received-deny"))
.build();
.button(CustomMessages.asString("Forms.tpa-received-deny"));

sendRequest(sender, form);
sendRequest(sender, form, true);
}

private void sendRequest(@NotNull Player sender, SimpleForm form) {
form.setResponseHandler(
responseData -> {
SimpleFormResponse response = form.parseResponse(responseData);
if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}
getPlayer()
.performCommand(
response.getClickedButtonId() == 0
? "advancedteleport:tpyes " + sender.getName()
: "advancedteleport:tpno " + sender.getName());
});
private void sendRequest(final @NotNull Player sender, final @NotNull SimpleForm.Builder form,
final boolean tpa) {
if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}

form.closedOrInvalidResultHandler(() ->
CustomMessages.sendMessage(
getPlayer(),
tpa ? "Info.tpaRequestReceived" : "Info.tpaRequestHere",
Placeholder.parsed(
"player", MiniMessage.miniMessage().escapeTags(sender.getName())),
Placeholder.unparsed("lifetime", String.valueOf(MainConfig.get().REQUEST_LIFETIME.get()))));

form.validResultHandler(response ->
getPlayer().performCommand(
response.clickedButtonId() == 0
? "advancedteleport:tpyes " + sender.getName()
: "advancedteleport:tpno " + sender.getName()));

FloodgateApi.getInstance().sendForm(floodgateUuid, form);
}
Expand All @@ -158,19 +160,18 @@ private void sendRequest(@NotNull Player sender, SimpleForm form) {
public void sendRequestFormTPAHere(@NotNull final Player sender) {

// Set up the form
SimpleForm form =
SimpleForm.Builder form =
SimpleForm.builder()
.title(CustomMessages.asString("Forms.tpahere-received-title"))
.content(
CustomMessages.asString(
"Forms.tpahere-received-description",
Placeholder.unparsed("player", sender.getDisplayName())))
.button(CustomMessages.asString("Forms.tpahere-received-accept"))
.button(CustomMessages.asString("Forms.tpahere-received-deny"))
.build();
.button(CustomMessages.asString("Forms.tpahere-received-deny"));

// Send the form
sendRequest(sender, form);
sendRequest(sender, form, false);
}

/** Sends the form for /home. */
Expand All @@ -180,34 +181,31 @@ public void sendHomeForm() {

/** Sends the form for /sethome. */
public void sendSetHomeForm() {
sendInputForm("sethome");
sendInputForm("sethome", "Error.noHomeInput");
}

private void sendInputForm(@NotNull String command) {
private void sendInputForm(final @NotNull String command,
final @NotNull String errorMessage) {

if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}

// Builds the form
CustomForm form =
CustomForm.Builder form =
CustomForm.builder()
.title(CustomMessages.asString("Forms." + command + "-title"))
.input(CustomMessages.asString("Forms." + command + "-description"))
.build();

form.setResponseHandler(
responseData -> {

// Gets the response
CustomFormResponse response = form.parseResponse(responseData);
if (getPlayer() == null) {
CoreClass.getInstance()
.getLogger()
.warning("This player with the UUID " + uuid + " is null, WHY?");
return;
}
.input(CustomMessages.asString("Forms." + command + "-description"));
form.closedOrInvalidResultHandler(() -> CustomMessages.sendMessage(getPlayer(), errorMessage));
form.validResultHandler(response -> {

// Gets the chosen button
String name = response.getInput(0);
getPlayer().performCommand("advancedteleport:" + command + " " + name);
});
// Gets the chosen button
String name = response.asInput();
getPlayer().performCommand("advancedteleport:" + command + " " + name);
});

// Sends the form
FloodgateApi.getInstance().sendForm(floodgateUuid, form);
Expand All @@ -220,7 +218,7 @@ public void sendDeleteHomeForm() {

/** Sends the form for /setmainhome. */
public void sendSetMainHomeForm() {
sendInputForm("setmainhome");
sendInputForm("setmainhome", "Error.noHomeInput");
}

/** Sends the form for /movehome. */
Expand All @@ -240,7 +238,7 @@ public void sendDeleteWarpForm() {

/** Sends the form for /setwarp. */
public void sendSetWarpForm() {
sendInputForm("setwarp");
sendInputForm("setwarp", "Error.noWarpInput");
}

/** Sends the form for /movewarp. */
Expand Down

0 comments on commit e41d74e

Please sign in to comment.