result = this.getNames(Collections.singletonList(uuid));
@@ -92,7 +92,7 @@ public class SquirrelIdUUIDService implements UUIDService {
results.add(result.get(0));
}
} else if (uuids.size() == 1 && Settings.DEBUG) {
- logger.info("[P2] (UUID) Found invalid UUID: {}", uuids.get(0));
+ logger.info("(UUID) Found invalid UUID: {}", uuids.get(0));
}
}
} catch (IOException | InterruptedException e) {
diff --git a/Core/src/main/java/com/plotsquared/core/Platform.java b/Core/src/main/java/com/plotsquared/core/Platform.java
index 3a9eb42e1..ff5187bae 100644
--- a/Core/src/main/java/com/plotsquared/core/Platform.java
+++ b/Core/src/main/java/com/plotsquared/core/Platform.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core;
diff --git a/Core/src/main/java/com/plotsquared/core/PlotAPI.java b/Core/src/main/java/com/plotsquared/core/PlotAPI.java
index 3dc756732..71dbf5c07 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotAPI.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotAPI.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core;
diff --git a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
index 6daa02a07..17c8c84fd 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core;
@@ -86,11 +86,13 @@ public interface PlotPlatform extends LocaleHolder {
/**
* Gets the version of Minecraft that is running.
+ * @return server version as array of numbers
*/
int[] getServerVersion();
/**
* Gets the server implementation name and version
+ * @return server implementationa and version as string
*/
String getServerImplementation();
@@ -254,6 +256,11 @@ public interface PlotPlatform
extends LocaleHolder {
*/
@Nonnull Audience getConsoleAudience();
+ /**
+ * Load the caption maps
+ */
+ void copyCaptionMaps();
+
/**
* Get the {@link PermissionHandler} implementation for the platform
*
diff --git a/Core/src/main/java/com/plotsquared/core/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
index 83ae671a1..3cc968a1e 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core;
@@ -90,7 +90,6 @@ import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.sql.SQLException;
import java.util.ArrayDeque;
@@ -141,7 +140,7 @@ public class PlotSquared {
public HashMap> plots_tmp;
private YamlConfiguration config;
// Localization
- private Map captionMaps;
+ private final Map captionMaps = new HashMap<>();
// Platform / Version / Update URL
private PlotVersion version;
// Files and configuration
@@ -174,6 +173,13 @@ public class PlotSquared {
//
ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
+ // Load caption map
+ try {
+ this.loadCaptionMap();
+ } catch (final Exception e) {
+ logger.error("Failed to load caption map", e);
+ }
+
// Setup the global flag container
GlobalFlagContainer.setup();
@@ -197,8 +203,6 @@ public class PlotSquared {
return;
}
- this.captionMaps = new HashMap<>();
-
this.worldedit = WorldEdit.getInstance();
// Create Event utility class
@@ -224,16 +228,19 @@ public class PlotSquared {
}
}
- public void loadCaptionMap() throws IOException {
+ public void loadCaptionMap() throws Exception {
+ this.platform.copyCaptionMaps();
// Setup localization
CaptionMap captionMap;
if (Settings.Enabled_Components.PER_USER_LOCALE) {
- captionMap = CaptionLoader.loadAll(Paths.get("lang"));
+ captionMap = CaptionLoader.loadAll(new File(this.platform.getDirectory(), "lang").toPath());
} else {
String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
- captionMap = CaptionLoader.loadSingle(Paths.get("lang", fileName));
+ captionMap = CaptionLoader.loadSingle(new File(new File(this.platform.getDirectory(), "lang"), fileName).toPath());
}
this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
+ logger.info("Loaded caption map for namespace 'plotsquared': {}",
+ this.captionMaps.get(TranslatableCaption.DEFAULT_NAMESPACE).getClass().getCanonicalName());
}
/**
@@ -384,16 +391,16 @@ public class PlotSquared {
regionInts.forEach(l -> regions.add(BlockVector2.at(l[0], l[1])));
chunkInts.forEach(l -> chunks.add(BlockVector2.at(l[0], l[1])));
int height = (int) list.get(2);
- logger.info("[P2] Incomplete road regeneration found. Restarting in world {} with height {}", plotArea.getWorldName(), height);
- logger.info("[P2] - Regions: {}", regions.size());
- logger.info("[P2] - Chunks: {}", chunks.size());
+ logger.info("Incomplete road regeneration found. Restarting in world {} with height {}", plotArea.getWorldName(), height);
+ logger.info(" - Regions: {}", regions.size());
+ logger.info(" - Chunks: {}", chunks.size());
HybridUtils.UPDATE = true;
PlotSquared.platform().getHybridUtils().scheduleRoadUpdate(plotArea, regions, height, chunks);
} catch (IOException | ClassNotFoundException e) {
- logger.error("[P2] Error restarting road regeneration", e);
+ logger.error("Error restarting road regeneration", e);
} finally {
if (!file.delete()) {
- logger.error("[P2] Error deleting persistent_regen_data_{}. Please delete this file manually", plotArea.getId());
+ logger.error("Error deleting persistent_regen_data_{}. Please delete this file manually", plotArea.getId());
}
}
});
@@ -796,10 +803,10 @@ public class PlotSquared {
// Conventional plot generator
PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
PlotManager plotManager = plotArea.getPlotManager();
- logger.info("[P2] Detected world load for '{}'", world);
- logger.info("[P2] - generator: {}>{}", baseGenerator, plotGenerator);
- logger.info("[P2] - plot world: {}", plotArea.getClass().getCanonicalName());
- logger.info("[P2] - plot area manager: {}", plotManager.getClass().getCanonicalName());
+ logger.info("Detected world load for '{}'", world);
+ logger.info(" - generator: {}>{}", baseGenerator, plotGenerator);
+ logger.info(" - plot world: {}", plotArea.getClass().getCanonicalName());
+ logger.info("- plot area manager: {}", plotManager.getClass().getCanonicalName());
if (!this.worldConfiguration.contains(path)) {
this.worldConfiguration.createSection(path);
worldSection = this.worldConfiguration.getConfigurationSection(path);
@@ -823,7 +830,7 @@ public class PlotSquared {
if (getPlotAreaManager().getPlotAreas(world, null).length != 0) {
return;
}
- logger.info("[P2] Detected world load for '{}'", world);
+ logger.info("Detected world load for '{}'", world);
String gen_string = worldSection.getString("generator.plugin", platform.getPluginName());
if (type == PlotAreaType.PARTIAL) {
Set clusters =
@@ -839,7 +846,7 @@ public class PlotSquared {
String fullId = name + "-" + pos1 + "-" + pos2;
worldSection.createSection("areas." + fullId);
DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
- logger.info("[P2] - {}-{}-{}", name, pos1, pos2);
+ logger.info(" - {}-{}-{}", name, pos1, pos2);
GeneratorWrapper areaGen = this.platform.getGenerator(world, gen_string);
if (areaGen == null) {
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
@@ -853,10 +860,10 @@ public class PlotSquared {
} catch (IOException e) {
e.printStackTrace();
}
- logger.info("[P2] | generator: {}>{}", baseGenerator, areaGen);
- logger.info("[P2] | plot world: {}", pa);
- logger.info("[P2] | manager: {}", pa);
- logger.info("[P2] Note: Area created for cluster '{}' (invalid or old configuration?)", name);
+ logger.info(" | generator: {}>{}", baseGenerator, areaGen);
+ logger.info(" | plot world: {}", pa);
+ logger.info(" | manager: {}", pa);
+ logger.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
toLoad.add(pa);
@@ -878,9 +885,9 @@ public class PlotSquared {
} catch (IOException e) {
e.printStackTrace();
}
- logger.info("[P2] - generator: {}>{}", baseGenerator, areaGen);
- logger.info("[P2] - plot world: {}", pa);
- logger.info("[P2] - plot area manager: {}", pa.getPlotManager());
+ logger.info(" - generator: {}>{}", baseGenerator, areaGen);
+ logger.info(" - plot world: {}", pa);
+ logger.info(" - plot area manager: {}", pa.getPlotManager());
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
addPlotArea(pa);
@@ -892,7 +899,7 @@ public class PlotSquared {
+ PlotAreaType.AUGMENTED + "`");
}
for (String areaId : areasSection.getKeys(false)) {
- logger.info("[P2] - {}", areaId);
+ logger.info(" - {}", areaId);
String[] split = areaId.split("(?<=[^;-])-");
if (split.length != 3) {
throw new IllegalArgumentException("Invalid Area identifier: " + areaId
@@ -954,10 +961,10 @@ public class PlotSquared {
} catch (IOException e) {
e.printStackTrace();
}
- logger.info("[P2] Detected area load for '{}'", world);
- logger.info("[P2] | generator: {}>{}", baseGenerator, areaGen);
- logger.info("[P2] | plot world: {}", pa);
- logger.info("[P2] | manager: {}", pa.getPlotManager());
+ logger.info("Detected area load for '{}'", world);
+ logger.info(" | generator: {}>{}", baseGenerator, areaGen);
+ logger.info(" | plot world: {}", pa);
+ logger.info(" | manager: {}", pa.getPlotManager());
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
addPlotArea(pa);
@@ -1028,7 +1035,7 @@ public class PlotSquared {
for (String element : split) {
String[] pair = element.split("=");
if (pair.length != 2) {
- logger.error("[P2] No value provided for '{}'", element);
+ logger.error("No value provided for '{}'", element);
return false;
}
String key = pair[0].toLowerCase();
@@ -1076,11 +1083,11 @@ public class PlotSquared {
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString());
break;
default:
- logger.error("[P2] Key not found: {}", element);
+ logger.error("Key not found: {}", element);
return false;
}
} catch (Exception e) {
- logger.error("[P2] Invalid value '{}' for arg '{}'", value, element);
+ logger.error("Invalid value '{}' for arg '{}'", value, element);
e.printStackTrace();
return false;
}
@@ -1148,7 +1155,7 @@ public class PlotSquared {
}
}
} catch (IOException e) {
- logger.error("[P2] Could not save {}", file);
+ logger.error("Could not save {}", file);
e.printStackTrace();
}
}
@@ -1171,7 +1178,7 @@ public class PlotSquared {
// Close the connection
DBFunc.close();
} catch (NullPointerException throwable) {
- logger.error("[P2] Could not close database connection", throwable);
+ logger.error("Could not close database connection", throwable);
throwable.printStackTrace();
}
}
@@ -1184,9 +1191,9 @@ public class PlotSquared {
HybridUtils.regions.isEmpty() && HybridUtils.chunks.isEmpty())) {
return;
}
- logger.info("[P2] Road regeneration incomplete. Saving incomplete regions to disk");
- logger.info("[P2] - regions: {}", HybridUtils.regions.size());
- logger.info("[P2] - chunks: {}", HybridUtils.chunks.size());
+ logger.info("Road regeneration incomplete. Saving incomplete regions to disk");
+ logger.info(" - regions: {}", HybridUtils.regions.size());
+ logger.info(" - chunks: {}", HybridUtils.chunks.size());
ArrayList regions = new ArrayList<>();
ArrayList chunks = new ArrayList<>();
for (BlockVector2 r : HybridUtils.regions) {
@@ -1203,14 +1210,14 @@ public class PlotSquared {
this.platform.getDirectory() + File.separator + "persistent_regen_data_" + HybridUtils.area
.getId() + "_" + HybridUtils.area.getWorldName());
if (file.exists() && !file.delete()) {
- logger.error("[P2] persistent_regene_data file already exists and could not be deleted");
+ logger.error("persistent_regene_data file already exists and could not be deleted");
return;
}
try (ObjectOutputStream oos = new ObjectOutputStream(
Files.newOutputStream(file.toPath(), StandardOpenOption.CREATE_NEW))) {
oos.writeObject(list);
} catch (IOException e) {
- logger.error("[P2] Error creating persistent_region_data file", e);
+ logger.error("Error creating persistent_region_data file", e);
}
}
@@ -1230,7 +1237,7 @@ public class PlotSquared {
File file = FileUtils.getFile(platform.getDirectory(), Storage.SQLite.DB + ".db");
database = new SQLite(file);
} else {
- logger.error("[P2] No storage type is set. Disabling PlotSquared");
+ logger.error("No storage type is set. Disabling PlotSquared");
this.platform.shutdown(); //shutdown used instead of disable because no database is set
return;
}
@@ -1248,11 +1255,11 @@ public class PlotSquared {
}
this.clustersTmp = DBFunc.getClusters();
} catch (ClassNotFoundException | SQLException e) {
- logger.error("[P2] Failed to open database connection ({}). Disabling PlotSquared", Storage.MySQL.USE ? "MySQL" : "SQLite");
- logger.error("[P2] ==== Here is an ugly stacktrace, if you are interested in those things ===");
+ logger.error("Failed to open database connection ({}). Disabling PlotSquared", Storage.MySQL.USE ? "MySQL" : "SQLite");
+ logger.error("==== Here is an ugly stacktrace, if you are interested in those things ===");
e.printStackTrace();
- logger.error("[P2] &d==== End of stacktrace ====");
- logger.error("[P2] &6Please go to the {} 'storage.yml' and configure the database correctly",
+ logger.error("==== End of stacktrace ====");
+ logger.error("Please go to the {} 'storage.yml' and configure the database correctly",
platform.getPluginName());
this.platform.shutdown(); //shutdown used instead of disable because of database error
}
@@ -1278,7 +1285,7 @@ public class PlotSquared {
try {
worldConfiguration.save(worldsFile);
} catch (IOException e) {
- logger.error("[P2] Failed to save worlds.yml", e);
+ logger.error("Failed to save worlds.yml", e);
e.printStackTrace();
}
}
@@ -1306,16 +1313,18 @@ public class PlotSquared {
* Setup all configuration files
* - Config: settings.yml
* - Storage: storage.yml
+ *
+ * @return success or not
*/
public boolean setupConfigs() {
File folder = new File(this.platform.getDirectory(), "config");
if (!folder.exists() && !folder.mkdirs()) {
- logger.error("[P2] Failed to create the /plugins/config folder. Please create it manually");
+ logger.error("Failed to create the /plugins/PlotSquared/config folder. Please create it manually");
}
try {
this.worldsFile = new File(folder, "worlds.yml");
if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
- logger.error("[P2] Could not create the worlds file. Please create 'worlds.yml' manually");
+ logger.error("Could not create the worlds file. Please create 'worlds.yml' manually");
}
this.worldConfiguration = YamlConfiguration.loadConfiguration(this.worldsFile);
@@ -1325,20 +1334,20 @@ public class PlotSquared {
.equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION) && !this.worldConfiguration
.getString("configuration_version").equalsIgnoreCase("v5"))) {
// Conversion needed
- logger.info("[P2] &aA legacy configuration file was detected. Conversion will be attempted.");
+ logger.info("A legacy configuration file was detected. Conversion will be attempted.");
try {
com.google.common.io.Files
.copy(this.worldsFile, new File(folder, "worlds.yml.old"));
- logger.info("[P2] &6A copy of worlds.yml has been saved in the file worlds.yml.old");
+ logger.info("A copy of worlds.yml has been saved in the file worlds.yml.old");
final ConfigurationSection worlds =
this.worldConfiguration.getConfigurationSection("worlds");
final LegacyConverter converter = new LegacyConverter(worlds);
converter.convert();
this.worldConfiguration.set("worlds", worlds);
this.setConfigurationVersion(LegacyConverter.CONFIGURATION_VERSION);
- logger.info("[P2] &aThe conversion has finished. PlotSquared will now be disabled and the new configuration file will be used at next startup. Please review the new worlds.yml file. Please note that schematics will not be converted, as we are now using WorldEdit to handle schematics. You need to re-generate the schematics.");
+ logger.info("The conversion has finished. PlotSquared will now be disabled and the new configuration file will be used at next startup. Please review the new worlds.yml file. Please note that schematics will not be converted, as we are now using WorldEdit to handle schematics. You need to re-generate the schematics.");
} catch (final Exception e) {
- logger.error("[P2] &cFailed to convert the legacy configuration file. See stack trace for information.", e);
+ logger.error("Failed to convert the legacy configuration file. See stack trace for information.", e);
}
// Disable plugin
this.platform.shutdown();
@@ -1348,27 +1357,27 @@ public class PlotSquared {
this.worldConfiguration.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
}
} catch (IOException ignored) {
- logger.error("[P2] Failed to save worlds.yml");
+ logger.error("Failed to save worlds.yml");
}
try {
this.configFile = new File(folder, "settings.yml");
if (!this.configFile.exists() && !this.configFile.createNewFile()) {
- logger.error("[P2] Could not create the settings file. Please create 'settings.yml' manually");
+ logger.error("Could not create the settings file. Please create 'settings.yml' manually");
}
this.config = YamlConfiguration.loadConfiguration(this.configFile);
setupConfig();
} catch (IOException ignored) {
- logger.error("[P2] Failed to save settings.yml");
+ logger.error("Failed to save settings.yml");
}
try {
this.storageFile = new File(folder, "storage.yml");
if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
- logger.error("[P2] Could not create the storage settings file. Please create 'storage.yml' manually");
+ logger.error("Could not create the storage settings file. Please create 'storage.yml' manually");
}
YamlConfiguration.loadConfiguration(this.storageFile);
setupStorage();
} catch (IOException ignored) {
- logger.error("[P2] Failed to save storage.yml");
+ logger.error("Failed to save storage.yml");
}
return true;
}
@@ -1399,7 +1408,7 @@ public class PlotSquared {
if (Settings.DEBUG) {
Map components = Settings.getFields(Settings.Enabled_Components.class);
for (Entry component : components.entrySet()) {
- logger.info("[P2] Key: {} | Value: {}", component.getKey(), component.getValue());
+ logger.info("Key: {} | Value: {}", component.getKey(), component.getValue());
}
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/PlotVersion.java b/Core/src/main/java/com/plotsquared/core/PlotVersion.java
index 86f3e8d58..019f23af3 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotVersion.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotVersion.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/Backup.java b/Core/src/main/java/com/plotsquared/core/backup/Backup.java
index e1af86eff..3fee60455 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/Backup.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/Backup.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/BackupManager.java b/Core/src/main/java/com/plotsquared/core/backup/BackupManager.java
index e1f7249d9..64da6c0ae 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/BackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/BackupManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/BackupProfile.java b/Core/src/main/java/com/plotsquared/core/backup/BackupProfile.java
index 5482cbcf7..fc6310ecf 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/BackupProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/BackupProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/NullBackupManager.java b/Core/src/main/java/com/plotsquared/core/backup/NullBackupManager.java
index a46e3b1d1..c237b49a6 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/NullBackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/NullBackupManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/NullBackupProfile.java b/Core/src/main/java/com/plotsquared/core/backup/NullBackupProfile.java
index b160e0e8f..12460e9c5 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/NullBackupProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/NullBackupProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java b/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
index 84feafee4..8366fe5bf 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
index 7c957b286..2d0794d4b 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.backup;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java b/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java
index cd72475e7..83e8ee272 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java b/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java
index b21ced106..119879e76 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java
index 0834f0d4f..1a0896988 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java b/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java
index d5b4e9394..efe9caa14 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java
index f6209ceb6..2be11b956 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java
index 905c69cfd..c63461325 100644
--- a/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java
+++ b/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.collection;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java
index e126c57f2..836ed2d11 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Add.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Add.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -48,7 +48,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "add",
- description = "Allow a user to build in a plot while the plot owner is online.",
usage = "/plot add ",
category = CommandCategory.SETTINGS,
permission = "plots.add",
diff --git a/Core/src/main/java/com/plotsquared/core/command/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java
index 14c47eb2a..ce12ed780 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Alias.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -44,7 +44,6 @@ import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "alias",
permission = "plots.alias",
- description = "Set the plot name",
usage = "/plot alias ",
aliases = {"setalias", "sa", "name", "rename", "setname", "seta", "nameplot"},
category = CommandCategory.SETTINGS,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java
index 283006d07..8d1bc9a75 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Area.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Area.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -93,7 +93,6 @@ import java.util.UUID;
permission = "plots.area",
category = CommandCategory.ADMINISTRATION,
requiredType = RequiredType.NONE,
- description = "Create a new PlotArea",
aliases = "world",
usage = "/plot area ",
confirmation = true)
diff --git a/Core/src/main/java/com/plotsquared/core/command/Argument.java b/Core/src/main/java/com/plotsquared/core/command/Argument.java
index 42a9858c8..3ccd4aed3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Argument.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Argument.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -58,7 +58,7 @@ public abstract class Argument {
}
};
public static final Argument PlayerName =
- new Argument("PlayerName", "") {
+ new Argument("PlayerName", "") {
@Override public String parse(String in) {
return in.length() <= 16 ? in : null;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java
index d8682eba1..467757d85 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Auto.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -64,7 +64,6 @@ import java.util.stream.Collectors;
permission = "plots.auto",
category = CommandCategory.CLAIMING,
requiredType = RequiredType.NONE,
- description = "Claim the nearest plot",
aliases = "a",
usage = "/plot auto [length, width]")
public class Auto extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Backup.java b/Core/src/main/java/com/plotsquared/core/command/Backup.java
index 9c0f459fd..5ba71cc03 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Backup.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Backup.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -57,7 +57,6 @@ import java.util.stream.Stream;
@CommandDeclaration(command = "backup",
usage = "/plot backup ",
- description = "Manage plot backups",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER,
permission = "plots.backup")
@@ -123,7 +122,6 @@ public final class Backup extends Command {
@CommandDeclaration(command = "save",
usage = "/plot backup save",
- description = "Create a plot backup",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER,
permission = "plots.backup.save")
@@ -174,7 +172,6 @@ public final class Backup extends Command {
@CommandDeclaration(command = "list",
usage = "/plot backup list",
- description = "List available plot backups",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER,
permission = "plots.backup.list")
@@ -241,7 +238,6 @@ public final class Backup extends Command {
@CommandDeclaration(command = "load",
usage = "/plot backup load <#>",
- description = "Restore a plot backup",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER,
permission = "plots.backup.load")
diff --git a/Core/src/main/java/com/plotsquared/core/command/Biome.java b/Core/src/main/java/com/plotsquared/core/command/Biome.java
index ffe5b0139..de6c46fbb 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Biome.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Biome.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
@CommandDeclaration(command = "setbiome",
permission = "plots.set.biome",
- description = "Set the plot biome",
usage = "/plot biome [biome]",
aliases = {"biome", "sb", "setb", "b"},
category = CommandCategory.APPEARANCE,
@@ -67,7 +66,7 @@ public class Biome extends SetCommand {
return false;
}
plot.addRunning();
- plot.setBiome(biome, () -> {
+ plot.getPlotModificationManager().setBiome(biome, () -> {
plot.removeRunning();
player.sendMessage(
TranslatableCaption.of("biome.biome_set_to"),
@@ -78,8 +77,7 @@ public class Biome extends SetCommand {
}
@Override
- public Collection tab(final PlotPlayer player, final String[] args,
- final boolean space) {
+ public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
return SuggestionHelper.getNamespacedRegistrySuggestions(BiomeType.REGISTRY, args[0])
.map(value -> value.toLowerCase(Locale.ENGLISH).replace("minecraft:", ""))
.filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
diff --git a/Core/src/main/java/com/plotsquared/core/command/Buy.java b/Core/src/main/java/com/plotsquared/core/command/Buy.java
index 74287404e..f49d0d238 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Buy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -46,7 +46,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "buy",
- description = "Buy the plot you are standing on",
usage = "/plot buy",
permission = "plots.buy",
category = CommandCategory.CLAIMING,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Caps.java b/Core/src/main/java/com/plotsquared/core/command/Caps.java
index 20d512e07..9f495cd9c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Caps.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Caps.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -47,7 +47,6 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
@CommandDeclaration(command = "caps",
category = CommandCategory.INFO,
- description = "Show plot entity caps",
usage = "/plot caps")
public class Caps extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Chat.java b/Core/src/main/java/com/plotsquared/core/command/Chat.java
index 4a2d4a986..e0f44813d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Chat.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Chat.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -29,7 +29,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
@CommandDeclaration(command = "chat",
- description = "Toggles plot chat on or off",
usage = "/plot chat",
permission = "plots.chat",
category = CommandCategory.CHAT,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java
index a136b599d..1906c1713 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Claim.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -55,7 +55,6 @@ import javax.annotation.Nullable;
@CommandDeclaration(
command = "claim",
aliases = "c",
- description = "Claim the current plot you're standing on",
category = CommandCategory.CLAIMING,
requiredType = RequiredType.PLAYER, permission = "plots.claim",
usage = "/plot claim")
@@ -175,8 +174,7 @@ public class Claim extends SubCommand {
try {
TaskManager.getPlatformImplementation().sync(() -> {
if (!plot.claim(player, true, finalSchematic, false)) {
- logger.info(TranslatableCaption.of("core.prefix") + String
- .format("Failed to claim plot %s", plot.getId().toCommaSeparatedString()));
+ logger.info("Failed to claim plot {}", plot.getId().toCommaSeparatedString());
player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
plot.setOwnerAbs(null);
} else if (area.isAutoMerge()) {
@@ -188,7 +186,7 @@ public class Claim extends SubCommand {
Template.of("value", "Auto merge on claim")
);
} else {
- plot.autoMerge(mergeEvent.getDir(), mergeEvent.getMax(), player.getUUID(), true);
+ plot.getPlotModificationManager().autoMerge(mergeEvent.getDir(), mergeEvent.getMax(), player.getUUID(), true);
}
}
return null;
@@ -197,9 +195,7 @@ public class Claim extends SubCommand {
e.printStackTrace();
}
}, () -> {
- logger.info(TranslatableCaption.of("core.prefix") + String
- .format("Failed to add plot %s to the database",
- plot.getId().toCommaSeparatedString()));
+ logger.info("Failed to add plot to database: {}", plot.getId().toCommaSeparatedString());
player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
plot.setOwnerAbs(null);
});
diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java
index bd9478cd6..da40ef248 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Clear.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -47,7 +47,6 @@ import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "clear",
- description = "Clear the plot you stand on",
requiredType = RequiredType.NONE,
permission = "plots.clear",
category = CommandCategory.APPEARANCE,
@@ -92,8 +91,8 @@ public class Clear extends Command {
confirm.run(this, () -> {
BackupManager.backup(player, plot, () -> {
final long start = System.currentTimeMillis();
- boolean result = plot.clear(true, false, () -> {
- plot.unlink();
+ boolean result = plot.getPlotModificationManager().clear(true, false, () -> {
+ plot.getPlotModificationManager().unlink();
TaskManager.runTask(() -> {
plot.removeRunning();
// If the state changes, then mark it as no longer done
diff --git a/Core/src/main/java/com/plotsquared/core/command/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java
index 610007fcb..4a4ae37f2 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -53,8 +53,7 @@ import java.util.concurrent.TimeoutException;
aliases = "clusters",
category = CommandCategory.ADMINISTRATION,
requiredType = RequiredType.NONE,
- permission = "plots.cluster",
- description = "Manage a plot cluster")
+ permission = "plots.cluster")
public class Cluster extends SubCommand {
@Override public boolean onCommand(PlotPlayer player, String[] args) {
@@ -270,7 +269,7 @@ public class Cluster extends SubCommand {
} else {
cluster = area.getCluster(player.getLocation());
if (cluster == null) {
- player.sendMessage(TranslatableCaption.of("cluster.not_in_cluster"));
+ player.sendMessage(TranslatableCaption.of("errors.not_in_cluster"));
return false;
}
}
@@ -298,7 +297,7 @@ public class Cluster extends SubCommand {
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster delete [name]")
+ Template.of("value", "/plot cluster resize [name]")
);
return false;
}
@@ -609,10 +608,7 @@ public class Cluster extends SubCommand {
}
return true;
}
- case "members":
- case "admin":
- case "helper":
- case "helpers": {
+ case "members": {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
@@ -623,7 +619,7 @@ public class Cluster extends SubCommand {
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster helpers ")
+ Template.of("value", "/plot cluster members ")
);
return false;
}
@@ -658,7 +654,7 @@ public class Cluster extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster helpers ")
+ Template.of("value", "/plot cluster members ")
);
}
}
@@ -690,7 +686,7 @@ public class Cluster extends SubCommand {
PlotCluster cluster = area.getCluster(args[1]);
if (cluster == null) {
player.sendMessage(
- TranslatableCaption.of("cluster.invalid_cluster"),
+ TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1])
);
return false;
@@ -733,7 +729,7 @@ public class Cluster extends SubCommand {
if (args.length == 2) {
cluster = area.getCluster(args[1]);
player.sendMessage(
- TranslatableCaption.of("cluster.invalid_cluster"),
+ TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1])
);
} else {
diff --git a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
index e0b9bbbb3..3b91d7cf1 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java b/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java
index 7dbd19407..b0a66685e 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java
index dbb872e24..006b93433 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Command.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Command.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -71,7 +71,7 @@ public abstract class Command {
private List aliases;
private RequiredType required;
private String usage;
- private String description;
+ private Caption description;
private String permission;
private boolean confirmation;
private CommandCategory category;
@@ -171,7 +171,7 @@ public abstract class Command {
return this.aliases;
}
- public String getDescription() {
+ public Caption getDescription() {
return this.description;
}
@@ -198,7 +198,21 @@ public abstract class Command {
aliasOptions.addAll(Arrays.asList(declaration.aliases()));
this.aliases = aliasOptions;
- this.description = declaration.description();
+ if (declaration.description().isEmpty()) {
+ Command parent = getParent();
+ // we're collecting the "path" of the command
+ List path = new ArrayList<>();
+ path.add(this.id);
+ while (parent != null && !parent.equals(MainCommand.getInstance())) {
+ path.add(parent.getId());
+ parent = parent.getParent();
+ }
+ Collections.reverse(path);
+ String descriptionKey = String.join(".", path);
+ this.description = TranslatableCaption.of(String.format("commands.description.%s", descriptionKey));
+ } else {
+ this.description = StaticCaption.of(declaration.description());
+ }
this.usage = declaration.usage();
this.confirmation = declaration.confirmation();
@@ -280,9 +294,10 @@ public abstract class Command {
}
/**
- * @param player Caller
- * @param args Arguments
- * @param confirm Instance, Success, Failure
+ * @param player Caller
+ * @param args Arguments
+ * @param confirm Instance, Success, Failure
+ * @param whenDone task to run when done
* @return CompletableFuture true if the command executed fully, false in
* any other case
*/
@@ -334,7 +349,7 @@ public abstract class Command {
String[] allArgs = setArgs.toArray(new String[0]);
int best = 0;
for (Command current : commands) {
- int match = getMatch(allArgs, current);
+ int match = getMatch(allArgs, current, player);
if (match > best) {
cmd = current;
}
@@ -384,12 +399,12 @@ public abstract class Command {
return true;
}
- public int getMatch(String[] args, Command cmd) {
+ public int getMatch(String[] args, Command cmd, PlotPlayer player) {
String perm = cmd.getPermission();
HashSet desc = new HashSet<>();
int count = cmd.getAliases().stream().filter(alias -> alias.startsWith(args[0]))
.mapToInt(alias -> 5).sum();
- Collections.addAll(desc, cmd.getDescription().split(" "));
+ Collections.addAll(desc, cmd.getDescription().getComponent(player).split(" "));
for (String arg : args) {
if (perm.startsWith(arg)) {
count++;
diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
index 46720f24a..e2e804e68 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -48,6 +48,7 @@ public interface CommandCaller {
* Check the player's permissions. Will be cached if permission caching is enabled.
*
* @param permission the name of the permission
+ * @return if permission is had
*/
boolean hasPermission(@Nonnull String permission);
diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
index 67895187e..5544edf6a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java b/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java
index 105543ba0..8213300f9 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Comment.java b/Core/src/main/java/com/plotsquared/core/command/Comment.java
index fe472a543..25766f3f0 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Comment.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Comment.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -41,7 +41,6 @@ import java.util.Locale;
@CommandDeclaration(command = "comment",
aliases = {"msg"},
- description = "Comment on a plot",
category = CommandCategory.CHAT,
requiredType = RequiredType.PLAYER,
permission = "plots.comment")
diff --git a/Core/src/main/java/com/plotsquared/core/command/Condense.java b/Core/src/main/java/com/plotsquared/core/command/Condense.java
index fa1144f40..01891ca56 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Condense.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Condense.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -51,7 +51,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
@CommandDeclaration(command = "condense",
permission = "plots.admin",
usage = "/plot condense [radius]",
- description = "Condense a plotworld",
category = CommandCategory.ADMINISTRATION,
requiredType = RequiredType.CONSOLE)
public class Condense extends SubCommand {
@@ -71,7 +70,7 @@ public class Condense extends SubCommand {
if (args.length != 2 && args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot condense [radius]")
+ Template.of("value", "/plot condense [radius]")
);
return false;
}
@@ -179,7 +178,7 @@ public class Condense extends SubCommand {
i++;
final AtomicBoolean result = new AtomicBoolean(false);
try {
- result.set(origin.move(possible, () -> {
+ result.set(origin.getPlotModificationManager().move(possible, () -> {
if (result.get()) {
player.sendMessage(
TranslatableCaption.of("condense.moving"),
diff --git a/Core/src/main/java/com/plotsquared/core/command/Confirm.java b/Core/src/main/java/com/plotsquared/core/command/Confirm.java
index eda912b9a..98fc3b39a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Confirm.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Confirm.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -32,7 +32,6 @@ import com.plotsquared.core.util.task.TaskManager;
@CommandDeclaration(command = "confirm",
permission = "plots.use",
- description = "Confirm an action",
category = CommandCategory.INFO)
public class Confirm extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java
index 627a3b511..49ffeca04 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Continue.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -42,7 +42,6 @@ import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@CommandDeclaration(command = "continue",
- description = "Continue a plot that was previously marked as done",
permission = "plots.continue",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER)
diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java
index 41e1e60fd..64ae43b8a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Copy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -37,7 +37,6 @@ import net.kyori.adventure.text.minimessage.Template;
permission = "plots.copy",
aliases = {"copypaste"},
category = CommandCategory.CLAIMING,
- description = "Copy a plot",
usage = "/plot copy ",
requiredType = RequiredType.NONE)
public class Copy extends SubCommand {
@@ -77,11 +76,15 @@ public class Copy extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.plotworld_incompatible"));
return false;
}
- if (plot1.copy(plot2, () -> player.sendMessage(TranslatableCaption.of("move.copy_success")))) {
- return true;
- } else {
- player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
- return false;
- }
+
+ plot1.getPlotModificationManager().copy(plot2).thenAccept(result -> {
+ if (result) {
+ player.sendMessage(TranslatableCaption.of("move.copy_success"));
+ } else {
+ player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
+ }
+ });
+
+ return true;
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
index ebdab6c65..da4d67b42 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -41,7 +41,6 @@ import javax.annotation.Nonnull;
category = CommandCategory.ADMINISTRATION,
requiredType = RequiredType.PLAYER,
permission = "plots.createroadschematic",
- description = "Add a road schematic to your world using the roads around your current plot",
usage = "/plot createroadschematic")
public class CreateRoadSchematic extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
index 1611d6cd0..09382ca9a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -48,7 +48,6 @@ import com.plotsquared.core.util.FileUtils;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.TaskManager;
import net.kyori.adventure.text.minimessage.Template;
-import sun.net.TransferProtocolClient;
import javax.annotation.Nonnull;
import java.io.File;
@@ -63,7 +62,6 @@ import java.util.Map.Entry;
aliases = {"convert"},
category = CommandCategory.ADMINISTRATION,
permission = "plots.database",
- description = "Convert/Backup Storage",
requiredType = RequiredType.CONSOLE,
usage = "/plot database [area] ")
public class DatabaseCommand extends SubCommand {
@@ -104,7 +102,7 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot database [area] ")
+ Template.of("value", "/plot database [area] ")
);
return false;
}
@@ -178,7 +176,11 @@ public class DatabaseCommand extends SubCommand {
continue;
}
}
- player.sendMessage(StaticCaption.of("Skipping duplicate plot: " + plot + " | id=" + plot.temp));
+ player.sendMessage(
+ TranslatableCaption.of("database.skipping_duplicated_plot"),
+ Template.of("plot", String.valueOf(plot)),
+ Template.of("id", String.valueOf(plot.temp))
+ );
continue;
}
plot.setArea(pa);
@@ -225,17 +227,17 @@ public class DatabaseCommand extends SubCommand {
return true;
} catch (ClassNotFoundException | SQLException e) {
player.sendMessage(TranslatableCaption.of("database.failed_to_save_plots"));
- player.sendMessage(StaticCaption.of(("=== Begin of stacktrace. ===")));
+ player.sendMessage(TranslatableCaption.of("errors.stacktrace_begin"));
e.printStackTrace();
- player.sendMessage(StaticCaption.of(("=== End of stacktrace. ===")));
+ player.sendMessage(TranslatableCaption.of(("errors.stacktrace_end")));
player.sendMessage(TranslatableCaption.of("database.invalid_args"));
return false;
}
} catch (ClassNotFoundException | SQLException e) {
player.sendMessage(TranslatableCaption.of("database.failed_to_open"));
- player.sendMessage(StaticCaption.of(("=== Begin of stacktrace. ===")));
+ player.sendMessage(TranslatableCaption.of("errors.stacktrace_begin"));
e.printStackTrace();
- player.sendMessage(StaticCaption.of(("=== End of stacktrace. ===")));
+ player.sendMessage(TranslatableCaption.of("errors.stacktrace_end"));
player.sendMessage(TranslatableCaption.of("database.invalid_args"));
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Debug.java b/Core/src/main/java/com/plotsquared/core/command/Debug.java
index 19e59ecf9..67eb61d3f 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Debug.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -55,7 +55,6 @@ import java.util.Set;
@CommandDeclaration(command = "debug",
category = CommandCategory.DEBUG,
- description = "Show debug information",
usage = "/plot debug [msg]",
permission = "plots.admin")
public class Debug extends SubCommand {
@@ -72,6 +71,10 @@ public class Debug extends SubCommand {
}
@Override public boolean onCommand(PlotPlayer player, String[] args) {
+ if (args.length == 0 ) {
+ player.sendMessage(TranslatableCaption.of("commandconfig.command_syntax"),
+ Template.of("value", "/plot debug "));
+ }
if (args.length > 0) {
if ("player".equalsIgnoreCase(args[0])) {
for (Map.Entry meta : player.getMeta().entrySet()) {
@@ -83,7 +86,7 @@ public class Debug extends SubCommand {
final long start = System.currentTimeMillis();
player.sendMessage(TranslatableCaption.of("debug.fetching_loaded_chunks"));
TaskManager.runTaskAsync(() -> player.sendMessage(StaticCaption
- .of("Loaded chunks: " + this.worldUtil.getChunkChunks(player.getLocation().getWorldName()).size() + "(" + (System.currentTimeMillis()
+ .of("Loaded chunks: " + this.worldUtil.getChunkChunks(player.getLocation().getWorldName()).size() + " (" + (System.currentTimeMillis()
- start) + "ms) using thread: " + Thread.currentThread().getName())));
return true;
}
@@ -106,10 +109,10 @@ public class Debug extends SubCommand {
return true;
}
if (args.length > 0 && "logging".equalsIgnoreCase(args[0])) {
- logger.info("[P2] Info!");
- logger.warn("[P2] Warning!");
- logger.error("[P2] Error!", new RuntimeException());
- logger.debug("[P2] Debug!");
+ logger.info("Info!");
+ logger.warn("Warning!");
+ logger.error("Error!", new RuntimeException());
+ logger.debug("Debug!");
return true;
}
if (args.length > 0 && "entitytypes".equalsIgnoreCase(args[0])) {
@@ -121,7 +124,7 @@ public class Debug extends SubCommand {
for (final EntityType entityType : category.getAll()) {
builder.append(entityType.getId()).append(" ");
}
- player.sendMessage(StaticCaption.of("core.prefix" + builder.toString()));
+ player.sendMessage(StaticCaption.of("" + builder.toString()));
});
EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
.forEach(entityType -> {
@@ -130,7 +133,7 @@ public class Debug extends SubCommand {
if (categoryCount > 0) {
return;
}
- player.sendMessage(StaticCaption.of("core.prefix" + entityType.getName() + " is in "
+ player.sendMessage(StaticCaption.of("" + entityType.getName() + " is in "
+ categoryCount + " categories"));
});
return true;
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java
index 37bad8d20..08948bc29 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -33,7 +33,6 @@ import java.util.List;
import java.util.UUID;
@CommandDeclaration(command = "debugallowunsafe",
- description = "Allow unsafe actions until toggled off",
usage = "/plot debugallowunsafe",
category = CommandCategory.DEBUG,
requiredType = RequiredType.NONE,
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
index eb196760b..5d0ffbc37 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -89,7 +89,6 @@ import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "debugexec",
permission = "plots.admin",
- description = "Mutli-purpose debug command",
aliases = {"exec", "$"},
category = CommandCategory.DEBUG)
public class DebugExec extends SubCommand {
@@ -230,7 +229,10 @@ public class DebugExec extends SubCommand {
player.sendMessage(TranslatableCaption.of("debugexec.starting_task"));
this.hybridUtils.analyzePlot(plot, new RunnableVal() {
@Override public void run(PlotAnalysis value) {
- player.sendMessage(StaticCaption.of("&6Done: &7Use &6/plot debugexec analyze &7for more information."));
+ player.sendMessage(
+ TranslatableCaption.of("debugexec.analyze_done"),
+ Template.of("command", "/plot debugexec analyze")
+ );
}
});
return true;
@@ -331,11 +333,9 @@ public class DebugExec extends SubCommand {
} else {
player.sendMessage(TranslatableCaption.of("debugexec.expiry_already_started"));
}
- case "h":
- case "he":
case "?":
case "help":
- player.sendMessage(StaticCaption.of("Possible sub commands: /plot debugexec <" + StringMan.join(allowed_params, "|") + ">"));
+ player.sendMessage(StaticCaption.of("Possible sub commands: /plot debugexec <" + StringMan.join(allowed_params, " | ") + ">"));
return false;
case "addcmd":
try {
@@ -422,7 +422,7 @@ public class DebugExec extends SubCommand {
message.set(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
.parse(TranslatableCaption.of("debugexec.script_list_item").getComponent(player), numTemplate, nameTemplate))));
}
- }, "/plot debugexec list-scripts", StaticCaption.of("List of scripts"));
+ }, "/plot debugexec list-scripts", TranslatableCaption.of("scripts.script_list"));
return true;
case "all":
if (args.length < 3) {
@@ -458,12 +458,12 @@ public class DebugExec extends SubCommand {
} catch (ScriptException e) {
e.printStackTrace();
}
- logger.info("[P2] > {}ms -> {}", System.currentTimeMillis() - start, result);
+ logger.info("{}ms -> {}", System.currentTimeMillis() - start, result);
});
} else {
long start = System.currentTimeMillis();
Object result = this.engine.eval(script, this.scope);
- logger.info("[P2] > {}ms -> {}", System.currentTimeMillis() - start, result);
+ logger.info("{}ms -> {}", System.currentTimeMillis() - start, result);
}
return true;
} catch (ScriptException e) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java
index ec12c1bc4..22282d5e5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -45,7 +45,6 @@ import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "debugimportworlds",
permission = "plots.admin",
- description = "Import worlds by player name",
requiredType = RequiredType.CONSOLE,
category = CommandCategory.TELEPORT)
public class DebugImportWorlds extends Command {
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java
index 387c5204e..00aa27558 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -31,7 +31,6 @@ import com.plotsquared.core.player.PlotPlayer;
@CommandDeclaration(command = "debugloadtest",
permission = "plots.debugloadtest",
- description = "This debug command will force the reload of all plots in the DB",
usage = "/plot debugloadtest",
category = CommandCategory.DEBUG,
requiredType = RequiredType.CONSOLE)
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
index f4a21e60a..a79a8a240 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -56,7 +56,6 @@ import java.util.stream.Collectors;
@CommandDeclaration(command = "debugpaste",
aliases = "dp",
usage = "/plot debugpaste",
- description = "Upload settings.yml, worlds.yml, your latest.log and Multiverse's worlds.yml (if being used) to https://athion.net/ISPaster/paste",
permission = "plots.debugpaste",
category = CommandCategory.DEBUG,
confirmation = true,
@@ -146,25 +145,30 @@ public class DebugPaste extends SubCommand {
final File logFile =
new File(PlotSquared.platform().getDirectory(), "../../logs/latest.log");
if (Files.size(logFile.toPath()) > 14_000_000) {
- throw new IOException("Too big...");
+ throw new IOException("The latest.log is larger than 14MB. Please reboot your server and submit a new paste.");
}
incendoPaster
.addFile(new IncendoPaster.PasteFile("latest.log", readFile(logFile)));
} catch (IOException ignored) {
- player.sendMessage(StaticCaption.of("&clatest.log is too big to be pasted, please reboot your server and submit a new paste."));
+ player.sendMessage(
+ TranslatableCaption.of("debugpaste.latest_log"),
+ Template.of("file", "latest.log"),
+ Template.of("size", "14MB"));
}
try {
incendoPaster.addFile(new IncendoPaster.PasteFile("settings.yml",
readFile(this.configFile)));
} catch (final IllegalArgumentException ignored) {
- player.sendMessage(StaticCaption.of("&cSkipping settings.yml because it's empty."));
+ player.sendMessage(TranslatableCaption.of("debugpaste.empty_file"),
+ Template.of("file", "settings.yml"));
}
try {
incendoPaster.addFile(new IncendoPaster.PasteFile("worlds.yml",
readFile(this.worldfile)));
} catch (final IllegalArgumentException ignored) {
- player.sendMessage(StaticCaption.of("&cSkipping worlds.yml because it's empty."));
+ player.sendMessage(TranslatableCaption.of("debugpaste.empty_file"),
+ Template.of("file", "worlds.yml"));
}
try {
@@ -173,7 +177,8 @@ public class DebugPaste extends SubCommand {
incendoPaster.addFile(new IncendoPaster.PasteFile("MultiverseCore/worlds.yml",
readFile(MultiverseWorlds)));
} catch (final IOException ignored) {
- player.sendMessage(StaticCaption.of("&cSkipping Multiverse world's.yml because Multiverse is not in use."));
+ player.sendMessage(TranslatableCaption.of("debugpaste.skip_multiverse"),
+ Template.of("file", "worlds.yml"));
}
try {
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
index 08afc831a..d95bbff35 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -43,7 +43,6 @@ import java.util.Arrays;
@CommandDeclaration(command = "debugroadregen",
usage = DebugRoadRegen.USAGE,
requiredType = RequiredType.NONE,
- description = "Regenerate roads in the plot or region the user is, based on the road schematic",
category = CommandCategory.DEBUG,
permission = "plots.debugroadregen")
public class DebugRoadRegen extends SubCommand {
@@ -140,7 +139,7 @@ public class DebugRoadRegen extends SubCommand {
Plot plot = player.getCurrentPlot();
PlotManager manager = area.getPlotManager();
if (!(manager instanceof HybridPlotManager)) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
+ player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
return true;
}
player.sendMessage(TranslatableCaption.of("debugroadregen.schematic"),
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java
index 02a2669b7..1274fb531 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -37,8 +37,7 @@ import java.util.List;
permission = "plots.debugsavetest",
category = CommandCategory.DEBUG,
requiredType = RequiredType.CONSOLE,
- usage = "/plot debugsavetest",
- description = "This command will force the recreation of all plots in the DB")
+ usage = "/plot debugsavetest")
public class DebugSaveTest extends SubCommand {
@Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java
index 908151ff7..be4774982 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Delete.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -47,7 +47,6 @@ import javax.annotation.Nullable;
@CommandDeclaration(command = "delete",
permission = "plots.delete",
- description = "Delete the plot you stand on",
usage = "/plot delete",
aliases = {"dispose", "del"},
category = CommandCategory.CLAIMING,
@@ -99,7 +98,7 @@ public class Delete extends SubCommand {
return;
}
final long start = System.currentTimeMillis();
- boolean result = plot.deletePlot(() -> {
+ boolean result = plot.getPlotModificationManager().deletePlot(() -> {
plot.removeRunning();
if ((this.econHandler != null) && plotArea.useEconomy()) {
Expression valueExr = plotArea.getPrices().get("sell");
diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java
index 3bf0b5eb1..cfe357c42 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Deny.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -50,7 +50,6 @@ import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "deny",
aliases = {"d", "ban"},
- description = "Deny a user from entering a plot",
usage = "/plot deny ",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.PLAYER)
diff --git a/Core/src/main/java/com/plotsquared/core/command/Desc.java b/Core/src/main/java/com/plotsquared/core/command/Desc.java
index ed25b6730..24d3f165a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Desc.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Desc.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -40,7 +40,6 @@ import javax.annotation.Nonnull;
@CommandDeclaration(command = "setdescription",
permission = "plots.set.desc",
- description = "Set the plot description",
usage = "/plot desc ",
aliases = {"desc", "setdesc", "setd", "description"},
category = CommandCategory.SETTINGS,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Dislike.java b/Core/src/main/java/com/plotsquared/core/command/Dislike.java
index 2d603f814..3e4db188c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Dislike.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Dislike.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -32,7 +32,6 @@ import javax.annotation.Nonnull;
@CommandDeclaration(command = "dislike",
permission = "plots.dislike",
- description = "Dislike the plot",
usage = "/plot dislike [next|purge]",
category = CommandCategory.INFO,
requiredType = RequiredType.PLAYER)
diff --git a/Core/src/main/java/com/plotsquared/core/command/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java
index ebe46201d..ab38a329b 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Done.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Done.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -49,7 +49,6 @@ import javax.annotation.Nonnull;
@CommandDeclaration(command = "done",
aliases = {"submit"},
- description = "Mark a plot as done",
permission = "plots.done",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE)
@@ -93,7 +92,7 @@ public class Done extends SubCommand {
return false;
}
plot.addRunning();
- player.sendMessage(TranslatableCaption.of("web.generating_lin"));
+ player.sendMessage(TranslatableCaption.of("web.generating_link"));
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
if (ExpireManager.IMP == null || doneRequirements == null) {
finish(plot, player, true);
diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java
index fcfcec3b6..b83eb4703 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Download.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Download.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -45,12 +45,11 @@ import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import java.net.URL;
-@CommandDeclaration(usage = "/plot download [schematic|world]",
+@CommandDeclaration(usage = "/plot download [schematic | world]",
command = "download",
aliases = {"dl"},
category = CommandCategory.SCHEMATIC,
requiredType = RequiredType.NONE,
- description = "Download your plot",
permission = "plots.download")
public class Download extends SubCommand {
@@ -111,7 +110,9 @@ public class Download extends SubCommand {
player.sendMessage(TranslatableCaption.of("web.generating_link_failed"));
return;
}
- player.sendMessage(StaticCaption.of(url.toString())
+ player.sendMessage(
+ TranslatableCaption.of("web.generation_link_success"),
+ Template.of("url", url.toString())
);
}
});
diff --git a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
index 766d2361b..b383a0db9 100644
--- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -71,7 +71,6 @@ import java.util.stream.Stream;
@CommandDeclaration(command = "flag",
aliases = {"f", "flag"},
usage = "/plot flag ",
- description = "Manage plot flags",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag")
@@ -282,7 +281,6 @@ public final class FlagCommand extends Command {
@CommandDeclaration(command = "set",
aliases = {"s", "set"},
usage = "/plot flag set ",
- description = "Set a plot flag",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.set.flag")
@@ -335,7 +333,6 @@ public final class FlagCommand extends Command {
@CommandDeclaration(command = "add",
aliases = {"a", "add"},
usage = "/plot flag add ",
- description = "Add a plot flag value",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag.add")
@@ -399,7 +396,6 @@ public final class FlagCommand extends Command {
@CommandDeclaration(command = "remove",
aliases = {"r", "remove", "delete"},
usage = "/plot flag remove [values]",
- description = "Remove a flag",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag.remove")
@@ -503,7 +499,6 @@ public final class FlagCommand extends Command {
@CommandDeclaration(command = "list",
aliases = {"l", "list", "flags"},
usage = "/plot flag list",
- description = "List all available plot flags",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag.list")
@@ -543,7 +538,6 @@ public final class FlagCommand extends Command {
@CommandDeclaration(command = "info",
aliases = {"i", "info"},
usage = "/plot flag info ",
- description = "View information about a flag",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag.info")
diff --git a/Core/src/main/java/com/plotsquared/core/command/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java
index 33c3f042b..1745eec0c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Grant.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -40,10 +40,14 @@ import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.minimessage.Template;
+import java.util.Collection;
+import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@CommandDeclaration(command = "grant",
category = CommandCategory.CLAIMING,
@@ -89,7 +93,7 @@ public class Grant extends Command {
PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
if (args[0].equalsIgnoreCase("check")) {
player.sendMessage(TranslatableCaption.of("grants.granted_plots"),
- Template.of("grants", String.valueOf(access.get().orElse(0))));
+ Template.of("amount", String.valueOf(access.get().orElse(0))));
} else {
access.set(access.get().orElse(0) + 1);
}
@@ -131,4 +135,10 @@ public class Grant extends Command {
sendUsage(player);
return CompletableFuture.completedFuture(true);
}
+ @Override public Collection tab(final PlotPlayer player, String[] args, boolean space) {
+ return Stream.of("check", "add")
+ .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
+ .map(value -> new Command(null, false, value, "plots.grant", RequiredType.NONE, null) {
+ }).collect(Collectors.toList());
+ }
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java
index f417e51d6..8ec4f7e40 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Help.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Help.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -39,7 +39,6 @@ import net.kyori.adventure.text.minimessage.Template;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "help",
- description = "Get this help menu",
aliases = "?",
category = CommandCategory.INFO,
usage = "help [category|#]",
diff --git a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
index 71b3de593..24f2a544c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -50,7 +50,6 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "home",
- description = "Teleport to your plot(s)",
permission = "plots.home",
usage = "/plot home [ | | | | ]",
aliases = {"h"},
diff --git a/Core/src/main/java/com/plotsquared/core/command/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java
index aa177b427..b722c2caa 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -44,8 +44,7 @@ import net.kyori.adventure.text.minimessage.Template;
import java.util.List;
@CommandDeclaration(command = "inbox",
- description = "Review the comments for a plot",
- usage = "/plot inbox [inbox] [delete |clear|page]",
+ usage = "/plot inbox [inbox] [delete | clear | page]",
permission = "plots.inbox",
category = CommandCategory.CHAT,
requiredType = RequiredType.PLAYER)
@@ -208,7 +207,7 @@ public class Inbox extends SubCommand {
}
PlotComment comment = value.get(index - 1);
inbox.removeComment(plot, comment);
- boolean success = plot.removeComment(comment);
+ boolean success = plot.getPlotCommentContainer().removeComment(comment);
if (success) {
player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"),
@@ -231,9 +230,9 @@ public class Inbox extends SubCommand {
player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
}
inbox.clearInbox(plot);
- List comments = plot.getComments(inbox.toString());
+ List comments = plot.getPlotCommentContainer().getComments(inbox.toString());
if (!comments.isEmpty()) {
- plot.removeComments(comments);
+ plot.getPlotCommentContainer().removeComments(comments);
}
player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"),
diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java
index 20c678fd3..dde661891 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Info.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Info.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -38,8 +38,7 @@ import net.kyori.adventure.text.minimessage.Template;
@CommandDeclaration(command = "info",
aliases = "i",
- description = "Display plot info",
- usage = "/plot info [-f, to force info]",
+ usage = "/plot info [-f to force info]",
category = CommandCategory.INFO)
public class Info extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java
index b8a4bc1b2..11fb6352e 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Kick.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -50,7 +50,6 @@ import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "kick",
aliases = "k",
- description = "Kick a player from your plot",
permission = "plots.kick",
usage = "/plot kick ",
category = CommandCategory.TELEPORT,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Leave.java b/Core/src/main/java/com/plotsquared/core/command/Leave.java
index b7cb17d74..7afa25ff7 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Leave.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Leave.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -39,7 +39,6 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "leave",
- description = "Removes self from being trusted or a member of the plot",
permission = "plots.leave",
usage = "/plot leave",
category = CommandCategory.CLAIMING,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java
index d14cd28c3..199bd09e3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Like.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Like.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -50,7 +50,6 @@ import java.util.UUID;
@CommandDeclaration(command = "like",
permission = "plots.like",
- description = "Like the plot",
usage = "/plot like [next | purge]",
category = CommandCategory.INFO,
requiredType = RequiredType.PLAYER)
@@ -172,6 +171,7 @@ public class Like extends SubCommand {
/**
* Get the likes to dislike ratio of a plot as a percentage (in decimal form)
*
+ * @param plot plot
* @return likes to dislike ratio, returns zero if the plot has no likes
*/
public static double getLikesPercentage(final Plot plot) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
index 8d79848a5..d01e3ea3e 100644
--- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -72,7 +72,6 @@ import java.util.stream.Collectors;
@CommandDeclaration(command = "list",
aliases = {"l", "find", "search"},
- description = "List plots",
permission = "plots.list",
category = CommandCategory.INFO,
usage = "/plot list > [#]")
diff --git a/Core/src/main/java/com/plotsquared/core/command/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java
index 3e8ab1b41..585a41234 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Load.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Load.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -54,7 +54,6 @@ import java.util.List;
aliases = "restore",
category = CommandCategory.SCHEMATIC,
requiredType = RequiredType.NONE,
- description = "Load your plot",
permission = "plots.load",
usage = "/plot load")
public class Load extends SubCommand {
diff --git a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
index d3c817747..4e9b366cf 100644
--- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -42,6 +42,8 @@ import com.plotsquared.core.util.Expression;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.LinkedList;
@@ -55,6 +57,8 @@ import java.util.concurrent.CompletableFuture;
aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
public class MainCommand extends Command {
+ private static final Logger logger = LoggerFactory.getLogger("P2/" + MainCommand.class.getSimpleName());
+
private static MainCommand instance;
public Help help;
public Toggle toggle;
@@ -144,7 +148,12 @@ public class MainCommand extends Command {
}
for (final Class command : commands) {
- injector.getInstance(command);
+ try {
+ injector.getInstance(command);
+ } catch (final Exception e) {
+ logger.error("Failed to register command {}", command.getCanonicalName());
+ e.printStackTrace();
+ }
}
// Referenced commands
@@ -301,12 +310,13 @@ public class MainCommand extends Command {
throw e;
} catch (Throwable e) {
e.printStackTrace();
- String message = e.getLocalizedMessage();
+ String message = e.getMessage();
if (message != null) {
player.sendMessage(TranslatableCaption.of("errors.error"),
net.kyori.adventure.text.minimessage.Template.of("value", message));
} else {
- player.sendMessage(TranslatableCaption.of("errors.error"));
+ player.sendMessage(
+ TranslatableCaption.of("errors.error_console"));
}
}
// Reset command scope //
diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java
index ebb9de4e1..12d0a5ec6 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Merge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java
@@ -21,19 +21,19 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Direction;
import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
@@ -42,7 +42,6 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.Expression;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringMan;
-import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@@ -51,7 +50,6 @@ import java.util.UUID;
@CommandDeclaration(command = "merge",
aliases = "m",
- description = "Merge the plot you are standing on with another plot",
permission = "plots.merge",
usage = "/plot merge [removeroads]",
category = CommandCategory.SETTINGS,
@@ -182,7 +180,7 @@ public class Merge extends SubCommand {
);
return true;
}
- if (plot.autoMerge(Direction.ALL, maxSize, uuid, terrain)) {
+ if (plot.getPlotModificationManager().autoMerge(Direction.ALL, maxSize, uuid, terrain)) {
if (this.econHandler != null && plotArea.useEconomy() && price > 0d) {
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
@@ -226,7 +224,7 @@ public class Merge extends SubCommand {
);
return true;
}
- if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) {
+ if (plot.getPlotModificationManager().autoMerge(direction, maxSize - size, uuid, terrain)) {
if (this.econHandler != null && plotArea.useEconomy() && price > 0d) {
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
@@ -234,12 +232,12 @@ public class Merge extends SubCommand {
Template.of("money", String.valueOf(price))
);
}
- player.sendMessage(TranslatableCaption.of("success_merge"));
+ player.sendMessage(TranslatableCaption.of("merge.success_merge"));
return true;
}
Plot adjacent = plot.getRelative(direction);
if (adjacent == null || !adjacent.hasOwner() || adjacent
- .getMerged((direction.getIndex() + 2) % 4) || (!force && adjacent.isOwner(uuid))) {
+ .isMerged((direction.getIndex() + 2) % 4) || (!force && adjacent.isOwner(uuid))) {
player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
return false;
}
@@ -261,8 +259,8 @@ public class Merge extends SubCommand {
final Direction dir = direction;
Runnable run = () -> {
accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
- plot.autoMerge(dir, maxSize - size, owner, terrain);
- PlotPlayer plotPlayer = PlotSquared.platform().getPlayerManager().getPlayerIfExists(player.getUUID());
+ plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, terrain);
+ PlotPlayer plotPlayer = PlotSquared.platform().getPlayerManager().getPlayerIfExists(player.getUUID());
if (plotPlayer == null) {
accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
return;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Middle.java b/Core/src/main/java/com/plotsquared/core/command/Middle.java
index 5ea239c3d..a8342c6df 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Middle.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Middle.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -36,7 +36,6 @@ import com.plotsquared.core.plot.Plot;
*/
@CommandDeclaration(command = "middle",
aliases = {"center", "centre"},
- description = "Teleports you to the center of the plot",
usage = "/plot middle",
category = CommandCategory.TELEPORT,
requiredType = RequiredType.PLAYER)
@@ -50,6 +49,7 @@ public class Middle extends SubCommand {
return false;
}
plot.getCenter(center -> player.teleport(center, TeleportCause.COMMAND));
+ player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot"));
return true;
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java
index a9feb3080..e4c2a64d3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Move.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Move.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -43,7 +43,6 @@ import java.util.concurrent.CompletableFuture;
@CommandDeclaration(usage = "/plot move ",
command = "move",
- description = "Move a plot",
permission = "plots.move",
category = CommandCategory.CLAIMING,
requiredType = RequiredType.PLAYER)
@@ -107,7 +106,7 @@ public class Move extends SubCommand {
return CompletableFuture.completedFuture(false);
}
- return plot1.move(plot2, () -> {
+ return plot1.getPlotModificationManager().move(plot2, () -> {
}, false).thenApply(result -> {
if (result) {
player.sendMessage(TranslatableCaption.of("move.move_success"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java
index f9c0ce8d9..ffab80dcf 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -48,7 +48,6 @@ import java.util.Locale;
@CommandDeclaration(command = "music",
permission = "plots.music",
- description = "Play music in your plot",
usage = "/plot music",
category = CommandCategory.APPEARANCE,
requiredType = RequiredType.PLAYER)
@@ -57,7 +56,7 @@ public class Music extends SubCommand {
private static final Collection DISCS = Arrays
.asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
"music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
- "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait");
+ "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_pigstep");
private final InventoryUtil inventoryUtil;
@@ -87,27 +86,27 @@ public class Music extends SubCommand {
.createFlagInstance(item.getType());
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
- player.sendMessage(
+ getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music removal"));
return true;
}
plot.removeFlag(event.getFlag());
- player.sendMessage(TranslatableCaption.of("flag.flag_removed"));
- } else if (item.name.toLowerCase(Locale.ENGLISH).contains("disc")) {
+ getPlayer().sendMessage(TranslatableCaption.of("flag.flag_removed"));
+ } else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
PlotFlag plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
.createFlagInstance(item.getType());
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
- player.sendMessage(
+ getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music addition"));
return true;
}
plot.setFlag(event.getFlag());
- player.sendMessage(TranslatableCaption.of("flag.flag_added"));
+ getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"));
} else {
- player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
+ getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));
}
return false;
}
@@ -115,16 +114,16 @@ public class Music extends SubCommand {
int index = 0;
for (final String disc : DISCS) {
- final String name = String.format("&r&6%s", disc);
- final String[] lore = {"&r&aClick to play!"};
+ final String name = String.format("%s", disc);
+ final String[] lore = {"Click to play!"};
final PlotItemStack item = new PlotItemStack(disc, 1, name, lore);
inv.setItem(index++, item);
}
// Always add the cancel button
// if (player.getMeta("music") != null) {
- String name = "&r&6Cancel music";
- String[] lore = {"&r&cClick to cancel!"};
+ String name = "Cancel music";
+ String[] lore = {"Click to remove the music!"};
inv.setItem(index, new PlotItemStack("bedrock", 1, name, lore));
// }
diff --git a/Core/src/main/java/com/plotsquared/core/command/Near.java b/Core/src/main/java/com/plotsquared/core/command/Near.java
index 91e5230d0..e14b14ddc 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Near.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Near.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -37,7 +37,6 @@ import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "near",
aliases = "n",
- description = "Display nearby players",
usage = "/plot near",
category = CommandCategory.INFO,
requiredType = RequiredType.PLAYER)
diff --git a/Core/src/main/java/com/plotsquared/core/command/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java
index 292ccdff1..c29034584 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Owner.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -49,7 +49,6 @@ import java.util.function.Consumer;
@CommandDeclaration(command = "setowner",
permission = "plots.set.owner",
- description = "Set the plot owner",
usage = "/plot setowner ",
aliases = {"owner", "so", "seto"},
category = CommandCategory.CLAIMING,
@@ -106,11 +105,11 @@ public class Owner extends SetCommand {
Template.of("value", "Unlink on owner change"));
return;
}
- plot.unlinkPlot(unlinkEvent.isCreateRoad(), unlinkEvent.isCreateRoad());
+ plot.getPlotModificationManager().unlinkPlot(unlinkEvent.isCreateRoad(), unlinkEvent.isCreateRoad());
Set connected = plot.getConnectedPlots();
for (Plot current : connected) {
current.unclaim();
- current.removeSign();
+ current.getPlotModificationManager().removeSign();
}
player.sendMessage(TranslatableCaption.of("owner.set_owner"));
return;
@@ -148,7 +147,7 @@ public class Owner extends SetCommand {
if (plot.setOwner(finalUUID, player)) {
if (removeDenied)
plot.removeDenied(finalUUID);
- plot.setSign(finalName);
+ plot.getPlotModificationManager().setSign(finalName);
player.sendMessage(TranslatableCaption.of("owner.set_owner"));
if (other != null) {
other.sendMessage(
diff --git a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
index cc8ab09af..695b045f6 100644
--- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -34,7 +34,6 @@ import net.kyori.adventure.text.minimessage.Template;
@CommandDeclaration(command = "plugin",
permission = "plots.use",
- description = "Show plugin information",
usage = "/plot plugin",
aliases = "version",
category = CommandCategory.INFO)
@@ -47,7 +46,7 @@ public class PluginCmd extends SubCommand {
Template.of("version", String.valueOf(PlotSquared.get().getVersion()))
);
player.sendMessage(StaticCaption.of(" >> Authors: Citymonstret & Empire92 & MattBDev & dordsor21 & NotMyFault & SirYwell"));
- player.sendMessage(StaticCaption.of(" >> Wiki: https://wiki.intellectualsites.com/plotsquared/home"));
+ player.sendMessage(StaticCaption.of(" >> Wiki: https://wiki.intellectualsites.com/plotsquared/home"));
player.sendMessage(
StaticCaption.of(" >> Premium: "),
Template.of("value", String.valueOf(PremiumVerification.isPremium()))
diff --git a/Core/src/main/java/com/plotsquared/core/command/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java
index 19ee68a92..2d75807b8 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Purge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -51,10 +51,9 @@ import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
-@CommandDeclaration(usage = "/plot purge world: area: id: owner: shared: unknown:[true|false] clear:[true|false]",
+@CommandDeclaration(usage = "/plot purge world: area: id: owner: shared: unknown:[true | false] clear:[true | false]",
command = "purge",
permission = "plots.admin",
- description = "Purge all plots for a world",
category = CommandCategory.ADMINISTRATION,
requiredType = RequiredType.CONSOLE,
confirmation = true)
@@ -201,7 +200,7 @@ public class Purge extends SubCommand {
boolean finalClear = clear;
Runnable run = () -> {
if (Settings.DEBUG) {
- logger.info("[P2] Calculating plots to purge, please wait...");
+ logger.info("Calculating plots to purge, please wait...");
}
HashSet ids = new HashSet<>();
Iterator iterator = toDelete.iterator();
@@ -215,20 +214,20 @@ public class Purge extends SubCommand {
try {
ids.add(plot.temp);
if (finalClear) {
- plot.clear(false, true, () -> {
+ plot.getPlotModificationManager().clear(false, true, () -> {
if (Settings.DEBUG) {
- logger.info("[P2] Plot {} cleared by purge", plot.getId());
+ logger.info("Plot {} cleared by purge", plot.getId());
}
});
} else {
- plot.removeSign();
+ plot.getPlotModificationManager().removeSign();
}
plot.getArea().removePlot(plot.getId());
for (PlotPlayer pp : plot.getPlayersInPlot()) {
Purge.this.plotListener.plotEntry(pp, plot);
}
} catch (NullPointerException e) {
- logger.error("[P2] NullPointer during purge detected. This is likely"
+ logger.error("NullPointer during purge detected. This is likely"
+ " because you are deleting a world that has been removed", e);
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java
index fe732005f..035ed41d3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Rate.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -54,7 +54,6 @@ import java.util.UUID;
@CommandDeclaration(command = "rate",
permission = "plots.rate",
- description = "Rate the plot",
usage = "/plot rate [# | next | purge]",
aliases = "rt",
category = CommandCategory.INFO,
@@ -160,19 +159,19 @@ public class Rate extends SubCommand {
if (index.getValue() >= Settings.Ratings.CATEGORIES.size()) {
int rV = rating.getValue();
PlotRateEvent event = Rate.this.eventDispatcher
- .callRating(this.player, plot, new Rating(rV));
+ .callRating(this.getPlayer(), plot, new Rating(rV));
if (event.getRating() != null) {
- plot.addRating(this.player.getUUID(), event.getRating());
- player.sendMessage(
+ plot.addRating(this.getPlayer().getUUID(), event.getRating());
+ getPlayer().sendMessage(
TranslatableCaption.of("ratings.rating_applied"),
Template.of("plot", plot.getId().toString())
);
if (Permissions
- .hasPermission(this.player, Permission.PERMISSION_COMMENT)) {
+ .hasPermission(this.getPlayer(), Permission.PERMISSION_COMMENT)) {
Command command =
MainCommand.getInstance().getCommand(Comment.class);
if (command != null) {
- player.sendMessage(
+ getPlayer().sendMessage(
TranslatableCaption.of("tutorial.comment_this"),
Template.of("plot", "/plot rate")
);
@@ -241,7 +240,7 @@ public class Rate extends SubCommand {
plot.addRating(uuid, event.getRating());
player.sendMessage(
TranslatableCaption.of("ratings.rating_applied"),
- Template.of("value", plot.getId().toString())
+ Template.of("plot", plot.getId().toString())
);
}
};
diff --git a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java
index 478fb29d3..7b5e0651f 100644
--- a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java
+++ b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -38,7 +38,6 @@ import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@CommandDeclaration(command = "regenallroads",
- description = "Regenerate all roads in the map using the set road schematic",
aliases = {"rgar"},
usage = "/plot regenallroads [height]",
category = CommandCategory.ADMINISTRATION,
@@ -89,7 +88,7 @@ public class RegenAllRoads extends SubCommand {
String name = args[0];
PlotManager manager = area.getPlotManager();
if (!(manager instanceof HybridPlotManager)) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
+ player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
return false;
}
//Set chunks = ChunkManager.manager.getChunkChunks(name);
diff --git a/Core/src/main/java/com/plotsquared/core/command/Relight.java b/Core/src/main/java/com/plotsquared/core/command/Relight.java
index 3737902b1..184a99571 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Relight.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Relight.java
@@ -21,11 +21,11 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
-import com.plotsquared.core.configuration.caption.StaticCaption;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
@@ -33,7 +33,6 @@ import com.plotsquared.core.util.task.RunnableVal3;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "relight",
- description = "Relight your plot",
usage = "/plot relight",
category = CommandCategory.DEBUG,
requiredType = RequiredType.PLAYER)
@@ -46,7 +45,7 @@ public class Relight extends Command {
public CompletableFuture execute(final PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
- player.sendMessage(StaticCaption.of("Not implemented."));
+ player.sendMessage(TranslatableCaption.of("errors.not_implemented"));
/* final Plot plot = player.getCurrentPlot();
if (plot == null) {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Reload.java b/Core/src/main/java/com/plotsquared/core/command/Reload.java
index f709c6bbf..1d4e1298d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Reload.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Reload.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -39,13 +39,11 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
import javax.annotation.Nonnull;
import java.io.File;
-import java.io.IOException;
import java.util.Objects;
@CommandDeclaration(command = "reload",
aliases = "rl",
permission = "plots.admin.command.reload",
- description = "Reload translations and world settings",
usage = "/plot reload",
category = CommandCategory.ADMINISTRATION)
public class Reload extends SubCommand {
@@ -117,7 +115,7 @@ public class Reload extends SubCommand {
});
this.worldConfiguration.save(this.worldFile);
player.sendMessage(TranslatableCaption.of("reload.reloaded_configs"));
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
player.sendMessage(TranslatableCaption.of("reload.reload_failed"));
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Remove.java b/Core/src/main/java/com/plotsquared/core/command/Remove.java
index ae8b12765..aeee2a30d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Remove.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -46,7 +46,6 @@ import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "remove",
aliases = {"r", "untrust", "ut", "undeny", "unban", "ud"},
- description = "Remove a player from a plot",
usage = "/plot remove ",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
diff --git a/Core/src/main/java/com/plotsquared/core/command/RequiredType.java b/Core/src/main/java/com/plotsquared/core/command/RequiredType.java
index c474680f6..e09866aca 100644
--- a/Core/src/main/java/com/plotsquared/core/command/RequiredType.java
+++ b/Core/src/main/java/com/plotsquared/core/command/RequiredType.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -32,8 +32,8 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
import javax.annotation.Nonnull;
public enum RequiredType {
- CONSOLE(TranslatableCaption.of("console.is_console")),
- PLAYER(TranslatableCaption.of("console.not_console")),
+ CONSOLE(TranslatableCaption.of("console.not_console")),
+ PLAYER(TranslatableCaption.of("console.is_console")),
NONE(StaticCaption.of("Something went wrong: RequiredType=NONE")); // this caption should never be sent
private final Caption caption;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Save.java b/Core/src/main/java/com/plotsquared/core/command/Save.java
index 1690d1380..636096943 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Save.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Save.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -47,7 +47,6 @@ import java.util.List;
import java.util.UUID;
@CommandDeclaration(command = "save",
- description = "Save your plot",
category = CommandCategory.SCHEMATIC,
requiredType = RequiredType.NONE,
permission = "plots.save")
diff --git a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
index ea031c0cf..2146c81ab 100644
--- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -52,7 +52,6 @@ import java.util.UUID;
@CommandDeclaration(command = "schematic",
permission = "plots.schematic",
- description = "Schematic command",
aliases = {"sch", "schem"},
category = CommandCategory.SCHEMATIC,
usage = "/plot schematic ")
@@ -72,7 +71,7 @@ public class SchematicCmd extends SubCommand {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "Possible values: save, paste , exportall, list")
+ Template.of("value", "Possible values: save, paste, exportall, list")
);
return true;
}
@@ -89,7 +88,7 @@ public class SchematicCmd extends SubCommand {
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "Possible values: save, paste , exportall, list")
+ Template.of("value", "Possible values: save, paste, exportall, list")
);
break;
}
@@ -266,7 +265,7 @@ public class SchematicCmd extends SubCommand {
default:
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "Possible values: save, paste , exportall, list")
+ Template.of("value", "Possible values: save, paste, exportall, list")
);
break;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Set.java b/Core/src/main/java/com/plotsquared/core/command/Set.java
index 90211a409..11015b70d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Set.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Set.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -58,7 +58,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
@CommandDeclaration(command = "set",
- description = "Set a plot value",
aliases = {"s"},
usage = "/plot set ",
permission = "plots.set",
@@ -154,8 +153,8 @@ public class Set extends SubCommand {
BackupManager.backup(player, plot, () -> {
plot.addRunning();
QueueCoordinator queue = plotArea.getQueue();
- for (Plot current : plot.getConnectedPlots()) {
- current.setComponent(component, pattern, queue);
+ for (final Plot current : plot.getConnectedPlots()) {
+ current.getPlotModificationManager().setComponent(component, pattern, queue);
}
queue.setCompleteTask(plot::removeRunning);
queue.enqueue();
diff --git a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java
index a8e4a973c..025baee87 100644
--- a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/SetHome.java b/Core/src/main/java/com/plotsquared/core/command/SetHome.java
index e0a7497fc..95940ea39 100644
--- a/Core/src/main/java/com/plotsquared/core/command/SetHome.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SetHome.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -34,7 +34,6 @@ import net.kyori.adventure.text.minimessage.Template;
@CommandDeclaration(command = "sethome",
permission = "plots.set.home",
- description = "Set the plot home to your current position",
usage = "/plot sethome [none]",
aliases = {"sh", "seth"},
category = CommandCategory.SETTINGS,
diff --git a/Core/src/main/java/com/plotsquared/core/command/Setup.java b/Core/src/main/java/com/plotsquared/core/command/Setup.java
index 5bf6fb974..eb870880b 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Setup.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Setup.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -47,7 +47,6 @@ import java.util.Map.Entry;
@CommandDeclaration(command = "setup",
permission = "plots.admin.command.setup",
- description = "Setup wizard for plot worlds",
usage = "/plot setup",
aliases = {"create"},
category = CommandCategory.ADMINISTRATION)
@@ -61,14 +60,14 @@ public class Setup extends SubCommand {
public void displayGenerators(PlotPlayer player) {
StringBuilder message = new StringBuilder();
- message.append("&6What generator do you want?");
+ message.append("What generator do you want?");
for (Entry> entry : SetupUtils.generators.entrySet()) {
if (entry.getKey().equals(PlotSquared.platform().getPluginName())) {
- message.append("\n&8 - &2").append(entry.getKey()).append(" (Default Generator)");
+ message.append("\n - ").append(entry.getKey()).append(" (Default Generator)");
} else if (entry.getValue().isFull()) {
- message.append("\n&8 - &7").append(entry.getKey()).append(" (Plot Generator)");
+ message.append("\n - ").append(entry.getKey()).append(" (Plot Generator)");
} else {
- message.append("\n&8 - &7").append(entry.getKey()).append(" (Unknown structure)");
+ message.append("\n - ").append(entry.getKey()).append(" (Unknown structure)");
}
}
player.sendMessage(StaticCaption.of(message.toString()));
diff --git a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java
index ad7665522..7b6768270 100644
--- a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java
index 0432ca643..6bb379c6c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Swap.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -39,7 +39,6 @@ import java.util.concurrent.CompletableFuture;
@CommandDeclaration(usage = "/plot swap ",
command = "swap",
- description = "Swap two plots",
aliases = {"switch"},
category = CommandCategory.CLAIMING,
requiredType = RequiredType.PLAYER)
@@ -85,7 +84,7 @@ public class Swap extends SubCommand {
return CompletableFuture.completedFuture(false);
}
- return plot1.move(plot2, () -> {
+ return plot1.getPlotModificationManager().move(plot2, () -> {
}, true).thenApply(result -> {
if (result) {
player.sendMessage(TranslatableCaption.of("swap.swap_success"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Target.java b/Core/src/main/java/com/plotsquared/core/command/Target.java
index 321e8bfd4..eccb5056a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Target.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Target.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -30,12 +30,18 @@ import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.StringMan;
+import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.query.PlotQuery;
import net.kyori.adventure.text.minimessage.Template;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
@CommandDeclaration(command = "target",
- usage = "/plot target < | nearest>",
- description = "Target a plot with your compass",
+ usage = "/plot target < | nearest>",
permission = "plots.target",
requiredType = RequiredType.PLAYER,
category = CommandCategory.INFO)
@@ -54,7 +60,7 @@ public class Target extends SubCommand {
if (args.length == 0) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot target < | nearest>")
+ Template.of("value", "/plot target < | nearest>")
);
return false;
}
@@ -79,4 +85,10 @@ public class Target extends SubCommand {
player.sendMessage(TranslatableCaption.of("compass.compass_target"));
return true;
}
+ @Override public Collection tab(final PlotPlayer player, String[] args, boolean space) {
+ return Stream.of("", "nearest")
+ .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
+ .map(value -> new Command(null, false, value, "plots.target", RequiredType.NONE, null) {
+ }).collect(Collectors.toList());
+ }
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Template.java b/Core/src/main/java/com/plotsquared/core/command/Template.java
index 1cf1e8c33..a384c74ac 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Template.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Template.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -54,14 +54,17 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Collection;
+import java.util.Locale;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
@CommandDeclaration(command = "template",
permission = "plots.admin",
- description = "Create or use a world template",
usage = "/plot template [import | export] ",
category = CommandCategory.ADMINISTRATION)
public class Template extends SubCommand {
@@ -239,7 +242,8 @@ public class Template extends SubCommand {
}
final PlotArea area = this.plotAreaManager.getPlotAreaByString(world);
if (area == null) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
+ player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"),
+ net.kyori.adventure.text.minimessage.Template.of("value", args[1]));
return false;
}
final PlotManager manager = area.getPlotManager();
@@ -262,4 +266,10 @@ public class Template extends SubCommand {
}
return false;
}
+ @Override public Collection tab(final PlotPlayer player, String[] args, boolean space) {
+ return Stream.of("import", "export")
+ .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
+ .map(value -> new Command(null, false, value, "plots.admin", RequiredType.NONE, null) {
+ }).collect(Collectors.toList());
+ }
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Toggle.java b/Core/src/main/java/com/plotsquared/core/command/Toggle.java
index 53c94440a..66a34a4d3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Toggle.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Toggle.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -35,7 +35,6 @@ import net.kyori.adventure.text.minimessage.Template;
aliases = {"attribute"},
permission = "plots.use",
usage = "/plot toggle ",
- description = "Toggle per user settings",
requiredType = RequiredType.NONE,
category = CommandCategory.SETTINGS)
public class Toggle extends Command {
@@ -45,8 +44,7 @@ public class Toggle extends Command {
@CommandDeclaration(command = "chatspy",
aliases = {"spy"},
- permission = "plots.admin.command.chat",
- description = "Toggle plot chat spy")
+ permission = "plots.admin.command.chat")
public void chatspy(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -65,8 +63,7 @@ public class Toggle extends Command {
@CommandDeclaration(command = "worldedit",
aliases = {"we", "wea"},
- permission = "plots.worldedit.bypass",
- description = "Toggle worldedit area restrictions")
+ permission = "plots.worldedit.bypass")
public void worldedit(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -84,8 +81,7 @@ public class Toggle extends Command {
}
@CommandDeclaration(command = "chat",
- permission = "plots.toggle.chat",
- description = "Toggle plot chat")
+ permission = "plots.toggle.chat")
public void chat(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -103,8 +99,7 @@ public class Toggle extends Command {
}
@CommandDeclaration(command = "clear-confirmation",
- permission = "plots.admin.command.autoclear",
- description = "Toggle autoclear confirmation")
+ permission = "plots.admin.command.autoclear")
public void clearConfirmation(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -122,8 +117,7 @@ public class Toggle extends Command {
}
@CommandDeclaration(command = "titles",
- permission = "plots.toggle.titles",
- description = "Toggle plot title messages")
+ permission = "plots.toggle.titles")
public void titles(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -141,8 +135,7 @@ public class Toggle extends Command {
}
@CommandDeclaration(command = "time",
- permission = "plots.toggle.time",
- description = "Toggle plot time settings")
+ permission = "plots.toggle.time")
public void time(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
@@ -160,8 +153,7 @@ public class Toggle extends Command {
}
@CommandDeclaration(command = "debug",
- permission = "plots.toggle.debug",
- description = "Toggle plot debugging")
+ permission = "plots.toggle.debug")
public void debug(Command command, PlotPlayer player, String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Trim.java b/Core/src/main/java/com/plotsquared/core/command/Trim.java
index 0c471dc9b..7116f588c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Trim.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Trim.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -57,7 +57,6 @@ import java.util.Set;
@CommandDeclaration(command = "trim",
permission = "plots.admin",
- description = "Delete unmodified portions of your plotworld",
usage = "/plot trim [regenerate]",
requiredType = RequiredType.CONSOLE,
category = CommandCategory.ADMINISTRATION)
@@ -86,7 +85,7 @@ public class Trim extends SubCommand {
*
* @param world The world
* @param result (viable = .mcr to trim, nonViable = .mcr keep)
- * @return
+ * @return success or not
*/
public static boolean getTrimRegions(String world,
final RunnableVal2, Set> result) {
@@ -145,15 +144,15 @@ public class Trim extends SubCommand {
@Override public void run(Set viable, final Set nonViable) {
Runnable regenTask;
if (regen) {
- logger.info("[P2] Starting regen task");
- logger.info("[P2] - This is a VERY slow command");
- logger.info("[P2] - It will say 'Trim done!' when complete");
+ logger.info("Starting regen task");
+ logger.info(" - This is a VERY slow command");
+ logger.info(" - It will say 'Trim done!' when complete");
regenTask = new Runnable() {
@Override public void run() {
if (nonViable.isEmpty()) {
Trim.TASK = false;
player.sendMessage(TranslatableCaption.of("trim.trim_done"));
- logger.info("[P2] Trim done!");
+ logger.info("Trim done!");
return;
}
Iterator iterator = nonViable.iterator();
@@ -203,7 +202,7 @@ public class Trim extends SubCommand {
regenTask = () -> {
Trim.TASK = false;
player.sendMessage(TranslatableCaption.of("trim.trim_done"));
- logger.info("[P2] Trim done!");
+ logger.info("Trim done!");
};
}
regionManager.deleteRegionFiles(world, viable, regenTask);
diff --git a/Core/src/main/java/com/plotsquared/core/command/Trust.java b/Core/src/main/java/com/plotsquared/core/command/Trust.java
index 736719745..965315f5a 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Trust.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Trust.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -52,7 +52,6 @@ import java.util.concurrent.TimeoutException;
aliases = {"t"},
requiredType = RequiredType.PLAYER,
usage = "/plot trust ",
- description = "Allow a user to build in a plot and use WorldEdit while the plot owner is offline.",
category = CommandCategory.SETTINGS)
public class Trust extends Command {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Unlink.java b/Core/src/main/java/com/plotsquared/core/command/Unlink.java
index 46b3650ff..1ee3fe370 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Unlink.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Unlink.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -43,7 +43,6 @@ import javax.annotation.Nonnull;
@CommandDeclaration(command = "unlink",
aliases = {"u", "unmerge"},
- description = "Unlink a mega-plot",
usage = "/plot unlink [createroads]",
requiredType = RequiredType.PLAYER,
category = CommandCategory.SETTINGS,
@@ -96,7 +95,7 @@ public class Unlink extends SubCommand {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
}
Runnable runnable = () -> {
- if (!plot.unlinkPlot(createRoad, createRoad)) {
+ if (!plot.getPlotModificationManager().unlinkPlot(createRoad, createRoad)) {
player.sendMessage(TranslatableCaption.of("merge.unmerge_cancelled"));
return;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Visit.java b/Core/src/main/java/com/plotsquared/core/command/Visit.java
index 0d6f300ad..b75182ee0 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Visit.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Visit.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -57,7 +57,6 @@ import java.util.concurrent.TimeoutException;
@CommandDeclaration(command = "visit",
permission = "plots.visit",
- description = "Visit someones plot",
usage = "/plot visit | | [area]|[#] [#]",
aliases = {"v", "tp", "teleport", "goto", "warp"},
requiredType = RequiredType.PLAYER,
diff --git a/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java b/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java
index 50cda457a..110a67cdc 100644
--- a/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java
+++ b/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.command;
@@ -29,7 +29,6 @@ import com.plotsquared.core.player.PlotPlayer;
@CommandDeclaration(command = "weanywhere",
permission = "plots.worldedit.bypass",
- description = "Force bypass of WorldEdit restrictions",
aliases = {"wea"},
usage = "/plot weanywhere",
requiredType = RequiredType.NONE,
diff --git a/Core/src/main/java/com/plotsquared/core/components/ComponentCommand.java b/Core/src/main/java/com/plotsquared/core/components/ComponentCommand.java
index 8c158c417..c2f45b58e 100644
--- a/Core/src/main/java/com/plotsquared/core/components/ComponentCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/components/ComponentCommand.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.components;
diff --git a/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java b/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
index f56668805..298d122a2 100644
--- a/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
+++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.components;
diff --git a/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java b/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
index 87fb16dac..9143257cf 100644
--- a/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
+++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.components;
@@ -83,7 +83,7 @@ public class ComponentPresetManager {
e.printStackTrace();
}
if (!created) {
- logger.error("[P2] Failed to create components.yml");
+ logger.error("Failed to create components.yml");
this.guiName = "&cInvalid!";
this.presets = new ArrayList<>();
return;
@@ -99,7 +99,7 @@ public class ComponentPresetManager {
try {
yamlConfiguration.save(file);
} catch (IOException e) {
- logger.error("[P2] Failed to save default values to components.yml", e);
+ logger.error("Failed to save default values to components.yml", e);
}
}
this.guiName = yamlConfiguration.getString("title", "&6Plot Components");
@@ -109,13 +109,13 @@ public class ComponentPresetManager {
.collect(Collectors.toList());
} else {
final List defaultPreset = Collections.singletonList(
- new ComponentPreset(ClassicPlotManagerComponent.FLOOR, "##wool", 0, "", "&6D&ai&cs&ec&bo &2F&3l&do&9o&4r",
- Arrays.asList("&6Spice up your plot floor"), ItemTypes.YELLOW_WOOL));
+ new ComponentPreset(ClassicPlotManagerComponent.FLOOR, "##wool", 0, "", "Disco Floor",
+ Arrays.asList("Spice up your plot floor"), ItemTypes.YELLOW_WOOL));
yamlConfiguration.set("presets", defaultPreset.stream().map(ComponentPreset::serialize).collect(Collectors.toList()));
try {
yamlConfiguration.save(file);
} catch (final IOException e) {
- logger.error("[P2] Failed to save default values to components.yml", e);
+ logger.error("Failed to save default values to components.yml", e);
}
this.presets = defaultPreset;
}
@@ -128,6 +128,7 @@ public class ComponentPresetManager {
* if the player is in a compatible plot, and sends appropriate
* error messages if not
*
+ * @param player player
* @return Build inventory, if it could be created
*/
@Nullable public PlotInventory buildInventory(final PlotPlayer player) {
@@ -154,7 +155,7 @@ public class ComponentPresetManager {
final int size = (int) Math.ceil((double) allowedPresets.size() / 9.0D);
final PlotInventory plotInventory = new PlotInventory(this.inventoryUtil, player, size, this.guiName) {
@Override public boolean onClick(final int index) {
- if (!player.getCurrentPlot().equals(plot)) {
+ if (!getPlayer().getCurrentPlot().equals(plot)) {
return false;
}
@@ -168,36 +169,36 @@ public class ComponentPresetManager {
}
if (plot.getRunning() > 0) {
- player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
+ getPlayer().sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
return false;
}
final Pattern pattern = PatternUtil.parse(null, componentPreset.getPattern(), false);
if (pattern == null) {
- player.sendMessage(TranslatableCaption.of("preset.preset_invalid"));
+ getPlayer().sendMessage(TranslatableCaption.of("preset.preset_invalid"));
return false;
}
if (componentPreset.getCost() > 0.0D && econHandler != null && plot.getArea().useEconomy()) {
- if (econHandler.getMoney(player) < componentPreset.getCost()) {
- player.sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
+ if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
+ getPlayer().sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
return false;
} else {
- econHandler.withdrawMoney(player, componentPreset.getCost());
- player.sendMessage(TranslatableCaption.of("economy.removed_balance"),
+ econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
+ getPlayer().sendMessage(TranslatableCaption.of("economy.removed_balance"),
Template.of("money", componentPreset.getCost() + ""));
}
}
- BackupManager.backup(player, plot, () -> {
+ BackupManager.backup(getPlayer(), plot, () -> {
plot.addRunning();
QueueCoordinator queue = plot.getArea().getQueue();
for (Plot current : plot.getConnectedPlots()) {
- current.setComponent(componentPreset.getComponent().name(), pattern, queue);
+ current.getPlotModificationManager().setComponent(componentPreset.getComponent().name(), pattern, queue);
}
queue.setCompleteTask(plot::removeRunning);
queue.enqueue();
- player.sendMessage(TranslatableCaption.of("working.generating_component"));
+ getPlayer().sendMessage(TranslatableCaption.of("working.generating_component"));
});
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Config.java b/Core/src/main/java/com/plotsquared/core/configuration/Config.java
index 3995ff964..7ae47fab6 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Config.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Config.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
@@ -53,10 +53,10 @@ public class Config {
* Get the value for a node
* Probably throws some error if you try to get a non existent key
*
- * @param key
- * @param root
- * @param
- * @return
+ * @param key configuration key
+ * @param root configuration class
+ * @param value type
+ * @return value
*/
public static T get(String key, Class root) {
String[] split = key.split("\\.");
@@ -80,7 +80,7 @@ public class Config {
*
* @param key config node
* @param value value
- * @param root
+ * @param root configuration class
*/
public static void set(String key, Object value, Class root) {
String[] split = key.split("\\.");
@@ -98,12 +98,12 @@ public class Config {
field.set(instance, value);
return;
} catch (final Throwable e) {
- logger.error("[P2] Invalid configuration value '{}: {}' in {}", key, value, root.getSimpleName());
+ logger.error("Invalid configuration value '{}: {}' in {}", key, value, root.getSimpleName());
e.printStackTrace();
}
}
}
- logger.error("[P2] Failed to set config option '{}: {}' | {}", key, value, instance);
+ logger.error("Failed to set config option '{}: {}' | {}", key, value, instance);
}
public static boolean load(File file, Class root) {
@@ -124,8 +124,8 @@ public class Config {
/**
* Set all values in the file (load first to avoid overwriting)
*
- * @param file
- * @param root
+ * @param file file
+ * @param root configuration file class
*/
public static void save(File file, Class root) {
try {
@@ -145,8 +145,8 @@ public class Config {
/**
* Get the static fields in a section.
*
- * @param clazz
- * @return
+ * @param clazz config section
+ * @return map or string against object of static fields
*/
public static Map getFields(Class clazz) {
HashMap map = new HashMap<>();
@@ -289,7 +289,7 @@ public class Config {
setAccessible(field);
return field;
} catch (final Throwable e) {
- logger.error("[P2] Invalid config field: {} for {}",
+ logger.error("Invalid config field: {} for {}",
StringMan.join(split, "."), toNodeName(instance.getClass().getSimpleName()));
e.printStackTrace();
return null;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java b/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java
index 0e17c3cfb..207262133 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
@@ -33,11 +33,9 @@ import java.util.Map;
public interface Configuration extends ConfigurationSection {
/**
* Sets the default value of the given path as provided.
- *
*
If no source {@link Configuration} was provided as a default
* collection, then a new {@link MemoryConfiguration} will be created to
* hold the new default value.
- *
*
If value is null, the value will be removed from the default
* Configuration source.
*
@@ -49,7 +47,6 @@ public interface Configuration extends ConfigurationSection {
/**
* Sets the default values of the given paths as provided.
- *
*
If no source {@link Configuration} was provided as a default
* collection, then a new {@link MemoryConfiguration} will be created to
* hold the new default values.
@@ -61,11 +58,9 @@ public interface Configuration extends ConfigurationSection {
/**
* Sets the default values of the given paths as provided.
- *
*
If no source {@link Configuration} was provided as a default
* collection, then a new {@link MemoryConfiguration} will be created to
* hold the new default value.
- *
*
This method will not hold a reference to the specified Configuration,
* nor will it automatically update if that Configuration ever changes. If
* you check this, you should set the default source with {@link
@@ -78,9 +73,8 @@ public interface Configuration extends ConfigurationSection {
/**
* Gets the source {@link Configuration} for this configuration.
- *
- *
- * If no configuration source was set, but default values were added, then
+ *
+ *
If no configuration source was set, but default values were added, then
* a {@link MemoryConfiguration} will be returned. If no source was set
* and no defaults were set, then this method will return null.
*
@@ -90,9 +84,8 @@ public interface Configuration extends ConfigurationSection {
/**
* Sets the source of all default values for this {@link Configuration}.
- *
- *
- * If a previous source was set, or previous default values were defined,
+ *
+ *
If a previous source was set, or previous default values were defined,
* then they will not be copied to the new source.
*
* @param defaults New source of default values for this configuration.
@@ -102,7 +95,6 @@ public interface Configuration extends ConfigurationSection {
/**
* Gets the {@link ConfigurationOptions} for this {@link Configuration}.
- *
*
All setters through this method are chainable.
*
* @return Options for this configuration
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java
index 89b130d46..71d9399c0 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java
index 293af2257..b7f4c457a 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java
index ddd14735e..8cc73f860 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java
index b370deae2..2e2444bbc 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java b/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java
index 03c7353bb..5b87b8e18 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java
index 88b8433ba..0e1ac50e4 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java
index 961c72586..b0f0833cc 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java b/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java
index 580730998..561947288 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
index 4ccadcd8c..e59c73677 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
@@ -186,10 +186,7 @@ public class Settings extends Config {
// Miscellaneous
DEBUG = config.getBoolean("debug", DEBUG);
- Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR);
Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE);
- Enabled_Components.BSTATS =
- config.getBoolean("bstats", Enabled_Components.BSTATS);
Enabled_Components.DATABASE_PURGER =
config.getBoolean("auto-purge", Enabled_Components.DATABASE_PURGER);
@@ -284,7 +281,7 @@ public class Settings extends Config {
INVALID_BLOCKS = Arrays.asList(
// Acacia Stuff
"acacia_button", "acacia_fence_gate", "acacia_door", "acacia_pressure_plate",
- "acaia_trapdoor", "acacia_sapling", "acacia_sign", "acacia_wall_sign", "acacia_leaves",
+ "acacia_trapdoor", "acacia_sapling", "acacia_sign", "acacia_wall_sign", "acacia_leaves",
// Birch Stuff
"birch_button", "birch_fence_gate", "birch_door", "birch_pressure_plate",
"birch_trapdoor", "birch_sapling", "birch_sign", "birch_wall_sign", "birch_leaves",
@@ -438,8 +435,6 @@ public class Settings extends Config {
@Comment("Chat related settings")
public static final class Chat {
- @Comment("Sometimes console color doesn't work, you can disable it here")
- public static boolean CONSOLE_COLOR = true;
@Comment("Should the chat be interactive?") public static boolean INTERACTIVE = true;
}
@@ -592,8 +587,6 @@ public class Settings extends Config {
public static boolean EXTENDED_USERNAME_COMPLETION = true;
@Comment("Command aliases that will be tab completed")
public static List TAB_COMPLETED_ALIASES = Arrays.asList("plot", "plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap");
- @Comment({"Send anonymous PlotSquared statistics to https://bstats.org/.",
- "Please keep this setting enabled. It helps us identifying which parts of PlotSquared are used the most to organize future updates better."}) public static boolean BSTATS = true;
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Storage.java b/Core/src/main/java/com/plotsquared/core/configuration/Storage.java
index 44a0be29b..4a3bc2626 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Storage.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Storage.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
index 07a871d4f..f826b7ed2 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java
index 42605bcd8..347c8e0fb 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionLoader.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionLoader.java
index a5d95296d..0e2d65c7f 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionLoader.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionLoader.java
@@ -21,21 +21,30 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
+import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -44,27 +53,74 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+/**
+ * This class handles loading and updating of message files.
+ */
public final class CaptionLoader {
+ private static final Logger logger = LoggerFactory.getLogger("P2/" + CaptionLoader.class.getSimpleName());
- private static final Gson GSON = new GsonBuilder().create();
- private static final Pattern FILE_NAME_PATTERN = Pattern.compile("messages_(.*)\\.json");
+ private static final Map DEFAULT_MESSAGES;
+ private static final Locale DEFAULT_LOCALE;
+ private static final Gson GSON;
+ private static final Pattern FILE_NAME_PATTERN;
+
+ static {
+ FILE_NAME_PATTERN = Pattern.compile("messages_(.*)\\.json");
+ GSON = new GsonBuilder()
+ .setPrettyPrinting()
+ .disableHtmlEscaping()
+ .create();
+ DEFAULT_LOCALE = Locale.ENGLISH;
+ Map temp;
+ try {
+ temp = loadResource(DEFAULT_LOCALE);
+ } catch (Exception e) {
+ logger.error("Failed to load default messages", e);
+ temp = Collections.emptyMap();
+ }
+ DEFAULT_MESSAGES = temp;
+ }
private CaptionLoader() {
}
- public static CaptionMap loadAll(@Nonnull final Path directory) throws IOException {
+ /**
+ * Load all message files in the given directory into a new CaptionMap.
+ *
+ * @param directory The directory to load files from
+ * @return A new CaptionMap containing the loaded messages
+ * @throws IOException if the files in the given path can't be listed
+ * @see Files#list(Path)
+ * @see #loadSingle(Path)
+ */
+ @Nonnull public static CaptionMap loadAll(@Nonnull final Path directory) throws IOException {
final Map localeMaps = new HashMap<>();
- try (Stream files = Files.list(directory)) {
- List captionFiles = files.filter(Files::isRegularFile).collect(Collectors.toList());
+ try (final Stream files = Files.list(directory)) {
+ final List captionFiles = files.filter(Files::isRegularFile).collect(Collectors.toList());
for (Path file : captionFiles) {
- CaptionMap localeMap = loadSingle(file);
- localeMaps.put(localeMap.getLocale(), localeMap);
+ try {
+ final CaptionMap localeMap = loadSingle(file);
+ localeMaps.put(localeMap.getLocale(), localeMap);
+ } catch (Exception e) {
+ logger.error("Failed to load language file '{}'", file.getFileName().toString(), e);
+ }
}
+ logger.info("Loaded {} message files. Loaded Languages: {}", localeMaps.size(), localeMaps.keySet());
return new PerUserLocaleCaptionMap(localeMaps);
}
}
- public static CaptionMap loadSingle(@Nonnull final Path file) throws IOException {
+ /**
+ * Load a message file into a new CaptionMap. The file name must match
+ * the pattern {@code messages_.json} where {@code }
+ * is a valid {@link Locale} string.
+ *
+ * @param file The file to load
+ * @return A new CaptionMap containing the loaded messages
+ * @throws IOException if the file couldn't be accessed or read successfully.
+ * @throws IllegalArgumentException if the file name doesn't match the specified format.
+ */
+ @Nonnull public static CaptionMap loadSingle(@Nonnull final Path file) throws IOException {
final String fileName = file.getFileName().toString();
final Matcher matcher = FILE_NAME_PATTERN.matcher(fileName);
final Locale locale;
@@ -73,15 +129,77 @@ public final class CaptionLoader {
} else {
throw new IllegalArgumentException(fileName + " is an invalid message file (cannot extract locale)");
}
- JsonObject object = GSON.fromJson(
- Files.newBufferedReader(file, StandardCharsets.UTF_16),
- JsonObject.class);
- Map captions = new HashMap<>();
- for (Map.Entry entry : object.entrySet()) {
- TranslatableCaption key = TranslatableCaption.of(entry.getKey());
- captions.put(key, entry.getValue().getAsString());
+ try (final BufferedReader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {
+ Map map = loadFromReader(reader);
+ if (patch(map, locale)) {
+ save(file, map); // update the file using the modified map
+ }
+ return new LocalizedCaptionMap(locale, map.entrySet().stream()
+ .collect(Collectors.toMap(entry -> TranslatableCaption.of(entry.getKey()), Map.Entry::getValue)));
}
- return new LocalizedCaptionMap(locale, captions);
}
+ @SuppressWarnings("UnstableApiUsage")
+ private static Map loadFromReader(final Reader reader) {
+ final Type type = new TypeToken>() {}.getType();
+ return new LinkedHashMap<>(GSON.fromJson(reader, type));
+ }
+
+ private static Map loadResource(final Locale locale) {
+ final String url = String.format("lang/messages_%s.json", locale.toString());
+ try {
+ final InputStream stream = CaptionLoader.class.getClassLoader().getResourceAsStream(url);
+ if (stream == null) {
+ logger.warn("No resource for locale '{}' found", locale);
+ return null;
+ }
+ try (final BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+ return loadFromReader(reader);
+ }
+ } catch (final IOException e) {
+ logger.error("Unable to load language resource", e);
+ return null;
+ }
+ }
+
+ private static void save(final Path file, final Map content) {
+ try (final BufferedWriter writer = Files.newBufferedWriter(file, StandardCharsets.UTF_8)) {
+ GSON.toJson(content, writer);
+ logger.info("Saved {} with new content", file.getFileName());
+ } catch (final IOException e) {
+ logger.error("Failed to save caption file '{}'", file.getFileName().toString(), e);
+ }
+ }
+
+ /**
+ * Add missing entries to the given map.
+ * Entries are missing if the key exists in {@link #DEFAULT_MESSAGES} but isn't present
+ * in the given map. For a missing key, a value will be loaded either from
+ * the resource matching the given locale or from {@link #DEFAULT_MESSAGES} if
+ * no matching resource was found or the key isn't present in the resource.
+ *
+ * @param map the map to patch
+ * @param locale the locale to get the resource from
+ * @return {@code true} if the map was patched.
+ */
+ private static boolean patch(final Map map, final Locale locale) {
+ boolean modified = false;
+ Map languageSpecific;
+ if (locale.equals(DEFAULT_LOCALE)) {
+ languageSpecific = DEFAULT_MESSAGES;
+ } else {
+ languageSpecific = loadResource(locale);
+ if (languageSpecific == null) { // fallback for languages not provided by PlotSquared
+ languageSpecific = DEFAULT_MESSAGES;
+ }
+ }
+ for (Map.Entry entry : DEFAULT_MESSAGES.entrySet()) {
+ if (!map.containsKey(entry.getKey())) {
+ final String value = languageSpecific.getOrDefault(entry.getKey(), entry.getValue());
+ map.put(entry.getKey(), value);
+ modified = true;
+ }
+ }
+ return modified;
+ }
}
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionMap.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionMap.java
index 3fe022a86..02538ce08 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionMap.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionMap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
@@ -79,7 +79,7 @@ public interface CaptionMap {
class NoSuchCaptionException extends IllegalArgumentException {
public NoSuchCaptionException(@Nonnull final NamespacedCaption caption) {
- super(String.format("No caption with the key '%s' exists in the map", caption.getKey()));
+ super(String.format("No caption with the key '%s:%s' exists in the map", caption.getNamespace(), caption.getKey()));
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java
index fa3bde36d..22214266e 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/ChatFormatter.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/ChatFormatter.java
index 1ddd95d67..ab886af1d 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/ChatFormatter.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/ChatFormatter.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/DummyCaptionMap.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/DummyCaptionMap.java
index 514ffbfb9..4e6274fcc 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/DummyCaptionMap.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/DummyCaptionMap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocaleHolder.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocaleHolder.java
index 32ebbd447..1974abdb8 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocaleHolder.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocaleHolder.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
index 6ad911a9d..8412e21c9 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/NamespacedCaption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/NamespacedCaption.java
index dccb7bc73..28167bf73 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/NamespacedCaption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/NamespacedCaption.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/PerUserLocaleCaptionMap.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/PerUserLocaleCaptionMap.java
index 313644e3a..83e2814cc 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/PerUserLocaleCaptionMap.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/PerUserLocaleCaptionMap.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/PlotSquaredChatFormatter.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/PlotSquaredChatFormatter.java
index c20639928..0b677ad38 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/PlotSquaredChatFormatter.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/PlotSquaredChatFormatter.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java
index e9886f4ed..cdc2cc309 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
index 2942ed56e..0fe96f0bd 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java
index a3ad37276..a31a5df46 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.caption;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java
index cc7475370..6fe3881ae 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java
index d92ca9e16..47a2e10d5 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java
index 3008ca451..3dd6c31c5 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
@@ -82,11 +82,11 @@ public class YamlConfiguration extends FileConfiguration {
}
Files.copy(file.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
if (Settings.DEBUG) {
- logger.error("[P2] Could not read: {}", file);
- logger.error("[P2] Renamed to: {}", file);
- logger.error("[P2] ============ Full stacktrace ============");
+ logger.error("Could not read: {}", file);
+ logger.error("Renamed to: {}", file);
+ logger.error("============ Full stacktrace ============");
ex.printStackTrace();
- logger.error("[P2] =========================================");
+ logger.error("=========================================");
}
} catch (IOException e) {
e.printStackTrace();
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java
index ed826e81a..58f111d4d 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java
index 6dea3c19b..55642ea97 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java
index b3cb59e88..6e7c6fc94 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.file;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java
index b66c4a5a0..780943325 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.serialization;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java
index c6d034b47..9ce425a8e 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.serialization;
@@ -53,11 +53,9 @@ public class ConfigurationSerialization {
/**
* Attempts to deserialize the given arguments into a new instance of the
* given class.
- *
*
The class must implement {@link ConfigurationSerializable}, including
* the extra methods as specified in the javadoc of
* ConfigurationSerializable.
- *
*
If a new instance could not be made, an example being the class not
* fully implementing the interface, null will be returned.
*
@@ -72,15 +70,12 @@ public class ConfigurationSerialization {
/**
* Attempts to deserialize the given arguments into a new instance of the
- *
* given class.
- *
- * The class must implement {@link ConfigurationSerializable}, including
+ *
+ *
The class must implement {@link ConfigurationSerializable}, including
* the extra methods as specified in the javadoc of
* ConfigurationSerializable.
- *
- *
- * If a new instance could not be made, an example being the class not
+ *
If a new instance could not be made, an example being the class not
* fully implementing the interface, null will be returned.
*
* @param args Arguments for deserialization
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java
index 1cace0091..d53a56245 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.serialization;
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java
index 06c4d93fd..1b27fa764 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.configuration.serialization;
diff --git a/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java b/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java
index 4bb366b6f..1ba59ecdd 100644
--- a/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java
+++ b/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
diff --git a/Core/src/main/java/com/plotsquared/core/database/DBFunc.java b/Core/src/main/java/com/plotsquared/core/database/DBFunc.java
index 2f12b2db6..501da4284 100644
--- a/Core/src/main/java/com/plotsquared/core/database/DBFunc.java
+++ b/Core/src/main/java/com/plotsquared/core/database/DBFunc.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
diff --git a/Core/src/main/java/com/plotsquared/core/database/Database.java b/Core/src/main/java/com/plotsquared/core/database/Database.java
index e76a137fd..ff56af689 100644
--- a/Core/src/main/java/com/plotsquared/core/database/Database.java
+++ b/Core/src/main/java/com/plotsquared/core/database/Database.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
diff --git a/Core/src/main/java/com/plotsquared/core/database/MySQL.java b/Core/src/main/java/com/plotsquared/core/database/MySQL.java
index 94624fd2c..5c10c6bd5 100644
--- a/Core/src/main/java/com/plotsquared/core/database/MySQL.java
+++ b/Core/src/main/java/com/plotsquared/core/database/MySQL.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
diff --git a/Core/src/main/java/com/plotsquared/core/database/SQLManager.java b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java
index 28c7a8d69..a17781d6c 100644
--- a/Core/src/main/java/com/plotsquared/core/database/SQLManager.java
+++ b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
@@ -373,12 +373,12 @@ public class SQLManager implements AbstractDB {
try {
task.run();
} catch (Throwable e) {
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] There was an error updating the database.");
- logger.error("[P2] - It will be corrected on shutdown");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("There was an error updating the database.");
+ logger.error(" - It will be corrected on shutdown");
e.printStackTrace();
- logger.error("[P2] ========================================");
+ logger.error("========================================");
}
}
commit();
@@ -428,12 +428,12 @@ public class SQLManager implements AbstractDB {
}
lastTask = task;
} catch (Throwable e) {
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] There was an error updating the database.");
- logger.error("[P2] - It will be corrected on shutdown");
- logger.error("[P2] ========================================");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("There was an error updating the database.");
+ logger.error(" - It will be corrected on shutdown");
+ logger.error("========================================");
e.printStackTrace();
- logger.error("[P2] ========================================");
+ logger.error("========================================");
}
}
if (statement != null && task != null) {
@@ -473,12 +473,12 @@ public class SQLManager implements AbstractDB {
}
lastTask = task;
} catch (Throwable e) {
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] There was an error updating the database.");
- logger.error("[P2] - It will be corrected on shutdown");
- logger.error("[P2] ========================================");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("There was an error updating the database.");
+ logger.error(" - It will be corrected on shutdown");
+ logger.error("========================================");
e.printStackTrace();
- logger.error("[P2] ========================================");
+ logger.error("========================================");
}
}
if (statement != null && task != null) {
@@ -519,12 +519,12 @@ public class SQLManager implements AbstractDB {
}
lastTask = task;
} catch (Throwable e) {
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] There was an error updating the database.");
- logger.error("[P2] - It will be corrected on shutdown");
- logger.error("[P2] ========================================");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("There was an error updating the database.");
+ logger.error(" - It will be corrected on shutdown");
+ logger.error("========================================");
e.printStackTrace();
- logger.error("[P2] ========================================");
+ logger.error("========================================");
}
}
if (statement != null && task != null) {
@@ -548,12 +548,12 @@ public class SQLManager implements AbstractDB {
this.plotTasks.clear();
}
} catch (Throwable e) {
- logger.error("[P2] ============ DATABASE ERROR ============");
- logger.error("[P2] There was an error updating the database.");
- logger.error("[P2] - It will be corrected on shutdown");
- logger.error("[P2] ========================================");
+ logger.error("============ DATABASE ERROR ============");
+ logger.error("There was an error updating the database.");
+ logger.error(" - It will be corrected on shutdown");
+ logger.error("========================================");
e.printStackTrace();
- logger.error("[P2] ========================================");
+ logger.error("========================================");
}
return false;
}
@@ -641,7 +641,7 @@ public class SQLManager implements AbstractDB {
}
})))));
} catch (SQLException e) {
- logger.warn("[P2] Failed to set all flags and member tiers for plots", e);
+ logger.warn("Failed to set all flags and member tiers for plots", e);
try {
SQLManager.this.connection.commit();
} catch (SQLException e1) {
@@ -650,7 +650,7 @@ public class SQLManager implements AbstractDB {
}
});
} catch (Exception e) {
- logger.warn("[P2] Warning! Failed to set all helper for plots", e);
+ logger.warn("Warning! Failed to set all helper for plots", e);
try {
SQLManager.this.connection.commit();
} catch (SQLException e1) {
@@ -719,19 +719,19 @@ public class SQLManager implements AbstractDB {
try {
preparedStatement.executeBatch();
} catch (final Exception e) {
- logger.error("[P2] Failed to store flag values for plot with entry ID: {}", plot);
+ logger.error("Failed to store flag values for plot with entry ID: {}", plot);
e.printStackTrace();
continue;
}
if (Settings.DEBUG) {
- logger.info("[P2] - Finished converting flag values for plot with entry ID: {}",
+ logger.info("- Finished converting flag values for plot with entry ID: {}",
plot.getId());
}
}
} catch (final Exception e) {
- logger.error("[P2] Failed to store flag values", e);
+ logger.error("Failed to store flag values", e);
}
- logger.info("[P2] Finished converting flags ({} plots processed)", plots.size());
+ logger.info("Finished converting flags ({} plots processed)", plots.size());
whenDone.run();
}
@@ -848,7 +848,7 @@ public class SQLManager implements AbstractDB {
return;
} catch (SQLException e) {
if (this.mySQL) {
- logger.error("[P2] 1: | {}", objList.get(0).getClass().getCanonicalName());
+ logger.error("1: | {}", objList.get(0).getClass().getCanonicalName());
e.printStackTrace();
}
}
@@ -886,8 +886,8 @@ public class SQLManager implements AbstractDB {
preparedStmt.close();
} catch (SQLException e) {
e.printStackTrace();
- logger.error("[P2] 2: | {}", objList.get(0).getClass().getCanonicalName());
- logger.error("[P2] Could not bulk save!");
+ logger.error("2: | {}", objList.get(0).getClass().getCanonicalName());
+ logger.error("Could not bulk save!");
try (PreparedStatement preparedStmt = this.connection
.prepareStatement(mod.getCreateSQL())) {
for (T obj : objList) {
@@ -896,7 +896,7 @@ public class SQLManager implements AbstractDB {
}
preparedStmt.executeBatch();
} catch (SQLException e3) {
- logger.error("[P2] Failed to save all", e);
+ logger.error("Failed to save all", e);
e3.printStackTrace();
}
}
@@ -948,7 +948,7 @@ public class SQLManager implements AbstractDB {
try {
preparedStatement.executeBatch();
} catch (final Exception e) {
- logger.error("[P2] Failed to store settings for plot with entry ID: {}", legacySettings.id);
+ logger.error("Failed to store settings for plot with entry ID: {}", legacySettings.id);
e.printStackTrace();
continue;
}
@@ -960,13 +960,13 @@ public class SQLManager implements AbstractDB {
try {
preparedStatement.executeBatch();
} catch (final Exception e) {
- logger.error("[P2] Failed to store settings", e);
+ logger.error("Failed to store settings", e);
}
}
} catch (final Exception e) {
- logger.error("[P2] Failed to store settings", e);
+ logger.error("Failed to store settings", e);
}
- logger.info("[P2] Finished converting settihgs ({} plots processed)", myList.size());
+ logger.info("Finished converting settings ({} plots processed)", myList.size());
whenDone.run();
}
@@ -1647,11 +1647,11 @@ public class SQLManager implements AbstractDB {
}
}
} catch (final Exception e) {
- logger.error("[P2] Failed to load old flag values", e);
+ logger.error("Failed to load old flag values", e);
return false;
}
- logger.info("[P2] Loaded {} plot flag collections...", flagMap.size());
- logger.info("[P2] Attempting to store these flags in the new table...");
+ logger.info("Loaded {} plot flag collections...", flagMap.size());
+ logger.info("Attempting to store these flags in the new table...");
try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
"INSERT INTO `" + SQLManager.this.prefix
+ "plot_flags`(`plot_id`, `flag`, `value`) VALUES(?, ?, ?)")) {
@@ -1679,7 +1679,7 @@ public class SQLManager implements AbstractDB {
try {
preparedStatement.executeBatch();
} catch (final Exception e) {
- logger.error("[P2] Failed to store flag values for plot with entry ID: {}", plotFlagEntry.getKey());
+ logger.error("Failed to store flag values for plot with entry ID: {}", plotFlagEntry.getKey());
e.printStackTrace();
continue;
}
@@ -1687,17 +1687,17 @@ public class SQLManager implements AbstractDB {
if (System.currentTimeMillis() - timeStarted >= 1000L || plotsProcessed >= flagMap
.size()) {
timeStarted = System.currentTimeMillis();
- logger.info("[P2] ... Flag conversion in progress. {}% done",
+ logger.info("... Flag conversion in progress. {}% done",
String.format("%.1f", ((float) flagsProcessed / totalFlags) * 100));
}
if (Settings.DEBUG) {
- logger.info("[P2] - Finished converting flags for plot with entry ID: {}",
+ logger.info("- Finished converting flags for plot with entry ID: {}",
plotFlagEntry.getKey());
}
}
} catch (final Exception e) {
- logger.error("[P2] Failed to store flag values", e);
+ logger.error("Failed to store flag values", e);
return false;
}
return true;
@@ -1788,7 +1788,7 @@ public class SQLManager implements AbstractDB {
time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
.getTime();
} catch (ParseException e) {
- logger.error("[P2] Could not parse date for plot: #{}({};{}) ({})",
+ logger.error("Could not parse date for plot: #{}({};{}) ({})",
id, areaID, plot_id, parsable);
time = System.currentTimeMillis() + id;
}
@@ -1803,7 +1803,7 @@ public class SQLManager implements AbstractDB {
if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(last.temp);
} else if (Settings.DEBUG) {
- logger.info("[P2] Plot #{}({}) in `{}plot` is a duplicate."
+ logger.info("Plot #{}({}) in `{}plot` is a duplicate."
+ " Delete this plot or set `database-purger: true` in the settings.yml", id, last, this.prefix);
}
}
@@ -1835,7 +1835,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_rating` does not exist."
+ logger.info("Entry #{}({}) in `plot_rating` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -1863,7 +1863,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_helpers` does not exist."
+ logger.info("Entry #{}({}) in `plot_helpers` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -1890,7 +1890,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_trusted` does not exist."
+ logger.info("Entry #{}({}) in `plot_trusted` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -1917,7 +1917,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_denied` does not exist."
+ logger.info("Entry #{}({}) in `plot_denied` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -1945,8 +1945,8 @@ public class SQLManager implements AbstractDB {
plot.getFlagContainer().addFlag(plotFlag.parse(value));
} catch (final FlagParseException e) {
e.printStackTrace();
- logger.error("[P2] Plot with ID {} has an invalid value:", id);
- logger.error("[P2] Failed to parse flag '{}', value '{}': {}",
+ logger.error("Plot with ID {} has an invalid value:", id);
+ logger.error("Failed to parse flag '{}', value '{}': {}",
plotFlag.getName(), e.getValue(), e.getErrorMessage());
if (!invalidFlags.containsKey(plot)) {
invalidFlags.put(plot, new ArrayList<>());
@@ -1957,7 +1957,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_flags` does not exist."
+ logger.info("Entry #{}({}) in `plot_flags` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -2013,7 +2013,7 @@ public class SQLManager implements AbstractDB {
} else if (Settings.Enabled_Components.DATABASE_PURGER) {
toDelete.add(id);
} else if (Settings.DEBUG) {
- logger.info("[P2] Entry #{}({}) in `plot_settings` does not exist."
+ logger.info("Entry #{}({}) in `plot_settings` does not exist."
+ " Create this plot or set `database-purger: true` in settings.yml", id, plot);
}
}
@@ -2031,15 +2031,15 @@ public class SQLManager implements AbstractDB {
String worldName = entry.getKey();
invalidPlot = true;
if (Settings.DEBUG) {
- logger.info("[P2] Warning! Found {} plots in DB for non existent world: '{}'",
+ logger.info("Warning! Found {} plots in DB for non existent world: '{}'",
entry.getValue().intValue(), worldName);
}
}
if (invalidPlot && Settings.DEBUG) {
- logger.info("[P2] Warning! Please create the world(s) or remove the plots using the purge command");
+ logger.info("Warning! Please create the world(s) or remove the plots using the purge command");
}
} catch (SQLException e) {
- logger.error("[P2] Failed to load plots", e);
+ logger.error("Failed to load plots", e);
}
return newPlots;
}
@@ -2080,7 +2080,7 @@ public class SQLManager implements AbstractDB {
preparedStatement.setInt(3, id2);
preparedStatement.execute();
} catch (final Exception e) {
- logger.error("[P2] Failed to persist wap of {} and {}", plot1, plot2);
+ logger.error("Failed to persist wap of {} and {}", plot1, plot2);
e.printStackTrace();
future.complete(false);
return;
@@ -2223,12 +2223,12 @@ public class SQLManager implements AbstractDB {
commit();
}
} catch (SQLException e) {
- logger.error("[P2] Failed to purge plots", e);
+ logger.error("Failed to purge plots", e);
return;
}
}
if (Settings.DEBUG) {
- logger.info("[P2] Successfully purged {} plots", uniqueIds.size());
+ logger.info("Successfully purged {} plots", uniqueIds.size());
}
}
});
@@ -2252,7 +2252,7 @@ public class SQLManager implements AbstractDB {
}
purgeIds(ids);
} catch (SQLException e) {
- logger.error("[P2] Failed to purge area '{}'", area);
+ logger.error("Failed to purge area '{}'", area);
e.printStackTrace();
}
for (Iterator iterator = plots.iterator(); iterator.hasNext(); ) {
@@ -2509,7 +2509,7 @@ public class SQLManager implements AbstractDB {
}
}
} catch (SQLException e) {
- logger.error("[P2] Failed to fetch rating for plot {}", plot.getId().toString());
+ logger.error("Failed to fetch rating for plot {}", plot.getId().toString());
e.printStackTrace();
}
return map;
@@ -2729,7 +2729,7 @@ public class SQLManager implements AbstractDB {
if (cluster != null) {
cluster.helpers.add(user);
} else if (Settings.DEBUG) {
- logger.warn("[P2] Cluster #{}({}) in cluster_helpers does not exist."
+ logger.warn("Cluster #{}({}) in cluster_helpers does not exist."
+ " Please create the cluster or remove this entry", id, cluster);
}
}
@@ -2748,7 +2748,7 @@ public class SQLManager implements AbstractDB {
if (cluster != null) {
cluster.invited.add(user);
} else if (Settings.DEBUG) {
- logger.warn("[P2] Cluster #{}({}) in cluster_helpers does not exist."
+ logger.warn("Cluster #{}({}) in cluster_helpers does not exist."
+ " Please create the cluster or remove this entry", id, cluster);
}
}
@@ -2783,7 +2783,7 @@ public class SQLManager implements AbstractDB {
}
cluster.settings.setMerged(merged);
} else if (Settings.DEBUG) {
- logger.warn("[P2] Cluster #{}({}) in cluster_helpers does not exist."
+ logger.warn("Cluster #{}({}) in cluster_helpers does not exist."
+ " Please create the cluster or remove this entry", id, cluster);
}
}
@@ -2793,13 +2793,13 @@ public class SQLManager implements AbstractDB {
for (Entry entry : noExist.entrySet()) {
String a = entry.getKey();
invalidPlot = true;
- logger.warn("[P2] Warning! Found {} clusters in DB for non existent area; '{}'", noExist.get(a), a);
+ logger.warn("Warning! Found {} clusters in DB for non existent area; '{}'", noExist.get(a), a);
}
if (invalidPlot) {
- logger.warn("[P2] Warning! Please create the world(s) or remove the clusters using the purge command");
+ logger.warn("Warning! Please create the world(s) or remove the clusters using the purge command");
}
} catch (SQLException e) {
- logger.error("[P2] Failed to load clusters", e);
+ logger.error("Failed to load clusters", e);
}
return newClusters;
}
@@ -2991,7 +2991,7 @@ public class SQLManager implements AbstractDB {
if (!isValid()) {
reconnect();
}
- logger.info("[P2] All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
+ logger.info("All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
commit();
while (true) {
if (!sendBatch()) {
@@ -3012,13 +3012,13 @@ public class SQLManager implements AbstractDB {
continue;
}
if (plot.getArea() == null) {
- logger.error("[P2] CRITICAL ERROR IN VALIDATION TASK!");
- logger.error("[P2] PLOT AREA CANNOT BE NULL! SKIPPING PLOT!");
+ logger.error("CRITICAL ERROR IN VALIDATION TASK!");
+ logger.error("PLOT AREA CANNOT BE NULL! SKIPPING PLOT!");
continue;
}
if (database == null) {
- logger.error("[P2] CRITICAL ERROR IN VALIDATION TASK!");
- logger.error("[P2] DATABASE VARIABLE CANNOT BE NULL! NOW ENDING VALIDATION!");
+ logger.error("CRITICAL ERROR IN VALIDATION TASK!");
+ logger.error("DATABASE VARIABLE CANNOT BE NULL! NOW ENDING VALIDATION!");
break;
}
HashMap worldPlots = database.get(plot.getArea().toString());
diff --git a/Core/src/main/java/com/plotsquared/core/database/SQLite.java b/Core/src/main/java/com/plotsquared/core/database/SQLite.java
index 71bdafd88..a315949fb 100644
--- a/Core/src/main/java/com/plotsquared/core/database/SQLite.java
+++ b/Core/src/main/java/com/plotsquared/core/database/SQLite.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
@@ -68,7 +68,7 @@ public class SQLite extends Database {
try {
file.createNewFile();
} catch (IOException ignored) {
- logger.error("[P2] Unable to create database");
+ logger.error("Unable to create database");
}
}
Class.forName("org.sqlite.JDBC");
diff --git a/Core/src/main/java/com/plotsquared/core/database/StmtMod.java b/Core/src/main/java/com/plotsquared/core/database/StmtMod.java
index 679f94776..83b707e27 100644
--- a/Core/src/main/java/com/plotsquared/core/database/StmtMod.java
+++ b/Core/src/main/java/com/plotsquared/core/database/StmtMod.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.database;
diff --git a/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java
index 85ccd6d71..2ece5b574 100644
--- a/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java
index c0b3e3999..b397321bb 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
@@ -70,6 +70,8 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
/**
* Set the schematic string used in the claim.
+ *
+ * @param schematic the schematic name
*/
public void setSchematic(String schematic) {
this.schematic = schematic;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java
index 6901a54ba..518d79e5b 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
@@ -59,6 +59,8 @@ public class PlayerClaimPlotEvent extends PlotPlayerEvent implements Cancellable
/**
* Set the schematic string used in the claim.
+ *
+ * @param schematic the schematic name
*/
public void setSchematic(String schematic) {
this.schematic = schematic;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java
index 568809513..cb16e2ded 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java
index 9a4366450..1d7a34619 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java
index f3458a615..1a982313b 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java
index 55a606381..4858f7484 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java
index 85db4a32d..e9bf0cb31 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java
index 8f6d40903..6d23706e3 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java
index 83754ecb4..d41115df8 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java
index e756c3835..bb934abcd 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java
index b4fedfab6..482cc1781 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java
index 32f5a09a5..1d25e6751 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java
index f2b7f70a8..5b37111d5 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java
index fbabf335c..fd873dd61 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java
index db1dd2b00..3f9bb1e87 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java
index 4dc1e4f86..68c3f2e4b 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java
index 54863d15c..6d222ee97 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java
index fbab48326..968d80eee 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java
index a5f69bdc4..36e70328a 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java
index 5e591fb57..cb34a6403 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java
index 337eb84ab..047ee5d8a 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java
index 6f3ff82a7..4065773d7 100644
--- a/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java
+++ b/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/Result.java b/Core/src/main/java/com/plotsquared/core/events/Result.java
index 1a5f9efbc..cfabc02c0 100644
--- a/Core/src/main/java/com/plotsquared/core/events/Result.java
+++ b/Core/src/main/java/com/plotsquared/core/events/Result.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java b/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java
index 576bd90f7..33f103107 100644
--- a/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java
+++ b/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.events;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java b/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java
index 1b42889ca..f800d3c2c 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
index f4849dd4e..ca8b5013a 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -60,10 +60,8 @@ public class ClassicPlotManager extends SquarePlotManager {
this.regionManager = regionManager;
}
- @Override public boolean setComponent(@Nonnull PlotId plotId,
- @Nonnull String component,
- @Nonnull Pattern blocks,
- @Nullable QueueCoordinator queue) {
+ @Override
+ public boolean setComponent(@Nonnull PlotId plotId, @Nonnull String component, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
final Optional componentOptional = ClassicPlotManagerComponent.fromString(component);
if (componentOptional.isPresent()) {
switch (componentOptional.get()) {
@@ -101,8 +99,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Set the plot floor
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set floor of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setFloor(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
Plot plot = classicPlotWorld.getPlotAbs(plotId);
@@ -116,8 +117,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Sets the plot main, floor and air areas.
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set all of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setAll(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
Plot plot = classicPlotWorld.getPlotAbs(plotId);
@@ -130,8 +134,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Sets the plot air region.
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set air of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setAir(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
Plot plot = classicPlotWorld.getPlotAbs(plotId);
@@ -145,8 +152,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Sets the plot main blocks.
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set main of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setMain(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
Plot plot = classicPlotWorld.getPlotAbs(plotId);
@@ -159,8 +169,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Set the middle plot block to a Pattern
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set middle block of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setMiddle(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
Plot plot = classicPlotWorld.getPlotAbs(plotId);
@@ -184,8 +197,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Set a plot's outline
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set outline of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setOutline(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
if (classicPlotWorld.ROAD_WIDTH == 0) {
@@ -211,7 +227,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
int maxY = classicPlotWorld.getPlotManager().getWorldHeight();
- if (!plot.getMerged(Direction.NORTH)) {
+ if (!plot.isMerged(Direction.NORTH)) {
int z = bottom.getZ();
for (int x = bottom.getX(); x <= top.getX(); x++) {
for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
@@ -219,7 +235,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
}
- if (!plot.getMerged(Direction.WEST)) {
+ if (!plot.isMerged(Direction.WEST)) {
int x = bottom.getX();
for (int z = bottom.getZ(); z <= top.getZ(); z++) {
for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
@@ -228,7 +244,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
- if (!plot.getMerged(Direction.SOUTH)) {
+ if (!plot.isMerged(Direction.SOUTH)) {
int z = top.getZ();
for (int x = bottom.getX(); x <= top.getX(); x++) {
for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
@@ -236,7 +252,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
}
- if (!plot.getMerged(Direction.EAST)) {
+ if (!plot.isMerged(Direction.EAST)) {
int x = top.getX();
for (int z = bottom.getZ(); z <= top.getZ(); z++) {
for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
@@ -257,8 +273,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Set the wall filling for a plot
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set wall filling of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setWallFilling(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
if (classicPlotWorld.ROAD_WIDTH == 0) {
@@ -274,7 +293,7 @@ public class ClassicPlotManager extends SquarePlotManager {
if (plot == null) {
return false;
}
- Location bot = plot.getExtendedBottomAbs().subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0, plot.getMerged(Direction.NORTH) ? 0 : 1);
+ Location bot = plot.getExtendedBottomAbs().subtract(plot.isMerged(Direction.WEST) ? 0 : 1, 0, plot.isMerged(Direction.NORTH) ? 0 : 1);
Location top = plot.getExtendedTopAbs().add(1, 0, 1);
boolean enqueue = false;
@@ -283,7 +302,7 @@ public class ClassicPlotManager extends SquarePlotManager {
enqueue = true;
}
- if (!plot.getMerged(Direction.NORTH)) {
+ if (!plot.isMerged(Direction.NORTH)) {
int z = bot.getZ();
for (int x = bot.getX(); x < top.getX(); x++) {
for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
@@ -291,7 +310,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
}
- if (!plot.getMerged(Direction.WEST)) {
+ if (!plot.isMerged(Direction.WEST)) {
int x = bot.getX();
for (int z = bot.getZ(); z < top.getZ(); z++) {
for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
@@ -299,17 +318,17 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
}
- if (!plot.getMerged(Direction.SOUTH)) {
+ if (!plot.isMerged(Direction.SOUTH)) {
int z = top.getZ();
- for (int x = bot.getX(); x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
+ for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
queue.setBlock(x, y, z, blocks);
}
}
}
- if (!plot.getMerged(Direction.EAST)) {
+ if (!plot.isMerged(Direction.EAST)) {
int x = top.getX();
- for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
+ for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
queue.setBlock(x, y, z, blocks);
}
@@ -321,8 +340,11 @@ public class ClassicPlotManager extends SquarePlotManager {
/**
* Set a plot's wall top block only
*
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
+ * @param plotId id of plot to set wall top block of
+ * @param blocks pattern to set
+ * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
+ * otherwise writes to the queue but does not enqueue.
+ * @return success or not
*/
public boolean setWall(@Nonnull PlotId plotId, @Nonnull Pattern blocks, @Nullable QueueCoordinator queue) {
if (classicPlotWorld.ROAD_WIDTH == 0) {
@@ -338,7 +360,7 @@ public class ClassicPlotManager extends SquarePlotManager {
if (plot == null) {
return false;
}
- Location bot = plot.getExtendedBottomAbs().subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0, plot.getMerged(Direction.NORTH) ? 0 : 1);
+ Location bot = plot.getExtendedBottomAbs().subtract(plot.isMerged(Direction.WEST) ? 0 : 1, 0, plot.isMerged(Direction.NORTH) ? 0 : 1);
Location top = plot.getExtendedTopAbs().add(1, 0, 1);
boolean enqueue = false;
@@ -348,27 +370,27 @@ public class ClassicPlotManager extends SquarePlotManager {
}
int y = classicPlotWorld.WALL_HEIGHT + 1;
- if (!plot.getMerged(Direction.NORTH)) {
+ if (!plot.isMerged(Direction.NORTH)) {
int z = bot.getZ();
for (int x = bot.getX(); x < top.getX(); x++) {
queue.setBlock(x, y, z, blocks);
}
}
- if (!plot.getMerged(Direction.WEST)) {
+ if (!plot.isMerged(Direction.WEST)) {
int x = bot.getX();
for (int z = bot.getZ(); z < top.getZ(); z++) {
queue.setBlock(x, y, z, blocks);
}
}
- if (!plot.getMerged(Direction.SOUTH)) {
+ if (!plot.isMerged(Direction.SOUTH)) {
int z = top.getZ();
- for (int x = bot.getX(); x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
+ for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
queue.setBlock(x, y, z, blocks);
}
}
- if (!plot.getMerged(Direction.EAST)) {
+ if (!plot.isMerged(Direction.EAST)) {
int x = top.getX();
- for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
+ for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
queue.setBlock(x, y, z, blocks);
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManagerComponent.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManagerComponent.java
index d66b6db8b..08288df67 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManagerComponent.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManagerComponent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java
index 5f4dd1f3c..2025661d6 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -73,7 +73,7 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
/**
* CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP.
- *
+ *
*
Set the last boolean to false if you do not check a specific config node to be set while using the setup
* command - this may be useful if a config value can be changed at a later date, and has no impact on the actual
* world generation
diff --git a/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java b/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java
index 04dbce965..191460b80 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java
index 37bddcd50..7d088b3c2 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java
index 6269b62b2..b26107000 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
index 2eeb89e1a..dd3730b20 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
index 13e941d2f..c16ea4c6a 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
index caa4cf2d3..f1673cc67 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -177,7 +177,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
// Dump world settings
if (Settings.DEBUG) {
- logger.info("[P2] - Dumping settings for ClassicPlotWorld with name {}", this.getWorldName());
+ logger.info("- Dumping settings for ClassicPlotWorld with name {}", this.getWorldName());
final Field[] fields = this.getClass().getFields();
for (final Field field : fields) {
final String name = field.getName().toLowerCase(Locale.ENGLISH);
@@ -193,7 +193,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
} catch (final IllegalAccessException e) {
value = String.format("Failed to parse: %s", e.getMessage());
}
- logger.info("[P2] -- {} = {}", name, value);
+ logger.info("-- {} = {}", name, value);
}
}
}
@@ -294,12 +294,12 @@ public class HybridPlotWorld extends ClassicPlotWorld {
}
if (Settings.DEBUG) {
- logger.info("[P2] - plot schematic: {}", schematic3File.getPath());
+ logger.info(" - plot schematic: {}", schematic3File.getPath());
}
}
if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
if (Settings.DEBUG) {
- logger.info("[P2] - schematic: false");
+ logger.info(" - schematic: false");
}
return;
}
@@ -367,7 +367,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
int pair = MathMan.pair(x, z);
BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
if (y >= height) {
- logger.error("[P2] Error adding overlay block. `y > height`");
+ logger.error("Error adding overlay block. `y > height`");
return;
}
existing[y] = id;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
index 2a1215074..0384f12ae 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -421,23 +421,23 @@ public class HybridUtils {
iter.remove();
boolean regenedRoad = regenerateRoad(area, chunk, extend);
if (!regenedRoad && Settings.DEBUG) {
- logger.info("[P2] Failed to regenerate roads");
+ logger.info("Failed to regenerate roads");
}
}
if (Settings.DEBUG) {
- logger.info("[P2] Cancelled road task");
+ logger.info("Cancelled road task");
}
return;
}
count.incrementAndGet();
if (count.intValue() % 20 == 0) {
- logger.info("[P2] Progress: {}%", 100 * (2048 - chunks.size()) / 2048);
+ logger.info("Progress: {}%", 100 * (2048 - chunks.size()) / 2048);
}
if (HybridUtils.regions.isEmpty() && chunks.isEmpty()) {
regeneratePlotWalls(area);
HybridUtils.UPDATE = false;
- logger.info("[P2] Finished road conversion");
+ logger.info("Finished road conversion");
// CANCEL TASK
} else {
final Runnable task = this;
@@ -449,8 +449,8 @@ public class HybridUtils {
BlockVector2 loc = iterator.next();
iterator.remove();
if (Settings.DEBUG) {
- logger.info("[P2] Updating .mcr: {}, {} (approx 1024 chunks)", loc.getX(), loc.getZ());
- logger.info("[P2] - Remaining: {}", HybridUtils.regions.size());
+ logger.info("Updating .mcr: {}, {} (approx 1024 chunks)", loc.getX(), loc.getZ());
+ logger.info("- Remaining: {}", HybridUtils.regions.size());
}
chunks.addAll(getChunks(loc));
System.gc();
@@ -465,7 +465,7 @@ public class HybridUtils {
iterator.remove();
boolean regenedRoads = regenerateRoad(area, chunk, extend);
if (!regenedRoads && Settings.DEBUG) {
- logger.info("[P2] Failed to regenerate road");
+ logger.info("Failed to regenerate road");
}
}
return null;
@@ -476,7 +476,7 @@ public class HybridUtils {
Iterator iterator = HybridUtils.regions.iterator();
BlockVector2 loc = iterator.next();
iterator.remove();
- logger.error("[P2] Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)", area.getWorldHash(), loc.getX(),
+ logger.error("Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)", area.getWorldHash(), loc.getX(),
loc.getZ());
}
TaskManager.runTaskLater(task, TaskTime.seconds(1L));
diff --git a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
index f3675ab40..5baf54822 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
@@ -21,14 +21,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotId;
-import com.plotsquared.core.plot.SetupObject;
import com.plotsquared.core.queue.ScopedQueueCoordinator;
import com.plotsquared.core.setup.PlotAreaBuilder;
@@ -41,6 +40,8 @@ public abstract class IndependentPlotGenerator {
/**
* Get the name of this generator.
+ *
+ * @return generator name
*/
public abstract String getName();
@@ -49,8 +50,8 @@ public abstract class IndependentPlotGenerator {
* The PlotArea settings is the same one this was initialized with.
* The PseudoRandom random is a fast random object.
*
- * @param result
- * @param settings
+ * @param result queue
+ * @param settings PlotArea (settings)
*/
public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings);
@@ -65,19 +66,10 @@ public abstract class IndependentPlotGenerator {
* @param id (May be null) Area name
* @param min Min plot id (may be null)
* @param max Max plot id (may be null)
- * @return
+ * @return new plot area
*/
public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
- /**
- * If any additional setup options need to be changed before world creation.
- * - e.g. If setup doesn't support some standard options
- *
- * @param setup
- */
- @Deprecated public void processSetup(SetupObject setup) {
- }
-
/**
* If any additional setup options need to be changed before world creation.
* - e.g. If setup doesn't support some standard options
@@ -90,7 +82,7 @@ public abstract class IndependentPlotGenerator {
/**
* It is preferred for the PlotArea object to do most of the initialization necessary.
*
- * @param area
+ * @param area area
*/
public abstract void initialize(PlotArea area);
@@ -98,9 +90,9 @@ public abstract class IndependentPlotGenerator {
* Get the generator for your specific implementation (bukkit/sponge).
* - e.g. YourIndependentGenerator.<ChunkGenerator>specify() - Would return a ChunkGenerator object
*
- * @param
- * @param
- * @return
+ * @param world
+ * @param world ChunkGenerator Implementation
+ * @return Chunk generator
*/
public GeneratorWrapper specify(String world) {
return (GeneratorWrapper) PlotSquared.platform().wrapPlotGenerator(world, this);
diff --git a/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java
index 818fd654b..7f7f351d2 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
diff --git a/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
index 0cfc21a95..8c4b09fdd 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -210,28 +210,28 @@ public abstract class SquarePlotManager extends GridPlotManager {
switch (hash) {
case 8:
// north
- return plot.getMerged(Direction.NORTH) ? id : null;
+ return plot.isMerged(Direction.NORTH) ? id : null;
case 4:
// east
- return plot.getMerged(Direction.EAST) ? id : null;
+ return plot.isMerged(Direction.EAST) ? id : null;
case 2:
// south
- return plot.getMerged(Direction.SOUTH) ? id : null;
+ return plot.isMerged(Direction.SOUTH) ? id : null;
case 1:
// west
- return plot.getMerged(Direction.WEST) ? id : null;
+ return plot.isMerged(Direction.WEST) ? id : null;
case 12:
// northeast
- return plot.getMerged(Direction.NORTHEAST) ? id : null;
+ return plot.isMerged(Direction.NORTHEAST) ? id : null;
case 6:
// southeast
- return plot.getMerged(Direction.SOUTHEAST) ? id : null;
+ return plot.isMerged(Direction.SOUTHEAST) ? id : null;
case 3:
// southwest
- return plot.getMerged(Direction.SOUTHWEST) ? id : null;
+ return plot.isMerged(Direction.SOUTHWEST) ? id : null;
case 9:
// northwest
- return plot.getMerged(Direction.NORTHWEST) ? id : null;
+ return plot.isMerged(Direction.NORTHWEST) ? id : null;
}
} catch (Exception ignored) {
logger.error("Invalid plot / road width in settings.yml for world: {}", squarePlotWorld.getWorldName());
diff --git a/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
index 74e3768d9..e1b4546a7 100644
--- a/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.generator;
@@ -61,7 +61,7 @@ public abstract class SquarePlotWorld extends GridPlotWorld {
@Override public void loadConfiguration(ConfigurationSection config) {
if (!config.contains("plot.height")) {
if (Settings.DEBUG) {
- logger.info("[P2] - Configuration is null? ({})", config.getCurrentPath());
+ logger.info(" - Configuration is null? ({})", config.getCurrentPath());
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/BackgroundPipeline.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/BackgroundPipeline.java
index 60c6f475e..a5fdfc228 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/BackgroundPipeline.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/BackgroundPipeline.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/ConfigFile.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/ConfigFile.java
index 6a8f950f8..bdcd123b1 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/ConfigFile.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/ConfigFile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/ConsoleActor.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/ConsoleActor.java
index 41213cc4f..692adc964 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/ConsoleActor.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/ConsoleActor.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/DefaultGenerator.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/DefaultGenerator.java
index 26060efd6..7a0923106 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/DefaultGenerator.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/DefaultGenerator.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/ImpromptuPipeline.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/ImpromptuPipeline.java
index 76caa547e..a921cfb97 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/ImpromptuPipeline.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/ImpromptuPipeline.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldConfig.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldConfig.java
index f7aeb5d54..35a718678 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldConfig.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldConfig.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldFile.java b/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldFile.java
index 4a6518a08..d56d6bac4 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldFile.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/annotations/WorldFile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.annotations;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorBuilderFactory.java b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorBuilderFactory.java
index c526ae731..aad7be0de 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorBuilderFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorBuilderFactory.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.factory;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
index aeb62d659..cda2e8e34 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.factory;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/factory/HybridPlotWorldFactory.java b/Core/src/main/java/com/plotsquared/core/inject/factory/HybridPlotWorldFactory.java
index dc6adfe7b..4fde7bcbf 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/HybridPlotWorldFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/HybridPlotWorldFactory.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.factory;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/factory/PlayerBackupProfileFactory.java b/Core/src/main/java/com/plotsquared/core/inject/factory/PlayerBackupProfileFactory.java
index 0dd259df9..72a3adb20 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/PlayerBackupProfileFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/PlayerBackupProfileFactory.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.factory;
diff --git a/Core/src/main/java/com/plotsquared/core/inject/modules/PlotSquaredModule.java b/Core/src/main/java/com/plotsquared/core/inject/modules/PlotSquaredModule.java
index d68f988e8..82c5549c3 100644
--- a/Core/src/main/java/com/plotsquared/core/inject/modules/PlotSquaredModule.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/modules/PlotSquaredModule.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.inject.modules;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java b/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java
index 33ea9c9d2..85e8704fd 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java b/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java
index 4ed318d7d..c31f0be29 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
index 83d53d242..8fabb2f06 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java
index 94b899eb9..58a302d42 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java b/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java
index 7909bd2f4..eeca518a8 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java
index c0d16753b..c70a974b4 100644
--- a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java
+++ b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.listener;
diff --git a/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java b/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java
index 34ab4750d..afe47a69d 100644
--- a/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java
+++ b/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.location;
diff --git a/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java b/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java
index 5f97ade75..5861a8c52 100644
--- a/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java
+++ b/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.location;
diff --git a/Core/src/main/java/com/plotsquared/core/location/Direction.java b/Core/src/main/java/com/plotsquared/core/location/Direction.java
index 406d3aa8c..ad0741408 100644
--- a/Core/src/main/java/com/plotsquared/core/location/Direction.java
+++ b/Core/src/main/java/com/plotsquared/core/location/Direction.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.location;
diff --git a/Core/src/main/java/com/plotsquared/core/location/Location.java b/Core/src/main/java/com/plotsquared/core/location/Location.java
index 926909c3f..603fb621c 100644
--- a/Core/src/main/java/com/plotsquared/core/location/Location.java
+++ b/Core/src/main/java/com/plotsquared/core/location/Location.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.location;
diff --git a/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java b/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java
index b7852f242..be257ce2d 100644
--- a/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java
+++ b/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.location;
@@ -78,11 +78,11 @@ public final class PlotLoc {
}
public int getX() {
- return this.getX();
+ return this.x;
}
public int getY() {
- return this.getY();
+ return this.y;
}
public int getZ() {
diff --git a/Core/src/main/java/com/plotsquared/core/location/World.java b/Core/src/main/java/com/plotsquared/core/location/World.java
index 2e4eb6c52..4d7e97162 100644
--- a/Core/src/main/java/com/plotsquared/core/location/World.java
+++ b/Core/src/main/java/com/plotsquared/core/location/World.java
@@ -21,9 +21,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
-
package com.plotsquared.core.location;
import javax.annotation.Nonnull;
@@ -52,6 +51,7 @@ public interface World {
/**
* Get a {@link NullWorld} implementation
*
+ * @param implementation-specific world object type e.g. a bukkit World
* @return NullWorld instance
*/
static NullWorld nullWorld() {
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/ConsolePermissionProfile.java b/Core/src/main/java/com/plotsquared/core/permissions/ConsolePermissionProfile.java
index 783f605a7..41aea02e0 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/ConsolePermissionProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/ConsolePermissionProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/NullPermissionProfile.java b/Core/src/main/java/com/plotsquared/core/permissions/NullPermissionProfile.java
index fbf7d8a03..8f214e969 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/NullPermissionProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/NullPermissionProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/Permission.java b/Core/src/main/java/com/plotsquared/core/permissions/Permission.java
index a49742a5b..96768516e 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/Permission.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/Permission.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHandler.java b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHandler.java
index 4a273c743..645669614 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHandler.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHandler.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java
index 829ff3fb0..2f5aff9a9 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/permissions/PermissionProfile.java b/Core/src/main/java/com/plotsquared/core/permissions/PermissionProfile.java
index b7aad8e63..8bab5e1bd 100644
--- a/Core/src/main/java/com/plotsquared/core/permissions/PermissionProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/permissions/PermissionProfile.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.permissions;
diff --git a/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
index 7ba30fdd3..2002bba37 100644
--- a/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
@@ -55,8 +55,6 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.List;
import java.util.UUID;
public class ConsolePlayer extends PlotPlayer {
@@ -145,15 +143,11 @@ public class ConsolePlayer extends PlotPlayer {
if (message.isEmpty()) {
return;
}
- message = CaptionUtility.format(this, message).
- /* Magic replacement characters */
- replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&');
- // Create the template list, and add the prefix as a replacement
- final List templates = Arrays.asList(replacements);
- templates.add(Template.of("prefix", MINI_MESSAGE.parse(
- TranslatableCaption.of("core.prefix").getComponent(this))));
+ message = CaptionUtility.format(this, message)
+ .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
+ .replace("", TranslatableCaption.of("core.prefix").getComponent(this));
// Parse the message
- PlotSquared.platform().getConsoleAudience().sendMessage(MINI_MESSAGE.parse(message, templates));
+ PlotSquared.platform().getConsoleAudience().sendMessage(MINI_MESSAGE.parse(message, replacements));
}
@Override public void teleport(Location location, TeleportCause cause) {
@@ -164,7 +158,7 @@ public class ConsolePlayer extends PlotPlayer {
lastPlot.set(location.getPlot());
}
}
- try (final MetaDataAccess locationMetaDataAccess = accessPersistentMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+ try (final MetaDataAccess locationMetaDataAccess = accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
locationMetaDataAccess.set(location);
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java b/Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java
index 800f1c080..b3267a971 100644
--- a/Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java
+++ b/Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
diff --git a/Core/src/main/java/com/plotsquared/core/player/MetaDataKey.java b/Core/src/main/java/com/plotsquared/core/player/MetaDataKey.java
index ab013e9c9..d611196f2 100644
--- a/Core/src/main/java/com/plotsquared/core/player/MetaDataKey.java
+++ b/Core/src/main/java/com/plotsquared/core/player/MetaDataKey.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
@@ -58,6 +58,7 @@ public final class MetaDataKey {
* Get a new named lock key
*
* @param key Key name
+ * @param type type
* @param Type
* @return MetaData key instance
*/
diff --git a/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java
index 24d83514a..7a75ac4be 100644
--- a/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
diff --git a/Core/src/main/java/com/plotsquared/core/player/PersistentMetaDataAccess.java b/Core/src/main/java/com/plotsquared/core/player/PersistentMetaDataAccess.java
index 1e3767c7d..59ffa843d 100644
--- a/Core/src/main/java/com/plotsquared/core/player/PersistentMetaDataAccess.java
+++ b/Core/src/main/java/com/plotsquared/core/player/PersistentMetaDataAccess.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
diff --git a/Core/src/main/java/com/plotsquared/core/player/PlayerMetaDataKeys.java b/Core/src/main/java/com/plotsquared/core/player/PlayerMetaDataKeys.java
index f936d17a1..43fa20fdf 100644
--- a/Core/src/main/java/com/plotsquared/core/player/PlayerMetaDataKeys.java
+++ b/Core/src/main/java/com/plotsquared/core/player/PlayerMetaDataKeys.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
diff --git a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
index e93c336f9..172e6e2a8 100644
--- a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
@@ -32,12 +32,11 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.collection.ByteArrayUtilities;
import com.plotsquared.core.command.CommandCaller;
import com.plotsquared.core.command.RequiredType;
-import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.caption.CaptionMap;
import com.plotsquared.core.configuration.caption.CaptionUtility;
import com.plotsquared.core.configuration.caption.LocaleHolder;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.TeleportCause;
@@ -79,13 +78,11 @@ import javax.annotation.Nullable;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -98,7 +95,6 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer, LocaleHolder {
- private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
private static final String NON_EXISTENT_CAPTION = "PlotSquared does not recognize the caption: ";
private static final Logger logger = LoggerFactory.getLogger("P2/" + PlotPlayer.class.getSimpleName());
@@ -266,15 +262,6 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer,
return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
}
- /**
- * Get the total number of allowed clusters
- *
- * @return number of allowed clusters within the scope (globally, or in the player's current world as defined in the settings.yml)
- */
- public int getAllowedClusters() {
- return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
- }
-
/**
* Get the number of plots this player owns.
*
@@ -321,7 +308,7 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
* Get the number of plots this player owns in the world.
*
* @param world the name of the plotworld to check.
- * @return
+ * @return plot count
*/
public int getPlotCount(String world) {
UUID uuid = getUUID();
@@ -397,6 +384,7 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
/**
* Get this player's full location (including yaw/pitch)
+ * @return location
*/
public abstract Location getLocationFull();
@@ -464,7 +452,7 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
* - Please note that this is not intended to store large values
* - For session only data use meta
*
- * @param key
+ * @param key metadata key
*/
public void setAttribute(String key) {
setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
@@ -473,7 +461,7 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
/**
* Retrieves the attribute of this player.
*
- * @param key
+ * @param key metadata key
* @return the attribute will be either true or false
*/
public boolean getAttribute(String key) {
@@ -486,7 +474,7 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
/**
* Remove an attribute from a player.
*
- * @param key
+ * @param key metadata key
*/
public void removeAttribute(String key) {
removePersistentMeta("attrib_" + key);
@@ -591,9 +579,9 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
}
if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
for (Plot owned : getPlots()) {
- owned.deletePlot(null);
+ owned.getPlotModificationManager().deletePlot(null);
if (Settings.DEBUG) {
- logger.info("[P2] Plot {} was deleted + cleared due to {} getting banned", owned.getId(), getName());
+ logger.info("Plot {} was deleted + cleared due to {} getting banned", owned.getId(), getName());
}
}
}
@@ -609,8 +597,8 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
/**
* Get the amount of clusters this player owns in the specific world.
*
- * @param world
- * @return
+ * @param world world
+ * @return number of clusters owned
*/
public int getPlayerClusterCount(String world) {
return PlotSquared.get().getClusters(world).stream()
@@ -827,13 +815,14 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
public void sendTitle(@Nonnull final Caption title, @Nonnull final Caption subtitle,
final int fadeIn, final int stay, final int fadeOut,
@Nonnull final Template... replacements) {
- final Component titleComponent = MINI_MESSAGE.parse(title.getComponent(this), replacements);
+ final Component titleComponent = MiniMessage.get().parse(title.getComponent(this), replacements);
final Component subtitleComponent =
- MINI_MESSAGE.parse(subtitle.getComponent(this), replacements);
- getAudience().showTitle(Title
- .of(titleComponent, subtitleComponent, Duration.of(fadeIn * 50, ChronoUnit.MILLIS),
+ MiniMessage.get().parse(subtitle.getComponent(this), replacements);
+ final Title.Times times = Title.Times.of(Duration.of(fadeIn * 50, ChronoUnit.MILLIS),
Duration.of(stay * 50, ChronoUnit.MILLIS),
- Duration.of(fadeOut * 50, ChronoUnit.MILLIS)));
+ Duration.of(fadeOut * 50, ChronoUnit.MILLIS));
+ getAudience().showTitle(Title
+ .of(titleComponent, subtitleComponent, times));
}
@Override public void sendMessage(@Nonnull final Caption caption,
@@ -851,14 +840,11 @@ public abstract class PlotPlayer
implements CommandCaller, OfflinePlotPlayer,
return;
}
// Replace placeholders, etc
- message = CaptionUtility.format(this, message).
- /* Magic replacement characters */
- replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&');
- // Create the template list, and add the prefix as a replacement
- final List templates = Arrays.asList(replacements);
- templates.add(Templates.of(this, "prefix", TranslatableCaption.of("core.prefix")));
+ message = CaptionUtility.format(this, message)
+ .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
+ .replace("", TranslatableCaption.of("core.prefix").getComponent(this));
// Parse the message
- final Component component = MINI_MESSAGE.parse(message, templates);
+ final Component component = MiniMessage.get().parse(message, replacements);
if (!Objects.equal(component, this.getMeta("lastMessage"))
|| System.currentTimeMillis() - this.getMeta("lastMessageTime") > 5000) {
setMeta("lastMessage", component);
@@ -921,6 +907,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer,
/**
* The amount of money this Player has.
+ *
+ * @return amount of money owned by the player
*/
public double getMoney() {
return this.econHandler == null ?
diff --git a/Core/src/main/java/com/plotsquared/core/player/TemporaryMetaDataAccess.java b/Core/src/main/java/com/plotsquared/core/player/TemporaryMetaDataAccess.java
index 2d1beb060..52a9f5a3b 100644
--- a/Core/src/main/java/com/plotsquared/core/player/TemporaryMetaDataAccess.java
+++ b/Core/src/main/java/com/plotsquared/core/player/TemporaryMetaDataAccess.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.player;
diff --git a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java
index 932e5e4fa..e09dead4d 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.plot;
diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
index 0e59b2024..c2689461e 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
package com.plotsquared.core.plot;
@@ -31,20 +31,14 @@ import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.command.Like;
-import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.caption.CaptionUtility;
import com.plotsquared.core.configuration.caption.StaticCaption;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlotComponentSetEvent;
-import com.plotsquared.core.events.PlotMergeEvent;
-import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.events.TeleportCause;
-import com.plotsquared.core.generator.SquarePlotWorld;
-import com.plotsquared.core.inject.annotations.ImpromptuPipeline;
import com.plotsquared.core.listener.PlotListener;
import com.plotsquared.core.location.BlockLoc;
import com.plotsquared.core.location.Direction;
@@ -53,7 +47,6 @@ import com.plotsquared.core.location.PlotLoc;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.comment.PlotComment;
import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.expiration.PlotAnalysis;
import com.plotsquared.core.plot.flag.FlagContainer;
@@ -65,7 +58,6 @@ import com.plotsquared.core.plot.flag.implementations.KeepFlag;
import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
import com.plotsquared.core.plot.flag.types.DoubleFlag;
import com.plotsquared.core.plot.schematic.Schematic;
-import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.core.queue.QueueCoordinator;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MathMan;
@@ -80,14 +72,9 @@ import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.task.TaskTime;
-import com.plotsquared.core.uuid.UUIDPipeline;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType;
-import com.sk89q.worldedit.world.block.BlockTypes;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
@@ -96,11 +83,6 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import java.awt.geom.Area;
-import java.awt.geom.PathIterator;
-import java.awt.geom.Rectangle2D;
-import java.io.File;
-import java.net.URL;
import java.text.DecimalFormat;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -108,7 +90,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -117,9 +98,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
-import java.util.stream.Collectors;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
@@ -144,8 +123,8 @@ public class Plot {
private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
- private static Set connected_cache;
- private static Set regions_cache;
+ static Set connected_cache;
+ static Set regions_cache;
static {
FLAG_DECIMAL_FORMAT.setMaximumFractionDigits(340);
}
@@ -154,9 +133,13 @@ public class Plot {
*/
private final FlagContainer flagContainer = new FlagContainer(null);
/**
- * Has the plot changed since the last save cycle?
+ * Utility used to manage plot comments
*/
- public boolean countsTowardsMax = true;
+ private final PlotCommentContainer plotCommentContainer = new PlotCommentContainer(this);
+ /**
+ * Utility used to modify the plot
+ */
+ private final PlotModificationManager plotModificationManager = new PlotModificationManager(this);
/**
* Represents whatever the database manager needs it to:
* - A value of -1 usually indicates the plot will not be stored in the DB
@@ -170,10 +153,8 @@ public class Plot {
@Inject private EventDispatcher eventDispatcher;
@Inject private PlotListener plotListener;
@Inject private RegionManager regionManager;
- @Inject private GlobalBlockQueue blockQueue;
@Inject private WorldUtil worldUtil;
@Inject private SchematicHandler schematicHandler;
- @Inject @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
/**
* plot owner
* (Merged plots can have multiple owners)
@@ -190,21 +171,21 @@ public class Plot {
/**
* List of trusted (with plot permissions).
*/
- private HashSet trusted;
+ HashSet trusted;
/**
* List of members users (with plot permissions).
*/
- private HashSet members;
+ HashSet members;
/**
* List of denied players.
*/
- private HashSet denied;
+ HashSet denied;
/**
* External settings class.
* - Please favor the methods over direct access to this class
* - The methods are more likely to be left unchanged from version changes
*/
- private PlotSettings settings;
+ PlotSettings settings;
private PlotArea area;
/**
* Session only plot metadata (session is until the server stops)
@@ -269,8 +250,15 @@ public class Plot {
* @param id the plot id
* @param owner the plot owner
* @param trusted the plot trusted players
+ * @param members the plot added players
* @param denied the plot denied players
+ * @param alias the plot's alias
+ * @param position plot home position
+ * @param flags the plot's flags
+ * @param area the plot's PlotArea
* @param merged an array giving merged plots
+ * @param timestamp when the plot was created
+ * @param temp value representing whatever DBManager needs to to. Do not touch tbh.
* @see Plot#getPlot(Location) for existing plots
*/
public Plot(@Nonnull PlotId id,
@@ -316,11 +304,13 @@ public class Plot {
* @param message If a message should be sent to the player if a plot cannot be found
* @return The plot if only 1 result is found, or null
*/
- @Nullable public static Plot getPlotFromString(PlotPlayer player, String arg, boolean message) {
+ @Nullable public static Plot getPlotFromString(@Nullable final PlotPlayer player,
+ @Nullable final String arg,
+ final boolean message) {
if (arg == null) {
if (player == null) {
if (message) {
- logger.info("[P2] No plot area string was supplied");
+ logger.info("No plot area string was supplied");
}
return null;
}
@@ -335,7 +325,7 @@ public class Plot {
} else {
area = ConsolePlayer.getConsole().getApplicablePlotArea();
}
- String[] split = arg.split(";|,");
+ String[] split = arg.split("[;,]");
PlotId id;
if (split.length == 4) {
area = PlotSquared.get().getPlotAreaManager().getPlotAreaByString(split[0] + ';' + split[1]);
@@ -358,14 +348,14 @@ public class Plot {
return p;
}
}
- if (message) {
+ if (message && player != null) {
player.sendMessage(TranslatableCaption.of("invalid.not_valid_plot_id"));
}
return null;
}
if (area == null) {
- if (message) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
+ if (message && player != null) {
+ player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
}
return null;
}
@@ -379,8 +369,8 @@ public class Plot {
* @param string plot id/area + id
* @return New or existing plot object
*/
- public static Plot fromString(PlotArea defaultArea, String string) {
- String[] split = string.split(";|,");
+ @Nullable public static Plot fromString(@Nullable final PlotArea defaultArea, @Nonnull final String string) {
+ final String[] split = string.split("[;,]");
if (split.length == 2) {
if (defaultArea != null) {
PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
@@ -409,15 +399,15 @@ public class Plot {
* @return plot at location or null
* @see PlotPlayer#getCurrentPlot() if a player is expected here.
*/
- public static Plot getPlot(Location location) {
- PlotArea pa = location.getPlotArea();
+ @Nullable public static Plot getPlot(@Nonnull final Location location) {
+ final PlotArea pa = location.getPlotArea();
if (pa != null) {
return pa.getPlot(location);
}
return null;
}
- @Nonnull private static Location[] getCorners(@Nonnull final String world, @Nonnull final CuboidRegion region) {
+ @Nonnull static Location[] getCorners(@Nonnull final String world, @Nonnull final CuboidRegion region) {
final BlockVector3 min = region.getMinimumPoint();
final BlockVector3 max = region.getMaximumPoint();
return new Location[] {Location.at(world, min), Location.at(world, max)};
@@ -451,7 +441,12 @@ public class Plot {
this.owner = owner;
}
- public String getWorldName() {
+ /**
+ * Get the name of the world that the plot is in
+ *
+ * @return World name
+ */
+ @Nullable public String getWorldName() {
return area.getWorldName();
}
@@ -463,7 +458,7 @@ public class Plot {
* @param key metadata key
* @param value metadata value
*/
- public void setMeta(String key, Object value) {
+ public void setMeta(@Nonnull final String key, @Nonnull final Object value) {
if (this.meta == null) {
this.meta = new ConcurrentHashMap<>();
}
@@ -478,7 +473,7 @@ public class Plot {
* @param key metadata key to get value for
* @return Object value
*/
- public Object getMeta(String key) {
+ @Nullable public Object getMeta(@Nonnull final String key) {
if (this.meta != null) {
return this.meta.get(key);
}
@@ -492,7 +487,7 @@ public class Plot {
*
* @param key key to delete
*/
- public void deleteMeta(String key) {
+ public void deleteMeta(@Nonnull final String key) {
if (this.meta != null) {
this.meta.remove(key);
}
@@ -503,7 +498,10 @@ public class Plot {
*
* @return the PlotCluster object, or null
*/
- public PlotCluster getCluster() {
+ @Nullable public PlotCluster getCluster() {
+ if (this.getArea() == null) {
+ return null;
+ }
return this.getArea().getCluster(this.id);
}
@@ -514,7 +512,7 @@ public class Plot {
*
* @return list of PlotPlayer(s) or an empty list
*/
- public List> getPlayersInPlot() {
+ @Nonnull public List> getPlayersInPlot() {
final List> players = new ArrayList<>();
for (final PlotPlayer player : PlotSquared.platform().getPlayerManager().getPlayers()) {
if (this.equals(player.getCurrentPlot())) {
@@ -527,7 +525,7 @@ public class Plot {
/**
* Checks if the plot has an owner.
*
- * @return false if there is no owner
+ * @return {@code true} if there is an owner, else {@code false}
*/
public boolean hasOwner() {
return this.getOwnerAbs() != null;
@@ -536,20 +534,26 @@ public class Plot {
/**
* Checks if a UUID is a plot owner (merged plots may have multiple owners)
*
- * @param uuid the player uuid
- * @return if the provided uuid is the owner of the plot
+ * @param uuid Player UUID
+ * @return {@code true} if the provided uuid is the owner of the plot, else {@code false}
*/
- public boolean isOwner(@Nonnull UUID uuid) {
+ public boolean isOwner(@Nonnull final UUID uuid) {
if (uuid.equals(this.getOwner())) {
return true;
}
if (!isMerged()) {
return false;
}
- Set connected = getConnectedPlots();
+ final Set connected = getConnectedPlots();
return connected.stream().anyMatch(current -> uuid.equals(current.getOwner()));
}
+ /**
+ * Checks if the given UUID is the owner of this specific plot
+ *
+ * @param uuid Player UUID
+ * @return {@code true} if the provided uuid is the owner of the plot, else {@code false}
+ */
public boolean isOwnerAbs(@Nullable final UUID uuid) {
if (uuid == null) {
return false;
@@ -563,8 +567,10 @@ public class Plot {
* Direct access is discouraged: use getOwners()
*
* @see #getOwnerAbs() getOwnerAbs() to get the owner as stored in the database
+ *
+ * @return Server if ServerPlot flag set, else {@link #getOwnerAbs()}
*/
- public UUID getOwner() {
+ @Nullable public UUID getOwner() {
if (this.getFlag(ServerPlotFlag.class)) {
return DBFunc.SERVER;
}
@@ -576,10 +582,10 @@ public class Plot {
*
* @param owner uuid to set as owner
*/
- public void setOwner(UUID owner) {
+ public void setOwner(@Nonnull final UUID owner) {
if (!hasOwner()) {
this.setOwnerAbs(owner);
- create();
+ this.getPlotModificationManager().create();
return;
}
if (!isMerged()) {
@@ -589,7 +595,7 @@ public class Plot {
}
return;
}
- for (Plot current : getConnectedPlots()) {
+ for (final Plot current : getConnectedPlots()) {
if (!owner.equals(current.getOwnerAbs())) {
current.setOwnerAbs(owner);
DBFunc.setOwner(current, owner);
@@ -603,9 +609,9 @@ public class Plot {
* This method cannot be used to add or remove owners from a plot.
*
*
- * @return the plot owners
+ * @return Immutable view of plot owners
*/
- public Set getOwners() {
+ @Nonnull public Set getOwners() {
if (this.getOwner() == null) {
return ImmutableSet.of();
}
@@ -615,7 +621,10 @@ public class Plot {
ImmutableSet.Builder owners = ImmutableSet.builder();
UUID last = this.getOwner();
owners.add(this.getOwner());
- for (Plot current : array) {
+ for (final Plot current : array) {
+ if (current.getOwner() == null) {
+ continue;
+ }
if (last == null || current.getOwner().getMostSignificantBits() != last.getMostSignificantBits()) {
owners.add(current.getOwner());
last = current.getOwner();
@@ -630,9 +639,9 @@ public class Plot {
* Checks if the player is either the owner or on the trusted/added list.
*
* @param uuid uuid to check
- * @return true if the player is added/trusted or is the owner
+ * @return {@code true} if the player is added/trusted or is the owner, else {@code false}
*/
- public boolean isAdded(UUID uuid) {
+ public boolean isAdded(@Nonnull final UUID uuid) {
if (!this.hasOwner() || getDenied().contains(uuid)) {
return false;
}
@@ -655,9 +664,9 @@ public class Plot {
* Checks if the player is not permitted on this plot.
*
* @param uuid uuid to check
- * @return boolean false if the player is allowed to enter
+ * @return {@code false} if the player is allowed to enter the plot, else {@code true}
*/
- public boolean isDenied(UUID uuid) {
+ public boolean isDenied(@Nonnull final UUID uuid) {
return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid) || !this.isAdded(uuid) && this.denied
.contains(uuid));
}
@@ -686,7 +695,7 @@ public class Plot {
*
* @return PlotArea
*/
- public PlotArea getArea() {
+ @Nullable public PlotArea getArea() {
return this.area;
}
@@ -699,7 +708,7 @@ public class Plot {
*
* @param area area to assign to
*/
- public void setArea(PlotArea area) {
+ public void setArea(@Nonnull final PlotArea area) {
if (this.getArea() == area) {
return;
}
@@ -717,7 +726,7 @@ public class Plot {
*
* @return PlotManager
*/
- public PlotManager getManager() {
+ @Nonnull public PlotManager getManager() {
return this.area.getPlotManager();
}
@@ -726,7 +735,7 @@ public class Plot {
*
* @return PlotSettings
*/
- public PlotSettings getSettings() {
+ @Nonnull public PlotSettings getSettings() {
if (this.settings == null) {
this.settings = new PlotSettings();
}
@@ -750,9 +759,11 @@ public class Plot {
* - If the plot is not merged it will return itself.
* - The result is cached locally
*
+ * @param recalculate whether to recalculate the merged plots to find the origin
+ *
* @return base Plot
*/
- public Plot getBasePlot(boolean recalculate) {
+ public Plot getBasePlot(final boolean recalculate) {
if (this.origin != null && !recalculate) {
if (this.equals(this.origin)) {
return this;
@@ -780,7 +791,7 @@ public class Plot {
/**
* Checks if this plot is merged in any direction.
*
- * @return true if this plot is merged, otherwise false
+ * @return {@code true} if this plot is merged, otherwise {@code false}
*/
public boolean isMerged() {
return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings().getMerged(1) || getSettings().getMerged(3);
@@ -813,13 +824,13 @@ public class Plot {
* 6 = south-west
* 7 = north-west
* ----------
- * //todo these artificial values are way too confusing.
+ *
* Note: A plot that is merged north and east will not be merged northeast if the northeast plot is not part of the same group
*
* @param dir direction to check for merged plot
- * @return true if merged in that direction
+ * @return {@code true} if merged in that direction, else {@code false}
*/
- public boolean getMerged(int dir) {
+ public boolean isMerged(final int dir) {
if (this.settings == null) {
return false;
}
@@ -834,8 +845,10 @@ public class Plot {
int i2 = 0;
if (this.getSettings().getMerged(i2)) {
if (this.getSettings().getMerged(i)) {
- if (this.area.getPlotAbs(this.id.getRelative(Direction.getFromIndex(i))).getMerged(i2)) {
- return this.area.getPlotAbs(this.id.getRelative(Direction.getFromIndex(i2))).getMerged(i);
+ if (Objects.requireNonNull(
+ this.area.getPlotAbs(this.id.getRelative(Direction.getFromIndex(i)))).isMerged(i2)) {
+ return Objects.requireNonNull(this.area
+ .getPlotAbs(this.id.getRelative(Direction.getFromIndex(i2)))).isMerged(i);
}
}
}
@@ -845,9 +858,11 @@ public class Plot {
case 6:
i = dir - 4;
i2 = dir - 3;
- return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i) && this.area
- .getPlotAbs(this.id.getRelative(Direction.getFromIndex(i))).getMerged(i2) && this.area
- .getPlotAbs(this.id.getRelative(Direction.getFromIndex(i2))).getMerged(i);
+ return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i) && Objects
+ .requireNonNull(
+ this.area.getPlotAbs(this.id.getRelative(Direction.getFromIndex(i)))).isMerged(i2) && Objects
+ .requireNonNull(
+ this.area.getPlotAbs(this.id.getRelative(Direction.getFromIndex(i2)))).isMerged(i);
}
return false;
@@ -858,7 +873,7 @@ public class Plot {
*
* @return a set of denied users
*/
- public HashSet getDenied() {
+ @Nonnull public HashSet getDenied() {
if (this.denied == null) {
this.denied = new HashSet<>();
}
@@ -870,7 +885,7 @@ public class Plot {
*
* @param uuids uuids to deny
*/
- public void setDenied(Set uuids) {
+ public void setDenied(@Nonnull final Set uuids) {
boolean larger = uuids.size() > getDenied().size();
HashSet intersection;
if (larger) {
@@ -899,7 +914,7 @@ public class Plot {
*
* @return a set of trusted users
*/
- public HashSet getTrusted() {
+ @Nonnull public HashSet getTrusted() {
if (this.trusted == null) {
this.trusted = new HashSet<>();
}
@@ -911,7 +926,7 @@ public class Plot {
*
* @param uuids uuids to trust
*/
- public void setTrusted(Set uuids) {
+ public void setTrusted(@Nonnull final Set uuids) {
boolean larger = uuids.size() > getTrusted().size();
HashSet intersection = new HashSet<>(larger ? getTrusted() : uuids);
intersection.retainAll(larger ? uuids : getTrusted());
@@ -931,7 +946,7 @@ public class Plot {
*
* @return a set of members
*/
- public HashSet getMembers() {
+ @Nonnull public HashSet getMembers() {
if (this.members == null) {
this.members = new HashSet<>();
}
@@ -943,7 +958,7 @@ public class Plot {
*
* @param uuids uuids to set member status for
*/
- public void setMembers(Set uuids) {
+ public void setMembers(@Nonnull final Set uuids) {
boolean larger = uuids.size() > getMembers().size();
HashSet intersection = new HashSet<>(larger ? getMembers() : uuids);
intersection.retainAll(larger ? uuids : getMembers());
@@ -963,8 +978,8 @@ public class Plot {
*
* @param uuid the uuid of the player to deny.
*/
- public void addDenied(UUID uuid) {
- for (Plot current : getConnectedPlots()) {
+ public void addDenied(@Nonnull final UUID uuid) {
+ for (final Plot current : getConnectedPlots()) {
if (current.getDenied().add(uuid)) {
DBFunc.setDenied(current, uuid);
}
@@ -976,8 +991,8 @@ public class Plot {
*
* @param uuid the uuid of the player to trust
*/
- public void addTrusted(UUID uuid) {
- for (Plot current : getConnectedPlots()) {
+ public void addTrusted(@Nonnull final UUID uuid) {
+ for (final Plot current : getConnectedPlots()) {
if (current.getTrusted().add(uuid)) {
DBFunc.setTrusted(current, uuid);
}
@@ -989,8 +1004,8 @@ public class Plot {
*
* @param uuid the uuid of the player to add as a member
*/
- public void addMember(UUID uuid) {
- for (Plot current : getConnectedPlots()) {
+ public void addMember(@Nonnull final UUID uuid) {
+ for (final Plot current : getConnectedPlots()) {
if (current.getMembers().add(uuid)) {
DBFunc.setMember(current, uuid);
}
@@ -1004,10 +1019,10 @@ public class Plot {
* @param initiator player initiating set owner
* @return boolean
*/
- public boolean setOwner(UUID owner, PlotPlayer initiator) {
+ public boolean setOwner(UUID owner, PlotPlayer initiator) {
if (!hasOwner()) {
this.setOwnerAbs(owner);
- create();
+ this.getPlotModificationManager().create();
return true;
}
if (!isMerged()) {
@@ -1026,183 +1041,6 @@ public class Plot {
return true;
}
- /**
- * Clear a plot.
- *
- * @param whenDone A runnable to execute when clearing finishes, or null
- * @see #clear(boolean, boolean, Runnable)
- * @see #deletePlot(Runnable) to clear and delete a plot
- */
- public void clear(Runnable whenDone) {
- this.clear(false, false, whenDone);
- }
-
- public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
- if (checkRunning && this.getRunning() != 0) {
- return false;
- }
- final Set regions = this.getRegions();
- final Set plots = this.getConnectedPlots();
- final ArrayDeque queue = new ArrayDeque<>(plots);
- if (isDelete) {
- this.removeSign();
- }
- PlotUnlinkEvent event = this.eventDispatcher
- .callUnlink(getArea(), this, true, !isDelete, isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR);
- if (event.getEventResult() != Result.DENY) {
- this.unlinkPlot(event.isCreateRoad(), event.isCreateSign());
- }
- final PlotManager manager = this.area.getPlotManager();
- Runnable run = new Runnable() {
- @Override public void run() {
- if (queue.isEmpty()) {
- Runnable run = () -> {
- for (CuboidRegion region : regions) {
- Location[] corners = getCorners(getWorldName(), region);
- regionManager.clearAllEntities(corners[0], corners[1]);
- }
- TaskManager.runTask(whenDone);
- };
- QueueCoordinator queue = getArea().getQueue();
- for (Plot current : plots) {
- if (isDelete || !current.hasOwner()) {
- manager.unClaimPlot(current, null, queue);
- } else {
- manager.claimPlot(current, queue);
- }
- }
- if (queue.size() > 0) {
- queue.enqueue();
- }
- TaskManager.runTask(run);
- return;
- }
- Plot current = queue.poll();
- if (Plot.this.area.getTerrain() != PlotAreaTerrainType.NONE) {
- try {
- regionManager.regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
- } catch (UnsupportedOperationException exception) {
- logger.info("[P2] Please ask md_5 to fix regenerateChunk() because it breaks plugins. We apologize for the inconvenience.");
- return;
- }
- return;
- }
- manager.clearPlot(current, this, null);
- }
- };
- run.run();
- return true;
- }
-
- /**
- * Sets the biome for a plot asynchronously.
- *
- * @param biome The biome e.g. "forest"
- * @param whenDone The task to run when finished, or null
- */
- public void setBiome(final BiomeType biome, final Runnable whenDone) {
- final ArrayDeque regions = new ArrayDeque<>(this.getRegions());
- final int extendBiome;
- if (area instanceof SquarePlotWorld) {
- extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
- } else {
- extendBiome = 0;
- }
- Runnable run = new Runnable() {
- @Override public void run() {
- if (regions.isEmpty()) {
- TaskManager.runTask(whenDone);
- return;
- }
- CuboidRegion region = regions.poll();
- regionManager.setBiome(region, extendBiome, biome, getWorldName(), this);
- }
- };
- run.run();
- }
-
- /**
- * Unlink the plot and all connected plots.
- *
- * @param createRoad whether to recreate road
- * @param createSign whether to recreate signs
- * @return success/!cancelled
- */
- public boolean unlinkPlot(boolean createRoad, boolean createSign) {
- if (!this.isMerged()) {
- return false;
- }
- final Set plots = this.getConnectedPlots();
- ArrayList ids = new ArrayList<>(plots.size());
- for (Plot current : plots) {
- current.setHome(null);
- ids.add(current.getId());
- }
- this.clearRatings();
- QueueCoordinator queue = null;
- if (createSign) {
- this.removeSign();
- queue = getArea().getQueue();
- }
- PlotManager manager = this.area.getPlotManager();
- if (createRoad) {
- manager.startPlotUnlink(ids, queue);
- }
- if (this.area.getTerrain() != PlotAreaTerrainType.ALL && createRoad) {
- for (Plot current : plots) {
- if (current.getMerged(Direction.EAST)) {
- manager.createRoadEast(current, queue);
- if (current.getMerged(Direction.SOUTH)) {
- manager.createRoadSouth(current, queue);
- if (current.getMerged(Direction.SOUTHEAST)) {
- manager.createRoadSouthEast(current, queue);
- }
- }
- }
- if (current.getMerged(Direction.SOUTH)) {
- manager.createRoadSouth(current, queue);
- }
- }
- }
- for (Plot current : plots) {
- boolean[] merged = new boolean[] {false, false, false, false};
- current.setMerged(merged);
- }
- if (createSign) {
- queue.setCompleteTask(() -> TaskManager.runTaskAsync(() -> {
- for (Plot current : plots) {
- current.setSign(PlayerManager.getName(current.getOwnerAbs()));
- }
- }));
- }
- if (createRoad) {
- manager.finishPlotUnlink(ids, queue);
- }
- return true;
- }
-
- /**
- * Sets the sign for a plot to a specific name
- *
- * @param name name
- */
- public void setSign(@Nonnull String name) {
- if (!isLoaded()) {
- return;
- }
- PlotManager manager = this.area.getPlotManager();
- if (this.area.allowSigns()) {
- Location location = manager.getSignLoc(this);
- String id = this.id.toString();
- Caption[] lines =
- new Caption[] {TranslatableCaption.of("signs.owner_sign_line_1"),
- TranslatableCaption.of("signs.owner_sign_line_2"),
- TranslatableCaption.of("signs.owner_sign_line_3"),
- TranslatableCaption.of("signs.owner_sign_line_4")};
- this.worldUtil.setSign(location, lines, Template.of("id", id), Template.of("owner", name));
- }
- }
-
public boolean isLoaded() {
return this.worldUtil.isWorld(getWorldName());
}
@@ -1210,16 +1048,14 @@ public class Plot {
/**
* This will return null if the plot hasn't been analyzed
*
+ * @param settings The set of settings to obtain the analysis of
+ *
* @return analysis of plot
*/
public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
return PlotAnalysis.getAnalysis(this, settings);
}
- public void analyze(RunnableVal whenDone) {
- PlotAnalysis.analyzePlot(this, whenDone);
- }
-
/**
* Get an immutable view of all the flags associated with the plot.
*
@@ -1233,9 +1069,10 @@ public class Plot {
* Sets a flag for the plot and stores it in the database.
*
* @param flag Flag to set
+ * @param flag value type
* @return A boolean indicating whether or not the operation succeeded
*/
- public boolean setFlag(PlotFlag flag) {
+ public boolean setFlag(@Nonnull final PlotFlag flag) {
if (flag instanceof KeepFlag && ExpireManager.IMP != null) {
ExpireManager.IMP.updateExpired(this);
}
@@ -1255,7 +1092,7 @@ public class Plot {
* @param value Flag value
* @return A boolean indicating whether or not the operation succeeded
*/
- public boolean setFlag(Class flag, String value) {
+ public boolean setFlag(@Nonnull final Class flag, @Nonnull final String value) {
try {
this.setFlag(GlobalFlagContainer.getInstance().getFlagErased(flag).parse(value));
} catch (final Exception e) {
@@ -1270,7 +1107,7 @@ public class Plot {
* @param flag the flag to remove
* @return success
*/
- public boolean removeFlag(Class> flag) {
+ public boolean removeFlag(@Nonnull final Class> flag) {
return this.removeFlag(getFlagContainer().queryLocal(flag));
}
@@ -1302,7 +1139,7 @@ public class Plot {
} else {
flags.putAll(flagMap);
}
- return flagMap.values();
+ return flags.values();
}
/**
@@ -1321,7 +1158,7 @@ public class Plot {
* @param flag the flag to remove
* @return success
*/
- public boolean removeFlag(PlotFlag flag) {
+ public boolean removeFlag(@Nonnull final PlotFlag flag) {
if (flag == null) {
return false;
}
@@ -1338,26 +1175,6 @@ public class Plot {
return removed;
}
- /**
- * Delete a plot (use null for the runnable if you don't need to be notified on completion)
- *
- * @see PlotSquared#removePlot(Plot, boolean)
- * @see #clear(boolean, boolean, Runnable) to simply clear a plot
- */
- public boolean deletePlot(final Runnable whenDone) {
- if (!this.hasOwner()) {
- return false;
- }
- final Set plots = this.getConnectedPlots();
- this.clear(false, true, () -> {
- for (Plot current : plots) {
- current.unclaim();
- }
- TaskManager.runTask(whenDone);
- });
- return true;
- }
-
/**
* Count the entities in a plot
*
@@ -1452,23 +1269,13 @@ public class Plot {
DBFunc.delete(current);
current.setOwnerAbs(null);
current.settings = null;
- for (PlotPlayer pp : players) {
+ for (final PlotPlayer pp : players) {
this.plotListener.plotEntry(pp, current);
}
}
return true;
}
- /**
- * Unlink a plot and remove the roads
- *
- * @return true if plot was linked
- * @see #unlinkPlot(boolean, boolean)
- */
- public boolean unlink() {
- return this.unlinkPlot(true, true);
- }
-
public void getCenter(final Consumer result) {
Location[] corners = getCorners();
Location top = corners[0];
@@ -1490,6 +1297,8 @@ public class Plot {
/**
* @deprecated May cause synchronous chunk loads
+ *
+ * @return Location of center
*/
@Deprecated public Location getCenterSynchronous() {
Location[] corners = getCorners();
@@ -1509,6 +1318,8 @@ public class Plot {
/**
* @deprecated May cause synchronous chunk loads
+ *
+ * @return side where players should teleport to
*/
@Deprecated public Location getSideSynchronous() {
CuboidRegion largest = getLargestRegion();
@@ -1546,6 +1357,8 @@ public class Plot {
/**
* @deprecated May cause synchronous chunk loading
+ *
+ * @return the plot home location
*/
@Deprecated public Location getHomeSynchronous() {
BlockLoc home = this.getPosition();
@@ -1569,6 +1382,8 @@ public class Plot {
/**
* Return the home location for the plot
+ *
+ * @param result consumer to pass location to when found
*/
public void getHome(final Consumer result) {
BlockLoc home = this.getPosition();
@@ -1615,6 +1430,8 @@ public class Plot {
/**
* Gets the default home location for a plot
* - Ignores any home location set for that specific plot
+ *
+ * @param result consumer to pass location to when found
*/
public void getDefaultHome(Consumer result) {
getDefaultHome(false, result);
@@ -1622,6 +1439,10 @@ public class Plot {
/**
* @deprecated May cause synchronous chunk loads
+ *
+ * @param member if to get the home for plot members
+ *
+ * @return location of home for members or visitors
*/
@Deprecated public Location getDefaultHomeSynchronous(final boolean member) {
Plot plot = this.getBasePlot(false);
@@ -1761,73 +1582,18 @@ public class Plot {
return base.settings != null && base.settings.getRatings() != null;
}
- /**
- * Resend all chunks inside the plot to nearby players
- * This should not need to be called
- */
- public void refreshChunks() {
- QueueCoordinator queue = this.blockQueue.getNewQueue(PlotSquared.platform().getWorldUtil().getWeWorld(getWorldName()));
- HashSet chunks = new HashSet<>();
- for (CuboidRegion region : Plot.this.getRegions()) {
- for (int x = region.getMinimumPoint().getX() >> 4; x <= region.getMaximumPoint().getX() >> 4; x++) {
- for (int z = region.getMinimumPoint().getZ() >> 4; z <= region.getMaximumPoint().getZ() >> 4; z++) {
- if (chunks.add(BlockVector2.at(x, z))) {
- worldUtil.refreshChunk(x, z, getWorldName());
- }
- }
- }
- }
- }
-
- /**
- * Remove the plot sign if it is set.
- */
- public void removeSign() {
- PlotManager manager = this.area.getPlotManager();
- if (!this.area.allowSigns()) {
- return;
- }
- Location location = manager.getSignLoc(this);
- QueueCoordinator queue = this.blockQueue.getNewQueue(worldUtil.getWeWorld(getWorldName()));
- queue.setBlock(location.getX(), location.getY(), location.getZ(), BlockTypes.AIR.getDefaultState());
- queue.enqueue();
- }
-
- /**
- * Sets the plot sign if plot signs are enabled.
- */
- public void setSign() {
- if (!this.hasOwner()) {
- this.setSign("unknown");
- return;
- }
- this.impromptuPipeline.getSingle(this.getOwnerAbs(), (username, sign) -> this.setSign(username));
- }
-
- /**
- * Register a plot and create it in the database
- * - The plot will not be created if the owner is null
- * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
- * creation.
- *
- * @return true if plot was created successfully
- */
- public boolean create() {
- return this.create(this.owner, true);
- }
-
- public boolean claim(@Nonnull final PlotPlayer player, boolean teleport, String schematic) {
+ public boolean claim(@Nonnull final PlotPlayer player, boolean teleport, String schematic) {
if (!canClaim(player)) {
return false;
}
return claim(player, teleport, schematic, true);
}
- public boolean claim(@Nonnull final PlotPlayer player, boolean teleport, String schematic, boolean updateDB) {
+ public boolean claim(@Nonnull final PlotPlayer player, boolean teleport, String schematic, boolean updateDB) {
if (updateDB) {
- if (!create(player.getUUID(), true)) {
- logger.error("[P2] Player {} attempted to claim plot {}, but the database failed to update", player.getName(),
+ if (!this.getPlotModificationManager().create(player.getUUID(), true)) {
+ logger.error("Player {} attempted to claim plot {}, but the database failed to update", player.getName(),
this.getId().toCommaSeparatedString());
return false;
}
@@ -1835,7 +1601,7 @@ public class Plot {
area.addPlot(this);
updateWorldBorder();
}
- setSign(player.getName());
+ this.getPlotModificationManager().setSign(player.getName());
player.sendMessage(TranslatableCaption.of("working.claimed"));
if (teleport && Settings.Teleport.ON_CLAIM) {
teleportPlayer(player, TeleportCause.COMMAND, result -> {
@@ -1871,75 +1637,10 @@ public class Plot {
return true;
}
-
- /**
- * Register a plot and create it in the database
- * - The plot will not be created if the owner is null
- * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
- * creation.
- *
- * @param uuid the uuid of the plot owner
- * @param notify notify
- * @return true if plot was created successfully
- */
- public boolean create(@Nonnull UUID uuid, final boolean notify) {
- this.setOwnerAbs(uuid);
- Plot existing = this.area.getOwnedPlotAbs(this.id);
- if (existing != null) {
- throw new IllegalStateException("Plot already exists!");
- }
- if (notify) {
- Integer meta = (Integer) this.area.getMeta("worldBorder");
- if (meta != null) {
- this.updateWorldBorder();
- }
- }
- connected_cache = null;
- regions_cache = null;
- this.getTrusted().clear();
- this.getMembers().clear();
- this.getDenied().clear();
- this.settings = new PlotSettings();
- if (this.area.addPlot(this)) {
- DBFunc.createPlotAndSettings(this, () -> {
- PlotArea plotworld = Plot.this.area;
- if (notify && plotworld.isAutoMerge()) {
- final PlotPlayer player = PlotSquared.platform().getPlayerManager().getPlayerIfExists(uuid);
-
- PlotMergeEvent event = this.eventDispatcher.callMerge(this, Direction.ALL, Integer.MAX_VALUE, player);
-
- if (event.getEventResult() == Result.DENY) {
- if (player != null) {
- player.sendMessage(TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Auto merge on claim"));
- }
- return;
- }
- Plot.this.autoMerge(event.getDir(), event.getMax(), uuid, true);
- }
- });
- return true;
- }
- logger.info("[P2] Failed to add plot {} to plot area {}", this.getId().toCommaSeparatedString(), this.area.toString());
- return false;
- }
-
- /**
- * Sets components such as border, wall, floor.
- * (components are generator specific)
- */
- @Deprecated public boolean setComponent(String component, String blocks, QueueCoordinator queue) {
- BlockBucket parsed = ConfigurationUtil.BLOCK_BUCKET.parseString(blocks);
- if (parsed != null && parsed.isEmpty()) {
- return false;
- }
- return this.setComponent(component, parsed.toPattern(), queue);
- }
-
- //TODO Better documentation needed.
-
/**
* Retrieve the biome of the plot.
+ *
+ * @param result consumer to pass biome to when found
*/
public void getBiome(Consumer result) {
this.getCenter(location -> this.worldUtil.getBiome(location.getWorldName(), location.getX(), location.getZ(), result));
@@ -1949,6 +1650,8 @@ public class Plot {
/**
* @deprecated May cause synchronous chunk loads
+ *
+ * @return biome at center of plot
*/
@Deprecated public BiomeType getBiomeSynchronous() {
final Location location = this.getCenterSynchronous();
@@ -1957,6 +1660,8 @@ public class Plot {
/**
* Returns the top location for the plot.
+ *
+ * @return location of Absolute Top
*/
public Location getTopAbs() {
return this.getManager().getPlotTopLocAbs(this.id).withWorld(this.getWorldName());
@@ -1964,6 +1669,8 @@ public class Plot {
/**
* Returns the bottom location for the plot.
+ *
+ * @return location of absolute bottom of plot
*/
public Location getBottomAbs() {
return this.getManager().getPlotBottomLocAbs(this.id).withWorld(this.getWorldName());
@@ -2003,8 +1710,8 @@ public class Plot {
* Moves the settings for a plot.
*
* @param plot the plot to move
- * @param whenDone
- * @return
+ * @param whenDone task to run when settings have been moved
+ * @return success or not
*/
public boolean moveData(Plot plot, Runnable whenDone) {
if (!this.hasOwner()) {
@@ -2034,10 +1741,10 @@ public class Plot {
if (!this.isMerged()) {
return top;
}
- if (this.getMerged(Direction.SOUTH)) {
+ if (this.isMerged(Direction.SOUTH)) {
top = top.withZ(this.getRelative(Direction.SOUTH).getBottomAbs().getZ() - 1);
}
- if (this.getMerged(Direction.EAST)) {
+ if (this.isMerged(Direction.EAST)) {
top = top.withX(this.getRelative(Direction.EAST).getBottomAbs().getX() - 1);
}
return top;
@@ -2055,10 +1762,10 @@ public class Plot {
if (!this.isMerged()) {
return bot;
}
- if (this.getMerged(Direction.NORTH)) {
+ if (this.isMerged(Direction.NORTH)) {
bot = bot.withZ(this.getRelative(Direction.NORTH).getTopAbs().getZ() + 1);
}
- if (this.getMerged(Direction.WEST)) {
+ if (this.isMerged(Direction.WEST)) {
bot = bot.withX(this.getRelative(Direction.WEST).getTopAbs().getX() + 1);
}
return bot;
@@ -2080,28 +1787,8 @@ public class Plot {
}
/**
- * Remove the east road section of a plot
- * - Used when a plot is merged
- *
- * @param queue Nullable {@link QueueCoordinator}. If null, creates own queue and enqueues,
- * otherwise writes to the queue but does not enqueue.
- */
- public void removeRoadEast(@Nullable QueueCoordinator queue) {
- if (this.area.getType() != PlotAreaType.NORMAL && this.area.getTerrain() == PlotAreaTerrainType.ROAD) {
- Plot other = this.getRelative(Direction.EAST);
- Location bot = other.getBottomAbs();
- Location top = this.getTopAbs();
- Location pos1 = Location.at(this.getWorldName(), top.getX(), 0, bot.getZ());
- Location pos2 = Location.at(this.getWorldName(), bot.getX(), MAX_HEIGHT, top.getZ());
- this.regionManager.regenerateRegion(pos1, pos2, true, null);
- } else if (this.area.getTerrain() != PlotAreaTerrainType.ALL) { // no road generated => no road to remove
- this.area.getPlotManager().removeRoadEast(this, queue);
- }
- }
-
- /**
- * @return
* @deprecated in favor of getCorners()[0];
+ * @return bottom corner location
*/
// Won't remove as suggestion also points to deprecated method
@Deprecated public Location getBottom() {
@@ -2109,39 +1796,14 @@ public class Plot {
}
/**
- * @return the top corner of the plot
* @deprecated in favor of getCorners()[1];
+ * @return the top corner of the plot
*/
// Won't remove as suggestion also points to deprecated method
@Deprecated public Location getTop() {
return this.getCorners()[1];
}
- /**
- * Swap the plot contents and settings with another location
- * - The destination must correspond to a valid plot of equal dimensions
- *
- * @param destination The other plot to swap with
- * @param whenDone A task to run when finished, or null
- * @return boolean if swap was successful
- * @see #swapData(Plot) to swap plot settings
- */
- public CompletableFuture swap(Plot destination, Runnable whenDone) {
- return this.move(destination, whenDone, true);
- }
-
- /**
- * Moves the plot to an empty location
- * - The location must be empty
- *
- * @param destination Where to move the plot
- * @param whenDone A task to run when done, or null
- * @return if the move was successful
- */
- public CompletableFuture move(Plot destination, Runnable whenDone) {
- return this.move(destination, whenDone, false);
- }
-
/**
* Gets plot display name.
*
@@ -2158,7 +1820,9 @@ public class Plot {
* Remove a denied player (use DBFunc as well)
* Using the * uuid will remove all users
*
- * @param uuid
+ * @param uuid uuid of player to remove from denied list
+ *
+ * @return success or not
*/
public boolean removeDenied(UUID uuid) {
if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
@@ -2186,7 +1850,9 @@ public class Plot {
* Remove a helper (use DBFunc as well)
* Using the * uuid will remove all users
*
- * @param uuid
+ * @param uuid uuid of trusted player to remove
+ *
+ * @return success or not
*/
public boolean removeTrusted(UUID uuid) {
if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
@@ -2214,7 +1880,9 @@ public class Plot {
* Remove a trusted user (use DBFunc as well)
* Using the * uuid will remove all users
*
- * @param uuid
+ * @param uuid uuid of player to remove
+ *
+ * @return success or not
*/
public boolean removeMember(UUID uuid) {
if (this.members == null) {
@@ -2241,56 +1909,6 @@ public class Plot {
return true;
}
- /**
- * Export the plot as a schematic to the configured output directory.
- */
- public void export(final RunnableVal whenDone) {
- this.schematicHandler.getCompoundTag(this, new RunnableVal