EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove last reference to PlotMessage in Core

Browse Source
This commit is contained in:
dordsor21
2020-08-07 10:20:11 +01:00
parent 6970dfa5f8
commit 1461804039
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
View File

@@ -26,6 +26,7 @@
package com.plotsquared.core.plot.expiration; package com.plotsquared.core.plot.expiration;
import com.plotsquared.core.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.caption.Templates; import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.database.DBFunc;
@@ -50,6 +51,7 @@ import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.task.TaskTime; import com.plotsquared.core.util.task.TaskTime;
import net.kyori.adventure.text.minimessage.Template;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -74,7 +76,7 @@ public class ExpireManager {
private final ConcurrentHashMap<UUID, Long> account_age_cache; private final ConcurrentHashMap<UUID, Long> account_age_cache;
private final EventDispatcher eventDispatcher; private final EventDispatcher eventDispatcher;
private volatile HashSet<Plot> plotsToDelete; private volatile HashSet<Plot> plotsToDelete;
private ArrayDeque<ExpiryTask> tasks; private final ArrayDeque<ExpiryTask> tasks;
/** /**
* 0 = stopped, 1 = stopping, 2 = running * 0 = stopped, 1 = stopping, 2 = running
@@ -102,7 +104,7 @@ public class ExpireManager {
confirmExpiry(pp); confirmExpiry(pp);
} }
public void handleEntry(PlotPlayer pp, Plot plot) { public void handleEntry(PlotPlayer<?> pp, Plot plot) {
if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
.hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) { .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) { if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
@@ -154,18 +156,16 @@ public class ExpireManager {
metaDataAccess.set(true); metaDataAccess.set(true);
current.getCenter(pp::teleport); current.getCenter(pp::teleport);
metaDataAccess.remove(); metaDataAccess.remove();
PlotMessage msg = new PlotMessage().text( Caption msg = TranslatableCaption.of("expiry.expired_options_clicky");
num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ").color("$1").text(current.toString()).color("$2") Template numTemplate = Template.of("num", String.valueOf(num));
.command("/plot list expired").tooltip("/plot list expired") Template areIsTemplate = Template.of("are_or_is", (num > 1 ? "plots are" : "plot is"));
//.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired") Template list_cmd = Template.of("list_cmd", "/plot list expired");
.text("\n - ").color("$3").text("Delete this (/plot delete)").color("$2").command("/plot delete").tooltip("/plot delete") Template plot = Template.of("plot", current.toString());
.text("\n - ").color("$3").text("Remind later (/plot flag set keep 1d)").color("$2") Template cmd_del = Template.of("cmd_del", "/plot delete");
.command("/plot flag set keep 1d").tooltip("/plot flag set keep 1d") Template cmd_keep_1d = Template.of("cmd_keep_1d", "/plot flag set keep 1d");
.text("\n - ").color("$3").text("Keep this (/plot flag set keep true)").color("$2") Template cmd_keep = Template.of("cmd_keep", "/plot flag set keep true");
.command("/plot flag set keep true").tooltip("/plot flag set keep true").text("\n - ").color("$3") Template cmd_no_show_expir = Template.of("cmd_no_show_expir", "/plot toggle clear-confirmation");
.text("Don't show me this").color("$2").command("/plot toggle clear-confirmation") pp.sendMessage(msg, numTemplate, areIsTemplate, list_cmd, plot, cmd_del, cmd_keep_1d, cmd_keep, cmd_no_show_expir);
.tooltip("/plot toggle clear-confirmation");
msg.send(pp);
}); });
return; return;
} else { } else {

2
Core/src/main/resources/lang/messages_en.json
View File

@@ -282,6 +282,8 @@
"debugexec.expiry_already_started": "<prefix><gold>Plot expiry task already started.</gold>", "debugexec.expiry_already_started": "<prefix><gold>Plot expiry task already started.</gold>",
"debugexec.script_list_item": "<dark_grey>[</dark_grey><gold><number></gold><dark_grey>]</dark_grey><gold> <name></gold>", "debugexec.script_list_item": "<dark_grey>[</dark_grey><gold><number></gold><dark_grey>]</dark_grey><gold> <name></gold>",
"expiry.expired_options_clicky": "<gold><num> <are_or_is> expired: </gold><click:run_command:<list_cmd>><hover:show_text:<list_cmd>><grey><plot></grey></hover></click>\n<dark_grey> - </dark_grey><click:run_command:<cmd_del>><hover:show_text:<cmd_del>><grey>Delete this (<cmd_del>)</grey></hover></click>\n<dark_grey> - </dark_grey><click:run_command:<cmd_keep_1d>><hover:show_text:<cmd_keep_1d>><grey>Remind later (<cmd_keep_1d>)</grey></hover></click>\n<dark_grey> - </dark_grey><click:run_command:<cmd_keep>><hover:show_text:<cmd_keep>><grey>Keep this (<cmd_keep>)</grey></hover></click>\n<dark_grey> - </dark_grey><click:run_command:<cmd_no_show_expir>><hover:show_text:<cmd_no_show_expir>><grey>Don't show me this (<cmd_no_show_expir>)</grey></hover></click>",
"debugimportworlds.single_plot_area": "<prefix><red>Must be a single plot area.</red>", "debugimportworlds.single_plot_area": "<prefix><red>Must be a single plot area.</red>",
"debugimportworlds.world_container": "<prefix><red>World container must be configured to be a separate directory to your base files.</red>", "debugimportworlds.world_container": "<prefix><red>World container must be configured to be a separate directory to your base files.</red>",
"debugimportworlds.done": "<prefix><gold>Done!</gold>", "debugimportworlds.done": "<prefix><gold>Done!</gold>",