parsedContent = new ArrayList<>();
+ contentParsers.forEach(parser -> parser.parse(sender, parsedContent));
+ sendHandler.send(sender, parsedContent);
}
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java b/src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java
deleted file mode 100644
index cd0bed8cc..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Filter content and text based on regex matching.
- *
- * Compile regex pattern based on {@link ContentFilter#filterString}. When prefixed with 'r=',
- * use {@link ContentFilter#filterString} as the full regex pattern. Else, set to any match that
- * contains the {@link ContentFilter#filterString}.
- */
-public class ContentFilter {
-
- public static final ContentFilter DEFAULT = new ContentFilter();
- private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
-
- private String filterString;
- private Pattern filterPattern;
- private boolean exactMatch;
-
- private ContentFilter() {
- }
-
- /**
- * @param filterString The text to do matching, either plaintext or regex.
- */
- public ContentFilter(@NotNull String filterString) {
- this(filterString, false);
- }
-
- /**
- * @param filterString The text to do matching, else plaintext or regex.
- * @param exactMatch Should check for exact match when doing regex matching.
- */
- public ContentFilter(@NotNull String filterString,
- boolean exactMatch) {
-
- this.filterString = filterString;
- this.exactMatch = exactMatch;
- parseFilter();
- }
-
- private void parseFilter() {
- if (filterString == null) {
- return;
- }
- if (filterString.startsWith("r=")) {
- convertToMatcher(filterString.substring(2));
- return;
- }
- String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
- convertToMatcher("(?i).*" + cleanedFilter + ".*");
- }
-
- /**
- * Compile and store the regex into a {@link Pattern}.
- *
- * @param regex The regex text.
- */
- private void convertToMatcher(@NotNull String regex) {
- try {
- this.filterPattern = Pattern.compile(regex);
- Logging.finest("Parsed regex pattern: %s", this.filterPattern.toString());
- }
- catch (PatternSyntaxException ignored) {
- Logging.warning("Error parsing regex: %s", filterString);
- }
- }
-
- /**
- * Do regex matching.
- *
- * @param text String to check regex on.
- * @return True of matches regex pattern, false otherwise.
- */
- public boolean checkMatch(@Nullable Object text) {
- if (!hasFilter()) {
- return true;
- }
- if (text == null || !hasValidPattern()) {
- return false;
- }
- text = ChatColor.stripColor(String.valueOf(text));
- return (exactMatch)
- ? filterPattern.matcher((CharSequence) text).matches()
- : filterPattern.matcher((CharSequence) text).find();
- }
-
- /**
- * Checks if a filter string is present.
- *
- * @return True if there is a filter string, else false.
- */
- public boolean hasFilter() {
- return filterString != null;
- }
-
- /**
- * Checks if regex pattern syntax is valid.
- *
- * @return True if valid, else false.
- */
- public boolean hasValidPattern() {
- return filterPattern != null;
- }
-
- /**
- * @return The filter string.
- */
- @Nullable
- public String getString() {
- return filterString;
- }
-
- /**
- * @return The regex pattern.
- */
- @Nullable
- public Pattern getPattern() {
- return filterPattern;
- }
-
- /**
- * @return True if filter is set to do exact matching, else false.
- */
- public boolean isExactMatch() {
- return exactMatch;
- }
-
- /**
- * Nicely format the filter string to be used for showing the sender.
- *
- * @return The formatted filter string.
- */
- public @NotNull String getFormattedString() {
- return String.format("%sFilter: '%s'", ChatColor.ITALIC, filterString);
- }
-
- @Override
- public String toString() {
- return "ContentFilter{" +
- "filterString='" + filterString + '\'' +
- ", filterPattern=" + filterPattern +
- ", exactMatch=" + exactMatch +
- '}';
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java
deleted file mode 100644
index 604d6acdc..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-/**
- * Thrown when an issue occur while formatting content.
- */
-public class DisplayFormatException extends Exception {
- public DisplayFormatException() {
- }
-
- public DisplayFormatException(String message) {
- super(message);
- }
-
- public DisplayFormatException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DisplayFormatException(Throwable cause) {
- super(cause);
- }
-
- public DisplayFormatException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java
deleted file mode 100644
index 7971a11f5..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.google.common.base.Strings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-/**
- * Handles the formatting and sending of all content by the {@link ContentDisplay}.
- *
- * @param Type of content to display.
- */
-@FunctionalInterface
-public interface DisplayHandler {
-
- /**
- * Formats the raw content into a {@link Collection} for displaying to the given sender.
- *
- * @param sender The {@link CommandSender} who will the content will be displayed to.
- * @param display The responsible {@link ContentDisplay}.
- * @return The formatted content.
- * @throws DisplayFormatException Issue occurred while formatting content. E.g. invalid page.
- */
- Collection format(@NotNull CommandSender sender, @NotNull ContentDisplay display)
- throws DisplayFormatException;
-
- /**
- * Sends the header.
- *
- * @param sender The {@link CommandSender} who will the header will be displayed to.
- * @param display The responsible {@link ContentDisplay}.
- */
- default void sendHeader(@NotNull CommandSender sender, @NotNull ContentDisplay display) {
- if (!Strings.isNullOrEmpty(display.getHeader())) {
- sender.sendMessage(display.getHeader());
- }
- }
-
- /**
- * Sends info such as filter and page.
- *
- * @param sender The {@link CommandSender} who will the sub header will be displayed to.
- * @param display The responsible {@link ContentDisplay}.
- */
- default void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay display) {
- if (display.getFilter().hasFilter()) {
- sender.sendMessage(String.format("%s[ %s ]", ChatColor.GRAY, display.getFilter().getFormattedString()));
- }
- }
-
- /**
- * Sends the content.
- *
- * @param sender The {@link CommandSender} who will the body will be displayed to.
- * @param display The responsible {@link ContentDisplay}.
- * @param formattedContent The content after being formatted by {@link #format(CommandSender, ContentDisplay)}
- */
- default void sendBody(@NotNull CommandSender sender, @NotNull ContentDisplay display,
- Collection formattedContent) {
- if (formattedContent == null || formattedContent.size() == 0) {
- sender.sendMessage(display.getEmptyMessage());
- return;
- }
- sender.sendMessage(formattedContent.toArray(new String[0]));
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java
deleted file mode 100644
index 7343c6ad5..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.onarandombox.MultiverseCore.display.handlers.InlineListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.InlineMapDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.ListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.PagedListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Various implementations of {@link DisplayHandler}.
- */
-public class DisplayHandlers {
-
- /**
- * Standard list display.
- *
- * Supported settings: none.
- */
- public static final DisplayHandler> LIST = new ListDisplayHandler();
-
- /**
- * List display with paging.
- *
- * Supported settings: {@link PagedDisplaySettings#SHOW_PAGE}, {@link PagedDisplaySettings#LINES_PER_PAGE},
- * {@link PagedDisplaySettings#PAGE_IN_CONSOLE}, {@link PagedDisplaySettings#DO_END_PADDING}.
- */
- public static final DisplayHandler> PAGE_LIST = new PagedListDisplayHandler();
-
- /**
- * Display a list inline.
- *
- * Supported settings: {@link InlineDisplaySettings#SEPARATOR}.
- */
- public static final DisplayHandler> INLINE_LIST = new InlineListDisplayHandler();
-
- /**
- * Display key value pair inline.
- *
- * Supported settings: {@link InlineDisplaySettings#SEPARATOR}, {@link MapDisplaySettings#OPERATOR}.
- */
- public static final DisplayHandler> INLINE_MAP = new InlineMapDisplayHandler();
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java b/src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java
new file mode 100644
index 000000000..240d7d92d
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java
@@ -0,0 +1,21 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Filter display content for it show only certain string.
+ */
+public interface ContentFilter {
+ /**
+ * Checks if a particular string should be displayed.
+ *
+ * @param value String to check on.
+ * @return True if should be display, false otherwise.
+ */
+ boolean checkMatch(String value);
+
+ /**
+ * Gets whether content needs to be filtered by this filter.
+ *
+ * @return True if content should be filtered, false otherwise.
+ */
+ boolean needToFilter();
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java b/src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java
new file mode 100644
index 000000000..5070d647a
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java
@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Default implementation of {@link ContentFilter} that doesn't filter anything.
+ */
+public class DefaultContentFilter implements ContentFilter {
+
+ public static DefaultContentFilter instance;
+
+ public static DefaultContentFilter getInstance() {
+ if (instance == null) {
+ instance = new DefaultContentFilter();
+ }
+ return instance;
+ }
+
+ private DefaultContentFilter() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkMatch(String value) {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean needToFilter() {
+ return false;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java b/src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java
new file mode 100644
index 000000000..e83611e9d
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.google.common.base.Strings;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Filter content and text based on regex matching.
+ */
+public class RegexContentFilter implements ContentFilter {
+
+ private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
+
+ /**
+ * Compile regex pattern to create a regex filter.
+ *
+ * When prefixed with 'r=', filter string is used as the full regex pattern.
+ * Else, set to regex that contains the filterString.
+ *
+ * @param filterString The target string to create filter.
+ * @return A new instance of {@link RegexContentFilter} with filter applied.
+ */
+ @NotNull
+ public static RegexContentFilter fromString(@Nullable String filterString) {
+ if (filterString == null) {
+ return new RegexContentFilter(null);
+ }
+ if (filterString.startsWith("r=")) {
+ return new RegexContentFilter(filterString.substring(2));
+ }
+ String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
+ return new RegexContentFilter("(?i).*" + cleanedFilter + ".*");
+ }
+
+ private final String regexString;
+ private Pattern regexPattern;
+
+ public RegexContentFilter(@Nullable String regexString) {
+ this.regexString = regexString;
+ convertToPattern();
+ }
+
+ /**
+ * Try to compile and store the regex into a {@link Pattern}.
+ */
+ private void convertToPattern() {
+ if (Strings.isNullOrEmpty(regexString)) {
+ return;
+ }
+ try {
+ regexPattern = Pattern.compile(regexString);
+ } catch (PatternSyntaxException ignored) {
+ regexPattern = null;
+ Logging.fine("Error parsing regex: %s", regexString);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkMatch(String value) {
+ if (!hasValidRegex()) {
+ return false;
+ }
+ String text = ChatColor.stripColor(String.valueOf(value));
+ return regexPattern.matcher(text).find();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean needToFilter() {
+ return hasValidRegex();
+ }
+
+ public boolean hasValidRegex() {
+ return regexPattern != null;
+ }
+
+ public String getRegexString() {
+ return regexString;
+ }
+
+ public Pattern getRegexPattern() {
+ return regexPattern;
+ }
+
+ @Override
+ public String toString() {
+ return regexString;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java
new file mode 100644
index 000000000..46e11b29e
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Base implementation of {@link SendHandler} with some common parameters.
+ *
+ * @param The subclass that inherited this baseclass.
+ */
+public abstract class BaseSendHandler> implements SendHandler {
+
+ protected String header = "";
+ protected ContentFilter filter = DefaultContentFilter.getInstance();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void send(@NotNull CommandSender sender, @NotNull List content) {
+ sendHeader(sender);
+ List filteredContent = filterContent(content);
+ if (filteredContent.isEmpty()) {
+ sender.sendMessage(String.format("%sThere is no content to display.", ChatColor.RED));
+ return;
+ }
+ sendContent(sender, filteredContent);
+ }
+
+ /**
+ * Sends the header if header is present.
+ *
+ * @param sender The target which the header will be displayed to.
+ */
+ protected void sendHeader(CommandSender sender) {
+ if (!Strings.isNullOrEmpty(header)) {
+ sender.sendMessage(header);
+ }
+ }
+
+ /**
+ * Filter to keep only contents that matches the filter.
+ *
+ * @param content The content to filter on.
+ * @return The filtered list of content.
+ */
+ protected List filterContent(@NotNull List content) {
+ if (filter.needToFilter()) {
+ return content.stream().filter(filter::checkMatch).collect(Collectors.toList());
+ }
+ return content;
+ }
+
+ /**
+ * Display the contents.
+ *
+ * @param sender The target which the content will be displayed to.
+ * @param content The content to display.
+ */
+ protected abstract void sendContent(@NotNull CommandSender sender, @NotNull List content);
+
+ /**
+ * Sets header to be displayed.
+ *
+ * @param header The header text.
+ * @param replacements String formatting replacements.
+ * @return Same {@link T} for method chaining.
+ */
+ public T withHeader(@NotNull String header, @NotNull Object...replacements) {
+ this.header = String.format(header, replacements);
+ return (T) this;
+ }
+
+ /**
+ * Sets content filter used to match specific content to be displayed.
+ *
+ * @param filter The filter to use.
+ * @return Same {@link T} for method chaining.
+ */
+ public T withFilter(@NotNull ContentFilter filter) {
+ this.filter = filter;
+ return (T) this;
+ }
+
+ public String getHeader() {
+ return header;
+ }
+
+ public ContentFilter getFilter() {
+ return filter;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java
new file mode 100644
index 000000000..e02997850
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class DefaultSendHandler implements SendHandler {
+
+ private static DefaultSendHandler instance;
+
+ public static DefaultSendHandler getInstance() {
+ if (instance == null) {
+ instance = new DefaultSendHandler();
+ }
+ return instance;
+ }
+
+ private DefaultSendHandler() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void send(@NotNull CommandSender sender, @NotNull List content) {
+ sender.sendMessage(content.toArray(new String[0]));
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineListDisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineListDisplayHandler.java
deleted file mode 100644
index 53aa196b4..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineListDisplayHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-public class InlineListDisplayHandler implements DisplayHandler> {
-
- @Override
- public Collection format(@NotNull CommandSender sender, @NotNull ContentDisplay> display)
- throws DisplayFormatException {
- StringBuilder builder = new StringBuilder();
- String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
-
- for (Iterator iterator = display.getContents().iterator(); iterator.hasNext(); ) {
- String content = iterator.next();
- if (!display.getFilter().checkMatch(content)) {
- continue;
- }
- builder.append(display.getColorTool().get()).append(content);
- if (iterator.hasNext()) {
- builder.append(separator);
- }
- }
- return (builder.length() == 0)
- ? Collections.singletonList(display.getEmptyMessage())
- : Collections.singleton(builder.toString());
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineMapDisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineMapDisplayHandler.java
deleted file mode 100644
index 312ccb86c..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineMapDisplayHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-public class InlineMapDisplayHandler implements DisplayHandler> {
-
- @Override
- public Collection format(@NotNull CommandSender sender,
- @NotNull ContentDisplay> display)
- throws DisplayFormatException {
- StringBuilder builder = new StringBuilder();
- String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
- String operator = display.getSetting(MapDisplaySettings.OPERATOR);
-
- for (Iterator> iterator = display.getContents().entrySet().iterator(); iterator.hasNext(); ) {
- Map.Entry entry = iterator.next();
- if (!display.getFilter().checkMatch(entry.getKey()) && !display.getFilter().checkMatch(entry.getValue())) {
- continue;
- }
- builder.append(display.getColorTool().get())
- .append(entry.getKey())
- .append(operator)
- .append(display.getColorTool().get())
- .append(entry.getValue());
- if (iterator.hasNext()) {
- builder.append(separator);
- }
- }
- return (builder.length() == 0)
- ? Collections.singletonList(display.getEmptyMessage())
- : Collections.singleton(builder.toString());
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java
new file mode 100644
index 000000000..5d8a1d100
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java
@@ -0,0 +1,53 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display the contents in a single line.
+ */
+public class InlineSendHandler extends BaseSendHandler {
+
+ /**
+ * Makes a new {@link InlineSendHandler} instance to use.
+ *
+ * @return New {@link InlineSendHandler} instance.
+ */
+ public static InlineSendHandler create() {
+ return new InlineSendHandler();
+ }
+
+ private String delimiter = ChatColor.WHITE + ", ";
+
+ public InlineSendHandler() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sendContent(@NotNull CommandSender sender, @NotNull List content) {
+ if (filter.needToFilter()) {
+ sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+ }
+ sender.sendMessage(String.join(delimiter, content));
+ }
+
+ /**
+ * Sets the delimiter. A sequence of characters that is used to separate each of the elements in content.
+ *
+ * @param delimiter The delimiter to use.
+ * @return Same {@link InlineSendHandler} for method chaining.
+ */
+ public InlineSendHandler withDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ return this;
+ }
+
+ public String getDelimiter() {
+ return delimiter;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/ListDisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/ListDisplayHandler.java
deleted file mode 100644
index c2b0979fd..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/ListDisplayHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-public class ListDisplayHandler implements DisplayHandler> {
-
- @Override
- public Collection format(@NotNull CommandSender sender, @NotNull ContentDisplay> display)
- throws DisplayFormatException {
- return display.getContents().stream()
- .filter(display.getFilter()::checkMatch)
- .map(s -> (ContentDisplay.LINE_BREAK.equals(s)) ? "" : display.getColorTool().get() + s)
- .collect(Collectors.toList());
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedListDisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedListDisplayHandler.java
deleted file mode 100644
index 17f0825e5..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedListDisplayHandler.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.IntStream;
-
-public class PagedListDisplayHandler extends ListDisplayHandler {
-
- @Override
- public Collection format(@NotNull CommandSender sender, @NotNull ContentDisplay> display)
- throws DisplayFormatException {
- if (dontNeedPaging(sender, display)) {
- return super.format(sender, display);
- }
-
- int pages = 1;
- int currentLength = 0;
- int targetPage = display.getSetting(PagedDisplaySettings.SHOW_PAGE);
- int linesPerPage = display.getSetting(PagedDisplaySettings.LINES_PER_PAGE);
- List content = new ArrayList<>(linesPerPage);
-
- // Calculate the paging.
- for (String line : display.getContents()) {
- if (!display.getFilter().checkMatch(line)) {
- continue;
- }
- // When it's the next page.
- boolean isLineBreak = ContentDisplay.LINE_BREAK.equals(line);
- if (isLineBreak || ++currentLength > linesPerPage) {
- pages++;
- currentLength = 0;
- if (isLineBreak) {
- continue;
- }
- }
- if (pages == targetPage) {
- // Let first line be the header when no header is defined.
- if (display.getHeader() == null) {
- display.setHeader(line);
- currentLength--;
- continue;
- }
- content.add(display.getColorTool().get() + line);
- }
- }
-
- // Page out of range.
- if (targetPage < 1 || targetPage > pages) {
- if (pages == 1) {
- throw new DisplayFormatException("There is only 1 page!");
- }
- throw new DisplayFormatException("Please enter a page from 1 to " + pages + ".");
- }
-
- // No content
- if (content.size() == 0) {
- content.add(display.getEmptyMessage());
- }
-
- // Add empty lines to make output length consistent.
- if (display.getSetting(PagedDisplaySettings.DO_END_PADDING)) {
- IntStream.range(0, linesPerPage - content.size()).forEach(i -> content.add(""));
- }
- display.setSetting(PagedDisplaySettings.TOTAL_PAGE, pages);
-
- return content;
- }
-
- @Override
- public void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay> display) {
- if (dontNeedPaging(sender, display)) {
- super.sendSubHeader(sender, display);
- return;
- }
-
- if (display.getFilter().hasFilter()) {
- sender.sendMessage(String.format("%s[ Page %s of %s, %s ]",
- ChatColor.GRAY,
- display.getSetting(PagedDisplaySettings.SHOW_PAGE),
- display.getSetting(PagedDisplaySettings.TOTAL_PAGE),
- display.getFilter().getFormattedString())
- );
- return;
- }
- sender.sendMessage(String.format("%s[ Page %s of %s ]",
- ChatColor.GRAY,
- display.getSetting(PagedDisplaySettings.SHOW_PAGE),
- display.getSetting(PagedDisplaySettings.TOTAL_PAGE))
- );
- }
-
- private boolean dontNeedPaging(CommandSender sender, ContentDisplay> display) {
- return sender instanceof ConsoleCommandSender
- && !display.getSetting(PagedDisplaySettings.PAGE_IN_CONSOLE);
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java
new file mode 100644
index 000000000..62208b5ce
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java
@@ -0,0 +1,170 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display content as a list with optional pagination.
+ */
+public class PagedSendHandler extends BaseSendHandler {
+
+ /**
+ * Makes a new {@link PagedSendHandler} instance to use.
+ *
+ * @return New {@link PagedSendHandler} instance.
+ */
+ public static PagedSendHandler create() {
+ return new PagedSendHandler();
+ }
+
+ private boolean paginate = true;
+ private boolean paginateInConsole = false;
+ private boolean padEnd = true;
+ private int linesPerPage = 8;
+ private int targetPage = 1;
+
+ public PagedSendHandler() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sendContent(@NotNull CommandSender sender,
+ @NotNull List content) {
+
+ if (!paginate || (sender instanceof ConsoleCommandSender && !paginateInConsole)) {
+ sendNormal(sender, content);
+ return;
+ }
+ sendPaged(sender, content);
+ }
+
+ /**
+ * Send content list without pagination.
+ *
+ * @param sender The target which the content will be displayed to.
+ * @param content The content to display.
+ */
+ private void sendNormal(@NotNull CommandSender sender,
+ @NotNull List content) {
+
+ if (filter.needToFilter()) {
+ sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+ }
+ sender.sendMessage(content.toArray(new String[0]));
+ }
+
+ /**
+ * Send content list with pagination.
+ *
+ * @param sender The target which the content will be displayed to.
+ * @param content The content to display.
+ */
+ private void sendPaged(@NotNull CommandSender sender,
+ @NotNull List content) {
+
+ int totalPages = (content.size() + linesPerPage - 1) / linesPerPage; // Basically just divide round up
+ if (targetPage < 1 || targetPage > totalPages) {
+ sender.sendMessage(String.format("%sInvalid page number. Please enter a page number between 1 and %s", ChatColor.RED, totalPages));
+ return;
+ }
+
+ if (filter.needToFilter()) {
+ sender.sendMessage(String.format("%s[Page %s of %s] [Filter '%s']", ChatColor.GRAY, targetPage, totalPages, filter));
+ } else {
+ sender.sendMessage(String.format("%s[Page %s of %s]", ChatColor.GRAY, targetPage, totalPages));
+ }
+
+ int startIndex = (targetPage - 1) * linesPerPage;
+ int pageEndIndex = startIndex + linesPerPage;
+ int endIndex = Math.min(pageEndIndex, content.size());
+ List pageContent = content.subList(startIndex, endIndex);
+ if (padEnd) {
+ for (int i = 0; i < (pageEndIndex - endIndex); i++) {
+ pageContent.add("");
+ }
+ }
+ sender.sendMessage(pageContent.toArray(new String[0]));
+ }
+
+ /**
+ * Sets whether display output should be paginated.
+ *
+ * @param paginate State of doing pagination.
+ * @return Same {@link PagedSendHandler} for method chaining.
+ */
+ public PagedSendHandler doPagination(boolean paginate) {
+ this.paginate = paginate;
+ return this;
+ }
+
+ /**
+ * Sets whether display output should be paginated if is for console output.
+ * This option will be useless of {@link PagedSendHandler#paginate} is set to false.
+ *
+ * @param paginateInConsole State of doing pagination in console.
+ * @return Same {@link PagedSendHandler} for method chaining.
+ */
+ public PagedSendHandler doPaginationInConsole(boolean paginateInConsole) {
+ this.paginateInConsole = paginateInConsole;
+ return this;
+ }
+
+ /**
+ * Sets whether empty lines should be added if content lines shown is less that {@link PagedSendHandler#linesPerPage}.
+ *
+ * @param padEnd State of doing end padding.
+ * @return Same {@link PagedSendHandler} for method chaining.
+ */
+ public PagedSendHandler doEndPadding(boolean padEnd) {
+ this.padEnd = padEnd;
+ return this;
+ }
+
+ /**
+ * Sets the max number of lines per page. This excludes header.
+ *
+ * @param linesPerPage The number of lines per page.
+ * @return Same {@link PagedSendHandler} for method chaining.
+ */
+ public PagedSendHandler withLinesPerPage(int linesPerPage) {
+ this.linesPerPage = linesPerPage;
+ return this;
+ }
+
+ /**
+ * Sets the page number to display.
+ *
+ * @param targetPage The target page number to display.
+ * @return Same {@link PagedSendHandler} for method chaining.
+ */
+ public PagedSendHandler withTargetPage(int targetPage) {
+ this.targetPage = targetPage;
+ return this;
+ }
+
+ public boolean isPaginate() {
+ return paginate;
+ }
+
+ public boolean isPaginateInConsole() {
+ return paginateInConsole;
+ }
+
+ public boolean isPadEnd() {
+ return padEnd;
+ }
+
+ public int getLinesPerPage() {
+ return linesPerPage;
+ }
+
+ public int getTargetPage() {
+ return targetPage;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java
new file mode 100644
index 000000000..6c826aa6a
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Handles the sending of all content to the command sender.
+ */
+@FunctionalInterface
+public interface SendHandler {
+ /**
+ * Sends all the content to the given command sender.
+ *
+ * @param sender The target which the content will be displayed to.
+ * @param content The content to display.
+ */
+ void send(@NotNull CommandSender sender, @NotNull List content);
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentParser.java b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentParser.java
new file mode 100644
index 000000000..b69f7a841
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentParser.java
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Parse objects into string or list of strings.
+ */
+@FunctionalInterface
+public interface ContentParser {
+ /**
+ * Parse the object to string(s) and add it to the content.
+ *
+ * @param sender The target which the content will be displayed to.
+ * @param content The content to display.
+ */
+ void parse(@NotNull CommandSender sender, @NotNull List content);
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentParser.java b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentParser.java
new file mode 100644
index 000000000..00a890617
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentParser.java
@@ -0,0 +1,60 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Simple parser for list object.
+ *
+ * @param List element type.
+ */
+public class ListContentParser implements ContentParser {
+
+ /**
+ * New list content parser for the given list.
+ *
+ * @param list The list object to parse.
+ * @param List element type.
+ * @return New {@link MapContentParser} instance.
+ */
+ public static ListContentParser forContent(List list) {
+ return new ListContentParser<>(list);
+ }
+
+ private final List list;
+
+ private String format = "%s";
+
+ public ListContentParser(List list) {
+ this.list = list;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void parse(@NotNull CommandSender sender, @NotNull List content) {
+ list.forEach(element -> content.add(String.format(format, element)));
+ }
+
+ /**
+ * Sets the format that will be used to parse each list entry. Uses java string format pattern.
+ *
+ * @param format The format to use.
+ * @return Same {@link ListContentParser} for method chaining.
+ */
+ public ListContentParser withFormat(String format) {
+ this.format = format;
+ return this;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentParser.java b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentParser.java
new file mode 100644
index 000000000..4aad97bc7
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentParser.java
@@ -0,0 +1,112 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple parser for map object.
+ *
+ * @param Key type.
+ * @param Value type.
+ */
+public class MapContentParser implements ContentParser {
+
+ /**
+ * New map content parser for the given map.
+ *
+ * @param map The map object to parse.
+ * @param Key type.
+ * @param Value type.
+ * @return New {@link MapContentParser} instance.
+ */
+ public static MapContentParser forContent(Map map) {
+ return new MapContentParser<>(map);
+ }
+
+ private final Map map;
+
+ private String format = "%s%s%s%s%s";
+ private ChatColor keyColor = ChatColor.WHITE;
+ private ChatColor valueColor = ChatColor.WHITE;
+ private String separator = ": ";
+
+ public MapContentParser(Map map) {
+ this.map = map;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void parse(@NotNull CommandSender sender, @NotNull List content) {
+ map.forEach((k, v) -> content.add(String.format(format, keyColor, k, separator, valueColor, v)));
+ }
+
+ /**
+ * Sets the format that will be used to parse each map entry. Uses java string format pattern.
+ *
+ * @param format The format to use.
+ * @return Same {@link MapContentParser} for method chaining.
+ */
+ public MapContentParser withFormat(String format) {
+ this.format = format;
+ return this;
+ }
+
+ /**
+ * Sets the color for the key text.
+ *
+ * @param keyColor The color to use.
+ * @return Same {@link MapContentParser} for method chaining.
+ */
+ public MapContentParser withKeyColor(ChatColor keyColor) {
+ this.keyColor = keyColor;
+ return this;
+ }
+
+ /**
+ * Sets the color for the value text.
+ *
+ * @param valueColor The color to use.
+ * @return Same {@link MapContentParser} for method chaining.
+ */
+ public MapContentParser withValueColor(ChatColor valueColor) {
+ this.valueColor = valueColor;
+ return this;
+ }
+
+ /**
+ * Sets the separator between each key value pairing.
+ *
+ * @param separator The separator to use.
+ * @return Same {@link MapContentParser} for method chaining.
+ */
+ public MapContentParser withSeparator(String separator) {
+ this.separator = separator;
+ return this;
+ }
+
+ public Map getMap() {
+ return map;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+
+ public ChatColor getKeyColor() {
+ return keyColor;
+ }
+
+ public ChatColor getValueColor() {
+ return valueColor;
+ }
+
+ public String getSeparator() {
+ return separator;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/settings/DisplaySetting.java b/src/main/java/com/onarandombox/MultiverseCore/display/settings/DisplaySetting.java
deleted file mode 100644
index 232e432ba..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/settings/DisplaySetting.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-
-/**
- * Represents a setting option that can be used by {@link DisplayHandler}.
- *
- * @param
- */
-@FunctionalInterface
-public interface DisplaySetting {
-
- /**
- * Gets the default value of this Display Setting.
- *
- * @return The default value.
- */
- T defaultValue();
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/settings/InlineDisplaySettings.java b/src/main/java/com/onarandombox/MultiverseCore/display/settings/InlineDisplaySettings.java
deleted file mode 100644
index 25661d121..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/settings/InlineDisplaySettings.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.ChatColor;
-
-/**
- * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
- */
-public class InlineDisplaySettings {
-
- /**
- * Inline separator. E.g. '1, 2, 3'
- */
- public static final DisplaySetting SEPARATOR = () -> ChatColor.WHITE + ", ";
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/settings/MapDisplaySettings.java b/src/main/java/com/onarandombox/MultiverseCore/display/settings/MapDisplaySettings.java
deleted file mode 100644
index a78473955..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/settings/MapDisplaySettings.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.ChatColor;
-
-/**
- * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
- */
-public class MapDisplaySettings {
-
- /**
- * The thing between a key value pair. E.g. 'Me = Smart'
- */
- public static final DisplaySetting OPERATOR = () -> ChatColor.WHITE + " = ";
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/settings/PagedDisplaySettings.java b/src/main/java/com/onarandombox/MultiverseCore/display/settings/PagedDisplaySettings.java
deleted file mode 100644
index bdc12f9ff..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/display/settings/PagedDisplaySettings.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-public class PagedDisplaySettings {
-
- /**
- * Page to display.
- */
- public static final DisplaySetting SHOW_PAGE = () -> 1;
-
- /**
- * Total pages available to display.
- */
- public static final DisplaySetting TOTAL_PAGE = () -> 1;
-
- /**
- * The max number of lines per page. This excludes header.
- */
- public static final DisplaySetting LINES_PER_PAGE = () -> 8;
-
- /**
- * Should add empty lines if content lines shown is less that {@link #LINES_PER_PAGE}.
- */
- public static final DisplaySetting DO_END_PADDING = () -> true;
-
- /**
- * Should display with paging when it's sent to console.
- */
- public static final DisplaySetting PAGE_IN_CONSOLE = () -> false;
-
-}
From 4ad6c53ba911912b71cd1c0bca1c4784584c9bae Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:11:38 +0800
Subject: [PATCH 009/725] refactor!: Remove redundant MapInitializeEvent
(#2507)
---
.../MultiverseCore/MultiverseCore.java | 2 -
.../listeners/MVMapListener.java | 43 -------------------
2 files changed, 45 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 15700950a..b14879107 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -82,7 +82,6 @@
import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
import com.onarandombox.MultiverseCore.listeners.MVChatListener;
import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVMapListener;
import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
@@ -395,7 +394,6 @@ private void registerEvents() {
pm.registerEvents(this.weatherListener, this);
pm.registerEvents(this.portalListener, this);
pm.registerEvents(this.worldListener, this);
- pm.registerEvents(new MVMapListener(this), this);
}
/**
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java
deleted file mode 100644
index 2443337a3..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.MapInitializeEvent;
-import org.bukkit.map.MapView;
-
-/**
- * A listener for bukkit map events.
- */
-public class MVMapListener implements Listener {
-
- private final MultiverseCore plugin;
-
- public MVMapListener(final MultiverseCore plugin) {
- this.plugin = plugin;
- }
-
- /**
- * This method is called when a map is initialized.
- * @param event The event that was fired.
- */
- @EventHandler
- public void mapInitialize(final MapInitializeEvent event) {
- for (final Player player : Bukkit.getOnlinePlayers()) {
- if ((player.getItemInHand().getType() == Material.MAP
- || player.getItemInHand().getType() == Material.FILLED_MAP)
- && player.getItemInHand().getDurability() == event.getMap().getId()) {
- final Location playerLoc = player.getLocation();
- final MapView map = event.getMap();
- map.setCenterX(playerLoc.getBlockX());
- map.setCenterZ(playerLoc.getBlockZ());
- map.setWorld(playerLoc.getWorld());
- return;
- }
- }
- }
-}
From 2acca7f330e57d55519e21dca96e75f4e403e40d Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:33:44 +0800
Subject: [PATCH 010/725] refactor!: Remove deprecated PlayChatEvent option
(#2828)
---
.../MultiverseCore/MultiverseCore.java | 15 +-------
.../MultiverseCoreConfiguration.java | 13 -------
.../api/MultiverseCoreConfig.java | 12 ------
.../commandsold/VersionCommand.java | 9 ++---
.../listeners/AsyncChatEvent.java | 35 ------------------
.../MultiverseCore/listeners/ChatEvent.java | 29 ---------------
.../listeners/MVAsyncPlayerChatListener.java | 35 ------------------
.../listeners/MVChatListener.java | 11 ++++--
.../listeners/MVPlayerChatListener.java | 36 ------------------
.../listeners/NormalChatEvent.java | 37 -------------------
.../MultiverseCore/TestWorldProperties.java | 15 ++++----
11 files changed, 20 insertions(+), 227 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/AsyncChatEvent.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/ChatEvent.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/listeners/NormalChatEvent.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index b14879107..d665877a5 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -79,10 +79,8 @@
import com.onarandombox.MultiverseCore.destination.WorldDestination;
import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
import com.onarandombox.MultiverseCore.listeners.MVChatListener;
import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
@@ -323,17 +321,8 @@ public void onEnable() {
// A test that had no worlds loaded was being run. This should never happen in production
}
this.saveMVConfig();
- // Register async or sync player chat according to config
- try {
- Class.forName("org.bukkit.event.player.AsyncPlayerChatEvent");
- } catch (ClassNotFoundException e) {
- getMVConfig().setUseAsyncChat(false);
- }
- if (getMVConfig().getUseAsyncChat()) {
- this.chatListener = new MVAsyncPlayerChatListener(this, this.playerListener);
- } else {
- this.chatListener = new MVPlayerChatListener(this, this.playerListener);
- }
+
+ this.chatListener = new MVChatListener(this, this.playerListener);
getServer().getPluginManager().registerEvents(this.chatListener, this);
this.initializeBuscript();
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
index aaf21275c..cc9b5fce3 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
@@ -48,8 +48,6 @@ public static MultiverseCoreConfiguration getInstance() {
@Property
private volatile String prefixchatformat;
@Property
- private volatile boolean useasyncchat;
- @Property
private volatile boolean teleportintercept;
@Property
private volatile boolean firstspawnoverride;
@@ -95,7 +93,6 @@ public MultiverseCoreConfiguration(Map values) {
protected void setDefaults() {
// BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
enforceaccess = false;
- useasyncchat = true;
prefixchat = false;
prefixchatformat = "[%world%]%chat%";
teleportintercept = true;
@@ -322,16 +319,6 @@ public void setTeleportCooldown(int teleportCooldown) {
this.teleportcooldown = teleportCooldown;
}
- @Override
- public void setUseAsyncChat(boolean useAsyncChat) {
- this.useasyncchat = useAsyncChat;
- }
-
- @Override
- public boolean getUseAsyncChat() {
- return this.useasyncchat;
- }
-
@Override
public void setSilentStart(boolean silentStart) {
Logging.setShowingConfig(!silentStart);
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
index 07b2bb91d..ee8d0b16c 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
@@ -158,18 +158,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
*/
boolean getEnforceAccess();
- /**
- * Sets useasyncchat.
- * @param useAsyncChat The new value.
- */
- void setUseAsyncChat(boolean useAsyncChat);
-
- /**
- * Gets useasyncchat.
- * @return useasyncchat.
- */
- boolean getUseAsyncChat();
-
/**
* Sets whether to suppress startup messages.
*
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java
index c0a938add..941e4713d 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java
@@ -7,6 +7,10 @@
package com.onarandombox.MultiverseCore.commandsold;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.event.MVVersionEvent;
@@ -26,10 +30,6 @@
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.scheduler.BukkitRunnable;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
/**
* Dumps version info to the console.
*/
@@ -63,7 +63,6 @@ private String getLegacyString() {
+ "[Multiverse-Core] enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
+ "[Multiverse-Core] prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
+ "[Multiverse-Core] prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
- + "[Multiverse-Core] useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
+ "[Multiverse-Core] teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
+ "[Multiverse-Core] firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
+ "[Multiverse-Core] displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/AsyncChatEvent.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/AsyncChatEvent.java
deleted file mode 100644
index 38d48bef6..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/AsyncChatEvent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-/**
- * A wrapper for the {@link AsyncPlayerChatEvent}.
- */
-public class AsyncChatEvent implements ChatEvent {
- private final AsyncPlayerChatEvent event;
-
- public AsyncChatEvent(AsyncPlayerChatEvent event) {
- this.event = event;
- }
-
- @Override
- public boolean isCancelled() {
- return event.isCancelled();
- }
-
- @Override
- public String getFormat() {
- return event.getFormat();
- }
-
- @Override
- public void setFormat(String s) {
- event.setFormat(s);
- }
-
- @Override
- public Player getPlayer() {
- return event.getPlayer();
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/ChatEvent.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/ChatEvent.java
deleted file mode 100644
index 16cafb81a..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/ChatEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-
-/**
- * A wrapper for the two chat-events in Bukkit.
- */
-public interface ChatEvent {
- /**
- * @return Whether this event is cancelled.
- */
- boolean isCancelled();
-
- /**
- * @return The format.
- */
- String getFormat();
-
- /**
- * Sets the format.
- * @param s The new format.
- */
- void setFormat(String s);
-
- /**
- * @return The player.
- */
- Player getPlayer();
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java
deleted file mode 100644
index c62102538..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.logging.Level;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-public class MVAsyncPlayerChatListener extends MVChatListener {
- public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
- super(plugin, playerListener);
- Logging.fine("Created AsyncPlayerChatEvent listener.");
- }
-
- /**
- * This method is called when a player wants to chat.
- * @param event The Event that was fired.
- */
- @EventHandler
- public void playerChat(AsyncPlayerChatEvent event) {
- this.playerChat(new AsyncChatEvent(event));
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
index aaa05ab54..84fcb11f4 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
@@ -5,12 +5,14 @@
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
/**
* Multiverse's {@link org.bukkit.event.Listener} for players.
*/
-public abstract class MVChatListener implements Listener {
+public class MVChatListener implements Listener {
private final MultiverseCore plugin;
private final MVWorldManager worldManager;
private final MVPlayerListener playerListener;
@@ -22,10 +24,11 @@ public MVChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
}
/**
- * This handles a {@link ChatEvent}.
- * @param event The {@link ChatEvent}.
+ * This handles a {@link AsyncPlayerChatEvent}.
+ * @param event The {@link AsyncPlayerChatEvent}.
*/
- public void playerChat(ChatEvent event) {
+ @EventHandler
+ public void playerChat(AsyncPlayerChatEvent event) {
if (event.isCancelled()) {
return;
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java
deleted file mode 100644
index fff535dac..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.logging.Level;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-@SuppressWarnings("deprecation") // this exists only for downwards compatibility
-public class MVPlayerChatListener extends MVChatListener {
- public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
- super(plugin, playerListener);
- Logging.fine("Registered PlayerChatEvent listener.");
- }
-
- /**
- * This method is called when a player wants to chat.
- * @param event The Event that was fired.
- */
- @EventHandler
- public void playerChat(PlayerChatEvent event) {
- this.playerChat(new NormalChatEvent(event));
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/NormalChatEvent.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/NormalChatEvent.java
deleted file mode 100644
index a712c627e..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/NormalChatEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
-
-/**
- * A wrapper for the {@link PlayerChatEvent}.
- * @deprecated This is deprecated like the {@link PlayerChatEvent}.
- */
-@Deprecated
-public class NormalChatEvent implements ChatEvent {
- private final PlayerChatEvent event;
-
- public NormalChatEvent(PlayerChatEvent event) {
- this.event = event;
- }
-
- @Override
- public boolean isCancelled() {
- return event.isCancelled();
- }
-
- @Override
- public String getFormat() {
- return event.getFormat();
- }
-
- @Override
- public void setFormat(String s) {
- event.setFormat(s);
- }
-
- @Override
- public Player getPlayer() {
- return event.getPlayer();
- }
-}
diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
index 3766e46ab..a431e8b75 100644
--- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
+++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
@@ -7,10 +7,11 @@
package com.onarandombox.MultiverseCore;
+import java.io.File;
+
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
import org.bukkit.ChatColor;
@@ -38,8 +39,6 @@
import org.junit.Before;
import org.junit.Test;
-import java.io.File;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -178,10 +177,10 @@ public void test() throws Exception {
// call player chat event
core.getMVConfig().setPrefixChat(true);
- ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+ core.getChatListener().playerChat(playerChatEvent);
verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
core.getMVConfig().setPrefixChat(false);
- ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+ core.getChatListener().playerChat(playerChatEvent);
verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
// call player join events
@@ -272,15 +271,15 @@ public void test() throws Exception {
// call player chat event
core.getMVConfig().setPrefixChat(true);
- ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+ core.getChatListener().playerChat(playerChatEvent);
// never because it's hidden!
verify(playerChatEvent, never()).setFormat(
"[" + mvWorld.getColoredWorldString() + "]" + "format");
mvWorld.setHidden(false);
- ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+ core.getChatListener().playerChat(playerChatEvent);
verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
core.getMVConfig().setPrefixChat(false);
- ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+ core.getChatListener().playerChat(playerChatEvent);
verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
mvWorld.setHidden(true); // reset hidden-state
From 0166b8d139cf22fb479955827c459a1f9118b221 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:38:51 +0800
Subject: [PATCH 011/725] refactor!: Remove deprecated LocationManipulation
class (#2528)
---
.../utils/LocationManipulation.java | 285 ------------------
1 file changed, 285 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
deleted file mode 100644
index b0bce924d..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.utils;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.util.Vector;
-
-import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Utility class to manipulate locations.
- *
- * @deprecated Use instead: {@link com.onarandombox.MultiverseCore.api.LocationManipulation} and {@link SimpleLocationManipulation}.
- */
-@Deprecated
-public class LocationManipulation {
- private LocationManipulation() { }
-
- private static Map orientationInts = new HashMap();
-
- static {
- // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- orientationInts.put("n", 180);
- orientationInts.put("ne", 225);
- orientationInts.put("e", 270);
- orientationInts.put("se", 315);
- orientationInts.put("s", 0);
- orientationInts.put("sw", 45);
- orientationInts.put("w", 90);
- orientationInts.put("nw", 135);
-
- // "freeze" the map:
- orientationInts = Collections.unmodifiableMap(orientationInts);
- // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- }
-
- /**
- * Convert a Location into a Colon separated string to allow us to store it in text.
- *
- * WORLD:X,Y,Z:yaw:pitch
- *
- * The corresponding String2Loc function is {@link #stringToLocation}
- *
- * @param location The Location to save.
- * @return The location as a string in this format: WORLD:x,y,z:yaw:pitch
- */
- public static String locationToString(Location location) {
- if (location == null) {
- return "";
- }
- // We set the locale to ENGLISH here so we always save with the format:
- // world:1.2,5.4,3.6:1.8:21.3
- // Otherwise we blow up when parsing!
- return String.format(Locale.ENGLISH, "%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
- location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
- }
-
- /**
- * This method simply does some rounding, rather than forcing a call to the server to get the blockdata.
- *
- * @param l The location to round to the block location
- * @return A rounded location.
- */
- public static Location getBlockLocation(Location l) {
- l.setX(l.getBlockX());
- l.setY(l.getBlockY());
- l.setZ(l.getBlockZ());
- return l;
- }
-
- /**
- * Returns a new location from a given string. The format is as follows:
- *
- * WORLD:X,Y,Z:yaw:pitch
- *
- * The corresponding Location2String function is {@link #stringToLocation}
- *
- * @param locationString The location represented as a string (WORLD:X,Y,Z:yaw:pitch)
- * @return A new location defined by the string or null if the string was invalid.
- */
- public static Location stringToLocation(String locationString) {
- //format:
- //world:x,y,z:pitch:yaw
- if (locationString == null) {
- return null;
- }
-
- // Split the whole string, format is:
- // {'world', 'x,y,z'[, 'pitch', 'yaw']}
- String[] split = locationString.split(":");
- if (split.length < 2 || split.length > 4) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
- return null;
- }
- // Split the xyz string, format is:
- // {'x', 'y', 'z'}
- String[] xyzsplit = split[1].split(",");
- if (xyzsplit.length != 3) {
- return null;
- }
-
- // Verify the world is valid
- World w = Bukkit.getWorld(split[0]);
- if (w == null) {
- return null;
- }
-
- try {
- float pitch = 0;
- float yaw = 0;
- if (split.length >= 3) {
- yaw = (float) Double.parseDouble(split[2]);
- }
- if (split.length == 4) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
- pitch = (float) Double.parseDouble(split[3]);
- }
- return new Location(w, Double.parseDouble(xyzsplit[0]), Double.parseDouble(xyzsplit[1]), Double.parseDouble(xyzsplit[2]), yaw, pitch);
- } catch (NumberFormatException e) {
- return null;
- }
- }
-
- /**
- * Returns a colored string with the coords.
- *
- * @param l The {@link Location}
- * @return The {@link String}
- */
- public static String strCoords(Location l) {
- String result = "";
- DecimalFormat df = new DecimalFormat();
- df.setMinimumFractionDigits(0);
- df.setMaximumFractionDigits(2);
- result += ChatColor.WHITE + "X: " + ChatColor.AQUA + df.format(l.getX()) + " ";
- result += ChatColor.WHITE + "Y: " + ChatColor.AQUA + df.format(l.getY()) + " ";
- result += ChatColor.WHITE + "Z: " + ChatColor.AQUA + df.format(l.getZ()) + " ";
- result += ChatColor.WHITE + "P: " + ChatColor.GOLD + df.format(l.getPitch()) + " ";
- result += ChatColor.WHITE + "Y: " + ChatColor.GOLD + df.format(l.getYaw()) + " ";
- return result;
- }
-
- /**
- * Converts a location to a printable readable formatted string including pitch/yaw.
- *
- * @param l The {@link Location}
- * @return The {@link String}
- */
- public static String strCoordsRaw(Location l) {
- if (l == null) {
- return "null";
- }
- String result = "";
- DecimalFormat df = new DecimalFormat();
- df.setMinimumFractionDigits(0);
- df.setMaximumFractionDigits(2);
- result += "X: " + df.format(l.getX()) + " ";
- result += "Y: " + df.format(l.getY()) + " ";
- result += "Z: " + df.format(l.getZ()) + " ";
- result += "P: " + df.format(l.getPitch()) + " ";
- result += "Y: " + df.format(l.getYaw()) + " ";
- return result;
- }
-
- /**
- * Return the NESW Direction a Location is facing.
- *
- * @param location The {@link Location}
- * @return The NESW Direction
- */
- public static String getDirection(Location location) {
- // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- double r = (location.getYaw() % 360) + 180;
- // Remember, these numbers are every 45 degrees with a 22.5 offset, to detect boundaries.
- String dir;
- if (r < 22.5)
- dir = "n";
- else if (r < 67.5)
- dir = "ne";
- else if (r < 112.5)
- dir = "e";
- else if (r < 157.5)
- dir = "se";
- else if (r < 202.5)
- dir = "s";
- else if (r < 247.5)
- dir = "sw";
- else if (r < 292.5)
- dir = "w";
- else if (r < 337.5)
- dir = "nw";
- else
- dir = "n";
- // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-
- return dir;
- }
-
- /**
- * Returns the float yaw position for the given cardinal direction.
- *
- * @param orientation The cardinal direction
- * @return The yaw
- */
- public static float getYaw(String orientation) {
- if (orientation == null) {
- return 0;
- }
- if (orientationInts.containsKey(orientation.toLowerCase())) {
- return orientationInts.get(orientation.toLowerCase());
- }
- return 0;
- }
-
- /**
- * Returns a speed float from a given vector.
- *
- * @param v The {@link Vector}
- * @return The speed
- */
- public static float getSpeed(Vector v) {
- return (float) Math.sqrt(v.getX() * v.getX() + v.getZ() * v.getZ());
- }
-
- // X, Y, Z
- // -W/+E,0, -N/+S
-
- /**
- * Returns a translated vector from the given direction.
- *
- * @param v The old {@link Vector}
- * @param direction The new direction
- * @return The translated {@link Vector}
- */
- public static Vector getTranslatedVector(Vector v, String direction) {
- if (direction == null) {
- return v;
- }
- float speed = getSpeed(v);
- float halfSpeed = (float) (speed / 2.0);
- if (direction.equalsIgnoreCase("n")) {
- return new Vector(0, 0, -1 * speed);
- } else if (direction.equalsIgnoreCase("ne")) {
- return new Vector(halfSpeed, 0, -1 * halfSpeed);
- } else if (direction.equalsIgnoreCase("e")) {
- return new Vector(speed, 0, 0);
- } else if (direction.equalsIgnoreCase("se")) {
- return new Vector(halfSpeed, 0, halfSpeed);
- } else if (direction.equalsIgnoreCase("s")) {
- return new Vector(0, 0, speed);
- } else if (direction.equalsIgnoreCase("sw")) {
- return new Vector(-1 * halfSpeed, 0, halfSpeed);
- } else if (direction.equalsIgnoreCase("w")) {
- return new Vector(-1 * speed, 0, 0);
- } else if (direction.equalsIgnoreCase("nw")) {
- return new Vector(-1 * halfSpeed, 0, -1 * halfSpeed);
- }
- return v;
- }
-
- /**
- * Returns the next Location that a {@link Vehicle} is traveling at.
- *
- * @param v The {@link Vehicle}
- * @return The {@link Location}
- */
- public static Location getNextBlock(Vehicle v) {
- Vector vector = v.getVelocity();
- Location location = v.getLocation();
- int x = vector.getX() < 0 ? vector.getX() == 0 ? 0 : -1 : 1;
- int z = vector.getZ() < 0 ? vector.getZ() == 0 ? 0 : -1 : 1;
- return location.add(x, 0, z);
- }
-}
From 17351e66c1cb53ccbd222b4fe0fb252a8bda1045 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:39:23 +0800
Subject: [PATCH 012/725] refactor!: Remove deprecated getStaticConfig (#2525)
---
.../onarandombox/MultiverseCore/MultiverseCore.java | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index d665877a5..2fcd3dcfb 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -1213,17 +1213,6 @@ public MultiverseCoreConfig getMVConfig() {
return config;
}
- /**
- * This method is currently used by other plugins.
- * It will be removed in 2.4
- * @return The Multiverse config.
- * @deprecated This is deprecated.
- */
- @Deprecated
- public static MultiverseCoreConfiguration getStaticConfig() {
- return MultiverseCoreConfiguration.getInstance();
- }
-
@Override
public Buscript getScriptAPI() {
return buscript;
From 3ec22fc578ca9e8f35aebc951c896bf4aecac454 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:40:42 +0800
Subject: [PATCH 013/725] refactor!: Remove deprecated WorldManager methods
(#2526)
---
.../MultiverseCore/MultiverseCore.java | 2 +-
.../MultiverseCore/api/MVWorldManager.java | 22 -------------------
.../MultiverseCore/utils/WorldManager.java | 20 -----------------
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 2fcd3dcfb..7d082260f 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -1123,7 +1123,7 @@ public Boolean deleteWorld(String name) {
* @return True if success, false if fail.
*/
public Boolean cloneWorld(String oldName, String newName, String generator) {
- return this.worldManager.cloneWorld(oldName, newName, generator);
+ return this.worldManager.cloneWorld(oldName, newName);
}
/**
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java
index 599ce7cb9..3c835c8d9 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java
@@ -59,18 +59,6 @@ boolean addWorld(String name, Environment env, String seedString, WorldType type
boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
String generator, boolean useSpawnAdjust);
- /**
- * Make a copy of a world.
- *
- * @param oldName Name of world to be copied
- * @param newName Name of world to be created
- * @param generator The Custom generator plugin to use. Ignored.
- * @return True if the world is copied successfully, false if not.
- * @deprecated Use {@link #cloneWorld(String, String)} instead.
- */
- @Deprecated
- boolean cloneWorld(String oldName, String newName, String generator);
-
/**
* Make a copy of a world.
*
@@ -234,19 +222,9 @@ boolean addWorld(String name, Environment env, String seedString, WorldType type
*/
void loadDefaultWorlds();
- /**
- * Return the World Purger.
- *
- * @return A valid {@link PurgeWorlds}.
- * @deprecated {@link PurgeWorlds} is deprecated!
- */
- @Deprecated
- PurgeWorlds getWorldPurger();
-
/**
* Gets the {@link WorldPurger}.
*
- * TODO: Remove {@link #getWorldPurger()} and replace it with this method.
* @return The {@link WorldPurger} this {@link MVWorldManager} is using.
* @see WorldPurger
* @see SimpleWorldPurger
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java b/src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
index 0b2ab0701..d50c2a095 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
@@ -95,16 +95,6 @@ public boolean accept(File file, String s) {
}
}
- /**
- * {@inheritDoc}
- * @deprecated Use {@link #cloneWorld(String, String)} instead.
- */
- @Override
- @Deprecated
- public boolean cloneWorld(String oldName, String newName, String generator) {
- return this.cloneWorld(oldName, newName);
- }
-
/**
* {@inheritDoc}
*/
@@ -784,16 +774,6 @@ private void ensureSecondNamespaceIsPrepared() {
}
}
- /**
- * {@inheritDoc}
- * @deprecated This is deprecated!
- */
- @Override
- @Deprecated
- public PurgeWorlds getWorldPurger() {
- return new PurgeWorlds(plugin);
- }
-
/**
* {@inheritDoc}
*/
From 3377c1dbe508f6dc2c51ce56f67b53fb58b3f435 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:45:55 +0800
Subject: [PATCH 014/725] refactor!: Remove deprecated logging (#2523)
---
.../MultiverseCore/MultiverseCore.java | 80 ++++---------------
.../MultiverseCore/api/LoggablePlugin.java | 36 ---------
.../MultiverseCore/api/MVPlugin.java | 2 +-
.../MultiverseCore/api/MultiversePlugin.java | 27 -------
4 files changed, 15 insertions(+), 130 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 7d082260f..a4e44b6ad 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -7,21 +7,6 @@
package com.onarandombox.MultiverseCore;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
import buscript.Buscript;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -120,6 +105,20 @@
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.plugin.java.JavaPluginLoader;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* The implementation of the Multiverse-{@link Core}.
*/
@@ -837,47 +836,6 @@ public boolean onCommand(CommandSender sender, Command command, String commandLa
}
}
- /**
- * {@inheritDoc}
- *
- * @deprecated This is now deprecated, nobody needs it any longer.
- * All logging is now done with {@link Logging}.
- */
- @Override
- @Deprecated
- public void log(Level level, String msg) {
- Logging.log(level, msg);
- }
-
- /**
- * Logs a message at the specified level.
- *
- * @param level The Log-{@link Level}.
- * @param msg The message to log.
- *
- * @deprecated Replaced by {@link Logging}. Please refrain from using this from a third party plugin as the
- * messages will appear to originate from Multiverse-Core.
- */
- @Deprecated
- public static void staticLog(Level level, String msg) {
- Logging.log(level, msg);
- }
-
- /**
- * Print messages to the Debug Log, if the servers in Debug Mode then we also want to print the messages to the
- * standard Server Console.
- *
- * @param level The Log-{@link Level}
- * @param msg The message
- *
- * @deprecated Replaced by {@link Logging}. Please refrain from using this from a third party plugin as the
- * messages will appear to originate from Multiverse-Core.
- */
- @Deprecated
- public static void staticDebugLog(Level level, String msg) {
- Logging.log(level, msg);
- }
-
/**
* {@inheritDoc}
*/
@@ -928,16 +886,6 @@ public CommandQueueManager getCommandQueueManager() {
return commandQueueManager;
}
- /**
- * Gets the log-tag.
- *
- * @return The log-tag
- */
- // TODO this should be static!
- public String getTag() {
- return MultiverseCore.LOG_TAG;
- }
-
/**
* Shows a message that the given world is not a MultiverseWorld.
*
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java b/src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java
deleted file mode 100644
index 56852e45c..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.api;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Server;
-
-import java.util.logging.Level;
-
-/**
- * A simple API to require plugins to have a log method.
- *
- * @deprecated Replaced by {@link Logging}.
- * */
-@Deprecated
-public interface LoggablePlugin {
- /**
- * Logs a message at the specified level.
- *
- * @param level The Log-{@link Level}.
- * @param msg The message to log.
- */
- void log(Level level, String msg);
-
- /**
- * Gets the server instance that this plugin is attached to.
- *
- * @return A {@link Server} instance.
- */
- Server getServer();
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java
index e70cd35dd..a9582edfa 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java
@@ -13,7 +13,7 @@
/**
* This interface is implemented by every official Multiverse-plugin.
*/
-public interface MVPlugin extends LoggablePlugin {
+public interface MVPlugin {
/**
* Adds This plugin's version information to the buffer and returns the new string.
*
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
index a6a064b8a..28bbc9190 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
@@ -115,33 +115,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
}
- @Override
- public void log(Level level, String msg) {
- int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
- if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
- || (level == Level.FINEST && debugLevel >= 3)) {
- debugLog.log(level, msg);
- } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
- String message = new StringBuilder(getLogTag()).append(msg).toString();
- this.getServer().getLogger().log(level, message);
- debugLog.log(level, message);
- }
- }
-
- private String getLogTag() {
- if (logTag == null)
- logTag = String.format("[%s]", this.getDescription().getName());
- return logTag;
- }
-
- /**
- * Sets the debug log-tag.
- * @param tag The new tag.
- */
- protected final void setDebugLogTag(String tag) {
- this.debugLog.setTag(tag);
- }
-
@Override
public final String dumpVersionInfo(String buffer) {
throw new UnsupportedOperationException("This is gone.");
From fe8118854ee1a552caca75894f182992e2eac6b3 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Sat, 4 Feb 2023 16:49:11 +0800
Subject: [PATCH 015/725] refactor!: Remove deprecated debug log
---
.../MultiverseCore/api/MultiversePlugin.java | 9 --
.../MultiverseCore/utils/DebugLog.java | 129 ------------------
2 files changed, 138 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
index 28bbc9190..90a9b33ff 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java
@@ -5,14 +5,12 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.logging.Level;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin;
import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.DebugLog;
import com.pneumaticraft.commandhandler.CommandHandler;
/**
@@ -20,11 +18,6 @@
*/
public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
private MultiverseCore core;
- /**
- * Prefix for standard log entrys.
- */
- protected String logTag;
- private DebugLog debugLog;
/**
* {@inheritDoc}
@@ -58,8 +51,6 @@ public final void onEnable() {
} catch (IOException e) {
e.printStackTrace();
}
- debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
- debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
this.onPluginEnable();
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java b/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java
deleted file mode 100644
index c83e7e089..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.utils;
-
-import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-/**
- * The Multiverse debug-logger.
- * @deprecated Deprecated in favor of new Logging lib. See {@link com.dumptruckman.minecraft.util.Logging}.
- */
-@Deprecated
-public class DebugLog extends Logger {
- private FileHandler fh;
- private Logger standardLog = null;
- private String prefix = "[MVCore-Debug] ";
-
- /**
- * Creates a new debug logger.
- *
- * @param logger The name of the logger.
- * @param file The file to log to.
- */
- public DebugLog(String logger, String file) {
- super(logger, null);
- try {
- this.fh = new FileHandler(file, true);
- this.setUseParentHandlers(false);
- List toRemove = Arrays.asList(this.getHandlers());
- for (Handler handler : toRemove) {
- this.removeHandler(handler);
- }
- this.addHandler(this.fh);
- this.setLevel(Level.ALL);
- this.fh.setFormatter(new LogFormatter());
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Sets the log-tag.
- * @param tag The new tag.
- */
- public void setTag(String tag) {
- this.prefix = tag + " ";
- }
-
- /**
- * Specifies the logger to use to send debug messages to as the debug logger itself only sends messages to a file.
- *
- * @param logger Logger to send debug messages to.
- */
- public void setStandardLogger(Logger logger) {
- this.standardLog = logger;
- }
-
- /**
- * Log a message at a certain level.
- *
- * @param level The log-{@link Level}.
- * @param msg the message.
- */
- @Override
- public void log(final Level level, final String msg) {
- if (MultiverseCoreConfiguration.isSet() && MultiverseCoreConfiguration.getInstance().getGlobalDebug() > 0) {
- // only redirect to standardLog if it's lower than INFO so we don't log that twice!
- if ((level.intValue() < Level.INFO.intValue()) && (standardLog != null)) {
- standardLog.log(Level.INFO, prefix + msg);
- }
-
- super.log(level, prefix + msg);
- }
- }
-
- /**
- * Our log-{@link Formatter}.
- */
- private class LogFormatter extends Formatter {
- private final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @Override
- public String format(LogRecord record) {
- StringBuilder builder = new StringBuilder();
- Throwable ex = record.getThrown();
-
- builder.append(this.date.format(record.getMillis()));
- builder.append(" [");
- builder.append(record.getLevel().getLocalizedName().toUpperCase());
- builder.append("] ");
- builder.append(record.getMessage());
- builder.append('\n');
-
- if (ex != null) {
- StringWriter writer = new StringWriter();
- ex.printStackTrace(new PrintWriter(writer));
- builder.append(writer);
- }
-
- return builder.toString();
- }
- }
-
- /**
- * Closes this {@link DebugLog}.
- */
- public void close() {
- this.fh.close();
- }
-}
From 747cab75fde0e241ebf64ab2abd6dff002600bb3 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Mon, 6 Feb 2023 21:04:34 +0800
Subject: [PATCH 016/725] feat: Implement command flag system (#2827)
* feat: Implement command flag system
* docs: Add javadocs and annotation
* chore: Implement suggested improvements
* chore: Add shortcuts for flaggroup in MultiverseCommand
* chore: Add check if flaggroup already registered
---
.../MultiverseCore/MultiverseCore.java | 33 ++--
.../commands/CreateCommand.java | 108 +++++++++++
.../MultiverseCore/commands/DebugCommand.java | 3 +-
.../commands/MultiverseCommand.java | 28 ++-
.../commandtools/MVCommandCompletions.java | 15 ++
.../commandtools/MVCommandManager.java | 21 ++-
.../commandtools/flags/CommandFlag.java | 93 ++++++++++
.../commandtools/flags/CommandFlagGroup.java | 129 +++++++++++++
.../flags/CommandFlagsManager.java | 93 ++++++++++
.../flags/CommandFlagsParser.java | 118 ++++++++++++
.../commandtools/flags/CommandValueFlag.java | 172 ++++++++++++++++++
.../flags/ParsedCommandFlags.java | 52 ++++++
12 files changed, 842 insertions(+), 23 deletions(-)
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index a4e44b6ad..b32d3716e 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -7,6 +7,20 @@
package com.onarandombox.MultiverseCore;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import buscript.Buscript;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -18,6 +32,7 @@
import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.commands.CreateCommand;
import com.onarandombox.MultiverseCore.commands.DebugCommand;
import com.onarandombox.MultiverseCore.commandsold.AnchorCommand;
import com.onarandombox.MultiverseCore.commandsold.CheckCommand;
@@ -25,7 +40,6 @@
import com.onarandombox.MultiverseCore.commandsold.ConfigCommand;
import com.onarandombox.MultiverseCore.commandsold.ConfirmCommand;
import com.onarandombox.MultiverseCore.commandsold.CoordCommand;
-import com.onarandombox.MultiverseCore.commandsold.CreateCommand;
import com.onarandombox.MultiverseCore.commandsold.DeleteCommand;
import com.onarandombox.MultiverseCore.commandsold.EnvironmentCommand;
import com.onarandombox.MultiverseCore.commandsold.GameruleCommand;
@@ -105,20 +119,6 @@
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.plugin.java.JavaPluginLoader;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* The implementation of the Multiverse-{@link Core}.
*/
@@ -743,7 +743,6 @@ private void registerCommands() {
this.commandHandler.registerCommand(new VersionCommand(this));
this.commandHandler.registerCommand(new ListCommand(this));
this.commandHandler.registerCommand(new InfoCommand(this));
- this.commandHandler.registerCommand(new CreateCommand(this));
this.commandHandler.registerCommand(new CloneCommand(this));
this.commandHandler.registerCommand(new ImportCommand(this));
this.commandHandler.registerCommand(new ReloadCommand(this));
@@ -770,7 +769,6 @@ private void registerCommands() {
this.commandHandler.registerCommand(new AnchorCommand(this));
// Misc Commands
this.commandHandler.registerCommand(new EnvironmentCommand(this));
- // this.commandHandler.registerCommand(new DebugCommand(this));
this.commandHandler.registerCommand(new SilentCommand(this));
this.commandHandler.registerCommand(new GeneratorCommand(this));
this.commandHandler.registerCommand(new CheckCommand(this));
@@ -780,6 +778,7 @@ private void registerCommands() {
//**NEW ACF COMMAND HANDLER**
this.commandManager.registerCommand(new DebugCommand(this));
+ this.commandManager.registerCommand(new CreateCommand(this));
}
/**
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
new file mode 100644
index 000000000..a6b28fed1
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
@@ -0,0 +1,108 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.command.CommandException;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class CreateCommand extends MultiverseCommand {
+
+ public CreateCommand(@NotNull MultiverseCore plugin) {
+ super(plugin);
+
+ registerFlagGroup(CommandFlagGroup.builder("mvcreate")
+ .add(CommandValueFlag.builder("--seed", String.class)
+ .addAlias("-s")
+ .completion(() -> Collections.singleton(String.valueOf(new Random().nextLong())))
+ .build())
+ .add(CommandValueFlag.builder("--generator", String.class)
+ .addAlias("-g")
+ .completion(() -> Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
+ .filter(Plugin::isEnabled)
+ .filter(genplugin -> this.plugin.getUnsafeCallWrapper().wrap(
+ () -> genplugin.getDefaultWorldGenerator("world", ""),
+ genplugin.getName(),
+ "Get generator"
+ ) != null)
+ .map(genplugin -> genplugin.getDescription().getName())
+ .collect(Collectors.toList()))
+ .build())
+ .add(CommandValueFlag.builder("--world-type", WorldType.class)
+ .addAlias("-t")
+ .context((value) -> {
+ try {
+ return WorldType.valueOf(value.toUpperCase());
+ } catch (IllegalArgumentException e) {
+ throw new CommandException("Invalid world type: " + value);
+ }
+ })
+ .completion(() -> {
+ List types = new ArrayList<>();
+ for (WorldType type : WorldType.values()) {
+ types.add(type.name().toLowerCase());
+ }
+ return types;
+ })
+ .build())
+ .add(CommandFlag.builder("--adjust-spawn")
+ .addAlias("-n")
+ .build())
+ .add(CommandFlag.builder("--no-structures")
+ .addAlias("-a")
+ .build())
+ .build());
+ }
+
+ @Subcommand("create")
+ @CommandPermission("multiverse.core.create")
+ @CommandCompletion("WORLDNAME @flags:groupName=mvcreate")
+ @Syntax(" -s [seed] -g [generator[:id]] -t [worldtype] [-n] -a [true|false]")
+ @Description("") //TODO
+ public void onCreateCommand(CommandIssuer issuer,
+
+ @Syntax("")
+ @Description("") //TODO
+ String worldName,
+
+ @Syntax("")
+ @Description("") //TODO
+ World.Environment environment,
+
+ @Optional
+ @Syntax("[world-flags]")
+ @Description("") //TODO
+ String[] flags
+ ) {
+ ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+ issuer.sendMessage(worldName + " " + environment.toString());
+ issuer.sendMessage("--seed: " + parsedFlags.hasFlag("--seed") + " " + String.valueOf(parsedFlags.flagValue("--seed", String.class)));
+ issuer.sendMessage("--generator: " + parsedFlags.hasFlag("--generator") + " " + String.valueOf(parsedFlags.flagValue("--generator", String.class)));
+ issuer.sendMessage("--world-type: " + parsedFlags.hasFlag("--world-type") + " " + String.valueOf(parsedFlags.flagValue("--world-type", WorldType.class)));
+ issuer.sendMessage("--adjust-spawn: " + parsedFlags.hasFlag("--adjust-spawn") + " " + String.valueOf(parsedFlags.flagValue("--adjust-spawn", String.class)));
+ issuer.sendMessage("--no-structures: " + parsedFlags.hasFlag("--no-structures") + " " + String.valueOf(parsedFlags.flagValue("--no-structures", String.class)));
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java
index e4cabe2a4..9e702267d 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java
@@ -16,7 +16,7 @@
@CommandAlias("mv")
public class DebugCommand extends MultiverseCommand {
- public DebugCommand(MultiverseCore plugin) {
+ public DebugCommand(@NotNull MultiverseCore plugin) {
super(plugin);
}
@@ -27,7 +27,6 @@ public void onShowDebugCommand(@NotNull CommandIssuer issuer) {
this.displayDebugMode(issuer);
}
-
@Subcommand("debug")
@CommandPermission("multiverse.core.debug")
@Syntax("<{@@mv-core.debug_change_syntax}>")
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
index 42a65604e..f9385144d 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java
@@ -2,12 +2,38 @@
import co.aikar.commands.BaseCommand;
import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import org.jetbrains.annotations.NotNull;
+/**
+ * A base command for Multiverse.
+ */
public class MultiverseCommand extends BaseCommand {
protected final MultiverseCore plugin;
+ protected final MVWorldManager worldManager;
+ protected final CommandFlagsManager flagsManager;
- protected MultiverseCommand(MultiverseCore plugin) {
+ private String flagGroupName;
+
+ protected MultiverseCommand(@NotNull MultiverseCore plugin) {
this.plugin = plugin;
+ this.worldManager = plugin.getMVWorldManager();
+ this.flagsManager = plugin.getCommandManager().getFlagsManager();
+ }
+
+ protected void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
+ if (flagGroupName != null) {
+ throw new IllegalStateException("Flag group already registered! (name: " + flagGroupName + ")");
+ }
+ flagsManager.registerFlagGroup(flagGroup);
+ flagGroupName = flagGroup.getName();
+ }
+
+ protected @NotNull ParsedCommandFlags parseFlags(@NotNull String[] flags) {
+ return flagsManager.parse(flagGroupName, flags);
}
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
index 7b5cbd9ff..72faa7ada 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
@@ -1,9 +1,24 @@
package com.onarandombox.MultiverseCore.commandtools;
+import java.util.Collection;
+
+import co.aikar.commands.BukkitCommandCompletionContext;
import co.aikar.commands.PaperCommandCompletions;
+import org.jetbrains.annotations.NotNull;
public class MVCommandCompletions extends PaperCommandCompletions {
+ protected final MVCommandManager commandManager;
+
public MVCommandCompletions(MVCommandManager mvCommandManager) {
super(mvCommandManager);
+ this.commandManager = mvCommandManager;
+
+ registerAsyncCompletion("flags", this::suggestFlags);
+ }
+
+ @NotNull
+ private Collection suggestFlags(@NotNull BukkitCommandCompletionContext context) {
+ return this.commandManager.getFlagsManager().suggest(
+ context.getConfig("groupName", ""), context.getContextValue(String[].class));
}
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
index d84689f2c..0522c6c3a 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
@@ -8,6 +8,8 @@
import co.aikar.commands.CommandContexts;
import co.aikar.commands.PaperCommandManager;
import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
+import org.jetbrains.annotations.NotNull;
/**
* Main class to manage permissions.
@@ -15,8 +17,9 @@
public class MVCommandManager extends PaperCommandManager {
private final MultiverseCore plugin;
+ private CommandFlagsManager flagsManager;
- public MVCommandManager(MultiverseCore plugin) {
+ public MVCommandManager(@NotNull MultiverseCore plugin) {
super(plugin);
this.plugin = plugin;
@@ -26,13 +29,25 @@ public MVCommandManager(MultiverseCore plugin) {
this.locales.loadLanguages();
}
+ /**
+ * Gets class responsible for flag handling.
+ *
+ * @return A not-null {@link CommandFlagsManager}.
+ */
+ public synchronized @NotNull CommandFlagsManager getFlagsManager() {
+ if (this.flagsManager == null) {
+ this.flagsManager = new CommandFlagsManager();
+ }
+ return flagsManager;
+ }
+
/**
* Gets class responsible for parsing string args into objects.
*
* @return A not-null {@link CommandContexts}.
*/
@Override
- public synchronized CommandContexts getCommandContexts() {
+ public synchronized @NotNull CommandContexts getCommandContexts() {
if (this.contexts == null) {
this.contexts = new MVCommandContexts(this);
}
@@ -45,7 +60,7 @@ public synchronized CommandContexts getCommandCon
* @return A not-null {@link CommandCompletions}.
*/
@Override
- public synchronized CommandCompletions getCommandCompletions() {
+ public synchronized @NotNull CommandCompletions getCommandCompletions() {
if (this.completions == null) {
this.completions = new MVCommandCompletions(this);
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java
new file mode 100644
index 000000000..6323244ef
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java
@@ -0,0 +1,93 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a flag.
+ */
+public class CommandFlag {
+ /**
+ * A builder for a flag.
+ *
+ * @param key The key for the new flag.
+ * @return The builder.
+ */
+ public static @NotNull Builder builder(@NotNull String key){
+ return new Builder<>(key);
+ }
+
+ private final String key;
+ private final List aliases;
+
+ /**
+ * Creates a new flag.
+ *
+ * @param builder The builder.
+ */
+ protected CommandFlag(@NotNull Builder builder) {
+ key = builder.key;
+ aliases = builder.aliases;
+ }
+
+ /**
+ * Get the key of this flag.
+ *
+ * @return The key of this flag.
+ */
+ public @NotNull String getKey() {
+ return key;
+ }
+
+ /**
+ * Get the aliases of this flag.
+ *
+ * @return The aliases of this flag.
+ */
+ public @NotNull List getAliases() {
+ return aliases;
+ }
+
+ /**
+ * A builder for a flag.
+ *
+ * @param The type of the builder.
+ */
+ public static class Builder> {
+ private final String key;
+ private final List aliases;
+
+ /**
+ * Create a new builder.
+ *
+ * @param key The key for the new flag.
+ */
+ public Builder(@NotNull String key) {
+ this.key = key;
+ aliases = new ArrayList<>();
+ }
+
+ /**
+ * Add one or more alias to the flag.
+ *
+ * @param alias The alias to add.
+ * @return The builder.
+ */
+ public @NotNull S addAlias(@NotNull String...alias){
+ Collections.addAll(this.aliases, alias);
+ return (S) this;
+ }
+
+ /**
+ * Build the flag.
+ *
+ * @return The flag.
+ */
+ public @NotNull CommandFlag build(){
+ return new CommandFlag(this);
+ }
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java
new file mode 100644
index 000000000..a36d23d78
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java
@@ -0,0 +1,129 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A group of flags.
+ */
+public class CommandFlagGroup {
+ /**
+ * A builder for a flag group.
+ *
+ * @param name The name of the group.
+ * @return The builder.
+ */
+ public static @NotNull Builder builder(@NotNull String name) {
+ return new Builder(name);
+ }
+
+ private final String name;
+ private final List keys;
+ private final Map keysFlagMap;
+
+ /**
+ * Creates a new flag group.
+ *
+ * @param builder The builder.
+ */
+ protected CommandFlagGroup(@NotNull Builder builder) {
+ name = builder.name;
+ keys = builder.keys;
+ keysFlagMap = builder.keysFlagMap;
+ }
+
+ /**
+ * Get the name of this group.
+ *
+ * @return The name of this group.
+ */
+ public @NotNull String getName() {
+ return name;
+ }
+
+ /**
+ * Check if this group contains a flag with the given key. Works with alias keys.
+ *
+ * @param key The key to check.
+ * @return True if the group contains a flag with the given key, false otherwise.
+ */
+ public boolean hasKey(@Nullable String key) {
+ return keysFlagMap.containsKey(key);
+ }
+
+ /**
+ * Get the remaining keys after the given flags have been removed. Works with alias keys.
+ *
+ * @param flags The flags to remove.
+ * @return The remaining keys.
+ */
+ public @NotNull Set getRemainingKeys(@NotNull String[] flags) {
+ Set keysRemaining = new HashSet<>(this.keys);
+ for (String flag : flags) {
+ CommandFlag mvFlag = this.getFlagByKey(flag);
+ if (mvFlag != null) {
+ keysRemaining.remove(mvFlag.getKey());
+ }
+ }
+ return keysRemaining;
+ }
+
+ /**
+ * Get a flag by its key. Alias keys are supported as well.
+ *
+ * @param key The key of the flag.
+ * @return The flag if found, null otherwise.
+ */
+ public @Nullable CommandFlag getFlagByKey(String key) {
+ return keysFlagMap.get(key);
+ }
+
+ /**
+ * A builder for {@link CommandFlagGroup}.
+ */
+ public static class Builder {
+ private final String name;
+ private final List keys;
+ private final Map keysFlagMap;
+
+ /**
+ * Creates a new builder.
+ *
+ * @param name The name of the flag group.
+ */
+ public Builder(@NotNull String name) {
+ this.name = name;
+ this.keys = new ArrayList<>();
+ this.keysFlagMap = new HashMap<>();
+ }
+
+ /**
+ * Adds a flag to the group.
+ *
+ * @param flag The flag to add.
+ * @return The builder.
+ */
+ public @NotNull Builder add(CommandFlag flag) {
+ keys.add(flag.getKey());
+ keysFlagMap.put(flag.getKey(), flag);
+ flag.getAliases().forEach((alias) -> keysFlagMap.put(alias, flag));
+ return this;
+ }
+
+ /**
+ * Builds the flag group.
+ *
+ * @return The flag group.
+ */
+ public @NotNull CommandFlagGroup build() {
+ return new CommandFlagGroup(this);
+ }
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java
new file mode 100644
index 000000000..6c66e4623
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java
@@ -0,0 +1,93 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import co.aikar.commands.InvalidCommandArgument;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Manages all the flag groups and parsing.
+ */
+public class CommandFlagsManager {
+ private final Map flagGroupMap;
+
+ /**
+ * Creates a new FlagsManager.
+ */
+ public CommandFlagsManager() {
+ flagGroupMap = new HashMap<>();
+ }
+
+ /**
+ * Registers a flag group.
+ *
+ * @param flagGroup The target flag group to register.
+ */
+ public void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
+ flagGroupMap.put(flagGroup.getName(), flagGroup);
+ }
+
+ /**
+ * Get a flag group by name.
+ *
+ * @param groupName The target flag group name.
+ * @return The flag group if found, null otherwise.
+ */
+ public @Nullable CommandFlagGroup getFlagGroup(@Nullable String groupName) {
+ return this.flagGroupMap.get(groupName);
+ }
+
+ /**
+ * Autocompletes suggestions for flags.
+ *
+ * @param groupName The target flag group name.
+ * @param flags The current flags so far.
+ * @return The list of suggestions.
+ */
+ public @NotNull Collection suggest(@Nullable String groupName, @NotNull String[] flags) {
+ CommandFlagGroup flagGroup = this.getFlagGroup(groupName);
+ if (flagGroup == null) {
+ return Collections.emptyList();
+ }
+
+ Collection suggestions = new ArrayList<>();
+ CommandFlag currentFlag = (flags.length <= 1) ? null : flagGroup.getFlagByKey(flags[flags.length - 2]);
+
+ if (currentFlag instanceof CommandValueFlag) {
+ CommandValueFlag valueFlag = (CommandValueFlag) currentFlag;
+ if (valueFlag.getCompletion() != null) {
+ suggestions.addAll(valueFlag.getCompletion().get());
+ }
+ if (valueFlag.isOptional()) {
+ suggestions.addAll(flagGroup.getRemainingKeys(flags));
+ }
+ } else {
+ suggestions.addAll(flagGroup.getRemainingKeys(flags));
+ }
+
+ return suggestions;
+ }
+
+ /**
+ * Parses the flags.
+ *
+ * @param groupName The target flag group name.
+ * @param flags The flags to parse.
+ * @return The parsed flags.
+ *
+ * @throws InvalidCommandArgument If the flags are invalid.
+ */
+ public @NotNull ParsedCommandFlags parse(@Nullable String groupName, @NotNull String[] flags) {
+ CommandFlagGroup flagGroup = this.getFlagGroup(groupName);
+ if (flagGroup == null) {
+ return ParsedCommandFlags.EMPTY;
+ }
+
+ return new CommandFlagsParser(this.getFlagGroup(groupName), flags).parse();
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java
new file mode 100644
index 000000000..4c5bde8c2
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java
@@ -0,0 +1,118 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import co.aikar.commands.InvalidCommandArgument;
+
+/**
+ * Parses flags from a string array. Each parser should only be used once.
+ */
+public class CommandFlagsParser {
+ private final CommandFlagGroup flagGroup;
+ private final String[] flags;
+
+ private ParsedCommandFlags parsedFlags;
+ private boolean nextArgMayBeKey;
+ private boolean nextArgMayBeValue;
+ private CommandFlag currentFlag;
+
+ /**
+ * Creates a new CommandFlagsParser.
+ *
+ * @param flagGroup The flag group to parse flags for.
+ * @param flags The flags to parse.
+ */
+ public CommandFlagsParser(CommandFlagGroup flagGroup, String[] flags) {
+ this.flagGroup = flagGroup;
+ this.flags = flags;
+ }
+
+ /**
+ * Parses the flags.
+ *
+ * @return The parsed flags.
+ */
+ public ParsedCommandFlags parse() {
+ parsedFlags = new ParsedCommandFlags();
+
+ // First argument is always a key
+ this.nextArgMayBeKey = true;
+ this.nextArgMayBeValue = false;
+
+ for (String flag : flags) {
+ if (this.nextArgMayBeKey) {
+ if (parseKey(flag)) continue;
+ }
+ if (this.nextArgMayBeValue) {
+ if (parseValue(flag)) continue;
+ }
+ throw new InvalidCommandArgument(flag + " is not a valid flag.");
+ }
+
+ if (!this.nextArgMayBeKey && this.nextArgMayBeValue) {
+ throw new InvalidCommandArgument(currentFlag.getKey() + " requires a value!");
+ }
+
+ return parsedFlags;
+ }
+
+ /**
+ * Parses a key.
+ *
+ * @param flag The flag to parse.
+ * @return True if the flag was parsed as a key, false otherwise.
+ */
+ private boolean parseKey(String flag) {
+ CommandFlag potentialFlag = flagGroup.getFlagByKey(flag);
+ if (potentialFlag == null) {
+ return false;
+ }
+
+ this.currentFlag = potentialFlag;
+
+ if (this.currentFlag instanceof CommandValueFlag) {
+ CommandValueFlag valueFlag = (CommandValueFlag) this.currentFlag;
+
+ if (valueFlag.isOptional()) {
+ parsedFlags.addFlagResult(valueFlag.getKey(), valueFlag.getDefaultValue());
+ this.nextArgMayBeKey = true;
+ this.nextArgMayBeValue = true;
+ return true;
+ }
+
+ this.nextArgMayBeKey = false;
+ this.nextArgMayBeValue = true;
+ return true;
+ }
+
+ parsedFlags.addFlagResult(this.currentFlag.getKey(), null);
+ this.nextArgMayBeKey = true;
+ this.nextArgMayBeValue = false;
+
+ return true;
+ }
+
+ /**
+ * Parses a value.
+ *
+ * @param flag The flag to parse.
+ * @return True if the flag was parsed as a value, false otherwise.
+ */
+ private boolean parseValue(String flag) {
+ if (this.currentFlag == null) {
+ throw new InvalidCommandArgument("Some flag logic error occurred at " + flag + "");
+ }
+ if (flagGroup.hasKey(flag)) {
+ throw new InvalidCommandArgument(currentFlag.getKey() + " requires a value!");
+ }
+
+ Object flagValue;
+ CommandValueFlag valueFlag = (CommandValueFlag) this.currentFlag;
+ flagValue = valueFlag.getContext() != null ? valueFlag.getContext().apply(flag) : flag;
+ parsedFlags.addFlagResult(valueFlag.getKey(), flagValue);
+
+ // After a value, the next argument must be a key
+ this.nextArgMayBeKey = true;
+ this.nextArgMayBeValue = false;
+ this.currentFlag = null;
+ return true;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java
new file mode 100644
index 000000000..bf1a70346
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java
@@ -0,0 +1,172 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents a flag with a value.
+ *
+ * @param The type of the value.
+ */
+public class CommandValueFlag extends CommandFlag {
+ /**
+ * A builder for a flag.
+ *
+ * @param key The key for the new flag.
+ * @param type The type of the value.
+ * @return The builder.
+ */
+ public static @NotNull Builder builder(@NotNull String key, @NotNull Class type) {
+ return new Builder<>(key, type);
+ }
+
+ private final Class type;
+ private final boolean optional;
+ private final T defaultValue;
+ private final Function context;
+ private final Supplier> completion;
+
+ /**
+ * Creates a new flag.
+ *
+ * @param builder The builder.
+ */
+ protected CommandValueFlag(@NotNull Builder builder) {
+ super(builder);
+ type = builder.type;
+ optional = builder.optional;
+ defaultValue = builder.defaultValue;
+ context = builder.context;
+ completion = builder.completion;
+ }
+
+ /**
+ * Get the type of the value.
+ *
+ * @return The type of the value.
+ */
+ public @NotNull Class getType() {
+ return type;
+ }
+
+ /**
+ * Check if it is optional for users to specify a value.
+ *
+ * @return True if the value is optional, false otherwise.
+ */
+ public boolean isOptional() {
+ return optional;
+ }
+
+ /**
+ * Get the default value. May be null.
+ *
+ * @return The default value.
+ */
+ public @Nullable T getDefaultValue() {
+ return defaultValue;
+ }
+
+ /**
+ * Get the context. May be null for {@link String} value type.
+ *
+ * @return The context.
+ */
+ public @Nullable Function getContext() {
+ return context;
+ }
+
+ /**
+ * Get the completion. May be null.
+ *
+ * @return The completion.
+ */
+ public @Nullable Supplier> getCompletion() {
+ return completion;
+ }
+
+ /**
+ * A builder for a flag.
+ *
+ * @param The type of the value.
+ * @param The type of the builder.
+ */
+ public static class Builder> extends CommandFlag.Builder {
+ private final Class type;
+ private boolean optional = false;
+ private T defaultValue = null;
+ private Function context = null;
+ private Supplier> completion = null;
+
+ /**
+ * Create a new builder.
+ *
+ * @param key The key for the new flag.
+ * @param type The type of the value.
+ */
+ public Builder(@NotNull String key, @NotNull Class type) {
+ super(key);
+ this.type = type;
+ }
+
+ /**
+ * Set the flag as optional for users to specify a value.
+ *
+ * @return The builder.
+ */
+ public @NotNull S optional() {
+ this.optional = true;
+ return (S) this;
+ }
+
+ /**
+ * Set the default value. Used if optional is true and user does not specify a value.
+ *
+ * @param defaultValue The default value.
+ * @return The builder.
+ */
+ public @NotNull S defaultValue(@NotNull T defaultValue) {
+ this.defaultValue = defaultValue;
+ return (S) this;
+ }
+
+ /**
+ * Set the context callback for parsing string into value type.
+ *
+ * @param context The context.
+ * @return The builder.
+ */
+ public @NotNull S context(@NotNull Function context) {
+ this.context = context;
+ return (S) this;
+ }
+
+ /**
+ * Set the completion callback for autocomplete.
+ *
+ * @param completion The completion.
+ * @return The builder.
+ */
+ public @NotNull S completion(@NotNull Supplier> completion) {
+ this.completion = completion;
+ return (S) this;
+ }
+
+ /**
+ * Build the flag.
+ *
+ * @return The flag.
+ */
+ @Override
+ public @NotNull CommandFlag build() {
+ if (context == null && !String.class.equals(type)) {
+ throw new IllegalStateException("Context is required for none-string value flags");
+ }
+ return new CommandValueFlag<>(this);
+ }
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java
new file mode 100644
index 000000000..469e917e3
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java
@@ -0,0 +1,52 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Object to contain the results of the flags present and its values.
+ */
+public class ParsedCommandFlags
+{
+ public static final ParsedCommandFlags EMPTY = new ParsedCommandFlags();
+
+ private final Map flagValues;
+
+ public ParsedCommandFlags() {
+ flagValues = new HashMap<>();
+ }
+
+ /**
+ * Add a flag result to the parsed flags.
+ *
+ * @param key The key of the flag.
+ * @param value The value of the flag.
+ */
+ void addFlagResult(@NotNull String key, @Nullable Object value) {
+ flagValues.put(key, value);
+ }
+
+ /**
+ * Check if a flag is present.
+ *
+ * @param key The key of the flag.
+ * @return True if the flag is present, false otherwise.
+ */
+ public boolean hasFlag(@Nullable String key) {
+ return this.flagValues.containsKey(key);
+ }
+
+ /**
+ * Get the value of a flag.
+ *
+ * @param key The key of the flag.
+ * @return The value of the flag, null if flag does not exist or no value.
+ */
+ public @Nullable T flagValue(@Nullable String key, @NotNull Class type) {
+ Object value = this.flagValues.get(key);
+ return (T) value;
+ }
+}
From a8590df9d4b13b125266c7f8c8899c170eb5e426 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Wed, 8 Feb 2023 12:43:59 +0800
Subject: [PATCH 017/725] feat: Implementation of new destination API (#2833)
* feat: Basic implementation of new destination API
* feat!: Move all destinations to new API
* feat: Fully implement teleport and check command
* chore: Improve autocomplete permission checking
* chore: Fine tune tab completion
* chore: Implement suggested changes
* docs: Add javadocs to added api methods
---
.../MultiverseCore/MultiverseCore.java | 41 ++-
.../onarandombox/MultiverseCore/api/Core.java | 8 +-
.../MultiverseCore/api/Destination.java | 56 ++++
.../api/DestinationInstance.java | 45 +++
.../MultiverseCore/api/MVDestination.java | 1 +
.../MultiverseCore/api/SafeTTeleporter.java | 19 +-
.../MultiverseCore/api/Teleporter.java | 16 +-
.../MultiverseCore/commands/CheckCommand.java | 40 +++
.../commands/TeleportCommand.java | 47 ++++
.../commandsold/CheckCommand.java | 58 ----
.../commandsold/TeleportCommand.java | 198 -------------
.../commandtools/MVCommandCompletions.java | 32 ++-
.../commandtools/MVCommandContexts.java | 73 ++++-
.../commandtools/MVCommandManager.java | 4 +-
.../destination/AnchorDestination.java | 148 ----------
.../destination/BedDestination.java | 141 ----------
.../destination/CannonDestination.java | 227 ---------------
.../CustomTeleporterDestination.java | 29 --
.../destination/DestinationFactory.java | 177 ------------
.../destination/DestinationsProvider.java | 208 ++++++++++++++
.../destination/ExactDestination.java | 263 ------------------
.../destination/InvalidDestination.java | 107 -------
.../destination/ParsedDestination.java | 53 ++++
.../destination/PlayerDestination.java | 137 ---------
.../destination/WorldDestination.java | 173 ------------
.../destination/core/AnchorDestination.java | 68 +++++
.../core/AnchorDestinationInstance.java | 56 ++++
.../destination/core/BedDestination.java | 67 +++++
.../core/BedDestinationInstance.java | 60 ++++
.../destination/core/CannonDestination.java | 103 +++++++
.../core/CannonDestinationInstance.java | 65 +++++
.../destination/core/ExactDestination.java | 106 +++++++
.../core/ExactDestinationInstance.java | 54 ++++
.../destination/core/PlayerDestination.java | 65 +++++
.../core/PlayerDestinationInstance.java | 54 ++++
.../destination/core/WorldDestination.java | 81 ++++++
.../core/WorldDestinationInstance.java | 66 +++++
.../MultiverseCore/event/MVTeleportEvent.java | 1 -
.../MultiverseCore/utils/PlayerFinder.java | 30 +-
.../utils/SimpleSafeTTeleporter.java | 70 ++---
40 files changed, 1502 insertions(+), 1745 deletions(-)
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/api/Destination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/CustomTeleporterDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java
create mode 100644 src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index b32d3716e..cfa0cdc70 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -34,8 +34,8 @@
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
import com.onarandombox.MultiverseCore.commands.CreateCommand;
import com.onarandombox.MultiverseCore.commands.DebugCommand;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
import com.onarandombox.MultiverseCore.commandsold.AnchorCommand;
-import com.onarandombox.MultiverseCore.commandsold.CheckCommand;
import com.onarandombox.MultiverseCore.commandsold.CloneCommand;
import com.onarandombox.MultiverseCore.commandsold.ConfigCommand;
import com.onarandombox.MultiverseCore.commandsold.ConfirmCommand;
@@ -63,19 +63,18 @@
import com.onarandombox.MultiverseCore.commandsold.SetSpawnCommand;
import com.onarandombox.MultiverseCore.commandsold.SilentCommand;
import com.onarandombox.MultiverseCore.commandsold.SpawnCommand;
-import com.onarandombox.MultiverseCore.commandsold.TeleportCommand;
import com.onarandombox.MultiverseCore.commandsold.UnloadCommand;
import com.onarandombox.MultiverseCore.commandsold.VersionCommand;
import com.onarandombox.MultiverseCore.commandsold.WhoCommand;
import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
-import com.onarandombox.MultiverseCore.destination.AnchorDestination;
-import com.onarandombox.MultiverseCore.destination.BedDestination;
-import com.onarandombox.MultiverseCore.destination.CannonDestination;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.destination.ExactDestination;
-import com.onarandombox.MultiverseCore.destination.PlayerDestination;
-import com.onarandombox.MultiverseCore.destination.WorldDestination;
+import com.onarandombox.MultiverseCore.destination.core.AnchorDestination;
+import com.onarandombox.MultiverseCore.destination.core.BedDestination;
+import com.onarandombox.MultiverseCore.destination.core.CannonDestination;
+import com.onarandombox.MultiverseCore.destination.core.ExactDestination;
+import com.onarandombox.MultiverseCore.destination.core.PlayerDestination;
+import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
+import com.onarandombox.MultiverseCore.destination.core.WorldDestination;
import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
import com.onarandombox.MultiverseCore.event.MVVersionEvent;
import com.onarandombox.MultiverseCore.listeners.MVChatListener;
@@ -227,7 +226,7 @@ public int getProtocolVersion() {
private MVEconomist economist;
private Buscript buscript;
private int pluginCount;
- private DestinationFactory destFactory;
+ private DestinationsProvider destinationsProvider;
private MultiverseMessaging messaging;
private BlockSafety blockSafety;
private LocationManipulation locationManipulation;
@@ -362,14 +361,13 @@ private void initializeBuscript() {
}
private void initializeDestinationFactory() {
- this.destFactory = new DestinationFactory(this);
- this.destFactory.registerDestinationType(WorldDestination.class, "");
- this.destFactory.registerDestinationType(WorldDestination.class, "w");
- this.destFactory.registerDestinationType(ExactDestination.class, "e");
- this.destFactory.registerDestinationType(PlayerDestination.class, "pl");
- this.destFactory.registerDestinationType(CannonDestination.class, "ca");
- this.destFactory.registerDestinationType(BedDestination.class, "b");
- this.destFactory.registerDestinationType(AnchorDestination.class, "a");
+ this.destinationsProvider = new DestinationsProvider(this);
+ this.destinationsProvider.registerDestination(new AnchorDestination(this));
+ this.destinationsProvider.registerDestination(new BedDestination());
+ this.destinationsProvider.registerDestination(new CannonDestination(this));
+ this.destinationsProvider.registerDestination(new ExactDestination(this));
+ this.destinationsProvider.registerDestination(new PlayerDestination());
+ this.destinationsProvider.registerDestination(new WorldDestination(this));
}
/**
@@ -748,7 +746,6 @@ private void registerCommands() {
this.commandHandler.registerCommand(new ReloadCommand(this));
this.commandHandler.registerCommand(new SetSpawnCommand(this));
this.commandHandler.registerCommand(new CoordCommand(this));
- this.commandHandler.registerCommand(new TeleportCommand(this));
this.commandHandler.registerCommand(new WhoCommand(this));
this.commandHandler.registerCommand(new SpawnCommand(this));
// Dangerous Commands
@@ -771,12 +768,12 @@ private void registerCommands() {
this.commandHandler.registerCommand(new EnvironmentCommand(this));
this.commandHandler.registerCommand(new SilentCommand(this));
this.commandHandler.registerCommand(new GeneratorCommand(this));
- this.commandHandler.registerCommand(new CheckCommand(this));
this.commandHandler.registerCommand(new ScriptCommand(this));
this.commandHandler.registerCommand(new GameruleCommand(this));
this.commandHandler.registerCommand(new GamerulesCommand(this));
//**NEW ACF COMMAND HANDLER**
+ this.commandManager.registerCommand(new TeleportCommand(this));
this.commandManager.registerCommand(new DebugCommand(this));
this.commandManager.registerCommand(new CreateCommand(this));
}
@@ -935,8 +932,8 @@ public void decrementPluginCount() {
* {@inheritDoc}
*/
@Override
- public DestinationFactory getDestFactory() {
- return this.destFactory;
+ public DestinationsProvider getDestinationsProvider() {
+ return this.destinationsProvider;
}
/**
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java
index d1d4e9e87..bb004c92b 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java
@@ -10,7 +10,7 @@
import buscript.Buscript;
import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
+import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
import com.onarandombox.MultiverseCore.utils.AnchorManager;
import com.onarandombox.MultiverseCore.utils.MVEconomist;
import com.onarandombox.MultiverseCore.utils.MVPermissions;
@@ -106,12 +106,12 @@ public interface Core {
CommandQueueManager getCommandQueueManager();
/**
- * Gets the factory class responsible for loading many different destinations
+ * Gets the class responsible for loading many different destinations
* on demand.
*
- * @return A valid {@link DestinationFactory}.
+ * @return A valid {@link DestinationsProvider}.
*/
- DestinationFactory getDestFactory();
+ DestinationsProvider getDestinationsProvider();
/**
* Gets the primary class responsible for managing Multiverse Worlds.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Destination.java b/src/main/java/com/onarandombox/MultiverseCore/api/Destination.java
new file mode 100644
index 000000000..7b15af66d
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/Destination.java
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Destination {
+ /**
+ * Returns the identifier or prefix that is required for this destination.
+ *
+ * Portals have a prefix of "p" for example and OpenWarp (third party plugin) uses "ow". This is derived from a
+ * hash and cannot have duplicate values. Read that as your plugin cannot use 'p' because it's already used.
+ * Please check the wiki when adding a custom destination!
+ *
+ * @return The identifier or prefix that is required for this destination.
+ */
+ @NotNull String getIdentifier();
+
+ /**
+ * Returns the destination instance for the given destination parameters.
+ *
+ * @param destinationParams The destination parameters. ex: p:MyPortal:nw
+ * @return The destination instance, or null if the destination parameters are invalid.
+ */
+ @Nullable T getDestinationInstance(@Nullable String destinationParams);
+
+ /**
+ * Returns a list of possible destinations for the given destination parameters.
+ *
+ * @param issuer The command issuer.
+ * @param destinationParams The destination parameters. ex: p:MyPortal:nw
+ * @return A list of possible destinations.
+ */
+ @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams);
+
+ /**
+ * Should the Multiverse SafeTeleporter be used?
+ *
+ * If not, MV will blindly take people to the location specified.
+ *
+ * @return True if the SafeTeleporter will be used, false if not.
+ */
+ boolean checkTeleportSafety();
+
+ /**
+ * Returns the teleporter to use for this destination.
+ *
+ * By default, Multiverse will automatically use SafeTeleporter. If you want to use a different teleporter, you can
+ * override this method.
+ *
+ * @return The custom teleporter to use for this destination. Return null to use the default teleporter.
+ */
+ @Nullable Teleporter getTeleporter();
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java
new file mode 100644
index 000000000..485f81058
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java
@@ -0,0 +1,45 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface DestinationInstance {
+ /**
+ * Gets the exact location to teleport an entity to.
+ *
+ * @param teleportee The entity to teleport.
+ * @return The location to teleport to.
+ */
+ @Nullable Location getLocation(@NotNull Entity teleportee);
+
+ /**
+ * Gets the velocity to apply to an entity after teleporting.
+ *
+ * @param teleportee The entity to teleport.
+ * @return A vector representing the speed/direction the player should travel when arriving at the destination.
+ */
+ @Nullable Vector getVelocity(@NotNull Entity teleportee);
+
+ /**
+ * Gets the permission suffix to check for when teleporting to this destination.
+ * This is used for finer per world/player permissions, such as "multiverse.teleport.self.worldname".
+ *
+ * For example, if the destination is "w:world", the permission suffix is "world".
+ *
+ * @return The permission suffix.
+ */
+ @Nullable String getFinerPermissionSuffix();
+
+ /**
+ * Serialises the destination instance to a savable string.
+ *
+ * This is used when plugins save destinations to configuration,
+ * and when the destination is displayed to the user.
+ *
+ * @return The serialised destination instance.
+ */
+ @NotNull String serialise();
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java
index c4e64de8a..6cafabb43 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java
@@ -16,6 +16,7 @@
* A destination API for Multiverse
* Any plugin can add these to MV and when they are, any action that uses them (portals, MVTP, etc.) can use them!
*/
+@Deprecated
public interface MVDestination {
/**
* Returns the identifier or prefix that is required for this destination.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java b/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java
index c6e7e76bf..90740a0d7 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java
@@ -1,11 +1,12 @@
package com.onarandombox.MultiverseCore.api;
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
-import com.onarandombox.MultiverseCore.enums.TeleportResult;
-
/**
* Used to safely teleport people.
*/
@@ -31,12 +32,12 @@ public interface SafeTTeleporter extends Teleporter {
* Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
* it's not, will adjust the final destination accordingly.
*
- * @param teleporter Person who performed the teleport command.
- * @param teleportee Entity to teleport
- * @param d Destination to teleport them to
+ * @param teleporter Person who performed the teleport command.
+ * @param teleportee Entity to teleport
+ * @param destination Destination to teleport them to
* @return true for success, false for failure
*/
- TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
+ TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination destination);
/**
* Safely teleport the entity to the Location. This may perform checks to
@@ -55,11 +56,11 @@ TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Locat
/**
* Returns a safe location for the entity to spawn at.
*
- * @param e The entity to spawn
- * @param d The MVDestination to take the entity to.
+ * @param entity The entity to spawn
+ * @param destination The MVDestination to take the entity to.
* @return A new location to spawn the entity at.
*/
- Location getSafeLocation(Entity e, MVDestination d);
+ Location getSafeLocation(Entity entity, DestinationInstance destination);
/**
* Finds a portal-block next to the specified {@link Location}.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java b/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java
index aead219cd..9dea1323b 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java
@@ -1,10 +1,18 @@
package com.onarandombox.MultiverseCore.api;
-import com.onarandombox.MultiverseCore.api.MVDestination;
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
import com.onarandombox.MultiverseCore.enums.TeleportResult;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Entity;
public interface Teleporter {
- TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
+ /**
+ * Teleport the entity to the Multiverse Destination.
+ *
+ * @param teleporter Person who performed the teleport command.
+ * @param teleportee Entity to teleport
+ * @param destination Destination to teleport them to
+ * @return true for success, false for failure
+ */
+ TeleportResult teleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination destination);
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java
new file mode 100644
index 000000000..347b1f837
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java
@@ -0,0 +1,40 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class CheckCommand extends MultiverseCommand {
+ protected CheckCommand(@NotNull MultiverseCore plugin) {
+ super(plugin);
+ }
+
+ @Subcommand("check")
+ @CommandPermission("multiverse.core.check")
+ @CommandCompletion("@players @destinations|@mvworlds")
+ @Syntax(" ")
+ @Description("Checks if a player can teleport to a destination.")
+ public void onCheckCommand(CommandIssuer issuer,
+
+ @Syntax("")
+ @Description("Player to check destination on.")
+ Player player,
+
+ @Syntax("")
+ @Description("A destination location, e.g. a world name.")
+ ParsedDestination destination
+ ) {
+ issuer.sendMessage("Checking " + player + " to " + destination + "...");
+ //TODO More detailed output on permissions required.
+ this.plugin.getDestinationsProvider().checkTeleportPermissions(issuer, player, destination);
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
new file mode 100644
index 000000000..9629d6ea3
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
@@ -0,0 +1,47 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class TeleportCommand extends MultiverseCommand {
+ public TeleportCommand(MultiverseCore plugin) {
+ super(plugin);
+ }
+
+ @Subcommand("teleport|tp")
+ @Syntax("[player] ")
+ @CommandCompletion("@players|@mvworlds:playeronly|@destinations:playeronly @mvworlds|@destinations")
+ @Description("Allows you to the teleport to a location on your server!")
+ public void onTeleportCommand(@NotNull CommandIssuer issuer,
+
+ @Flags("resolve=issueraware")
+ @Syntax("[player]")
+ @Description("Target player to teleport.")
+ Player player,
+
+ @Syntax("")
+ @Description("Location, can be a world name.")
+ ParsedDestination destination
+ ) {
+ issuer.sendMessage("Teleporting "
+ + (((BukkitCommandIssuer) issuer).getPlayer() == player ? "you" : player.getName())
+ + " to " + destination + "...");
+ this.plugin.getDestinationsProvider().playerTeleport((BukkitCommandIssuer) issuer, player, destination);
+ }
+
+ @Override
+ public boolean hasPermission(CommandIssuer issuer) {
+ return this.plugin.getDestinationsProvider().hasAnyTeleportPermission(issuer);
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java
deleted file mode 100644
index 519dfa21a..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandsold;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-/**
- * Checks to see if a player can go to a destination.
- */
-public class CheckCommand extends MultiverseCommand {
-
- public CheckCommand(MultiverseCore plugin) {
- super(plugin);
- this.setName("Help you validate your multiverse settings");
- this.setCommandUsage("/mv check " + ChatColor.GREEN + "{PLAYER} {DESTINATION}");
- this.setArgRange(2, 2);
- this.addKey("mv check");
- this.addKey("mvcheck");
- this.addCommandExample("/mv check " + ChatColor.GREEN + "fernferret " + ChatColor.LIGHT_PURPLE + "w:MyWorld");
- this.addCommandExample("/mv check " + ChatColor.GREEN + "Rigby90 " + ChatColor.LIGHT_PURPLE + "p:MyPortal");
- this.addCommandExample("/mv check " + ChatColor.GREEN + "lithium3141 " + ChatColor.LIGHT_PURPLE + "ow:WarpName");
- this.setPermission("multiverse.core.debug", "Checks to see if a player can go to a destination. Prints debug if false.", PermissionDefault.OP);
- }
-
- @Override
- public void runCommand(CommandSender sender, List args) {
- Player p = PlayerFinder.get(args.get(0), sender);
- if (p == null) {
- sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
- sender.sendMessage("Are they online?");
- return;
- }
- MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
- if (dest instanceof InvalidDestination) {
- sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
- args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
- sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
- return;
- }
-
- MVPermissions perms = this.plugin.getMVPerms();
- perms.tellMeWhyICantDoThis(sender, p, dest);
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java
deleted file mode 100644
index 15571fd48..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandsold;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.Teleporter;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
-import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.destination.WorldDestination;
-import com.onarandombox.MultiverseCore.enums.TeleportResult;
-import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Used to teleport players.
- */
-public class TeleportCommand extends MultiverseCommand {
- private SafeTTeleporter playerTeleporter;
-
- public TeleportCommand(MultiverseCore plugin) {
- super(plugin);
- Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);
-
- this.setName("Teleport");
- this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
- this.setArgRange(1, 2);
- this.addKey("mvtp");
- this.addKey("mv tp");
- this.playerTeleporter = this.plugin.getSafeTTeleporter();
- this.setPermission(menu);
- }
-
- private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 15;
-
- @Override
- public void runCommand(CommandSender sender, List args) {
- CommandSender teleporter = sender;
- Player teleportee = null;
-
- String destinationName;
-
- if (args.size() == 2) {
- teleportee = PlayerFinder.get(args.get(0), sender);
- if (teleportee == null) {
- this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
- ChatColor.GOLD, args.get(0)), false);
- return;
- }
- destinationName = args.get(1);
-
- } else {
- destinationName = args.get(0);
- if (!(sender instanceof Player)) {
- this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
- return;
- }
- teleportee = (Player) sender;
- }
-
- DestinationFactory df = this.plugin.getDestFactory();
- MVDestination d = df.getPlayerAwareDestination(teleportee, destinationName);
-
- MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
- this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
- if (teleportEvent.isCancelled()) {
- Logging.fine("Someone else cancelled the MVTeleport Event!!!");
- return;
- }
-
- if (d != null && d instanceof InvalidDestination) {
- this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
- ChatColor.RED, destinationName), false);
- return;
- }
-
- if (!this.checkSendPermissions(teleporter, teleportee, d)) {
- return;
- }
-
- if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
- if (teleportee.equals(teleporter)) {
- teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
- } else {
- teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD
- + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
- }
- return;
- } else if (teleporter != null && !this.plugin.getMVPerms().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
- if (teleportee.equals(teleporter)) {
- this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like you can get to %s%s %sfrom where you are...",
- ChatColor.GREEN, d.toString(), ChatColor.WHITE), false);
- } else {
- this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
- ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED), false);
- }
- return;
- }
-
- // Special check to verify if players are tryint to teleport to the same
- // WORLDDestination as the world they're in, that they ALSO have multiverse.core.spawn.self
-
- if (d instanceof WorldDestination) {
- World w = d.getLocation(teleportee).getWorld();
- if (teleportee.getWorld().equals(w)) {
- if (teleporter.equals(teleportee)) {
- if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
- this.messaging.sendMessages(teleporter, new String[]{
- String.format("Sorry you don't have permission to go to the world spawn!"),
- String.format("%s (multiverse.core.spawn.self)",
- ChatColor.RED) }, false);
- return;
- }
- } else {
- if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
- this.messaging.sendMessages(teleporter, new String[]{
- String.format("Sorry you don't have permission to send %s to the world spawn!",
- teleportee.getDisplayName()),
- String.format("%s (multiverse.core.spawn.other)",
- ChatColor.RED) }, false);
- return;
- }
- }
- }
- }
-
- if (d.getLocation(teleportee) == null) {
- this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
- return;
- }
- Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
- ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
- TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
- if (result == TeleportResult.FAIL_UNSAFE) {
- Logging.fine("Could not teleport " + teleportee.getName()
- + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-
- String player = "you";
- if (!teleportee.equals(teleporter)) {
- player = teleportee.getName();
- }
-
- this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
- sender,
- doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
- String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
- ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
- UNSAFE_TELEPORT_EXPIRE_DELAY
- ));
- }
- // else: Player was teleported successfully (or the tp event was fired I should say)
- }
-
- private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
- return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
- }
-
- private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
- if (teleporter.equals(teleportee)) {
- if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
- this.messaging.sendMessages(teleporter, new String[]{
- String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination",
- ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE),
- String.format("%s (multiverse.teleport.self.%s)",
- ChatColor.RED, destination.getIdentifier()) }, false);
- return false;
- }
- } else {
- if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
- this.messaging.sendMessages(teleporter, new String[]{
- String.format("You don't have permission to teleport another player to a %s%s Destination.",
- ChatColor.GREEN, destination.getType()),
- String.format("%s(multiverse.teleport.other.%s)",
- ChatColor.RED, destination.getIdentifier()) }, false);
- return false;
- }
- }
- return true;
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
index 72faa7ada..8ce23113e 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java
@@ -1,24 +1,52 @@
package com.onarandombox.MultiverseCore.commandtools;
import java.util.Collection;
+import java.util.Collections;
+import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandCompletionContext;
+import co.aikar.commands.BukkitCommandIssuer;
import co.aikar.commands.PaperCommandCompletions;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import org.jetbrains.annotations.NotNull;
public class MVCommandCompletions extends PaperCommandCompletions {
protected final MVCommandManager commandManager;
+ private final MultiverseCore plugin;
- public MVCommandCompletions(MVCommandManager mvCommandManager) {
+ public MVCommandCompletions(MVCommandManager mvCommandManager, MultiverseCore plugin) {
super(mvCommandManager);
this.commandManager = mvCommandManager;
+ this.plugin = plugin;
+ registerAsyncCompletion("destinations", this::suggestDestinations);
registerAsyncCompletion("flags", this::suggestFlags);
+ registerAsyncCompletion("mvworlds", this::suggestMVWorlds);
+ }
+
+ private Collection suggestDestinations(BukkitCommandCompletionContext context) {
+ if (context.hasConfig("playeronly") && !context.getIssuer().isPlayer()) {
+ return Collections.emptyList();
+ }
+
+ return this.plugin.getDestinationsProvider()
+ .suggestDestinations((BukkitCommandIssuer)context.getIssuer(), context.getInput());
}
- @NotNull
private Collection suggestFlags(@NotNull BukkitCommandCompletionContext context) {
return this.commandManager.getFlagsManager().suggest(
context.getConfig("groupName", ""), context.getContextValue(String[].class));
}
+
+ private Collection suggestMVWorlds(BukkitCommandCompletionContext context) {
+ if (context.hasConfig("playeronly") && !context.getIssuer().isPlayer()) {
+ return Collections.emptyList();
+ }
+
+ return this.plugin.getMVWorldManager().getMVWorlds()
+ .stream()
+ .map(MultiverseWorld::getName)
+ .collect(Collectors.toList());
+ }
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java
index 0ed2ac902..c5560c5b9 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java
@@ -1,9 +1,80 @@
package com.onarandombox.MultiverseCore.commandtools;
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.InvalidCommandArgument;
import co.aikar.commands.PaperCommandContexts;
+import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.entity.Player;
public class MVCommandContexts extends PaperCommandContexts {
- public MVCommandContexts(MVCommandManager mvCommandManager) {
+ private final MultiverseCore plugin;
+
+ public MVCommandContexts(MVCommandManager mvCommandManager, MultiverseCore plugin) {
super(mvCommandManager);
+ this.plugin = plugin;
+
+ registerContext(ParsedDestination.class, this::parseDestination);
+ registerIssuerAwareContext(Player.class, this::parsePlayer);
+ }
+
+ private ParsedDestination parseDestination(BukkitCommandExecutionContext context) {
+ String destination = context.popFirstArg();
+ if (Strings.isNullOrEmpty(destination)) {
+ throw new InvalidCommandArgument("No destination specified.");
+ }
+
+ ParsedDestination parsedDestination = plugin.getDestinationsProvider().parseDestination(destination);
+ if (parsedDestination == null) {
+ throw new InvalidCommandArgument("The destination " + destination + " is not valid.");
+ }
+
+ return parsedDestination;
+ }
+
+ private Player parsePlayer(BukkitCommandExecutionContext context) {
+ String resolve = context.getFlagValue("resolve", "");
+
+ // Get player based on sender only
+ if (resolve.equals("issueronly")) {
+ if (context.getIssuer().isPlayer()) {
+ return context.getIssuer().getPlayer();
+ }
+ if (context.isOptional()) {
+ return null;
+ }
+ throw new InvalidCommandArgument("This command can only be used by a player.");
+ }
+
+ String playerIdentifier = context.getFirstArg();
+ Player player = PlayerFinder.get(playerIdentifier, context.getSender());
+
+ // Get player based on input, fallback to sender if input is not a player
+ if (resolve.equals("issueraware")) {
+ if (player != null) {
+ context.popFirstArg();
+ return player;
+ }
+ if (context.getIssuer().isPlayer()) {
+ return context.getIssuer().getPlayer();
+ }
+ if (context.isOptional()) {
+ return null;
+ }
+ throw new InvalidCommandArgument("Invalid player: " + playerIdentifier
+ + ". Either specify an online player or use this command as a player.");
+ }
+
+ // Get player based on input only
+ if (player != null) {
+ context.popFirstArg();
+ return player;
+ }
+ if (!context.isOptional()) {
+ return null;
+ }
+ throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
}
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
index 0522c6c3a..06db2a4aa 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java
@@ -49,7 +49,7 @@ public MVCommandManager(@NotNull MultiverseCore plugin) {
@Override
public synchronized @NotNull CommandContexts getCommandContexts() {
if (this.contexts == null) {
- this.contexts = new MVCommandContexts(this);
+ this.contexts = new MVCommandContexts(this, plugin);
}
return this.contexts;
}
@@ -62,7 +62,7 @@ public MVCommandManager(@NotNull MultiverseCore plugin) {
@Override
public synchronized @NotNull CommandCompletions getCommandCompletions() {
if (this.completions == null) {
- this.completions = new MVCommandCompletions(this);
+ this.completions = new MVCommandCompletions(this, plugin);
}
return this.completions;
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java
deleted file mode 100644
index 0efea0173..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * An anchor-{@link MVDestination}.
- */
-public class AnchorDestination implements MVDestination {
- private boolean isValid;
- private Location location;
- private MultiverseCore plugin;
- private String name;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "a";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector(0, 0, 0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return false;
- }
- this.plugin = (MultiverseCore) plugin;
- List parsed = Arrays.asList(destination.split(":"));
- // Need at least: a:name
- if (!(parsed.size() == 2)) {
- return false;
- }
- // If it's not an Anchor type
- return parsed.get(0).equalsIgnoreCase("a");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- return this.location;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return;
- }
- this.plugin = (MultiverseCore) plugin;
- List parsed = Arrays.asList(destination.split(":"));
- // Need at least: e:world:x,y,z
- // OR e:world:x,y,z:pitch:yaw
- // so basically 3 or 5
- if (!(parsed.size() == 2)) {
- this.isValid = false;
- return;
- }
- this.name = parsed.get(1);
- this.location = this.plugin.getAnchorManager().getAnchorLocation(parsed.get(1));
- if (this.location == null) {
- this.isValid = false;
- return;
- }
- if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
- this.isValid = false;
- }
- this.isValid = true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "Anchor";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return "Anchor: " + this.name;
- }
-
- @Override
- public String toString() {
- if (isValid) {
- return "a:" + this.name;
- }
- return "i:Invalid Destination";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- return "multiverse.access." + this.location.getWorld().getName();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- // This is an ANCHOR destination, don't safely teleport here.
- return false;
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java
deleted file mode 100644
index 19b6ad0aa..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-/**
- * A bed-{@link MVDestination}.
- */
-public class BedDestination implements MVDestination {
- public static final String OWN_BED_STRING = "playerbed";
- private String playername = "";
- private boolean isValid;
- private Location knownBedLoc;
- private MultiverseCore plugin;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "b";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- String[] split = destination.split(":");
- boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
-
- OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
- boolean validPlayer = p.getName() != null && !p.getName().equals(OWN_BED_STRING);
-
- if (validFormat && validPlayer) this.playername = p.getName();
-
- this.isValid = destination.equals("b:" + OWN_BED_STRING) || (validFormat && validPlayer);
-
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity entity) {
- if (entity instanceof Player) {
- if (this.playername.isEmpty())
- this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
- else
- this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(Bukkit.getOfflinePlayer(this.playername).getBedSpawnLocation());
-
- if (this.knownBedLoc == null) {
- ((Player) entity).sendMessage("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
- }
- return this.knownBedLoc;
- }
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- this.plugin = (MultiverseCore) plugin;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "Bed";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return "Bed";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- if (knownBedLoc != null) {
- return "multiverse.access." + knownBedLoc.getWorld().getName();
- }
- return "";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- // Bukkit should have already checked this.
- return false;
- }
-
- @Override
- public String toString() {
- return "b:" + (playername.isEmpty() ? OWN_BED_STRING : playername);
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java
deleted file mode 100644
index e26acec32..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A cannon-{@link MVDestination}.
- */
-public class CannonDestination implements MVDestination {
- private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
- private boolean isValid;
- private Location location;
- private double speed;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- double pitchRadians = Math.toRadians(location.getPitch());
- double yawRadians = Math.toRadians(location.getYaw());
- double x = Math.sin(yawRadians) * speed * -1;
- double y = Math.sin(pitchRadians) * speed * -1;
- double z = Math.cos(yawRadians) * speed;
- // Account for the angle they were pointed, and take away velocity
- x = Math.cos(pitchRadians) * x;
- z = Math.cos(pitchRadians) * z;
- return new Vector(x, y, z);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "ca";
- }
-
- // NEED ca:world:x,y,z:pitch:yaw:speed
- // so basically 6
- private static final int SPLIT_SIZE = 6;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return false;
- }
- List parsed = Arrays.asList(destination.split(":"));
- if (parsed.size() != SPLIT_SIZE) {
- return false;
- }
- // If it's not an Cannon type
- if (!parsed.get(0).equalsIgnoreCase("ca")) {
- return false;
- }
-
- // If it's not a MV world
- if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
- return false;
- }
- // Verify X,Y,Z are numbers
- if (!parsed.get(2).matches(coordRegex)) {
- return false;
- }
-
- try {
- // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- Float.parseFloat(parsed.get(3));
- Float.parseFloat(parsed.get(4));
- Float.parseFloat(parsed.get(5));
- // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- } catch (NumberFormatException e) {
- return false;
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- return this.location;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return;
- }
- List parsed = Arrays.asList(destination.split(":"));
-
- if (parsed.size() != SPLIT_SIZE) {
- this.isValid = false;
- return;
- }
- if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
- this.isValid = false;
- return;
- }
-
- if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
- this.isValid = false;
- return;
- }
-
- this.location = new Location(((MultiverseCore) plugin).getMVWorldManager().getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
-
- if (!parsed.get(2).matches(this.coordRegex)) {
- this.isValid = false;
- return;
- }
- double[] coords = new double[3];
- String[] coordString = parsed.get(2).split(",");
- for (int i = 0; i < 3; i++) {
- try {
- coords[i] = Double.parseDouble(coordString[i]);
- } catch (NumberFormatException e) {
- this.isValid = false;
- return;
- }
- }
- this.location.setX(coords[0]);
- this.location.setY(coords[1]);
- this.location.setZ(coords[2]);
-
- try {
- // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- this.location.setPitch(Float.parseFloat(parsed.get(3)));
- this.location.setYaw(Float.parseFloat(parsed.get(4)));
- this.speed = Math.abs(Float.parseFloat(parsed.get(5)));
- // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
- } catch (NumberFormatException e) {
- this.isValid = false;
- return;
- }
-
- this.isValid = true;
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "Cannon!";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return "Cannon (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":"
- + this.location.getPitch() + ":" + this.location.getYaw() + ":" + this.speed + ")";
-
- }
-
- /**
- * Sets this {@link CannonDestination}.
- *
- * @param location The {@link Location}.
- * @param speed The speed.
- */
- public void setDestination(Location location, double speed) {
- if (location != null) {
- this.location = location;
- this.speed = Math.abs(speed);
- this.isValid = true;
- }
- this.isValid = false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- return "multiverse.access." + this.location.getWorld().getName();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- return false;
- }
-
- @Override
- public String toString() {
- if (isValid) {
- return "ca:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
- + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
- }
- return "i:Invalid Destination";
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/CustomTeleporterDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/CustomTeleporterDestination.java
deleted file mode 100644
index 858c3e342..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/CustomTeleporterDestination.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.api.Teleporter;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.util.Vector;
-
-public abstract class CustomTeleporterDestination implements MVDestination {
- @Override
- public final Location getLocation(final Entity entity) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public final Vector getVelocity() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public final boolean useSafeTeleporter() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public abstract String toString();
-
- public abstract Teleporter getTeleporter();
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java
deleted file mode 100644
index 7f00248c9..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandsold.TeleportCommand;
-import com.onarandombox.MultiverseCore.utils.PermissionTools;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
-import com.pneumaticraft.commandhandler.Command;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * A factory class that will create destinations from specific strings.
- */
-public class DestinationFactory {
-
- private static final Pattern CANNON_PATTERN = Pattern.compile("(?i)cannon-[\\d]+(\\.[\\d]+)?");
-
- private MultiverseCore plugin;
- private Map> destList;
- private Command teleportCommand;
-
- public DestinationFactory(MultiverseCore plugin) {
- this.plugin = plugin;
- this.destList = new HashMap>();
- List cmds = this.plugin.getCommandHandler().getAllCommands();
- for (Command c : cmds) {
- if (c instanceof TeleportCommand) {
- this.teleportCommand = c;
- }
- }
- }
-
- /**
- * Parse a destination that has relation to sender, such as a cannon or player destination.
- *
- * @param teleportee The player that is going to be teleported.
- * @param destinationName The destination to parse.
- * @return A non-null MVDestination
- */
- @NotNull
- public MVDestination getPlayerAwareDestination(@NotNull Player teleportee,
- @NotNull String destinationName) {
-
- // Prioritise world, in the event that a world is named after a player online.
- if (Bukkit.getWorld(destinationName) != null) {
- return getDestination(destinationName);
- }
-
- Player targetPlayer = PlayerFinder.get(destinationName, teleportee);
- if (targetPlayer != null) {
- return getDestination("pl:" + targetPlayer.getName());
- }
-
- if (CANNON_PATTERN.matcher(destinationName).matches()) {
- return getDestination(parseCannonDest(teleportee, destinationName));
- }
-
- return getDestination(destinationName);
- }
-
- /**
- * Parses a cannon destination.
- *
- * @param teleportee The player that is going to be teleported.
- * @param destinationName The destination to parse.
- * @return A destination string.
- */
- @NotNull
- private String parseCannonDest(@NotNull Player teleportee,
- @NotNull String destinationName) {
-
- String[] cannonSpeed = destinationName.split("-");
- try {
- double speed = Double.parseDouble(cannonSpeed[1]);
- destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
- + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
- + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
- }
- catch (Exception e) {
- destinationName = "i:invalid";
- }
-
- return destinationName;
- }
-
- /**
- * Gets a new destination from a string.
- * Returns a new InvalidDestination if the string could not be parsed.
- *
- * @param destination The destination in string format.
- *
- * @return A non-null MVDestination
- */
- public MVDestination getDestination(String destination) {
- String idenChar = "";
- if (destination.split(":").length > 1) {
- idenChar = destination.split(":")[0];
- }
-
- if (this.destList.containsKey(idenChar)) {
- Class myClass = this.destList.get(idenChar);
- try {
- MVDestination mydest = myClass.newInstance();
- if (!mydest.isThisType(this.plugin, destination)) {
- return new InvalidDestination();
- }
- mydest.setDestination(this.plugin, destination);
- return mydest;
- } catch (InstantiationException e) {
- } catch (IllegalAccessException e) {
- }
- }
- return new InvalidDestination();
- }
-
- /**
- * Registers a {@link MVDestination}.
- *
- * @param c The {@link Class} of the {@link MVDestination} to register.
- * @param identifier The {@link String}-identifier.
- * @return True if the class was successfully registered.
- */
- public boolean registerDestinationType(Class c, String identifier) {
- if (this.destList.containsKey(identifier)) {
- return false;
- }
- this.destList.put(identifier, c);
- // Special case for world defaults:
- if (identifier.equals("")) {
- identifier = "w";
- }
- Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self." + identifier);
- Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other." + identifier);
- PermissionTools pt = new PermissionTools(this.plugin);
- if (self == null) {
- self = new Permission("multiverse.teleport.self." + identifier,
- "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP);
- this.plugin.getServer().getPluginManager().addPermission(self);
- pt.addToParentPerms("multiverse.teleport.self." + identifier);
- }
- if (other == null) {
- other = new Permission("multiverse.teleport.other." + identifier,
- "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP);
- this.plugin.getServer().getPluginManager().addPermission(other);
- pt.addToParentPerms("multiverse.teleport.other." + identifier);
- }
- this.teleportCommand.addAdditonalPermission(self);
- this.teleportCommand.addAdditonalPermission(other);
- return true;
- }
-
- /**
- * Gets all the {@link MVDestination} identifiers registered.
- *
- * @return A collection of destination identifiers.
- */
- public Collection getRegisteredIdentifiers() {
- return this.destList.keySet();
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java
new file mode 100644
index 000000000..6e4d3b2b9
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java
@@ -0,0 +1,208 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.CommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.plugin.PluginManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Provides destinations for teleportation.
+ */
+public class DestinationsProvider {
+ private static final String SEPARATOR = ":";
+ private static final String PERMISSION_PREFIX = "multiverse.teleport.";
+
+ private final MultiverseCore plugin;
+ private final Map> destinationMap;
+
+ /**
+ * Creates a new destinations provider.
+ *
+ * @param plugin The plugin.
+ */
+ public DestinationsProvider(@NotNull MultiverseCore plugin) {
+ this.plugin = plugin;
+ this.destinationMap = new HashMap<>();
+ }
+
+ /**
+ * Adds a destination to the provider.
+ *
+ * @param destination The destination.
+ */
+ public void registerDestination(@NotNull Destination destination) {
+ this.destinationMap.put(destination.getIdentifier(), destination);
+ this.registerDestinationPerms(destination);
+ }
+
+ private void registerDestinationPerms(@NotNull Destination destination) {
+ PluginManager pluginManager = this.plugin.getServer().getPluginManager();
+ pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "self." + destination.getIdentifier()));
+ pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "other." + destination.getIdentifier()));
+ }
+
+ /**
+ * Suggest tab completions for a destination string.
+ *
+ * @param issuer The command issuer.
+ * @param deststring The current destination string.
+ * @return A collection of tab completions.
+ */
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer,
+ @Nullable String deststring
+ ) {
+ return destinationMap.values().stream()
+ .filter(destination -> issuer.hasPermission(PERMISSION_PREFIX + "self." + destination.getIdentifier())
+ || issuer.hasPermission(PERMISSION_PREFIX + "other." + destination.getIdentifier()))
+ .map(destination -> destination.suggestDestinations(issuer, deststring).stream()
+ .map(s -> destination.getIdentifier() + SEPARATOR + s)
+ .collect(Collectors.toList()))
+ .flatMap(Collection::stream)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Converts a destination string to a destination object.
+ *
+ * @param destinationString The destination string.
+ * @return The destination object, or null if invalid format.
+ */
+ public ParsedDestination parseDestination(String destinationString) {
+ String[] items = destinationString.split(SEPARATOR, 2);
+
+ String idString = items[0];
+ String destinationParams;
+ Destination destination;
+
+ if (items.length < 2) {
+ // Assume world destination
+ destination = this.getDestinationById("w");
+ destinationParams = items[0];
+ } else {
+ destination = this.getDestinationById(idString);
+ destinationParams = items[1];
+ }
+
+ if (destination == null) {
+ return null;
+ }
+
+ DestinationInstance destinationInstance = destination.getDestinationInstance(destinationParams);
+ if (destinationInstance == null) {
+ return null;
+ }
+
+ return new ParsedDestination<>(destination, destinationInstance);
+ }
+
+ /**
+ * Gets a destination by its identifier.
+ *
+ * @param identifier The identifier.
+ * @return The destination, or null if not found.
+ */
+ public @Nullable Destination getDestinationById(@Nullable String identifier) {
+ return this.destinationMap.get(identifier);
+ }
+
+ /**
+ * Teleports the teleportee to the destination.
+ *
+ * @param teleporter The teleporter.
+ * @param teleportee The teleportee.
+ * @param destination The destination.
+ */
+ public void playerTeleport(@NotNull BukkitCommandIssuer teleporter,
+ @NotNull Player teleportee,
+ @NotNull ParsedDestination destination
+ ) {
+ if (!checkTeleportPermissions(teleporter, teleportee, destination)) {
+ return;
+ }
+ teleport(teleporter, teleportee, destination);
+ }
+
+ /**
+ * Teleports the teleportee to the destination.
+ *
+ * @param teleporter The teleporter.
+ * @param teleportee The teleportee.
+ * @param destination The destination.
+ */
+ public void teleport(@NotNull BukkitCommandIssuer teleporter,
+ @NotNull Entity teleportee,
+ @NotNull ParsedDestination destination
+ ) {
+ Teleporter teleportHandler = destination.getDestination().getTeleporter();
+ if (teleportHandler == null) {
+ teleportHandler = this.plugin.getSafeTTeleporter();
+ }
+ teleportHandler.teleport(teleporter, teleportee, destination);
+ }
+
+ /**
+ * Checks if the teleporter has permission to teleport the teleportee to the destination.
+ *
+ * @param teleporter The teleporter.
+ * @param teleportee The teleportee.
+ * @param destination The destination.
+ * @return True if the teleporter has permission, false otherwise.
+ */
+ public boolean checkTeleportPermissions(CommandIssuer teleporter, Entity teleportee, ParsedDestination destination) {
+ //TODO Move permission checking to a separate class
+ String permission = PERMISSION_PREFIX
+ + (teleportee.equals(teleporter.getIssuer()) ? "self" : "other") + "."
+ + destination.getDestination().getIdentifier();
+ if (!teleporter.hasPermission(permission)) {
+ teleporter.sendMessage("You don't have permission to teleport to this destination.");
+ return false;
+ }
+
+ //TODO Config whether to use finer permission
+ String finerPermissionSuffix = destination.getDestinationInstance().getFinerPermissionSuffix();
+ if (finerPermissionSuffix == null || finerPermissionSuffix.isEmpty()) {
+ return true;
+ }
+
+ String finerPermission = permission + "." + finerPermissionSuffix;
+ if (!teleporter.hasPermission(finerPermission)) {
+ teleporter.sendMessage("You don't have permission to teleport to this destination.");
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Checks if the issuer has permission to teleport to at least one destination.
+ *
+ * @param issuer The issuer.
+ * @return True if the issuer has permission, false otherwise.
+ */
+ public boolean hasAnyTeleportPermission(CommandIssuer issuer) {
+ for (Destination destination : this.destinationMap.values()) {
+ String permission = PERMISSION_PREFIX + "self." + destination.getIdentifier();
+ if (issuer.hasPermission(permission)) {
+ return true;
+ }
+ permission = PERMISSION_PREFIX + "other." + destination.getIdentifier();
+ if (issuer.hasPermission(permission)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java
deleted file mode 100644
index 081628933..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * An exact {@link MVDestination}.
- */
-public class ExactDestination implements MVDestination {
- private final String coordRegex = "(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~)";
- private boolean isValid;
- private Location location;
- private boolean relativeX, relativeY, relativeZ;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "e";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector(0, 0, 0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return false;
- }
- List parsed = Arrays.asList(destination.split(":"));
- // Need at least: e:world:x,y,z
- // OR e:world:x,y,z:pitch:yaw
- // so basically 3 or 5
- if (!(parsed.size() == 3 || parsed.size() == 5)) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
- return false;
- }
- // If it's not an Exact type
- if (!parsed.get(0).equalsIgnoreCase("e")) {
- return false;
- }
-
- // If it's not a MV world
- if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
- return false;
- }
-
- if (!parsed.get(2).matches(coordRegex)) {
- return false;
- }
- // This is 1 now, because we've removed 2
- if (parsed.size() == 3) {
- return true;
- }
-
- try {
- Float.parseFloat(parsed.get(3));
- Float.parseFloat(parsed.get(4)); // SUPPRESS CHECKSTYLE: MagicNumberCheck
- } catch (NumberFormatException e) {
- return false;
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- Location loc = this.location.clone();
- if (relativeX || relativeY || relativeZ) {
- Location eLoc = e.getLocation();
- loc.add(relativeX ? eLoc.getX() : 0, relativeY ? eLoc.getY() : 0, relativeZ ? eLoc.getZ() : 0);
- // Since the location is relative, it makes sense to use the entity's pitch and yaw unless those were
- // specified in the destination.
- if (loc.getPitch() == 0) {
- loc.setPitch(eLoc.getPitch());
- }
- if (loc.getYaw() == 0) {
- loc.setYaw(eLoc.getYaw());
- }
- }
- return loc;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- if (!(plugin instanceof MultiverseCore)) {
- return;
- }
- List parsed = Arrays.asList(destination.split(":"));
- // Need at least: e:world:x,y,z
- // OR e:world:x,y,z:pitch:yaw
- // so basically 3 or 5
- if (!(parsed.size() == 3 || parsed.size() == 5)) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
- this.isValid = false;
- return;
- }
-
- if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
- this.isValid = false;
- return;
- }
-
- if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
- this.isValid = false;
- return;
- }
- this.location = new Location(((MultiverseCore) plugin).getMVWorldManager().getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
-
- if (!parsed.get(2).matches(this.coordRegex)) {
- this.isValid = false;
- return;
- }
- double[] coords = new double[3];
- String[] coordString = parsed.get(2).split(",");
- for (int i = 0; i < 3; i++) {
- String[] relSplit = coordString[i].split("~");
- boolean relative = false;
- if (relSplit.length == 0) {
- // coord is "~" form
- relative = true;
- coords[i] = 0;
- } else if (relSplit.length == 1) {
- // coord is "123" form
- try {
- coords[i] = Double.parseDouble(relSplit[0]);
- } catch (NumberFormatException e) {
- this.isValid = false;
- return;
- }
- } else {
- // coord is "~123" form
- relative = true;
- try {
- coords[i] = Double.parseDouble(relSplit[1]);
- } catch (NumberFormatException e) {
- this.isValid = false;
- return;
- }
- }
- if (relative) {
- switch (i) {
- case 0:
- relativeX = true;
- break;
- case 1:
- relativeY = true;
- break;
- case 2:
- relativeZ = true;
- break;
- }
- }
- }
- this.location.setX(coords[0]);
- this.location.setY(coords[1]);
- this.location.setZ(coords[2]);
-
- if (parsed.size() == 3) {
- this.isValid = true;
- return;
- }
-
- try {
- this.location.setPitch(Float.parseFloat(parsed.get(3)));
- this.location.setYaw(Float.parseFloat(parsed.get(4))); // SUPPRESS CHECKSTYLE: MagicNumberCheck
- } catch (NumberFormatException e) {
- this.isValid = false;
- return;
- }
- this.isValid = true;
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "Exact";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return "Exact (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ()
- + ":" + location.getPitch() + ":" + location.getYaw() + ")";
- }
-
- /**
- * Sets this {@link ExactDestination}.
- *
- * @param location The {@link Location}.
- */
- public void setDestination(Location location) {
- this.isValid = (this.location = location) != null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- if (isValid) {
- return "e:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
- + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw();
- }
- return "i:Invalid Destination";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- return "multiverse.access." + this.location.getWorld().getName();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- // This is an EXACT destination, don't safely teleport here.
- return false;
- }
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java
deleted file mode 100644
index 85e99b65d..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-/**
- * An invalid {@link MVDestination}.
- */
-public class InvalidDestination implements MVDestination {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "i";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- // Nothing needed, it's invalid.
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return ChatColor.RED + "Invalid Destination";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return ChatColor.RED + "Invalid Destination";
- }
-
- @Override
- public String toString() {
- return "i:Invalid Destination";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector(0, 0, 0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- return false;
- }
-
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java
new file mode 100644
index 000000000..69c7b2d1b
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java
@@ -0,0 +1,53 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+
+/**
+ * A parsed destination.
+ *
+ * @param The destination instance type.
+ */
+public class ParsedDestination {
+ private final Destination destination;
+ private final DestinationInstance destinationInstance;
+
+ /**
+ * Creates a new parsed destination.
+ *
+ * @param destination The destination.
+ * @param destinationInstance The destination instance.
+ */
+ public ParsedDestination(Destination destination, DestinationInstance destinationInstance) {
+ this.destination = destination;
+ this.destinationInstance = destinationInstance;
+ }
+
+ /**
+ * Gets the destination.
+ *
+ * @return The destination.
+ */
+ public Destination getDestination() {
+ return destination;
+ }
+
+ /**
+ * Gets the destination instance.
+ *
+ * @return The destination instance.
+ */
+ public DestinationInstance getDestinationInstance() {
+ return destinationInstance;
+ }
+
+ /**
+ * Converts to saveable string representation of this destination.
+ *
+ * @return Serialized string.
+ */
+ @Override
+ public String toString() {
+ return destination.getIdentifier() + ":" + destinationInstance.serialise();
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
deleted file mode 100644
index 0ca08f985..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-/**
- * A player-{@link MVDestination}.
- */
-public class PlayerDestination implements MVDestination {
- private String player;
- private boolean isValid;
- private JavaPlugin plugin;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "pl";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- String[] items = destination.split(":");
- if (items.length != 2) {
- return false;
- }
- if (!items[0].equalsIgnoreCase("pl")) {
- return false;
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- Player p = plugin.getServer().getPlayerExact(this.player);
- Player plLoc = null;
- if (e instanceof Player) {
- plLoc = (Player) e;
- } else if (e.getPassenger() instanceof Player) {
- plLoc = (Player) e.getPassenger();
- }
-
- if (p != null && plLoc != null) {
- return p.getLocation();
- }
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- String[] items = destination.split(":");
- if (items.length != 2) {
- this.isValid = false;
- }
- if (!items[0].equalsIgnoreCase("pl")) {
- this.isValid = false;
- }
- this.isValid = true;
- this.player = items[1];
- this.plugin = plugin;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "Player";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return this.player;
- }
-
- @Override
- public String toString() {
- return "pl:" + this.player;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- return "";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector(0, 0, 0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- return true;
- }
-
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
deleted file mode 100644
index 6cbc03510..000000000
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011. *
- * Multiverse 2 is licensed under the BSD License. *
- * For more information please check the README.md file included *
- * with this project. *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.Core;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-/**
- * A world-{@link MVDestination}.
- */
-public class WorldDestination implements MVDestination {
- private boolean isValid;
- private MultiverseWorld world;
- private float yaw = -1;
- private String direction = "";
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIdentifier() {
- return "w";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isThisType(JavaPlugin plugin, String destination) {
- String[] items = destination.split(":");
- if (items.length > 3) {
- return false;
- }
- if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
- // This case is: world
- return true;
- }
- if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
- // This case is: world:n
- return true;
- } else if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
- // This case is: w:world
- // and w:world:ne
- return true;
- }
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Location getLocation(Entity e) {
- Location spawnLoc = getAcurateSpawnLocation(e, this.world);
- if (this.yaw >= 0) {
- // Only modify the yaw if its set.
- spawnLoc.setYaw(this.yaw);
- }
- return spawnLoc;
- }
-
- private static Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
- if (world != null) {
- return world.getSpawnLocation();
- } else {
- // add 0.5 to x and z to center people
- // (spawn location is stored as int meaning that you would spawn in the corner of a block)
- return e.getWorld().getSpawnLocation().add(.5, 0, .5);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isValid() {
- return this.isValid;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setDestination(JavaPlugin plugin, String destination) {
- // TODO Taking a JavaPlugin here is rather useless, if we keep casting it up to MultiverseCore.
- // We should change that.
- Core core = (Core) plugin;
- String[] items = destination.split(":");
- if (items.length > 3) {
- isValid = false;
- return;
- }
- if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
- isValid = true;
- this.world = core.getMVWorldManager().getMVWorld(items[0]);
- return;
- }
- if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
- this.world = core.getMVWorldManager().getMVWorld(items[0]);
- this.yaw = core.getLocationManipulation().getYaw(items[1]);
- return;
- }
- if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
- this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[1]);
- isValid = true;
- if (items.length == 3) {
- this.yaw = core.getLocationManipulation().getYaw(items[2]);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return "World";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return this.world.getColoredWorldString();
- }
-
- @Override
- public String toString() {
- if (direction.length() > 0 && yaw >= 0) {
- return this.world.getCBWorld().getName() + ":" + this.direction;
- }
- return this.world.getCBWorld().getName();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getRequiredPermission() {
- // TODO: Potenitally replace spaces wiht tabs for friendlier yaml.
- // this.world.getName().replace(" ","_");
- return "multiverse.access." + this.world.getName();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Vector getVelocity() {
- return new Vector(0, 0, 0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean useSafeTeleporter() {
- return true;
- }
-
-}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java
new file mode 100644
index 000000000..87d30926b
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java
@@ -0,0 +1,68 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class AnchorDestination implements Destination {
+ private final MultiverseCore plugin;
+
+ /**
+ * Constructor.
+ *
+ * @param plugin The MultiverseCore plugin.
+ */
+ public AnchorDestination(MultiverseCore plugin) {
+ this.plugin = plugin;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "a";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable AnchorDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ Location anchorLocation = this.plugin.getAnchorManager().getAnchorLocation(destinationParams);
+ if (anchorLocation == null) {
+ return null;
+ }
+ return new AnchorDestinationInstance(destinationParams, anchorLocation);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ return this.plugin.getAnchorManager().getAnchors(issuer.getPlayer());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java
new file mode 100644
index 000000000..f0cc0bbdb
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class AnchorDestinationInstance implements DestinationInstance {
+ private final String anchorName;
+ private final Location anchorLocation;
+
+ /**
+ * Constructor.
+ *
+ * @param anchorName The name of the anchor.
+ * @param anchorLocation The location of the anchor.
+ */
+ public AnchorDestinationInstance(@NotNull String anchorName, @NotNull Location anchorLocation) {
+ this.anchorName = anchorName;
+ this.anchorLocation = anchorLocation;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ return anchorLocation;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return anchorName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ return anchorName;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java
new file mode 100644
index 000000000..96eda7a6c
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java
@@ -0,0 +1,67 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class BedDestination implements Destination {
+ public static final String OWN_BED_STRING = "playerbed";
+
+ public BedDestination() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "b";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable BedDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ Player player = PlayerFinder.get(destinationParams);
+ if (player == null && !destinationParams.equals(OWN_BED_STRING)) {
+ return null;
+ }
+ return new BedDestinationInstance(player);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ List collect = Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
+ collect.add(OWN_BED_STRING);
+ return collect;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java
new file mode 100644
index 000000000..8e7c0edb6
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java
@@ -0,0 +1,60 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class BedDestinationInstance implements DestinationInstance {
+ private final Player player;
+
+ /**
+ * Constructor.
+ *
+ * @param player The player whose bed to use.
+ */
+ public BedDestinationInstance(Player player) {
+ this.player = player;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ if (player != null) {
+ return player.getBedSpawnLocation();
+ }
+ if (teleportee instanceof Player) {
+ return ((Player) teleportee).getBedSpawnLocation();
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return player != null ? player.getName() : BedDestination.OWN_BED_STRING;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ return player != null ? player.getName() : BedDestination.OWN_BED_STRING;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java
new file mode 100644
index 000000000..cb2ae27dd
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java
@@ -0,0 +1,103 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class CannonDestination implements Destination {
+ private final MultiverseCore plugin;
+
+ /**
+ * Constructor.
+ *
+ * @param plugin The MultiverseCore plugin.
+ */
+ public CannonDestination(MultiverseCore plugin) {
+ this.plugin = plugin;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "ca";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable CannonDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ String[] params = destinationParams.split(":");
+ if (params.length != 5) {
+ return null;
+ }
+
+ String worldName = params[0];
+ String coordinates = params[1];
+ String pitch = params[2];
+ String yaw = params[3];
+ String speed = params[4];
+
+ String[] coordinatesParams = coordinates.split(",");
+ if (coordinatesParams.length != 3) {
+ return null;
+ }
+
+ MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
+ if (world == null) {
+ return null;
+ }
+
+ Location location;
+ double dSpeed;
+ try {
+ location = new Location(
+ world.getCBWorld(),
+ Double.parseDouble(coordinatesParams[0]),
+ Double.parseDouble(coordinatesParams[1]),
+ Double.parseDouble(coordinatesParams[2]),
+ Float.parseFloat(yaw),
+ Float.parseFloat(pitch)
+ );
+ dSpeed = Double.parseDouble(speed);
+ } catch (NumberFormatException e) {
+ return null;
+ }
+
+ return new CannonDestinationInstance(location, dSpeed);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ return Collections.singleton("");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java
new file mode 100644
index 000000000..8ceb8c805
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java
@@ -0,0 +1,65 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class CannonDestinationInstance implements DestinationInstance {
+ private final Location location;
+ private final double speed;
+
+ /**
+ * Constructor.
+ *
+ * @param location The location to teleport to.
+ * @param speed The speed to fire the player at.
+ */
+ public CannonDestinationInstance(@NotNull Location location, double speed) {
+ this.location = location;
+ this.speed = speed;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ return location;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ double pitchRadians = Math.toRadians(location.getPitch());
+ double yawRadians = Math.toRadians(location.getYaw());
+ double x = Math.sin(yawRadians) * speed * -1;
+ double y = Math.sin(pitchRadians) * speed * -1;
+ double z = Math.cos(yawRadians) * speed;
+ // Account for the angle they were pointed, and take away velocity
+ x = Math.cos(pitchRadians) * x;
+ z = Math.cos(pitchRadians) * z;
+ return new Vector(x, y, z);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return location.getWorld().getName();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ return location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
+ + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java
new file mode 100644
index 000000000..39776eac5
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java
@@ -0,0 +1,106 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ExactDestination implements Destination {
+ private final MultiverseCore plugin;
+
+ /**
+ * Constructor.
+ *
+ * @param plugin The MultiverseCore plugin.
+ */
+ public ExactDestination(MultiverseCore plugin) {
+ this.plugin = plugin;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "e";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable ExactDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ String[] items = destinationParams.split(":");
+ if (items.length < 2) {
+ return null;
+ }
+
+ String worldName = items[0];
+ String coordinates = items[1];
+ String[] coordinatesParams = coordinates.split(",");
+ if (coordinatesParams.length != 3) {
+ return null;
+ }
+
+ MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
+ if (world == null) {
+ return null;
+ }
+
+ Location location;
+ try {
+ location = new Location(
+ world.getCBWorld(),
+ Double.parseDouble(coordinatesParams[0]),
+ Double.parseDouble(coordinatesParams[1]),
+ Double.parseDouble(coordinatesParams[2])
+ );
+ } catch (NumberFormatException e) {
+ return null;
+ }
+
+ if (items.length == 4) {
+ String pitch = items[2];
+ String yaw = items[3];
+ try {
+ location.setPitch(Float.parseFloat(pitch));
+ location.setYaw(Float.parseFloat(yaw));
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ return new ExactDestinationInstance(location);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ return Collections.singleton("");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java
new file mode 100644
index 000000000..e2235829b
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java
@@ -0,0 +1,54 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ExactDestinationInstance implements DestinationInstance {
+ private final Location location;
+
+ /**
+ * Constructor.
+ *
+ * @param location The location to teleport to.
+ */
+ public ExactDestinationInstance(Location location) {
+ this.location = location;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ return location;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return location.getWorld().getName();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ return location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
+ + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw();
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java
new file mode 100644
index 000000000..b6ecf6e4b
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java
@@ -0,0 +1,65 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerDestination implements Destination {
+ /**
+ * Creates a new instance of the PlayerDestination.
+ */
+ public PlayerDestination() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "pl";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable PlayerDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ Player player = PlayerFinder.get(destinationParams);
+ if (player == null) {
+ return null;
+ }
+ return new PlayerDestinationInstance(player);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ return Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java
new file mode 100644
index 000000000..fc31082ff
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java
@@ -0,0 +1,54 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerDestinationInstance implements DestinationInstance {
+ private final Player player;
+
+ /**
+ * Constructor.
+ *
+ * @param player The player whose location to go to.
+ */
+ public PlayerDestinationInstance(Player player) {
+ this.player = player;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ return player.getLocation();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return player.getName();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ return player.getName();
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java
new file mode 100644
index 000000000..d9c31b5b2
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java
@@ -0,0 +1,81 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class WorldDestination implements Destination {
+
+ private final MultiverseCore plugin;
+
+ /**
+ * Constructor.
+ *
+ * @param plugin The MultiverseCore plugin.
+ */
+ public WorldDestination(MultiverseCore plugin) {
+ this.plugin = plugin;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String getIdentifier() {
+ return "w";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable WorldDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
+ String[] items = destinationParams.split(":");
+ if (items.length > 3) {
+ return null;
+ }
+
+ String worldName = items[0];
+ MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
+ if (world == null) {
+ return null;
+ }
+
+ String direction = (items.length == 2) ? items[1] : null;
+ float yaw = direction != null ? this.plugin.getLocationManipulation().getYaw(direction) : -1;
+
+ return new WorldDestinationInstance(world, direction, yaw);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull Collection suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
+ // Autocomplete of worlds is done by MVCommandCompletion without prefix
+ return Collections.emptyList();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean checkTeleportSafety() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Teleporter getTeleporter() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java b/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java
new file mode 100644
index 000000000..3f53da344
--- /dev/null
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java
@@ -0,0 +1,66 @@
+package com.onarandombox.MultiverseCore.destination.core;
+
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class WorldDestinationInstance implements DestinationInstance {
+ private final MultiverseWorld world;
+ private final String direction;
+ private final float yaw;
+
+ /**
+ * Constructor.
+ *
+ * @param world The world to teleport to.
+ */
+ public WorldDestinationInstance(@NotNull MultiverseWorld world, @Nullable String direction, float yaw) {
+ this.world = world;
+ this.direction = direction;
+ this.yaw = yaw;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Location getLocation(@NotNull Entity teleportee) {
+ Location worldLoc = world.getSpawnLocation();
+ if (this.yaw >= 0) {
+ // Only modify the yaw if its set.
+ worldLoc.setYaw(this.yaw);
+ }
+ return worldLoc;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable Vector getVelocity(@NotNull Entity teleportee) {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @Nullable String getFinerPermissionSuffix() {
+ return world.getName();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public @NotNull String serialise() {
+ if (this.direction != null) {
+ return this.world.getCBWorld().getName() + ":" + this.direction;
+ }
+ return this.world.getCBWorld().getName();
+ }
+}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java
index fac53728b..75afb3ddc 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java
@@ -9,7 +9,6 @@
import com.onarandombox.MultiverseCore.api.MVDestination;
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java b/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java
index 318450084..62bbb7e6d 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java
@@ -1,5 +1,11 @@
package com.onarandombox.MultiverseCore.utils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -7,12 +13,6 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
/**
* Helper class to get {@link Player} from name, UUID or Selectors.
*/
@@ -21,6 +21,16 @@ public class PlayerFinder {
private static final Pattern UUID_REGEX = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
private static final Pattern COMMA_SPLIT = Pattern.compile(",");
+ /**
+ * Get a {@link Player} based on an identifier of name UUID or selector.
+ *
+ * @param playerIdentifier An identifier of name UUID or selector.
+ * @return The player if found, else null.
+ */
+ public static Player get(@NotNull String playerIdentifier) {
+ return get(playerIdentifier, Bukkit.getConsoleSender());
+ }
+
/**
* Get a {@link Player} based on an identifier of name UUID or selector.
*
@@ -29,17 +39,21 @@ public class PlayerFinder {
* @return The player if found, else null.
*/
@Nullable
- public static Player get(@NotNull String playerIdentifier,
- @NotNull CommandSender sender) {
+ public static Player get(@Nullable String playerIdentifier, @NotNull CommandSender sender) {
+ if (playerIdentifier == null) {
+ return null;
+ }
Player targetPlayer = getByName(playerIdentifier);
if (targetPlayer != null) {
return targetPlayer;
}
+
targetPlayer = getByUuid(playerIdentifier);
if (targetPlayer != null) {
return targetPlayer;
}
+
return getBySelector(playerIdentifier, sender);
}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java
index 93367ae51..0d0d54dfd 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java
@@ -7,11 +7,12 @@
package com.onarandombox.MultiverseCore.utils;
+import co.aikar.commands.BukkitCommandIssuer;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
import com.onarandombox.MultiverseCore.enums.TeleportResult;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -189,11 +190,12 @@ private boolean checkAroundSpecificDiameter(Location checkLoc, int circle) {
* {@inheritDoc}
*/
@Override
- public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d) {
- if (d instanceof InvalidDestination) {
+ public TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination destination) {
+ if (destination == null) {
Logging.finer("Entity tried to teleport to an invalid destination");
return TeleportResult.FAIL_INVALID;
}
+
Player teleporteePlayer = null;
if (teleportee instanceof Player) {
teleporteePlayer = ((Player) teleportee);
@@ -204,26 +206,29 @@ public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee
if (teleporteePlayer == null) {
return TeleportResult.FAIL_INVALID;
}
- MultiverseCore.addPlayerToTeleportQueue(teleporter.getName(), teleporteePlayer.getName());
- Location safeLoc = d.getLocation(teleportee);
- if (d.useSafeTeleporter()) {
- safeLoc = this.getSafeLocation(teleportee, d);
+ MultiverseCore.addPlayerToTeleportQueue(teleporter.getIssuer().getName(), teleporteePlayer.getName());
+
+ Location safeLoc = destination.getDestinationInstance().getLocation(teleportee);
+ if (destination.getDestination().checkTeleportSafety()) {
+ safeLoc = this.getSafeLocation(teleportee, destination.getDestinationInstance());
}
- if (safeLoc != null) {
- if (teleportee.teleport(safeLoc)) {
- Vector v = d.getVelocity();
- if (v != null && !DEFAULT_VECTOR.equals(v)) {
- Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
- teleportee.setVelocity(d.getVelocity());
- }, 1);
- }
- return TeleportResult.SUCCESS;
- }
+ if (safeLoc == null) {
+ return TeleportResult.FAIL_UNSAFE;
+ }
+
+ if (!teleportee.teleport(safeLoc)) {
return TeleportResult.FAIL_OTHER;
}
- return TeleportResult.FAIL_UNSAFE;
+
+ Vector v = destination.getDestinationInstance().getVelocity(teleportee);
+ if (v != null && !DEFAULT_VECTOR.equals(v)) {
+ Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
+ teleportee.setVelocity(v);
+ }, 1);
+ }
+ return TeleportResult.SUCCESS;
}
/**
@@ -244,23 +249,20 @@ public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee
return TeleportResult.FAIL_UNSAFE;
}
- /**
- * {@inheritDoc}
- */
@Override
- public Location getSafeLocation(Entity e, MVDestination d) {
- Location l = d.getLocation(e);
+ public Location getSafeLocation(Entity entity, DestinationInstance destination) {
+ Location l = destination.getLocation(entity);
if (plugin.getBlockSafety().playerCanSpawnHereSafely(l)) {
Logging.fine("The first location you gave me was safe.");
return l;
}
- if (e instanceof Minecart) {
- Minecart m = (Minecart) e;
+ if (entity instanceof Minecart) {
+ Minecart m = (Minecart) entity;
if (!plugin.getBlockSafety().canSpawnCartSafely(m)) {
return null;
}
- } else if (e instanceof Vehicle) {
- Vehicle v = (Vehicle) e;
+ } else if (entity instanceof Vehicle) {
+ Vehicle v = (Vehicle) entity;
if (!plugin.getBlockSafety().canSpawnVehicleSafely(v)) {
return null;
}
@@ -268,19 +270,19 @@ public Location getSafeLocation(Entity e, MVDestination d) {
Location safeLocation = this.getSafeLocation(l);
if (safeLocation != null) {
// Add offset to account for a vehicle on dry land!
- if (e instanceof Minecart && !plugin.getBlockSafety().isEntitiyOnTrack(safeLocation)) {
+ if (entity instanceof Minecart && !plugin.getBlockSafety().isEntitiyOnTrack(safeLocation)) {
safeLocation.setY(safeLocation.getBlockY() + .5);
Logging.finer("Player was inside a minecart. Offsetting Y location.");
}
Logging.finer("Had to look for a bit, but I found a safe place for ya!");
return safeLocation;
}
- if (e instanceof Player) {
- Player p = (Player) e;
+ if (entity instanceof Player) {
+ Player p = (Player) entity;
this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
Logging.finer("No safe location found for " + p.getName());
- } else if (e.getPassenger() instanceof Player) {
- Player p = (Player) e.getPassenger();
+ } else if (entity.getPassenger() instanceof Player) {
+ Player p = (Player) entity.getPassenger();
this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
Logging.finer("No safe location found for " + p.getName());
}
@@ -334,7 +336,7 @@ private static Location getCloserBlock(Location source, Location blockA, Locatio
}
@Override
- public TeleportResult teleport(final CommandSender teleporter, final Player teleportee, final MVDestination destination) {
+ public TeleportResult teleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination destination) {
return this.safelyTeleport(teleporter, teleportee, destination);
}
}
From 5dba9f156d31f46e845318301c23a0f346543ee0 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Wed, 8 Feb 2023 13:41:38 +0800
Subject: [PATCH 018/725] refactor!: Remove old command handler and commands
---
pom.xml | 9 -
.../MultiverseCore/MultiverseCore.java | 114 +-------
.../onarandombox/MultiverseCore/api/Core.java | 9 -
.../MultiverseCore/api/MultiversePlugin.java | 27 +-
.../MultiverseCore/commands/CheckCommand.java | 2 +-
.../commandsold/AnchorCommand.java | 162 -----------
.../commandsold/CloneCommand.java | 55 ----
.../commandsold/ConfigCommand.java | 72 -----
.../commandsold/ConfirmCommand.java | 39 ---
.../commandsold/CoordCommand.java | 69 -----
.../commandsold/CreateCommand.java | 131 ---------
.../commandsold/DebugCommand.java | 66 -----
.../commandsold/DeleteCommand.java | 59 ----
.../commandsold/EnvironmentCommand.java | 118 --------
.../commandsold/GameruleCommand.java | 116 --------
.../commandsold/GamerulesCommand.java | 111 -------
.../commandsold/GeneratorCommand.java | 60 ----
.../commandsold/HelpCommand.java | 98 -------
.../commandsold/ImportCommand.java | 137 ---------
.../commandsold/InfoCommand.java | 274 ------------------
.../commandsold/ListCommand.java | 120 --------
.../commandsold/LoadCommand.java | 42 ---
.../commandsold/ModifyAddCommand.java | 95 ------
.../commandsold/ModifyClearCommand.java | 92 ------
.../commandsold/ModifyCommand.java | 76 -----
.../commandsold/ModifyRemoveCommand.java | 97 -------
.../commandsold/ModifySetCommand.java | 125 --------
.../commandsold/MultiverseCommand.java | 40 ---
.../commandsold/PaginatedCommand.java | 177 -----------
.../commandsold/PaginatedCoreCommand.java | 26 --
.../commandsold/PurgeCommand.java | 92 ------
.../commandsold/RegenCommand.java | 69 -----
.../commandsold/ReloadCommand.java | 58 ----
.../commandsold/RemoveCommand.java | 42 ---
.../commandsold/ScriptCommand.java | 58 ----
.../commandsold/SetSpawnCommand.java | 148 ----------
.../commandsold/SilentCommand.java | 52 ----
.../commandsold/SleepCommand.java | 42 ---
.../commandsold/SpawnCommand.java | 91 ------
.../commandsold/UnloadCommand.java | 42 ---
.../commandsold/VersionCommand.java | 224 --------------
.../commandsold/WhoCommand.java | 118 --------
.../commandsold/package-info.java | 4 -
.../MultiverseCore/utils/MVPermissions.java | 21 +-
src/main/resources/plugin.yml | 180 ------------
45 files changed, 11 insertions(+), 3848 deletions(-)
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/AnchorCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/CloneCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfigCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfirmCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/CoordCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/CreateCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/DebugCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/DeleteCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/EnvironmentCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/GameruleCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/GamerulesCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/GeneratorCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/HelpCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ImportCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/InfoCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ListCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/LoadCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyAddCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyClearCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyRemoveCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifySetCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/MultiverseCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCoreCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/PurgeCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/RegenCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ReloadCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/RemoveCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/ScriptCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/SetSpawnCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/SilentCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/SleepCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/SpawnCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/UnloadCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/WhoCommand.java
delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/package-info.java
diff --git a/pom.xml b/pom.xml
index 2628624a5..8c348bae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,10 +228,6 @@
me.main__.util
com.onarandombox.serializationconfig
-
- com.pneumaticraft.commandhandler
- com.onarandombox.commandhandler
-
buscript
com.onarandombox.buscript
@@ -325,11 +321,6 @@
acf-paper
0.5.1-SNAPSHOT