playerEntries = new LinkedHashMap<>();
+ while (rs.next()) {
+ playerEntries.put(rs.getString(1), rs.getInt(2));
+ }
+ return playerEntries;
+ }));
+ }
+
+ /**
+ * Constructs a SQL query to retrieve leaderboard data by sorting based on a given timeframe.
+ *
+ * This query returns the top leaderboard entries ordered by the score
+ * within the specified timeframe.
+ *
+ * @param sortBy the timeframe used to filter entries. Determines the minimum date for reviews
+ * (e.g., daily, weekly, monthly, yearly).
+ * @return the constructed SQL query as a {@code String}.
+ */
+ @Contract(pure = true)
+ private static @NotNull String getLeaderboardQuery(@NotNull LeaderboardTimeframe sortBy) {
+ String minimumDate = switch (sortBy) {
+ case DAILY -> "(NOW() - INTERVAL 1 DAY)";
+ case WEEKLY -> "(NOW() - INTERVAL 1 WEEK)";
+ case MONTHLY -> "(NOW() - INTERVAL 1 MONTH)";
+ case YEARLY -> "(NOW() - INTERVAL 1 YEAR)";
+ default -> null;
+ };
+
+ return "WITH latest_reviews AS ( "
+ + " SELECT pr.* "
+ + " FROM plot_review pr "
+ + " INNER JOIN ( "
+ + " SELECT plot_id, MAX(review_date) AS latest_review_date "
+ + " FROM plot_review "
+ + " GROUP BY plot_id "
+ + " ) latest ON pr.plot_id = latest.plot_id AND pr.review_date = latest.latest_review_date "
+ + "), "
+ + "plot_member_counts AS ( "
+ + " SELECT plot_id, COUNT(*) AS member_count "
+ + " FROM builder_is_plot_member "
+ + " GROUP BY plot_id "
+ + "), "
+ + "all_builders AS ( "
+ + " SELECT "
+ + " p.owner_uuid AS builder_uuid, "
+ + " p.plot_id "
+ + " FROM plot p "
+ + " WHERE p.status = 'completed' "
+ + " UNION ALL "
+ + " SELECT "
+ + " bipm.uuid AS builder_uuid, "
+ + " bipm.plot_id "
+ + " FROM builder_is_plot_member bipm "
+ + " JOIN plot p ON p.plot_id = bipm.plot_id "
+ + " WHERE p.status = 'completed' "
+ + ") "
+ + "SELECT b.name, SUM( "
+ + " IF(pmc.member_count IS NULL OR pmc.member_count = 0, lr.score, FLOOR(lr.score / (pmc.member_count + 1))) "
+ + ") AS total_score "
+ + "FROM all_builders ab "
+ + "JOIN builder b ON b.uuid = ab.builder_uuid "
+ + "JOIN latest_reviews lr ON lr.plot_id = ab.plot_id "
+ + "LEFT JOIN plot_member_counts pmc ON pmc.plot_id = ab.plot_id "
+ + (minimumDate != null ? "WHERE lr.review_date BETWEEN " + minimumDate + " AND NOW() " : "")
+ + "GROUP BY b.name "
+ + "ORDER BY total_score DESC, b.name "
+ + "LIMIT 10;";
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/CityProjectProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/CityProjectProvider.java
new file mode 100644
index 000000000..2030e3dee
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/CityProjectProvider.java
@@ -0,0 +1,105 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.core.system.CityProject;
+import com.alpsbte.plotsystem.utils.Utils;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class CityProjectProvider {
+ protected static final List CITY_PROJECTS = new ArrayList<>();
+
+ public CityProjectProvider() {
+ String qCityProjects = "SELECT city_project_id, country_code, server_name, is_visible, build_team_id FROM city_project;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qCityProjects, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ CITY_PROJECTS.add(new CityProject(rs.getString(1), // cache all city projects
+ rs.getString(2), rs.getString(3), rs.getBoolean(4), rs.getInt(5)));
+ }
+ }));
+ }
+
+ public Optional getById(String id) {
+ return CITY_PROJECTS.stream().filter(c -> c.getId().equals(id)).findFirst();
+ }
+
+ public List getByCountryCode(String countryCode, boolean onlyVisible) {
+ return CITY_PROJECTS.stream().filter(c -> (!onlyVisible || c.isVisible()) &&
+ c.getCountry().getCode().equals(countryCode)).toList();
+ }
+
+ public List get(boolean onlyVisible) {
+ return CITY_PROJECTS.stream().filter(c -> !onlyVisible || c.isVisible()).toList();
+ }
+
+ public List getCityProjectsByBuildTeam(int buildTeamId) {
+ String qIdByBtId = "SELECT city_project_id FROM city_project WHERE build_team_id = ?;";
+ return Utils.handleSqlException(new ArrayList<>(), () -> SqlHelper.runQuery(qIdByBtId, ps -> {
+ ps.setInt(1, buildTeamId);
+ ResultSet rs = ps.executeQuery();
+ List cityProjects = new ArrayList<>();
+ while (rs.next()) {
+ Optional city = getById(rs.getString(1));
+ city.ifPresent(cityProjects::add);
+ }
+ return cityProjects;
+ }));
+ }
+
+ public boolean add(String id, int buildTeamId, String countryCode, String serverName) {
+ if (getById(id).isPresent()) return true;
+
+ String qInsert = "INSERT INTO city_project (city_project_id, build_team_id, country_code, server_name) VALUES (?, ?, ?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsert, ps -> {
+ ps.setString(1, id);
+ ps.setInt(2, buildTeamId);
+ ps.setString(3, countryCode);
+ ps.setString(4, serverName);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) CITY_PROJECTS.add(new CityProject(id, countryCode, serverName, true, buildTeamId));
+ return result;
+ })));
+ }
+
+ public boolean remove(String id) {
+ Optional cityProject = getById(id);
+ String qDelete = "DELETE FROM city_project WHERE city_project_id = ?;";
+ return cityProject.filter(project -> Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDelete, ps -> {
+ ps.setString(1, id);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) CITY_PROJECTS.remove(project);
+ return result;
+ })))).isPresent();
+ }
+
+ public boolean setVisibility(String id, boolean isVisible) {
+ String qUpdateVisible = "UPDATE city_project SET is_visible = ? WHERE city_project_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qUpdateVisible, ps -> {
+ ps.setBoolean(1, isVisible);
+ ps.setString(2, id);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setServer(String id, String serverName) {
+ String qUpdateServerName = "UPDATE city_project SET server_name = ? WHERE city_project_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qUpdateServerName, ps -> {
+ ps.setString(1, serverName);
+ ps.setString(2, id);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setBuildTeam(String id, int buildTeamId) {
+ String qUpdateBuildTeamId = "UPDATE city_project SET build_team_id = ? WHERE city_project_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qUpdateBuildTeamId, ps -> {
+ ps.setInt(1, buildTeamId);
+ ps.setString(2, id);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/CountryProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/CountryProvider.java
new file mode 100644
index 000000000..df759ce1c
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/CountryProvider.java
@@ -0,0 +1,79 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.core.system.Country;
+import com.alpsbte.plotsystem.utils.Utils;
+import com.alpsbte.plotsystem.utils.enums.Continent;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class CountryProvider {
+ protected static final List COUNTRIES = new ArrayList<>();
+
+ public CountryProvider() {
+ String qAll = "SELECT country_code, continent, material, custom_model_data FROM country;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAll, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ Continent continent = Continent.fromDatabase(rs.getString(2));
+ Country country = new Country(rs.getString(1), continent, rs.getString(3),
+ rs.getString(4));
+ COUNTRIES.add(country); // cache all countries
+ }
+ }));
+ }
+
+ public List getCountries() {
+ return COUNTRIES;
+ }
+
+ public List getCountriesByContinent(Continent continent) {
+ return COUNTRIES.stream().filter(c -> c.getContinent() == continent).toList();
+ }
+
+ public Optional getCountryByCode(String code) {
+ return COUNTRIES.stream().filter(c -> c.getCode().equals(code)).findFirst();
+ }
+
+ public boolean setMaterialAndCustomModelData(String code, String material, @Nullable String customModelData) {
+ String qSetItem = "UPDATE country SET material = ?, custom_model_data = ? WHERE country_code = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetItem, ps -> {
+ ps.setString(1, material);
+ ps.setString(2, customModelData);
+ ps.setString(3, code);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean addCountry(String code, Continent continent, String material, @Nullable String customModelData) {
+ if (getCountryByCode(code).isPresent()) return true;
+
+ String qInsert = "INSERT INTO country (country_code, continent, material, custom_model_data) VALUES (?, ?, ?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsert, ps -> {
+ ps.setString(1, code);
+ ps.setString(2, continent.databaseEnum);
+ ps.setString(3, material);
+ ps.setString(4, customModelData);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) COUNTRIES.add(new Country(code, continent, material, customModelData));
+ return result;
+ })));
+ }
+
+ public boolean removeCountry(String code) {
+ Optional cachedCountry = getCountryByCode(code);
+ if (cachedCountry.isEmpty()) return false;
+
+ String qDelete = "DELETE FROM country WHERE country_code = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDelete, ps -> {
+ ps.setString(1, code);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) COUNTRIES.remove(cachedCountry.get());
+ return result;
+ })));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/DifficultyProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/DifficultyProvider.java
new file mode 100644
index 000000000..95d6d2914
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/DifficultyProvider.java
@@ -0,0 +1,79 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.system.Builder;
+import com.alpsbte.plotsystem.core.system.Difficulty;
+import com.alpsbte.plotsystem.utils.Utils;
+import com.alpsbte.plotsystem.utils.enums.PlotDifficulty;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static net.kyori.adventure.text.Component.text;
+
+public class DifficultyProvider {
+ protected static final List DIFFICULTIES = new ArrayList<>();
+
+ public DifficultyProvider() {
+ // cache all difficulties
+ String qAll = "SELECT difficulty_id, multiplier, score_requirement FROM plot_difficulty;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAll, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ String id = rs.getString(1);
+ double multiplier = rs.getDouble(2);
+ int scoreRequirement = rs.getInt(3);
+
+ Difficulty difficulty = new Difficulty(PlotDifficulty.valueOf(id), id, multiplier, scoreRequirement);
+ DIFFICULTIES.add(difficulty); // cache all difficulties
+ }
+ }));
+ }
+
+ public List getDifficulties() {
+ return DIFFICULTIES;
+ }
+
+ public Optional getDifficultyById(String id) {
+ return DIFFICULTIES.stream().filter(d -> d.getID().equalsIgnoreCase(id)).findAny();
+ }
+
+ public Optional getDifficultyByEnum(PlotDifficulty difficulty) {
+ if (difficulty == null) return Optional.empty();
+ return DIFFICULTIES.stream().filter(d -> d.getID().equalsIgnoreCase(difficulty.name())).findFirst();
+ }
+
+ public boolean setMultiplier(String id, double multiplier) {
+ String qSetMulti = "UPDATE plot_difficulty SET multiplier = ? WHERE difficulty_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetMulti, ps -> {
+ ps.setDouble(1, multiplier);
+ ps.setString(2, id);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setScoreRequirement(String id, int scoreRequirement) {
+ String qSetScoreRequirement = "UPDATE plot_difficulty SET score_requirement = ? WHERE difficulty_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetScoreRequirement, ps -> {
+ ps.setInt(1, scoreRequirement);
+ ps.setString(2, id);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean builderMeetsRequirements(Builder builder, PlotDifficulty plotDifficulty) {
+ Optional cachedDifficulty = getDifficultyByEnum(plotDifficulty);
+ if (cachedDifficulty.isEmpty()) {
+ PlotSystem.getPlugin().getComponentLogger().error(text("No database entry for difficulty "
+ + plotDifficulty.toString() + " was found!"));
+ return false;
+ }
+
+ int playerScore = builder.getScore();
+ int scoreRequirement = cachedDifficulty.get().getScoreRequirement();
+ return playerScore >= scoreRequirement;
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/PlotProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/PlotProvider.java
new file mode 100644
index 000000000..c06507f41
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/PlotProvider.java
@@ -0,0 +1,268 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.core.database.DataProvider;
+import com.alpsbte.plotsystem.core.system.Builder;
+import com.alpsbte.plotsystem.core.system.CityProject;
+import com.alpsbte.plotsystem.core.system.plot.Plot;
+import com.alpsbte.plotsystem.core.system.plot.utils.PlotType;
+import com.alpsbte.plotsystem.utils.Utils;
+import com.alpsbte.plotsystem.utils.enums.PlotDifficulty;
+import com.alpsbte.plotsystem.utils.enums.Status;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class PlotProvider {
+ private static final String PLOT_SQL_COLUMNS = "plot.plot_id, plot.city_project_id, plot.difficulty_id, " +
+ "plot.owner_uuid, plot.status, plot.outline_bounds, plot.last_activity_date, " +
+ "plot.plot_version, plot.plot_type";
+
+ public Plot getPlotById(int plotId) {
+ String qGet = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot WHERE plot_id = ?;";
+ return Utils.handleSqlException(null, () -> SqlHelper.runQuery(qGet, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) return null; // No plot found
+ return extractPlot(rs);
+ }));
+ }
+
+ public List getPlots(@NotNull Status status) {
+ String qAllByStatus = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot WHERE status = ?;";
+ return Utils.handleSqlException(List.of(), () -> SqlHelper.runQuery(qAllByStatus, ps -> {
+ ps.setString(1, status.name());
+ ResultSet rs = ps.executeQuery();
+ List plots = new ArrayList<>();
+ while (rs.next()) {
+ plots.add(extractPlot(rs));
+ }
+ return plots;
+ }));
+ }
+
+ public List getPlots(@NotNull CityProject city, Status @NotNull ... statuses) {
+ String query = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot WHERE city_project_id = ?";
+ query += statuses.length > 0 ? " AND status IN (" + "?,".repeat(statuses.length - 1) + "?);" : ";";
+ String qPlotsWithCityAndStatuses = query;
+ return Utils.handleSqlException(List.of(), () -> SqlHelper.runQuery(qPlotsWithCityAndStatuses, ps -> {
+ ps.setString(1, city.getId());
+ for (int i = 0; i < statuses.length; i++) ps.setString(i + 2, statuses[i].name());
+ ResultSet rs = ps.executeQuery();
+ List plots = new ArrayList<>();
+ while (rs.next()) plots.add(extractPlot(rs));
+ return plots;
+ }));
+ }
+
+ public List getPlots(@NotNull CityProject city, @NotNull PlotDifficulty plotDifficulty, @NotNull Status status) {
+ String qAllByCityDifficultyStatus = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot WHERE city_project_id = ? AND difficulty_id = ? AND status = ?;";
+ return Utils.handleSqlException(List.of(), () -> SqlHelper.runQuery(qAllByCityDifficultyStatus, ps -> {
+ ps.setString(1, city.getId());
+ ps.setString(2, plotDifficulty.name());
+ ps.setString(3, status.name());
+ ResultSet rs = ps.executeQuery();
+ List plots = new ArrayList<>();
+ while (rs.next()) plots.add(extractPlot(rs));
+ return plots;
+ }));
+ }
+
+ public List getPlots(@NotNull List cities, Status... statuses) {
+ if (cities.isEmpty()) return List.of();
+
+ String cityPlaceholders = "?,".repeat(cities.size() - 1) + "?";
+ String query = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot WHERE city_project_id IN (" + cityPlaceholders + ")";
+ query += statuses.length > 0 ? " AND status IN (" + "?,".repeat(statuses.length - 1) + "?) ORDER BY plot.plot_id;" : ";";
+ String qPlotsWithCitiesAndStatuses = query;
+
+ return Utils.handleSqlException(List.of(), () -> SqlHelper.runQuery(qPlotsWithCitiesAndStatuses, ps -> {
+ int index = 1;
+ for (CityProject city : cities) ps.setString(index++, city.getId());
+ for (Status status : statuses) ps.setString(index++, status.name());
+
+ ResultSet rs = ps.executeQuery();
+ List plots = new ArrayList<>();
+ while (rs.next()) plots.add(extractPlot(rs));
+ return plots;
+ }));
+ }
+
+ public List getPlots(@NotNull Builder builder, Status @NotNull ... statuses) {
+ String query = "SELECT " + PLOT_SQL_COLUMNS + " FROM plot LEFT JOIN builder_is_plot_member pm ON " +
+ "plot.plot_id = pm.plot_id WHERE (plot.owner_uuid = ? OR pm.uuid = ?)";
+ query += statuses.length > 0 ? "AND plot.status IN (" + "?,".repeat(statuses.length - 1) + "?);" : ";";
+ String qPlotsWithBuilderAndStatuses = query;
+ return Utils.handleSqlException(List.of(), () -> SqlHelper.runQuery(qPlotsWithBuilderAndStatuses, ps -> {
+ String builderUUID = builder.getUUID().toString();
+ ps.setString(1, builderUUID);
+ ps.setString(2, builderUUID);
+ for (int i = 0; i < statuses.length; i++) ps.setString(i + 3, statuses[i].name());
+
+ ResultSet rs = ps.executeQuery();
+ List plots = new ArrayList<>();
+ while (rs.next()) plots.add(extractPlot(rs));
+ return plots;
+ }));
+ }
+
+ private @NotNull Plot extractPlot(@NotNull ResultSet rs) throws SQLException {
+ int plotId = rs.getInt("plot_id");
+ CityProject cityProject = DataProvider.CITY_PROJECT.getById(rs.getString("city_project_id")).orElseThrow();
+ PlotDifficulty difficulty = DataProvider.DIFFICULTY.getDifficultyById(rs.getString("difficulty_id")).orElseThrow().getDifficulty();
+
+ String ownerUUIDString = rs.getString("owner_uuid");
+ UUID ownerUUID = ownerUUIDString != null ? UUID.fromString(ownerUUIDString) : null;
+
+ Status status = Status.valueOf(rs.getString("status"));
+ String outlineBounds = rs.getString("outline_bounds");
+ Date lastActivity = rs.getDate("last_activity_date");
+
+ double version = rs.getDouble("plot_version");
+ PlotType type = PlotType.byId(rs.getInt("plot_type"));
+
+ return new Plot(
+ plotId,
+ cityProject,
+ difficulty,
+ ownerUUID,
+ status,
+ outlineBounds,
+ lastActivity != null ? lastActivity.toLocalDate() : null,
+ version,
+ type,
+ getPlotMembers(plotId));
+ }
+
+ public List getPlotMembers(int plotId) {
+ String qAllMembers = "SELECT uuid FROM builder_is_plot_member WHERE plot_id = ?;";
+ return Utils.handleSqlException(new ArrayList<>(), () -> SqlHelper.runQuery(qAllMembers, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ List members = new ArrayList<>();
+ while (rs.next()) {
+ members.add(Builder.byUUID(UUID.fromString(rs.getString(1))));
+ }
+ return members;
+ }));
+ }
+
+ public byte[] getInitialSchematic(int plotId) {
+ return getSchematic(plotId, "initial_schematic");
+ }
+
+ public byte[] getCompletedSchematic(int plotId) {
+ return getSchematic(plotId, "complete_schematic");
+ }
+
+ private byte @Nullable [] getSchematic(int plotId, String name) {
+ String qName = "SELECT " + name + " FROM plot WHERE plot_id = ?;";
+ return Utils.handleSqlException(null, () -> SqlHelper.runQuery(qName, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) return null;
+ return rs.getBytes(1);
+ }));
+ }
+
+ public boolean setCompletedSchematic(int plotId, byte[] completedSchematic) {
+ String qSetCompleteSchematic = "UPDATE plot SET complete_schematic = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetCompleteSchematic, ps -> {
+ ps.setBytes(1, completedSchematic);
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setPlotOwner(int plotId, UUID ownerUUID) {
+ String qSetOwner = "UPDATE plot SET owner_uuid = " + (ownerUUID == null ? "DEFAULT(owner_uuid)" : "?") + " WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetOwner, ps -> {
+ if (ownerUUID == null) {
+ ps.setInt(1, plotId);
+ } else {
+ ps.setString(1, ownerUUID.toString());
+ ps.setInt(2, plotId);
+ }
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setLastActivity(int plotId, LocalDate activityDate) {
+ String qSetLastActivityDate = "UPDATE plot SET last_activity_date = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetLastActivityDate, ps -> {
+ ps.setDate(1, activityDate == null ? null : Date.valueOf(activityDate));
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setStatus(int plotId, @NotNull Status status) {
+ String qSetStatus = "UPDATE plot SET status = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetStatus, ps -> {
+ ps.setString(1, status.name());
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setMcVersion(int plotId) {
+ String qSetMcVersion = "UPDATE plot SET mc_version = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetMcVersion, ps -> {
+ ps.setString(1, Bukkit.getMinecraftVersion());
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setPlotType(int plotId, @NotNull PlotType type) {
+ String qSetType = "UPDATE plot SET plot_type = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetType, ps -> {
+ ps.setInt(1, type.getId());
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setPasted(int plotId, boolean pasted) {
+ String qSetPasted = "UPDATE plot SET is_pasted = ? WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetPasted, ps -> {
+ ps.setBoolean(1, pasted);
+ ps.setInt(2, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean deletePlot(int plotId) {
+ String qDelete = "DELETE FROM plot WHERE plot_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDelete, ps -> {
+ ps.setInt(1, plotId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean addPlotMember(int id, Builder member) {
+ String qInsertPlotMember = "INSERT INTO builder_is_plot_member (plot_id, uuid) VALUES (?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsertPlotMember, ps -> {
+ ps.setInt(1, id);
+ ps.setString(2, member.getUUID().toString());
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean removePlotMember(int id, Builder member) {
+ String qDeletePlotMember = "DELETE FROM builder_is_plot_member WHERE plot_id = ? AND uuid = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDeletePlotMember, ps -> {
+ ps.setInt(1, id);
+ ps.setString(2, member.getUUID().toString());
+ return ps.executeUpdate() > 0;
+ })));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/ReviewProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/ReviewProvider.java
new file mode 100644
index 000000000..f5656fff1
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/ReviewProvider.java
@@ -0,0 +1,345 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.core.database.DataProvider;
+import com.alpsbte.plotsystem.core.system.Builder;
+import com.alpsbte.plotsystem.core.system.plot.Plot;
+import com.alpsbte.plotsystem.core.system.plot.utils.PlotUtils;
+import com.alpsbte.plotsystem.core.system.review.BuildTeamToggleCriteria;
+import com.alpsbte.plotsystem.core.system.review.PlotReview;
+import com.alpsbte.plotsystem.core.system.review.ReviewNotification;
+import com.alpsbte.plotsystem.core.system.review.ReviewRating;
+import com.alpsbte.plotsystem.core.system.review.ToggleCriteria;
+import com.alpsbte.plotsystem.utils.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+public class ReviewProvider {
+ protected static final List NOTIFICATIONS = new ArrayList<>();
+ protected static final List TOGGLE_CRITERIA = new ArrayList<>();
+ protected static final List BUILD_TEAM_TOGGLE_CRITERIA = new ArrayList<>();
+
+ public ReviewProvider() {
+ // cache all review notifications
+ String qAllNotifys = "SELECT review_id, uuid FROM builder_has_review_notification;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAllNotifys, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ NOTIFICATIONS.add(new ReviewNotification(rs.getInt(1), UUID.fromString(rs.getString(2))));
+ }
+ }));
+
+ // cache all toggle criteria
+ String qAllToggleCriterias = "SELECT criteria_name, is_optional FROM review_toggle_criteria;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAllToggleCriterias, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ TOGGLE_CRITERIA.add(new ToggleCriteria(rs.getString(1), rs.getBoolean(2)));
+ }
+ }));
+
+ // cache all build team toggle criteria
+ String qAllBuildteamCriteria = "SELECT criteria_name, build_team_id FROM build_team_uses_toggle_criteria;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAllBuildteamCriteria, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ String criteriaName = rs.getString(1);
+ ToggleCriteria toggle = TOGGLE_CRITERIA.stream().filter(c -> c.criteriaName().equals(criteriaName)).findFirst().orElseThrow();
+ BUILD_TEAM_TOGGLE_CRITERIA.add(new BuildTeamToggleCriteria(rs.getInt(2), toggle));
+ }
+ }));
+ }
+
+ public Optional getReview(int reviewId) {
+ String qById = "SELECT plot_id, rating, score, feedback, reviewed_by FROM plot_review WHERE review_id = ?;";
+ return Utils.handleSqlException(Optional.empty(), () -> SqlHelper.runQuery(qById, ps -> {
+ ps.setInt(1, reviewId);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) return Optional.empty();
+
+ int plotId = rs.getInt(1);
+ ReviewRating rating = getReviewRating(reviewId, rs.getString(2));
+ int score = rs.getInt(3);
+ String feedback = rs.getString(4);
+ UUID reviewedBy = UUID.fromString(rs.getString(5));
+
+ return Optional.of(new PlotReview(reviewId, plotId, rating, score, feedback, reviewedBy));
+ }));
+ }
+
+ public Optional getLatestReview(int plotId) {
+ String qLatestByPlotId = "SELECT review_id, rating, score, feedback, reviewed_by FROM plot_review WHERE plot_id = ? ORDER BY review_date DESC LIMIT 1;";
+ return Utils.handleSqlException(Optional.empty(), () -> SqlHelper.runQuery(qLatestByPlotId, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) return Optional.empty();
+
+ int reviewId = rs.getInt(1);
+ ReviewRating rating = getReviewRating(reviewId, rs.getString(2));
+ int score = rs.getInt(3);
+ String feedback = rs.getString(4);
+ UUID reviewedBy = UUID.fromString(rs.getString(5));
+
+ return Optional.of(new PlotReview(reviewId, plotId, rating, score, feedback, reviewedBy));
+ }));
+ }
+
+ public List getPlotReviewHistory(int plotId) {
+ String qByPlotId = "SELECT review_id, rating, score, feedback, reviewed_by FROM plot_review WHERE plot_id = ?;";
+ return Utils.handleSqlException(new ArrayList<>(), () -> SqlHelper.runQuery(qByPlotId, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ List reviews = new ArrayList<>();
+ while (rs.next()) {
+ int reviewId = rs.getInt(1);
+ ReviewRating rating = getReviewRating(reviewId, rs.getString(2));
+ int score = rs.getInt(3);
+ String feedback = rs.getString(4);
+ UUID reviewedBy = UUID.fromString(rs.getString(5));
+
+ reviews.add(new PlotReview(reviewId, plotId, rating, score, feedback, reviewedBy));
+ }
+ return reviews;
+ }));
+ }
+
+ private @NotNull ReviewRating getReviewRating(int reviewId, @NotNull String ratingString) {
+ int accuracyPoints = Integer.parseInt(ratingString.split(",")[0]);
+ int blockPalettePoints = Integer.parseInt(ratingString.split(",")[1]);
+ Map toggleCriteria = getReviewToggleCriteria(reviewId);
+ return new ReviewRating(accuracyPoints, blockPalettePoints, toggleCriteria);
+ }
+
+ public boolean updateFeedback(int reviewId, String newFeedback) {
+ String qSetFeedback = "UPDATE plot_review SET feedback = ? WHERE review_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetFeedback, ps -> {
+ ps.setString(1, newFeedback);
+ ps.setInt(2, reviewId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public PlotReview createReview(@NotNull Plot plot, ReviewRating rating, int score, UUID reviewerUUID) {
+ boolean result = DataProvider.PLOT.setMcVersion(plot.getId());
+ if (!result) return null;
+
+ // Create Review
+ String qInsert = "INSERT INTO plot_review (plot_id, rating, score, reviewed_by) VALUES (?, ?, ?, ?);";
+ result = Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsert, ps -> {
+ ps.setInt(1, plot.getId());
+ ps.setString(2, rating.getRatingDatabaseString());
+ ps.setInt(3, score);
+ ps.setString(4, reviewerUUID.toString());
+ return ps.executeUpdate() > 0;
+ })));
+
+ if (!result) return null;
+
+ PlotReview review = plot.getLatestReview().orElseThrow();
+ Map allToggles = rating.getAllToggles();
+ for (Map.Entry criteriaEntry : allToggles.entrySet()) {
+ if (!addReviewToggleCriteria(review.getReviewId(), criteriaEntry.getKey(), criteriaEntry.getValue()))
+ return null;
+ }
+
+
+ // create feedback notifications
+ createReviewNotification(review.getReviewId(), plot.getPlotOwner().getUUID());
+ for (Builder builder : plot.getPlotMembers()) {
+ createReviewNotification(review.getReviewId(), builder.getUUID());
+ }
+ return review;
+ }
+
+ public boolean removeReview(int reviewId) {
+ // remove all review notifications
+ List notifications = getReviewNotifications(reviewId);
+ for (ReviewNotification notification : notifications) {
+ removeReviewNotification(notification.reviewId(), notification.uuid());
+ }
+
+ // remove checked toggle criteria
+ removeCheckedToggleCriteria(reviewId);
+
+ // remove review
+ String qDelete = "DELETE FROM plot_review WHERE review_id = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDelete, ps -> {
+ ps.setInt(1, reviewId);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean removeAllReviewsOfPlot(int plotId) {
+ String qIdsByPlotId = "SELECT review_id FROM plot_review WHERE plot_id = ?;";
+ List reviewIds = new ArrayList<>();
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qIdsByPlotId, ps -> {
+ ps.setInt(1, plotId);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ reviewIds.add(rs.getInt(1));
+ }
+ }));
+
+ boolean successful = true;
+ for (int reviewId : reviewIds) {
+ successful = successful && removeReview(reviewId);
+ }
+ return successful;
+ }
+
+ // --- Toggle Criteria ---
+ public Optional getToggleCriteria(String criteriaName) {
+ return TOGGLE_CRITERIA.stream().filter(c -> c.criteriaName().equals(criteriaName)).findFirst();
+ }
+
+ public boolean addToggleCriteria(String criteriaName, boolean isOptional) {
+ Optional criteria = TOGGLE_CRITERIA.stream().filter(t -> t.criteriaName().equals(criteriaName)).findFirst();
+ if (criteria.isPresent()) return false;
+
+ String qInsertToggleCriteria = "INSERT INTO review_toggle_criteria (criteria_name, is_optional) VALUES (?, ?);";
+ if (!Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsertToggleCriteria, ps -> {
+ ps.setString(1, criteriaName);
+ ps.setBoolean(2, isOptional);
+ return ps.executeUpdate() > 0;
+ })))) return false;
+ TOGGLE_CRITERIA.add(new ToggleCriteria(criteriaName, isOptional));
+ return true;
+ }
+
+ public boolean removeToggleCriteria(String criteriaName) {
+ Optional criteria = TOGGLE_CRITERIA.stream().filter(t -> t.criteriaName().equals(criteriaName)).findFirst();
+ if (criteria.isEmpty()) return false;
+
+ String qDeleteToggleCriteria = "DELETE FROM review_toggle_criteria WHERE criteria_name = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDeleteToggleCriteria, ps -> {
+ ps.setString(1, criteriaName);
+ boolean successful = ps.executeUpdate() > 0;
+ if (successful) TOGGLE_CRITERIA.remove(criteria.get());
+ return successful;
+ })));
+ }
+
+ public boolean setToggleCriteriaOptional(String criteriaName, boolean isOptional) {
+ Optional criteria = TOGGLE_CRITERIA.stream().filter(t -> t.criteriaName().equals(criteriaName)).findFirst();
+ if (criteria.isEmpty()) return false;
+
+ String qSetToggleCriteriaOptional = "UPDATE review_toggle_criteria SET is_optional = ? WHERE criteria_name = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetToggleCriteriaOptional, ps -> {
+ ps.setBoolean(1, isOptional);
+ ps.setString(2, criteriaName);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public List getAllToggleCriteria() {return TOGGLE_CRITERIA.stream().toList();}
+
+ public List getBuildTeamToggleCriteria(int buildTeamId) {
+ return BUILD_TEAM_TOGGLE_CRITERIA.stream().filter(c -> c.buildTeamId() == buildTeamId).map(BuildTeamToggleCriteria::criteria).toList();
+ }
+
+ public boolean assignBuildTeamToggleCriteria(int buildTeamId, ToggleCriteria criteria) {
+ Optional existingCriteria = getBuildTeamToggleCriteria(buildTeamId).stream().filter(t ->
+ t.criteriaName().equals(criteria.criteriaName())).findFirst();
+ if (existingCriteria.isPresent()) return false;
+ String qInsertCriteriaToBuildteam = "INSERT INTO build_team_uses_toggle_criteria (build_team_id, criteria_name) VALUES (?, ?);";
+ if (!Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsertCriteriaToBuildteam, ps -> {
+ ps.setInt(1, buildTeamId);
+ ps.setString(2, criteria.criteriaName());
+ return ps.executeUpdate() > 0;
+ })))) return false;
+ BUILD_TEAM_TOGGLE_CRITERIA.add(new BuildTeamToggleCriteria(buildTeamId, criteria));
+ return true;
+ }
+
+ public boolean removeBuildTeamToggleCriteria(int buildTeamId, ToggleCriteria criteria) {
+ Optional existingCriteria = BUILD_TEAM_TOGGLE_CRITERIA.stream().filter(btc ->
+ btc.buildTeamId() == buildTeamId && btc.criteria().criteriaName().equals(criteria.criteriaName())).findFirst();
+ if (existingCriteria.isEmpty()) return false;
+ String qDeleteCriteriaToBuildteam = "DELETE FROM build_team_uses_toggle_criteria WHERE build_team_id = ? AND criteria_name = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDeleteCriteriaToBuildteam, ps -> {
+ ps.setInt(1, buildTeamId);
+ ps.setString(2, criteria.criteriaName());
+ boolean successful = ps.executeUpdate() > 0;
+ if (successful) BUILD_TEAM_TOGGLE_CRITERIA.remove(existingCriteria.get());
+ return successful;
+ })));
+ }
+
+ public Map getReviewToggleCriteria(int reviewId) {
+ String qReviewToggleCriteriasByReviewId = "SELECT criteria_name, is_checked FROM review_contains_toggle_criteria WHERE review_id = ?;";
+ return Utils.handleSqlException(new HashMap<>(), () -> SqlHelper.runQuery(qReviewToggleCriteriasByReviewId, ps -> {
+ ps.setInt(1, reviewId);
+ ResultSet rs = ps.executeQuery();
+ HashMap toggleCriteriaList = new HashMap<>();
+ while (rs.next()) {
+ boolean isChecked = rs.getBoolean(2);
+ toggleCriteriaList.put(getToggleCriteria(rs.getString(1)).orElseThrow(), isChecked);
+ }
+ return toggleCriteriaList;
+ }));
+ }
+
+ public boolean addReviewToggleCriteria(int reviewId, @NotNull ToggleCriteria toggle, boolean isChecked) {
+ String qInsertToggleCriteriaToReview = "INSERT INTO review_contains_toggle_criteria (review_id, criteria_name, is_checked) VALUES (?, ?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsertToggleCriteriaToReview, ps -> {
+ ps.setInt(1, reviewId);
+ ps.setString(2, toggle.criteriaName());
+ ps.setBoolean(3, isChecked);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public void removeCheckedToggleCriteria(int reviewId) {
+ String qDeleteToggleCriteriaToReview = "DELETE FROM review_contains_toggle_criteria WHERE review_id = ?;";
+ Utils.handleSqlException(() -> SqlHelper.runStatement(qDeleteToggleCriteriaToReview, ps -> ps.setInt(1, reviewId)));
+ }
+
+ // --- Review Notification ---
+ public Optional getReviewNotification(int reviewId, UUID uuid) {
+ return NOTIFICATIONS.stream().filter(n -> n.reviewId() == reviewId && n.uuid() == uuid).findFirst();
+ }
+
+ public List getReviewNotifications(int reviewId) {
+ return NOTIFICATIONS.stream().filter(n -> n.reviewId() == reviewId).toList();
+ }
+
+ public List getReviewNotifications(UUID uuid) {
+ return NOTIFICATIONS.stream().filter(n -> n.uuid() == uuid).toList();
+ }
+
+ public void removeReviewNotification(int reviewId, UUID uuid) {
+ Optional notification = getReviewNotification(reviewId, uuid);
+ if (notification.isEmpty()) return;
+
+ String qDeleteReviewNotify = "DELETE FROM builder_has_review_notification WHERE review_id = ? AND uuid = ?;";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qDeleteReviewNotify, ps -> {
+ ps.setInt(1, reviewId);
+ ps.setString(2, uuid.toString());
+ if (ps.executeUpdate() > 0) NOTIFICATIONS.remove(notification.get());
+ }));
+ }
+
+ public void createReviewNotification(int reviewId, UUID uuid) {
+ Player player = Bukkit.getPlayer(uuid);
+ if (player != null && player.isOnline()) {
+ PlotUtils.ChatFormatting.sendFeedbackMessage(List.of(new ReviewNotification(reviewId, uuid)), player);
+ return;
+ }
+
+ String qInsertReviewNotify = "INSERT INTO builder_has_review_notification (review_id, uuid) VALUES (?, ?);";
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qInsertReviewNotify, ps -> {
+ ps.setInt(1, reviewId);
+ ps.setString(2, uuid.toString());
+ if (ps.executeUpdate() > 0) NOTIFICATIONS.add(new ReviewNotification(reviewId, uuid));
+ }));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/ServerProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/ServerProvider.java
new file mode 100644
index 000000000..6da3f21a6
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/ServerProvider.java
@@ -0,0 +1,56 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.utils.Utils;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ServerProvider {
+ protected static final List SERVERS = new ArrayList<>();
+
+ public ServerProvider() {
+ String qAll = "SELECT server_name FROM server;";
+
+ Utils.handleSqlException(() -> SqlHelper.runQuery(qAll, ps -> {
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ SERVERS.add(rs.getString(1)); // cache all servers
+ }
+ }));
+ }
+
+ public boolean serverExists(String serverName) {
+ return SERVERS.stream().anyMatch(s -> s.equals(serverName));
+ }
+
+ public List getServers() {
+ return SERVERS;
+ }
+
+ public boolean addServer(String name, int buildTeamId) {
+ if (serverExists(name)) return true;
+
+ String qInsert = "INSERT INTO server (server_name, build_team_id) VALUES (?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsert, ps -> {
+ ps.setString(1, name);
+ ps.setInt(2, buildTeamId);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) SERVERS.add(name);
+ return result;
+ })));
+ }
+
+ public boolean removeServer(String name) {
+ if (!serverExists(name)) return false;
+
+ String qDelete = "DELETE FROM server WHERE server_name = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qDelete, ps -> {
+ ps.setString(1, name);
+ boolean result = ps.executeUpdate() > 0;
+ if (result) SERVERS.remove(name);
+ return result;
+ })));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/database/providers/TutorialPlotProvider.java b/src/main/java/com/alpsbte/plotsystem/core/database/providers/TutorialPlotProvider.java
new file mode 100644
index 000000000..ae9e46601
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/database/providers/TutorialPlotProvider.java
@@ -0,0 +1,85 @@
+package com.alpsbte.plotsystem.core.database.providers;
+
+import com.alpsbte.alpslib.io.database.SqlHelper;
+import com.alpsbte.plotsystem.core.system.plot.TutorialPlot;
+import com.alpsbte.plotsystem.utils.Utils;
+
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Optional;
+
+public class TutorialPlotProvider {
+ public static final Map tutorialPlots = new HashMap<>();
+ public static final Deque freeTutorialPlotIds = new LinkedList<>();
+
+ public Optional getById(int id) {
+ return tutorialPlots.keySet().stream().filter(t -> tutorialPlots.get(t) == id).findFirst();
+ }
+
+ public Optional getByTutorialId(int tutorialId, String playerUUID) {
+ Optional tutorialPlot = tutorialPlots.keySet().stream()
+ .filter(t -> t.getTutorialID() == tutorialId && t.getUUID().toString().equals(playerUUID)).findFirst();
+
+ if (tutorialPlot.isPresent()) return tutorialPlot;
+
+ String qGet = "SELECT stage_id, is_complete, last_stage_complete_date FROM tutorial WHERE tutorial_id = ? AND uuid = ?;";
+ return Utils.handleSqlException(tutorialPlot, () -> SqlHelper.runQuery(qGet, ps -> {
+ ps.setInt(1, tutorialId);
+ ps.setString(2, playerUUID);
+ ResultSet rs = ps.executeQuery();
+ if (rs.next()) {
+ int plotId = freeTutorialPlotIds.isEmpty() ? 0 : freeTutorialPlotIds.poll();
+ int stageId = rs.getInt(1);
+ boolean isComplete = rs.getBoolean(2);
+ Date lastStageCompleteDate = rs.getDate(3);
+ TutorialPlot newTutorialPlot = new TutorialPlot(plotId, tutorialId, playerUUID, stageId,
+ isComplete, lastStageCompleteDate != null ? lastStageCompleteDate.toLocalDate() : null);
+ tutorialPlots.put(newTutorialPlot, plotId);
+
+ return Optional.of(newTutorialPlot);
+ }
+ return Optional.empty();
+ }));
+
+ }
+
+ public boolean add(int tutorialId, String playerUUID) {
+ if (getByTutorialId(tutorialId, playerUUID).isPresent()) return false;
+
+ String qInsert = "INSERT INTO tutorial (tutorial_id, uuid) VALUES (?, ?);";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qInsert, ps -> {
+ ps.setInt(1, tutorialId);
+ ps.setString(2, playerUUID);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setStageId(int tutorialId, String playerUUID, int stageId) {
+ String qSetStage = "UPDATE tutorial SET stage_id = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetStage, ps -> {
+ ps.setInt(1, stageId);
+ ps.setObject(2, LocalDate.now());
+ ps.setInt(3, tutorialId);
+ ps.setString(4, playerUUID);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+
+ public boolean setComplete(int tutorialId, String playerUUID) {
+ String qSetComplete = "UPDATE tutorial SET is_complete = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
+ return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetComplete, ps -> {
+ ps.setBoolean(1, true);
+ ps.setObject(2, Timestamp.valueOf(LocalDateTime.now()));
+ ps.setInt(3, tutorialId);
+ ps.setString(4, playerUUID);
+ return ps.executeUpdate() > 0;
+ })));
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramConfiguration.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramConfiguration.java
index 8d2d313ac..b42cbccad 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramConfiguration.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramConfiguration.java
@@ -1,27 +1,3 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.holograms;
public interface HologramConfiguration {
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramRegister.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramRegister.java
index d8b92f732..72652253b 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramRegister.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/holograms/HologramRegister.java
@@ -2,6 +2,7 @@
import com.alpsbte.alpslib.hologram.DecentHologramDisplay;
import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.holograms.leaderboards.ScoreLeaderboard;
import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.io.ConfigUtil;
import org.bukkit.Bukkit;
@@ -12,13 +13,14 @@
import java.util.Objects;
public final class HologramRegister {
+ private HologramRegister() {}
+
/**
- * Registers the {@link ScoreLeaderboard}, {@link PlotsLeaderboard} and adds
+ * Registers the {@link ScoreLeaderboard} and adds
* them to {@link DecentHologramDisplay#activeDisplays}.
*/
public static void init() {
new ScoreLeaderboard();
- new PlotsLeaderboard();
}
public static void reload() {
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotTutorialHologram.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotTutorialHologram.java
index 5e729f947..9ed7dd9cc 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotTutorialHologram.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotTutorialHologram.java
@@ -1,32 +1,8 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.holograms;
import com.alpsbte.plotsystem.core.system.tutorial.AbstractTutorialHologram;
-import com.alpsbte.plotsystem.core.system.tutorial.utils.TutorialUtils;
import com.alpsbte.plotsystem.core.system.tutorial.stage.tasks.message.ChatMessageTask;
+import com.alpsbte.plotsystem.core.system.tutorial.utils.TutorialUtils;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import net.kyori.adventure.text.Component;
@@ -35,7 +11,12 @@
import org.bukkit.Sound;
import org.bukkit.entity.Player;
-import static org.bukkit.ChatColor.*;
+import static org.bukkit.ChatColor.BOLD;
+import static org.bukkit.ChatColor.DARK_GRAY;
+import static org.bukkit.ChatColor.GOLD;
+import static org.bukkit.ChatColor.GRAY;
+import static org.bukkit.ChatColor.GREEN;
+import static org.bukkit.ChatColor.YELLOW;
public class PlotTutorialHologram extends AbstractTutorialHologram {
public PlotTutorialHologram(Player player, int plotTutorialId, int holoId, String content) {
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotsLeaderboard.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotsLeaderboard.java
deleted file mode 100644
index 51d4e1e0c..000000000
--- a/src/main/java/com/alpsbte/plotsystem/core/holograms/PlotsLeaderboard.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.alpsbte.plotsystem.core.holograms;
-
-import com.alpsbte.alpslib.hologram.DecentHologramDisplay;
-import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.core.system.Builder;
-import com.alpsbte.plotsystem.utils.io.ConfigPaths;
-import com.alpsbte.plotsystem.utils.items.BaseItems;
-import org.bukkit.inventory.ItemStack;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.logging.Level;
-
-public class PlotsLeaderboard extends DecentHologramDisplay implements HologramConfiguration {
- protected PlotsLeaderboard() {
- super(ConfigPaths.PLOTS_LEADERBOARD, null, false);
- setLocation(HologramRegister.getLocation(this));
- setEnabled(PlotSystem.getPlugin().getConfig().getBoolean(getEnablePath()));
- }
-
- @Override
- public ItemStack getItem() {
- return new ItemStack(BaseItems.LEADERBOARD_PLOT.getItem());
- }
-
- @Override
- public String getTitle(UUID playerUUID) {
- return "§b§lCOMPLETED PLOTS §6§l[Lifetime]";
- }
-
- @Override
- public List> getContent(UUID playerUUID) {
- try {
- ArrayList> lines = new ArrayList<>();
-
- List> entries = Builder.getBuildersByCompletedBuilds(10);
- for (int i = 0; i < 10; i++) {
- Builder.DatabaseEntry entry = i < entries.size() && entries.get(i).getValue() != 0 ? entries.get(i) : null;
- lines.add(new HologramRegister.LeaderboardPositionLine(i + 1, entry != null ? entry.getKey() : null, entry != null ? entry.getValue() : 0));
- }
-
- return lines;
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getLogger().log(Level.SEVERE, "An error occurred while reading leaderboard content", ex);
- }
- return new ArrayList<>();
- }
-
- @Override
- public boolean hasViewPermission(UUID uuid) {
- return true;
- }
-
- @Override
- public String getEnablePath() {
- return ConfigPaths.PLOTS_LEADERBOARD_ENABLE;
- }
-
- @Override
- public String getXPath() {
- return ConfigPaths.PLOTS_LEADERBOARD_X;
- }
-
- @Override
- public String getYPath() {
- return ConfigPaths.PLOTS_LEADERBOARD_Y;
- }
-
- @Override
- public String getZPath() {
- return ConfigPaths.PLOTS_LEADERBOARD_Z;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/ScoreLeaderboard.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/ScoreLeaderboard.java
deleted file mode 100644
index 4625c69f0..000000000
--- a/src/main/java/com/alpsbte/plotsystem/core/holograms/ScoreLeaderboard.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.alpsbte.plotsystem.core.holograms;
-
-import com.alpsbte.alpslib.hologram.DecentHologramPagedDisplay;
-import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.core.system.Builder;
-import com.alpsbte.plotsystem.core.system.Payout;
-import com.alpsbte.plotsystem.core.system.tutorial.AbstractTutorial;
-import com.alpsbte.plotsystem.utils.io.ConfigPaths;
-import com.alpsbte.plotsystem.utils.io.ConfigUtil;
-import com.alpsbte.plotsystem.utils.io.LangPaths;
-import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.BaseItems;
-import eu.decentsoftware.holograms.api.DHAPI;
-import eu.decentsoftware.holograms.api.holograms.Hologram;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.format.TextDecoration;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-public class ScoreLeaderboard extends DecentHologramPagedDisplay implements HologramConfiguration {
- private final DecimalFormat df = new DecimalFormat("#.##");
- private LeaderboardTimeframe sortByLeaderboard;
-
- protected ScoreLeaderboard() {
- super("score-leaderboard", null, false, PlotSystem.getPlugin());
- setEnabled(PlotSystem.getPlugin().getConfig().getBoolean(getEnablePath()));
- setLocation(HologramRegister.getLocation(this));
-
- new BukkitRunnable() {
- @Override
- public void run() {
- for (Player player : getPlayersInRadiusForRanking()) {
- if (AbstractTutorial.getActiveTutorial(player.getUniqueId()) != null) continue;
- player.sendActionBar(getRankingString(player));
- }
- }
- }.runTaskTimerAsynchronously(PlotSystem.getPlugin(), 0L, 20L);
- }
-
- @Override
- public List getPages() {
- if (ConfigUtil.getInstance() == null) return new ArrayList<>();
- FileConfiguration config = PlotSystem.getPlugin().getConfig();
- return Arrays.stream(LeaderboardTimeframe.values())
- .filter(p -> config.getBoolean(p.configPath)).map(LeaderboardTimeframe::toString).collect(Collectors.toList());
- }
-
- @Override
- public void create(Player player) {
- if (getPages().isEmpty()) {
- PlotSystem.getPlugin().getLogger().log(Level.WARNING, "Unable to initialize Score-Leaderboard - No display pages enabled! Check config for display-options.");
- return;
- }
-
- super.create(player);
- }
-
- @Override
- public boolean hasViewPermission(UUID uuid) {
- return true;
- }
-
- @Override
- public ItemStack getItem() {
- return new ItemStack(BaseItems.LEADERBOARD_SCORE.getItem());
- }
-
- @Override
- public String getTitle(UUID playerUUID) {
- return "§b§lTOP SCORE §6§l[" + (sortByLeaderboard.toString().charAt(0) +
- sortByLeaderboard.toString().toLowerCase().substring(1)) + "]";
- }
-
- @Override
- public List> getHeader(UUID playerUUID) {
- sortByLeaderboard = LeaderboardTimeframe.valueOf(currentPage);
- return super.getHeader(playerUUID);
- }
-
- @Override
- public List> getContent(UUID playerUUID) {
- try {
- ArrayList> lines = new ArrayList<>();
-
- for (int index = 0; index < 10; index++) {
- lines.add(new LeaderboardPositionLineWithPayout(index + 1, null, 0));
- }
-
- int index = 0;
- for (Builder.DatabaseEntry entry : Builder.getBuildersByScore(sortByLeaderboard)) {
- lines.set(index, new LeaderboardPositionLineWithPayout(index + 1, entry.getKey(), entry.getValue()));
- index++;
- }
-
- return lines;
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getLogger().log(Level.SEVERE, "An error occurred while reading leaderboard content", ex);
- }
- return new ArrayList<>();
- }
-
- private Component getRankingString(Player player) {
- int position, rows, myScore;
- try {
- position = Builder.getBuilderScorePosition(player.getUniqueId(), sortByLeaderboard);
- rows = Builder.getBuildersInSort(sortByLeaderboard);
- myScore = Builder.getBuilderScore(player.getUniqueId(), sortByLeaderboard);
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(Component.text("A SQL error occurred!"), ex);
- return Component.empty();
- }
-
- // Start building the component
- TextComponent.Builder builder = Component.text()
- .append(Component.text(" " + LangUtil.getInstance().get(player, sortByLeaderboard.langPath))
- .color(NamedTextColor.GOLD)
- .decorate(TextDecoration.BOLD)
- )
- .append(Component.text(" ➜ ")
- .color(NamedTextColor.DARK_GRAY)
- .decorate(TextDecoration.BOLD)
- );
-
- if (position == -1) {
- builder.append(Component.text(LangUtil.getInstance().get(player, LangPaths.Leaderboards.NOT_ON_LEADERBOARD))
- .color(NamedTextColor.RED)
- .decoration(TextDecoration.BOLD, false)
- );
- } else if (position < 50) {
- builder.append(Component.text(
- LangUtil.getInstance().get(player, LangPaths.Leaderboards.ACTIONBAR_POSITION, String.valueOf(position)))
- .color(NamedTextColor.GREEN)
- .decoration(TextDecoration.BOLD, false)
- );
- } else {
- String topPercentage = df.format(position * 1.0 / rows);
- builder.append(Component.text(
- LangUtil.getInstance().get(player, LangPaths.Leaderboards.ACTIONBAR_PERCENTAGE, topPercentage))
- .decoration(TextDecoration.BOLD, false)
- );
- }
-
- if (myScore != -1) {
- builder.append(
- Component.text(" (", NamedTextColor.DARK_GRAY)
- .append(Component.text(myScore + " points", NamedTextColor.AQUA))
- .append(Component.text(")", NamedTextColor.DARK_GRAY))
- );
- }
-
- return builder.build();
- }
-
- private List getPlayersInRadiusForRanking() {
- FileConfiguration config = PlotSystem.getPlugin().getConfig();
- boolean actionBarEnabled = config.getBoolean(ConfigPaths.DISPLAY_OPTIONS_ACTION_BAR_ENABLE, true);
- int actionBarRadius = config.getInt(ConfigPaths.DISPLAY_OPTIONS_ACTION_BAR_RADIUS, 30);
- List players = new ArrayList<>();
- if (!actionBarEnabled) return players;
- for (Player player : Bukkit.getOnlinePlayers()) {
- Hologram holo = DHAPI.getHologram(player.getUniqueId() + "-" + getId());
- if (holo == null) continue;
- if (player.getWorld().getName().equals(holo.getLocation().getWorld().getName()) &&
- holo.getLocation().distance(player.getLocation()) <= actionBarRadius) {
- players.add(player);
- }
- }
- return players;
- }
-
- @Override
- public long getInterval() {
- return PlotSystem.getPlugin().getConfig().getInt(ConfigPaths.DISPLAY_OPTIONS_INTERVAL) * 20L;
- }
-
- @Override
- public String getEnablePath() {
- return ConfigPaths.SCORE_LEADERBOARD_ENABLE;
- }
-
- @Override
- public String getXPath() {
- return ConfigPaths.SCORE_LEADERBOARD_X;
- }
-
- @Override
- public String getYPath() {
- return ConfigPaths.SCORE_LEADERBOARD_Y;
- }
-
- @Override
- public String getZPath() {
- return ConfigPaths.SCORE_LEADERBOARD_Z;
- }
-
- public enum LeaderboardTimeframe {
- DAILY(ConfigPaths.DISPLAY_OPTIONS_SHOW_DAILY),
- WEEKLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_WEEKLY),
- MONTHLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_MONTHLY),
- YEARLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_YEARLY),
- LIFETIME(ConfigPaths.DISPLAY_OPTIONS_SHOW_LIFETIME);
-
- public final String configPath;
- public final String langPath;
-
- LeaderboardTimeframe(String configPath) {
- this.configPath = configPath;
- this.langPath = LangPaths.Leaderboards.PAGES + name();
- }
- }
-
- private class LeaderboardPositionLineWithPayout extends HologramRegister.LeaderboardPositionLine {
- private final int position;
-
- public LeaderboardPositionLineWithPayout(int position, String username, int score) {
- super(position, username, score);
- this.position = position;
- }
-
- @Override
- public String getLine() {
- try {
- String line = super.getLine();
- Payout payout = sortByLeaderboard != LeaderboardTimeframe.LIFETIME ? Payout.getPayout(sortByLeaderboard, position) : null;
- if (payout == null) return line;
- String payoutAmount = payout.getPayoutAmount();
- try {
- // if payout amount can be number, prefix with dollar sign
- Integer.valueOf(payoutAmount);
- payoutAmount = "$" + payoutAmount;
- } catch (NumberFormatException ignored) {}
-
- return line + " §7- §e§l" + payoutAmount;
- } catch (SQLException e) {
- return super.getLine() + " §7- §cSQL ERR";
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/LeaderboardTimeframe.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/LeaderboardTimeframe.java
new file mode 100644
index 000000000..dc722dd0b
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/LeaderboardTimeframe.java
@@ -0,0 +1,20 @@
+package com.alpsbte.plotsystem.core.holograms.leaderboards;
+
+import com.alpsbte.plotsystem.utils.io.ConfigPaths;
+import com.alpsbte.plotsystem.utils.io.LangPaths;
+
+public enum LeaderboardTimeframe {
+ DAILY(ConfigPaths.DISPLAY_OPTIONS_SHOW_DAILY),
+ WEEKLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_WEEKLY),
+ MONTHLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_MONTHLY),
+ YEARLY(ConfigPaths.DISPLAY_OPTIONS_SHOW_YEARLY),
+ LIFETIME(ConfigPaths.DISPLAY_OPTIONS_SHOW_LIFETIME);
+
+ public final String configPath;
+ public final String langPath;
+
+ LeaderboardTimeframe(String configPath) {
+ this.configPath = configPath;
+ this.langPath = LangPaths.Leaderboards.PAGES + name();
+ }
+}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/ScoreLeaderboard.java b/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/ScoreLeaderboard.java
new file mode 100644
index 000000000..e4ec49e28
--- /dev/null
+++ b/src/main/java/com/alpsbte/plotsystem/core/holograms/leaderboards/ScoreLeaderboard.java
@@ -0,0 +1,112 @@
+package com.alpsbte.plotsystem.core.holograms.leaderboards;
+
+import com.alpsbte.alpslib.hologram.DecentHologramPagedDisplay;
+import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.database.DataProvider;
+import com.alpsbte.plotsystem.core.holograms.HologramConfiguration;
+import com.alpsbte.plotsystem.core.holograms.HologramRegister;
+import com.alpsbte.plotsystem.utils.io.ConfigPaths;
+import com.alpsbte.plotsystem.utils.io.ConfigUtil;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.logging.Level;
+
+public class ScoreLeaderboard extends DecentHologramPagedDisplay implements HologramConfiguration {
+ private LeaderboardTimeframe sortByLeaderboard;
+
+ public ScoreLeaderboard() {
+ super("score-leaderboard", null, false, PlotSystem.getPlugin());
+ setEnabled(PlotSystem.getPlugin().getConfig().getBoolean(getEnablePath()));
+ setLocation(HologramRegister.getLocation(this));
+ }
+
+ @Override
+ public List getPages() {
+ if (ConfigUtil.getInstance() == null) return new ArrayList<>();
+ FileConfiguration config = PlotSystem.getPlugin().getConfig();
+ return Arrays.stream(LeaderboardTimeframe.values())
+ .filter(p -> config.getBoolean(p.configPath)).map(LeaderboardTimeframe::toString).toList();
+ }
+
+ @Override
+ public void create(Player player) {
+ if (getPages().isEmpty()) {
+ PlotSystem.getPlugin().getLogger().log(Level.WARNING, "Unable to initialize Score-Leaderboard - No display pages enabled! Check config for display-options.");
+ return;
+ }
+
+ super.create(player);
+ }
+
+ @Override
+ public boolean hasViewPermission(UUID uuid) {
+ return true;
+ }
+
+ @Override
+ public ItemStack getItem() {
+ return new ItemStack(BaseItems.LEADERBOARD_SCORE.getItem());
+ }
+
+ @Override
+ public String getTitle(UUID playerUUID) {
+ return "§b§lTOP SCORE §6§l[" + (sortByLeaderboard.toString().charAt(0) +
+ sortByLeaderboard.toString().toLowerCase().substring(1)) + "]";
+ }
+
+ @Override
+ public List> getHeader(UUID playerUUID) {
+ sortByLeaderboard = LeaderboardTimeframe.valueOf(currentPage);
+ return super.getHeader(playerUUID);
+ }
+
+ @Override
+ public List> getContent(UUID playerUUID) {
+ ArrayList> lines = new ArrayList<>();
+
+ for (int index = 0; index < 10; index++) {
+ lines.add(new HologramRegister.LeaderboardPositionLine(index + 1, null, 0));
+ }
+
+ Map playerRankings = DataProvider.BUILDER.getLeaderboardEntries(sortByLeaderboard);
+ int i = 0;
+ for (Map.Entry entry : playerRankings.entrySet()) {
+ lines.set(i, new HologramRegister.LeaderboardPositionLine(i + 1, entry.getKey(), entry.getValue()));
+ i++;
+ }
+ return lines;
+ }
+
+ @Override
+ public long getInterval() {
+ return PlotSystem.getPlugin().getConfig().getInt(ConfigPaths.DISPLAY_OPTIONS_INTERVAL) * 20L;
+ }
+
+ @Override
+ public String getEnablePath() {
+ return ConfigPaths.SCORE_LEADERBOARD_ENABLE;
+ }
+
+ @Override
+ public String getXPath() {
+ return ConfigPaths.SCORE_LEADERBOARD_X;
+ }
+
+ @Override
+ public String getYPath() {
+ return ConfigPaths.SCORE_LEADERBOARD_Y;
+ }
+
+ @Override
+ public String getZPath() {
+ return ConfigPaths.SCORE_LEADERBOARD_Z;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractMenu.java
index 0dfc4ce4a..0b3c2f21f 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractMenu.java
@@ -1,27 +1,3 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.plotsystem.PlotSystem;
@@ -38,11 +14,11 @@ public abstract class AbstractMenu {
private final Player menuPlayer;
private final String title;
- public AbstractMenu(int rows, String title, Player menuPlayer) {
+ protected AbstractMenu(int rows, String title, Player menuPlayer) {
this(rows, title, menuPlayer, true);
}
- public AbstractMenu(int rows, String title, Player menuPlayer, boolean reload) {
+ protected AbstractMenu(int rows, String title, Player menuPlayer, boolean reload) {
this.title = title;
this.menuPlayer = menuPlayer;
this.menu = ChestMenu.builder(rows).title(text(title)).redraw(true).build();
@@ -53,12 +29,16 @@ public AbstractMenu(int rows, String title, Player menuPlayer, boolean reload) {
/**
* Places items asynchronously in the menu after it is opened
*/
- protected abstract void setMenuItemsAsync();
+ protected void setMenuItemsAsync() {
+ // Default just does nothing, for use-cases which doesn't need it.
+ }
/**
* Sets click events for the items placed in the menu async after it is opened
*/
- protected abstract void setItemClickEventsAsync();
+ protected void setItemClickEventsAsync() {
+ // Default just does nothing, for use-cases which doesn't need it.
+ }
/**
* Places pre-defined items in the menu before it is opened
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractPaginatedMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractPaginatedMenu.java
index 8c52640e2..57231c609 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractPaginatedMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/AbstractPaginatedMenu.java
@@ -1,27 +1,3 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2021-2022, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.plotsystem.PlotSystem;
@@ -36,7 +12,7 @@ public abstract class AbstractPaginatedMenu extends AbstractMenu {
private int totalItemsAmount;
private int currentPage = 0;
- public AbstractPaginatedMenu(int rows, int pagedRows, String title, Player menuPlayer) {
+ protected AbstractPaginatedMenu(int rows, int pagedRows, String title, Player menuPlayer) {
super(rows, title, menuPlayer, false);
this.maxItemsPerPage = pagedRows * 9;
reloadMenuAsync();
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/BuilderUtilitiesMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/BuilderUtilitiesMenu.java
index 8f0e74b96..1c3f26ac4 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/BuilderUtilitiesMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/BuilderUtilitiesMenu.java
@@ -1,35 +1,12 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
-import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.core.system.plot.utils.PlotUtils;
+import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
import com.alpsbte.plotsystem.utils.items.MenuItems;
import net.kyori.adventure.text.Component;
import org.bukkit.Material;
@@ -100,9 +77,9 @@ protected void setItemClickEventsAsync() {
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
- .pattern("111111111")
- .pattern("000000000")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
@@ -111,7 +88,7 @@ protected Mask getMask() {
* @return Menu item
*/
public static ItemStack getMenuItem(Player player) {
- return new ItemBuilder(Material.GOLDEN_AXE)
+ return new ItemBuilder(BaseItems.BUILDER_UTILITIES.getItem())
.setName(Component.text(LangUtil.getInstance().get(player, LangPaths.MenuTitle.BUILDER_UTILITIES), AQUA, BOLD))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(player, LangPaths.MenuDescription.BUILDER_UTILITIES), true).build())
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/FeedbackMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/FeedbackMenu.java
index 6c97e3cd2..88a162a69 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/FeedbackMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/FeedbackMenu.java
@@ -1,62 +1,42 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
-import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.core.database.DatabaseConnection;
-import com.alpsbte.plotsystem.core.system.Review;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.system.plot.Plot;
+import com.alpsbte.plotsystem.core.system.review.PlotReview;
+import com.alpsbte.plotsystem.core.system.review.ToggleCriteria;
import com.alpsbte.plotsystem.utils.Utils;
-import com.alpsbte.plotsystem.utils.enums.Category;
-import com.alpsbte.plotsystem.utils.items.MenuItems;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
+import com.alpsbte.plotsystem.utils.items.MenuItems;
import org.bukkit.Material;
import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class FeedbackMenu extends AbstractMenu {
- private Review review = null;
+ private PlotReview review = null;
private final Plot plot;
- public FeedbackMenu(Player player, int plotID) throws SQLException {
+ public FeedbackMenu(Player player, int plotID) {
super(3, LangUtil.getInstance().get(player, LangPaths.MenuTitle.FEEDBACK, String.valueOf(plotID)), player);
- this.plot = new Plot(plotID);
+ this.plot = DataProvider.PLOT.getPlotById(plotID);
}
@Override
@@ -68,84 +48,91 @@ protected void setPreviewItems() {
@Override
protected void setMenuItemsAsync() {
// Get review id from plot
- try (ResultSet rs = DatabaseConnection.createStatement("SELECT review_id FROM plotsystem_plots WHERE id = ?")
- .setValue(plot.getID()).executeQuery()) {
-
- if (rs.next()) this.review = new Review(rs.getInt(1));
- DatabaseConnection.closeResultSet(rs);
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
+ plot.getLatestReview().ifPresent(value -> this.review = value);
// Set score item
- try {
- getMenu().getSlot(10).setItem(new ItemBuilder(Material.NETHER_STAR)
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.SCORE), AQUA, BOLD))
- .setLore(new LoreBuilder()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY).append(text(plot.getTotalScore(), WHITE)))
- .emptyLine()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.ACCURACY) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating(Category.ACCURACY))
- .append(text("/", DARK_GRAY))
- .append(text("5", GREEN))))
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.BLOCK_PALETTE) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating(Category.BLOCKPALETTE)))
- .append(text("/", DARK_GRAY))
- .append(text("5", GREEN)))
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.DETAILING) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating(Category.DETAILING)))
- .append(text("/", DARK_GRAY))
- .append(text("5", GREEN)))
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.TECHNIQUE) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating(Category.TECHNIQUE)))
- .append(text("/", DARK_GRAY))
- .append(text("5", GREEN)))
- .emptyLine()
- .addLine(plot.isRejected()
- ? text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REJECTED), RED, BOLD)
- : text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.ACCEPTED), GREEN, BOLD))
- .build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(10).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
+ getMenu().getSlot(10).setItem(new ItemBuilder(BaseItems.REVIEW_SCORE.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.SCORE), AQUA, BOLD))
+ .setLore(new LoreBuilder()
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY).append(text(review.getScore(), WHITE)))
+ .emptyLine()
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.ACCURACY) + ": ", GRAY)
+ .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating().getAccuracyPoints(), 5)
+ .append(text("/", DARK_GRAY))
+ .append(text("5", GREEN))))
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.BLOCK_PALETTE) + ": ", GRAY)
+ .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating().getBlockPalettePoints(), 5))
+ .append(text("/", DARK_GRAY))
+ .append(text("5", GREEN)))
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.TOGGLE_POINTS) + ": ", GRAY)
+ .append(Utils.ItemUtils.getColoredPointsComponent(review.getRating().getTogglePoints(), 10))
+ .append(text("/", DARK_GRAY))
+ .append(text("10", GREEN)))
+ .emptyLine()
+ .addLine(plot.isRejected()
+ ? text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REJECTED), RED, BOLD)
+ : text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.ACCEPTED), GREEN, BOLD))
+ .build())
+ .build());
+
+ // Set toggles item
+ getMenu().getSlot(12).setItem(getTogglesItem());
// Set feedback text item
- try {
- getMenu().getSlot(13).setItem(new ItemBuilder(Material.WRITABLE_BOOK)
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.FEEDBACK), AQUA, BOLD))
- .setLore(new LoreBuilder()
- .addLine(plot.getReview().getFeedback().replaceAll("//", " "), true)
- .build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(13).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
+ String feedbackText = review.getFeedback() == null ? LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.NO_FEEDBACK) : review.getFeedback();
+ getMenu().getSlot(14).setItem(new ItemBuilder(BaseItems.REVIEW_FEEDBACK.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.FEEDBACK), AQUA, BOLD))
+ .setLore(new LoreBuilder()
+ .addLine(feedbackText.replace("//", " "), true)
+ .build())
+ .build());
// Set reviewer item
- try {
- getMenu().getSlot(16).setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(review.getReviewer().getUUID()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REVIEWER), AQUA, BOLD))
- .setLore(new LoreBuilder().addLine(review.getReviewer().getName()).build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(13).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
+ getMenu().getSlot(16).setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(review.getReviewerUUID()))
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REVIEWER), AQUA, BOLD))
+ .setLore(new LoreBuilder().addLine(review.getReviewer().getName()).build())
+ .build());
}
- @Override
- protected void setItemClickEventsAsync() {}
-
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build())
- .pattern("111111111")
- .pattern("000000000")
- .pattern("111111111")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
+ .pattern(Utils.FULL_MASK)
.build();
}
-}
+
+ private ItemStack getTogglesItem() {
+ ItemBuilder itemBuilder = new ItemBuilder(BaseItems.REVIEW_TOGGLE_CHECKED.getItem())
+ .setName(text("Toggle Criteria", AQUA, BOLD));
+
+
+ int totalCheckCriteriaCount = review.getRating().getAllToggles().size();
+ int checkedCount = review.getRating().getCheckedToggles().size();
+ LoreBuilder loreBuilder = new LoreBuilder()
+ .addLine(text(checkedCount + "/" + totalCheckCriteriaCount, GRAY));
+
+ if (!review.getRating().getUncheckedToggles().isEmpty()) {
+ loreBuilder.emptyLine();
+ loreBuilder.addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.CRITERIA_NOT_FULFILLED) + ":", RED, BOLD));
+ for (ToggleCriteria unchecked : review.getRating().getUncheckedToggles()) {
+ loreBuilder.addLine(text("• ", DARK_GRAY).append(text(unchecked.getDisplayName(getMenuPlayer()), GRAY)
+ .append(unchecked.isOptional()
+ ? empty()
+ : text(" - ").append(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.REQUIRED), GOLD)))));
+ }
+ }
+
+ if (!review.getRating().getCheckedToggles().isEmpty()) {
+ loreBuilder.emptyLine();
+ loreBuilder.addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.CRITERIA_FULFILLED) + ":", GREEN, BOLD));
+ for (ToggleCriteria unchecked : review.getRating().getCheckedToggles()) {
+ loreBuilder.addLine(text("• ", DARK_GRAY).append(text(unchecked.getDisplayName(getMenuPlayer()), GRAY)));
+ }
+ }
+
+ return itemBuilder.setLore(loreBuilder.build()).build();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/PlayerPlotsMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/PlayerPlotsMenu.java
index 75b5bd7ce..09b11c689 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/PlayerPlotsMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/PlayerPlotsMenu.java
@@ -1,53 +1,37 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
+import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
-import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.system.Builder;
+import com.alpsbte.plotsystem.core.system.plot.AbstractPlot;
import com.alpsbte.plotsystem.core.system.plot.Plot;
-import com.alpsbte.alpslib.utils.item.ItemBuilder;
+import com.alpsbte.plotsystem.core.system.review.PlotReview;
+import com.alpsbte.plotsystem.core.system.review.ReviewRating;
import com.alpsbte.plotsystem.utils.Utils;
-import com.alpsbte.plotsystem.utils.enums.Category;
-import com.alpsbte.plotsystem.utils.items.BaseItems;
-import com.alpsbte.plotsystem.utils.items.MenuItems;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
+import com.alpsbte.plotsystem.utils.items.MenuItems;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
+import org.jetbrains.annotations.NotNull;
-import java.sql.SQLException;
import java.util.List;
+import java.util.Optional;
-import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class PlayerPlotsMenu extends AbstractMenu {
@@ -56,7 +40,7 @@ public class PlayerPlotsMenu extends AbstractMenu {
private int plotDisplayCount = 0;
- public PlayerPlotsMenu(Player menuPlayer, Builder builder) throws SQLException {
+ public PlayerPlotsMenu(Player menuPlayer, @NotNull Builder builder) {
super(6, LangUtil.getInstance().get(menuPlayer.getPlayer(), LangPaths.MenuTitle.PLAYER_PLOTS, builder.getName() + "'"), menuPlayer);
this.builder = builder;
}
@@ -75,48 +59,34 @@ protected void setPreviewItems() {
@Override
protected void setMenuItemsAsync() {
// Set player stats item
- try {
- getMenu().getSlot(4)
- .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(builder.getUUID()))
- .setName(text(builder.getName(), GOLD).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.SCORE) + ": ", GRAY)
- .append(text(builder.getScore(), WHITE)))
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.COMPLETED_PLOTS) + ": ", GRAY)
- .append(text(builder.getCompletedBuilds(), WHITE)))
- .build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(4).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
+ getMenu().getSlot(4)
+ .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(builder.getUUID()))
+ .setName(text(builder.getName(), GOLD).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.SCORE) + ": ", GRAY)
+ .append(text(builder.getScore(), WHITE)))
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.COMPLETED_PLOTS) + ": ", GRAY)
+ .append(text(builder.getCompletedBuildsCount(), WHITE)))
+ .build())
+ .build());
// Set player plot items
- try {
- plots = Plot.getPlots(builder);
-
- plotDisplayCount = Math.min(plots.size(), 36);
- for (int i = 0; i < plotDisplayCount; i++) {
- Plot plot = plots.get(i);
- try {
- ItemStack item = switch (plot.getStatus()) {
- case unfinished -> BaseItems.PLOT_UNFINISHED.getItem();
- case unreviewed -> BaseItems.PLOT_UNREVIEWED.getItem();
- default -> BaseItems.PLOT_COMPLETED.getItem();
- };
-
- getMenu().getSlot(9 + i)
- .setItem(new ItemBuilder(item)
- .setName(text(plot.getCity().getName() + " | " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.PLOT_NAME) + " #" + plot.getID(), AQUA).decoration(BOLD, true))
- .setLore(getLore(plot, getMenuPlayer()).build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(9 + i).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
- }
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
+ plots = DataProvider.PLOT.getPlots(builder);
+
+ plotDisplayCount = Math.min(plots.size(), 36);
+ for (int i = 0; i < plotDisplayCount; i++) {
+ Plot plot = plots.get(i);
+ ItemStack item = switch (plot.getStatus()) {
+ case unfinished -> BaseItems.PLOT_UNFINISHED.getItem();
+ case unreviewed -> BaseItems.PLOT_UNREVIEWED.getItem();
+ default -> BaseItems.PLOT_COMPLETED.getItem();
+ };
+
+ getMenu().getSlot(9 + i)
+ .setItem(new ItemBuilder(item)
+ .setName(text(plot.getCityProject().getName(getMenuPlayer()) + " | " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.PLOT_NAME) + " #" + plot.getId(), AQUA).decoration(BOLD, true))
+ .setLore(getLore(plot, getMenuPlayer()).build())
+ .build());
}
}
@@ -126,12 +96,8 @@ protected void setItemClickEventsAsync() {
for (int i = 0; i < plotDisplayCount; i++) {
int itemSlot = i;
getMenu().getSlot(9 + i).setClickHandler((clickPlayer, clickInformation) -> {
- try {
- new PlotActionsMenu(clickPlayer, plots.get(itemSlot));
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- clickPlayer.closeInventory();
- }
+ if (plots.get(itemSlot).getVersion() <= AbstractPlot.LEGACY_VERSION_THRESHOLD) return;
+ new PlotActionsMenu(clickPlayer, plots.get(itemSlot));
});
}
@@ -142,12 +108,12 @@ protected void setItemClickEventsAsync() {
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build())
+ .item(Utils.DEFAULT_ITEM)
.pattern("111101111")
- .pattern("000000000")
- .pattern("000000000")
- .pattern("000000000")
- .pattern("000000000")
+ .pattern(Utils.EMPTY_MASK)
+ .pattern(Utils.EMPTY_MASK)
+ .pattern(Utils.EMPTY_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
@@ -159,57 +125,67 @@ protected Mask getMask() {
* @param p player instance for language system
* @return description lore for plot item
*/
- private LoreBuilder getLore(Plot plot, Player p) throws SQLException {
- LoreBuilder builder = new LoreBuilder();
+ private @NotNull LoreBuilder getLore(@NotNull Plot plot, Player p) {
+ LoreBuilder loreBuilder = new LoreBuilder();
+
+ Optional review = plot.getLatestReview();
+ int score = (review.isEmpty() || plot.isRejected()) ? 0 : review.get().getScore();
if (plot.getPlotMembers().isEmpty()) {
// Plot is single player plot
- builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY)
- .append(text((plot.getTotalScore() == -1 ? 0 : plot.getTotalScore()), WHITE)));
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY)
+ .append(text(score, WHITE)));
} else {
// Plot is multiplayer plot
- builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.OWNER) + ": ", GRAY)
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.OWNER) + ": ", GRAY)
.append(text(plot.getPlotOwner().getName(), WHITE)));
- builder.emptyLine();
+ loreBuilder.emptyLine();
- int score = (plot.getTotalScore() == -1 ? 0 : plot.getTotalScore());
- builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY)
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.TOTAL_SCORE) + ": ", GRAY)
.append(text(score + " ", WHITE))
- .append(text(LangUtil.getInstance().get(p, LangPaths.Plot.GroupSystem.SHARED_BY_MEMBERS, Integer.toString(plot.getPlotMembers().size() + 1)), DARK_GRAY)));
+ .append(text(LangUtil.getInstance().get(p, LangPaths.Plot.GroupSystem.SHARED_BY_MEMBERS,
+ Integer.toString(plot.getPlotMembers().size() + 1)), DARK_GRAY)));
}
- if (plot.isReviewed() || plot.isRejected()) {
- builder.emptyLine();
- builder.addLines(
+ if (review.isPresent()) {
+ ReviewRating rating = review.get().getRating();
+ loreBuilder.emptyLine();
+ loreBuilder.addLines(
text(LangUtil.getInstance().get(p, LangPaths.Review.Criteria.ACCURACY) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(plot.getReview().getRating(Category.ACCURACY)))
+ .append(Utils.ItemUtils.getColoredPointsComponent(rating.getAccuracyPoints(), 5))
.append(text("/", DARK_GRAY)).append(text("5", GREEN)),
text(LangUtil.getInstance().get(p, LangPaths.Review.Criteria.BLOCK_PALETTE) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(plot.getReview().getRating(Category.BLOCKPALETTE)))
- .append(text("/", DARK_GRAY)).append(text("5", GREEN)),
- text(LangUtil.getInstance().get(p, LangPaths.Review.Criteria.DETAILING) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(plot.getReview().getRating(Category.DETAILING)))
- .append(text("/", DARK_GRAY)).append(text("5", GREEN)),
- text(LangUtil.getInstance().get(p, LangPaths.Review.Criteria.TECHNIQUE) + ": ", GRAY)
- .append(Utils.ItemUtils.getColoredPointsComponent(plot.getReview().getRating(Category.TECHNIQUE)))
+ .append(Utils.ItemUtils.getColoredPointsComponent(rating.getBlockPalettePoints(), 5))
.append(text("/", DARK_GRAY)).append(text("5", GREEN))
);
- builder.emptyLine();
- builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Review.FEEDBACK) + ":", GRAY));
- builder.addLine(text(plot.getReview().getFeedback().replaceAll("//", " "), WHITE), true);
+ if (plot.getVersion() > AbstractPlot.LEGACY_VERSION_THRESHOLD) {
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Review.TOGGLE_POINTS) + ": ", GRAY)
+ .append(Utils.ItemUtils.getColoredPointsComponent(rating.getTogglePoints(), 10))
+ .append(text("/", DARK_GRAY)).append(text("10", GREEN)));
+ }
+ loreBuilder.emptyLine();
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Review.FEEDBACK) + ":", GRAY));
+ String feedback = review.get().getFeedback() == null
+ ? LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.NO_FEEDBACK)
+ : review.get().getFeedback().replace("//", " ");
+ loreBuilder.addLine(text(feedback, WHITE), true);
}
- builder.emptyLine();
- if (plot.isReviewed() && plot.isRejected()) builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Review.REJECTED), RED, BOLD));
- builder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.STATUS) + ": ", GRAY)
+ loreBuilder.emptyLine();
+ if (plot.isRejected()) loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Review.REJECTED), RED, BOLD));
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Plot.STATUS) + ": ", GRAY)
.append(text(plot.getStatus().name().substring(0, 1).toUpperCase() +
plot.getStatus().name().substring(1), WHITE)));
- return builder;
+
+ if (plot.getVersion() <= AbstractPlot.LEGACY_VERSION_THRESHOLD) {
+ loreBuilder.addLine(text(LangUtil.getInstance().get(p, LangPaths.Note.LEGACY), RED).decoration(BOLD, true));
+ }
+ return loreBuilder;
}
/**
* @return Menu item
*/
- public static ItemStack getMenuItem(Player p) {
+ public static ItemStack getMenuItem(@NotNull Player p) {
return new ItemBuilder(AlpsHeadUtils.getPlayerHead(p.getUniqueId()))
.setName(text(LangUtil.getInstance().get(p, LangPaths.MenuTitle.SHOW_PLOTS), AQUA, BOLD))
.setLore(new LoreBuilder()
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java
index 7b0c8f652..d2924c14b 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java
@@ -1,104 +1,76 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
-import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.utils.io.ConfigPaths;
import com.alpsbte.plotsystem.core.system.Builder;
+import com.alpsbte.plotsystem.core.system.plot.AbstractPlot;
import com.alpsbte.plotsystem.core.system.plot.Plot;
import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.enums.Status;
+import com.alpsbte.plotsystem.utils.io.ConfigPaths;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
-import com.alpsbte.plotsystem.utils.items.MenuItems;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
+import org.jetbrains.annotations.NotNull;
-import java.sql.SQLException;
-
-import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class PlotActionsMenu extends AbstractMenu {
private final Plot plot;
- private final boolean hasFeedback;
+ private final boolean hasReview;
+ final FileConfiguration config;
- public PlotActionsMenu(Player menuPlayer, Plot plot) throws SQLException {
- super(3, LangUtil.getInstance().get(menuPlayer, LangPaths.Plot.PLOT_NAME) + " #" + plot.getID() + " | " + plot.getStatus().name().substring(0, 1).toUpperCase() + plot.getStatus().name().substring(1), menuPlayer);
+ public PlotActionsMenu(Player menuPlayer, @NotNull Plot plot) {
+ super(3, LangUtil.getInstance().get(menuPlayer, LangPaths.Plot.PLOT_NAME) + " #" + plot.getId() + " | " + plot.getStatus().name().substring(0, 1).toUpperCase() + plot.getStatus().name().substring(1), menuPlayer);
this.plot = plot;
- hasFeedback = plot.isReviewed() || plot.isRejected();
+ hasReview = plot.getLatestReview().isPresent();
+ config = PlotSystem.getPlugin().getConfig();
}
@Override
protected void setMenuItemsAsync() {
// Set plot submit or undo submit item
- try {
- if (plot.getStatus().equals(Status.unreviewed)) {
- getMenu().getSlot(10)
- .setItem(new ItemBuilder(Material.FIRE_CHARGE, 1)
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.UNDO_SUBMIT), RED).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.UNDO_SUBMIT), true).build())
- .build());
- } else {
- getMenu().getSlot(10)
- .setItem(new ItemBuilder(Material.NAME_TAG, 1)
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SUBMIT), GREEN).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SUBMIT_PLOT)).color(GRAY), true)
- .emptyLine()
- .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.WONT_BE_ABLE_CONTINUE_BUILDING)))
- .build())
- .build());
- }
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(10).setItem(MenuItems.errorItem(getMenuPlayer()));
+ if (plot.getStatus().equals(Status.unreviewed)) {
+ getMenu().getSlot(10)
+ .setItem(new ItemBuilder(BaseItems.PLOT_UNDO_SUBMIT.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.UNDO_SUBMIT), RED).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.UNDO_SUBMIT), true).build())
+ .build());
+ } else {
+ getMenu().getSlot(10)
+ .setItem(new ItemBuilder(BaseItems.PLOT_SUBMIT.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SUBMIT), GREEN).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SUBMIT_PLOT)).color(GRAY), true)
+ .emptyLine()
+ .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.WONT_BE_ABLE_CONTINUE_BUILDING)))
+ .build())
+ .build());
}
// Set teleport to plot item
- getMenu().getSlot(hasFeedback ? 12 : 13)
- .setItem(new ItemBuilder(Material.COMPASS, 1)
+ getMenu().getSlot(hasReview ? 12 : 13)
+ .setItem(new ItemBuilder(BaseItems.PLOT_TELEPORT.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.TELEPORT), GOLD).decoration(BOLD, true))
.setLore(new LoreBuilder().addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.TELEPORT)).color(GRAY), true).build())
.build());
// Set plot abandon item
- getMenu().getSlot(hasFeedback ? 14 : 16)
- .setItem(new ItemBuilder(Material.BARRIER, 1)
+ getMenu().getSlot(hasReview ? 14 : 16)
+ .setItem(new ItemBuilder(BaseItems.PLOT_ABANDON.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.ABANDON), RED).decoration(BOLD, true))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.ABANDON), true)
@@ -108,42 +80,39 @@ protected void setMenuItemsAsync() {
.build());
// Set plot feedback item
- if (hasFeedback) {
+ if (hasReview) {
getMenu().getSlot(16)
- .setItem(new ItemBuilder(Material.WRITABLE_BOOK)
+ .setItem(new ItemBuilder(BaseItems.REVIEW_FEEDBACK.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.FEEDBACK), AQUA).decoration(BOLD, true))
.setLore(new LoreBuilder().addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.FEEDBACK), true).build())
.build());
}
-
+
// Set plot members item
- try {
- if (!plot.isReviewed()) {
- FileConfiguration config = PlotSystem.getPlugin().getConfig();
- if ((getMenuPlayer() == plot.getPlotOwner().getPlayer() || getMenuPlayer().hasPermission("plotsystem.admin")) && config.getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) {
- getMenu().getSlot(22)
- .setItem(new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.ADD_BUTTON.getId()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.MANAGE_MEMBERS), AQUA).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.MANAGE_MEMBERS), true)
- .emptyLine()
- .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.SCORE_WILL_BE_SPLIT)))
- .build())
- .build());
- } else if (plot.getPlotMembers().stream().anyMatch(m -> m.getUUID().equals(getMenuPlayer().getUniqueId()))) {
- getMenu().getSlot(22)
- .setItem(new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.REMOVE_BUTTON.getId()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.LEAVE_PLOT), AQUA).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.LEAVE_PLOT), true)
- .emptyLine()
- .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.WONT_BE_ABLE_CONTINUE_BUILDING)))
- .build())
- .build());
- }
+ if (!plot.isReviewed() && config.getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) {
+ if ((getMenuPlayer() == plot.getPlotOwner().getPlayer() || getMenuPlayer().hasPermission("plotsystem.admin"))) {
+ getMenu().getSlot(22)
+ .setItem(new ItemBuilder(BaseItems.MENU_ADD.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.MANAGE_MEMBERS), AQUA).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.MANAGE_MEMBERS), true)
+ .emptyLine()
+ .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.SCORE_WILL_BE_SPLIT)))
+ .build())
+ .build());
+ } else if (plot.getPlotMembers().stream().anyMatch(m -> m.getUUID().equals(getMenuPlayer().getUniqueId()))) {
+ getMenu().getSlot(22)
+ .setItem(new ItemBuilder(BaseItems.MENU_REMOVE.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.LEAVE_PLOT), AQUA).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.LEAVE_PLOT), true)
+ .emptyLine()
+ .addLine(Utils.ItemUtils.getNoteFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.WONT_BE_ABLE_CONTINUE_BUILDING)))
+ .build())
+ .build());
}
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
+ } else {
+ getMenu().getSlot(22).setItem(Utils.DEFAULT_ITEM);
}
}
@@ -152,36 +121,36 @@ protected void setItemClickEventsAsync() {
// Set click event for submit or undo submit plot item
getMenu().getSlot(10).setClickHandler((clickPlayer, clickInformation) -> {
clickPlayer.closeInventory();
- try {
- clickPlayer.performCommand("plot " + (plot.getStatus().equals(Status.unreviewed) ? "undosubmit " : "submit ") + plot.getID());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
+ clickPlayer.performCommand("plot " + (plot.getStatus().equals(Status.unreviewed) ? "undosubmit " : "submit ") + plot.getId());
});
// Set click event for teleport to plot item
- getMenu().getSlot(hasFeedback ? 12 : 13).setClickHandler((clickPlayer, clickInformation) -> {
+ getMenu().getSlot(hasReview ? 12 : 13).setClickHandler((clickPlayer, clickInformation) -> {
clickPlayer.closeInventory();
+ if (plot.getVersion() <= AbstractPlot.LEGACY_VERSION_THRESHOLD) {
+ clickPlayer.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(clickPlayer, LangPaths.Message.Error.CANNOT_LOAD_LEGACY_PLOT)));
+ return;
+ }
plot.getWorld().teleportPlayer(clickPlayer);
});
// Set click event for abandon plot item
- getMenu().getSlot(hasFeedback ? 14 : 16).setClickHandler((clickPlayer, clickInformation) -> {
+ getMenu().getSlot(hasReview ? 14 : 16).setClickHandler((clickPlayer, clickInformation) -> {
clickPlayer.closeInventory();
- clickPlayer.performCommand("plot abandon " + plot.getID());
+ clickPlayer.performCommand("plot abandon " + plot.getId());
});
// Set click event for feedback menu button
- if (hasFeedback) {
+ if (hasReview) {
getMenu().getSlot(16).setClickHandler((clickPlayer, clickInformation) -> {
clickPlayer.closeInventory();
- clickPlayer.performCommand("plot feedback " + plot.getID());
+ clickPlayer.performCommand("plot feedback " + plot.getId());
});
}
// Set click event for plot members item
- getMenu().getSlot(22).setClickHandler((clickPlayer, clickInformation) -> {
- try {
+ if (!plot.isReviewed() && config.getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) {
+ getMenu().getSlot(22).setClickHandler((clickPlayer, clickInformation) -> {
if (plot.isReviewed()) return;
if (plot.getStatus() != Status.unfinished) {
clickPlayer.closeInventory();
@@ -196,21 +165,19 @@ protected void setItemClickEventsAsync() {
// Leave Plot
clickPlayer.closeInventory();
plot.removePlotMember(Builder.byUUID(clickPlayer.getUniqueId()));
- clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.LEFT_PLOT, Integer.toString(plot.getID()))));
+ clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.LEFT_PLOT, Integer.toString(plot.getId()))));
}
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
- });
+ });
+ }
}
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
- .pattern("111111111")
- .pattern("000000000")
- .pattern("111111111")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
+ .pattern(Utils.FULL_MASK)
.build();
}
}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotMemberMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotMemberMenu.java
index 34992e0f1..1fc54affd 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotMemberMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotMemberMenu.java
@@ -1,27 +1,3 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
@@ -35,21 +11,23 @@
import com.alpsbte.plotsystem.utils.chat.PlayerInviteeChatInput;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.inventory.ItemStack;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
+import org.jetbrains.annotations.NotNull;
-import java.sql.SQLException;
import java.util.List;
import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.DARK_GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class PlotMemberMenu extends AbstractMenu {
@@ -58,9 +36,16 @@ public class PlotMemberMenu extends AbstractMenu {
private final ItemStack emptyMemberSlotItem = new ItemBuilder(Material.GREEN_STAINED_GLASS_PANE, 1).setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.GroupSystem.EMPTY_MEMBER_SLOTS), DARK_GREEN).decoration(BOLD, true)).build();
private List builders;
- public PlotMemberMenu(Plot plot, Player menuPlayer) {
- super(3, LangUtil.getInstance().get(menuPlayer, LangPaths.MenuTitle.MANAGE_MEMBERS) + " | " + LangUtil.getInstance().get(menuPlayer, LangPaths.Plot.PLOT_NAME) + " #" + plot.getID(), menuPlayer);
+ public PlotMemberMenu(@NotNull Plot plot, Player menuPlayer) {
+ // Avoid opening the menu before 'plot' is assigned
+ super(3,
+ LangUtil.getInstance().get(menuPlayer, LangPaths.MenuTitle.MANAGE_MEMBERS) + " | " +
+ LangUtil.getInstance().get(menuPlayer, LangPaths.Plot.PLOT_NAME) + " #" + plot.getId(),
+ menuPlayer,
+ false);
this.plot = plot;
+ // Now that 'plot' is set, we can safely load the menu
+ reloadMenuAsync();
}
@Override
@@ -69,23 +54,21 @@ protected void setPreviewItems() {
getMenu().getSlot(10).setItem(MenuItems.loadingItem(Material.PLAYER_HEAD, getMenuPlayer()));
// Set loading item for plot member items
- Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> {
- try {
- List plotMembers = plot.getPlotMembers();
- for (int i = 1; i <= 3; i++) {
- getMenu().getSlot(11 + i).setItem(plotMembers.size() >= i
- ? MenuItems.loadingItem(Material.PLAYER_HEAD, getMenuPlayer())
- : emptyMemberSlotItem);
- }
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
+ if (plot != null) {
+ List plotMembers = plot.getPlotMembers();
+ for (int i = 1; i <= 3; i++) {
+ getMenu().getSlot(11 + i).setItem(plotMembers.size() >= i
+ ? MenuItems.loadingItem(Material.PLAYER_HEAD, getMenuPlayer())
+ : emptyMemberSlotItem);
}
- });
+ } else {
+ PlotSystem.getPlugin().getComponentLogger().warn(text("PlotMemberMenu: plot is null in setPreviewItems"));
+ }
// Set add plot member item
- ItemStack whitePlus = AlpsHeadUtils.getCustomHead(CustomHeads.ADD_BUTTON.getId());
+ ItemStack addItem = BaseItems.MENU_ADD.getItem();
getMenu().getSlot(16)
- .setItem(new ItemBuilder(whitePlus)
+ .setItem(new ItemBuilder(addItem)
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.ADD_MEMBER_TO_PLOT), GOLD, BOLD))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.ADD_MEMBER_TO_PLOT), true)
@@ -102,55 +85,57 @@ protected void setPreviewItems() {
@Override
protected void setMenuItemsAsync() {
- // Set plot owner item
- try {
- getMenu().getSlot(10)
- .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(plot.getPlotOwner().getUUID()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.OWNER), GOLD, BOLD))
- .setLore(new LoreBuilder()
- .addLine(plot.getPlotOwner().getName()).build())
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
+ if (plot == null) {
+ PlotSystem.getPlugin().getComponentLogger().error(text("PlotMemberMenu: plot is null in setMenuItemsAsync, cannot load menu items"));
+ return;
}
+ // Set plot owner item
+ getMenu().getSlot(10)
+ .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(plot.getPlotOwner().getUUID()))
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.OWNER), GOLD, BOLD))
+ .setLore(new LoreBuilder()
+ .addLines(text(plot.getPlotOwner().getName()),
+ empty(),
+ text(Utils.ItemUtils.getActionFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.Action.CLICK_TO_OPEN_PLOTS_MENUE))))
+ .build())
+ .build());
+
// Set plot member items
- try {
- builders = plot.getPlotMembers();
- for (int i = 12; i < 15; i++) {
- if (builders.size() < (i - 11)) return;
-
- Builder builder = builders.get(i - 12);
- getMenu().getSlot(i)
- .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(builder.getUUID()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.MEMBER), AQUA, BOLD))
- .setLore(new LoreBuilder()
- .addLines(text(builder.getName()),
- empty(),
- text(Utils.ItemUtils.getActionFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.Action.CLICK_TO_REMOVE_PLOT_MEMBER))))
- .build())
- .build());
- }
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
+ builders = plot.getPlotMembers();
+ for (int i = 12; i < 15; i++) {
+ if (builders.size() < (i - 11)) return;
+
+ Builder builder = builders.get(i - 12);
+ getMenu().getSlot(i)
+ .setItem(new ItemBuilder(AlpsHeadUtils.getPlayerHead(builder.getUUID()))
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.MEMBER), AQUA, BOLD))
+ .setLore(new LoreBuilder()
+ .addLines(text(builder.getName()),
+ empty(),
+ text(Utils.ItemUtils.getActionFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Note.Action.CLICK_TO_REMOVE_PLOT_MEMBER))))
+ .build())
+ .build());
}
}
@Override
protected void setItemClickEventsAsync() {
+ // Set click event for owner slot
+ getMenu().getSlot(10).setClickHandler((clickPlayer, clickInformation) -> {
+ clickPlayer.closeInventory(InventoryCloseEvent.Reason.OPEN_NEW);
+ new PlayerPlotsMenu(clickPlayer, plot.getPlotOwner());
+ });
+
// Set click event for member slots
for (int i = 12; i < 15; i++) {
int itemSlot = i;
getMenu().getSlot(i).setClickHandler((clickPlayer, clickInformation) -> {
if (getMenu().getSlot(itemSlot).getItem(clickPlayer).equals(emptyMemberSlotItem)) return;
Builder builder = builders.get(itemSlot - 12);
- try {
- plot.removePlotMember(builder);
- clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(),
- LangPaths.Message.Info.REMOVED_PLOT_MEMBER, builder.getName(), Integer.toString(plot.getID()))));
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
+ plot.removePlotMember(builder);
+ clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(),
+ LangPaths.Message.Info.REMOVED_PLOT_MEMBER, builder.getName(), Integer.toString(plot.getId()))));
reloadMenuAsync();
});
}
@@ -163,22 +148,18 @@ protected void setItemClickEventsAsync() {
});
// Set click event for back item
- getMenu().getSlot(22).setClickHandler((clickPlayer, clickInformation) -> {
- try {
- new PlotActionsMenu(clickPlayer, plot);
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
- });
+ getMenu().getSlot(22).setClickHandler((clickPlayer, clickInformation)
+ -> new PlotActionsMenu(clickPlayer, plot));
}
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build())
- .pattern("111111111")
- .pattern("000000000")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
-}
\ No newline at end of file
+}
+
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotTypeMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotTypeMenu.java
index 114263d22..a44216cfa 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotTypeMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotTypeMenu.java
@@ -1,38 +1,15 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
-import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
+import com.alpsbte.plotsystem.PlotSystem;
import com.alpsbte.plotsystem.core.system.Builder;
import com.alpsbte.plotsystem.core.system.plot.utils.PlotType;
import com.alpsbte.plotsystem.utils.Utils;
+import com.alpsbte.plotsystem.utils.io.ConfigPaths;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
import com.alpsbte.plotsystem.utils.items.MenuItems;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -41,7 +18,9 @@
import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class PlotTypeMenu extends AbstractMenu {
@@ -62,12 +41,12 @@ protected void setPreviewItems() {
protected void setMenuItemsAsync() {
// Set plot type items
getMenu().getSlot(11).setItem(
- new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.FOCUS_MODE_BUTTON.getId()))
+ new ItemBuilder(BaseItems.PLOT_FOCUS_MODE.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SELECT_FOCUS_MODE), GOLD, BOLD))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_FOCUS_MODE), true)
.build())
- .setEnchanted(builder.getPlotTypeSetting().getId() == PlotType.FOCUS_MODE.getId())
+ .setEnchanted(builder.getPlotType().getId() == PlotType.FOCUS_MODE.getId())
.build());
getMenu().getSlot(13).setItem(
@@ -76,28 +55,30 @@ protected void setMenuItemsAsync() {
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_INSPIRATION_MODE), true)
.build())
- .setEnchanted(builder.getPlotTypeSetting().getId() == PlotType.LOCAL_INSPIRATION_MODE.getId())
+ .setEnchanted(builder.getPlotType().getId() == PlotType.LOCAL_INSPIRATION_MODE.getId())
.build());
- getMenu().getSlot(15).setItem(
- new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.CITY_INSPIRATION_MODE_BUTTON.getId()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SELECT_CITY_INSPIRATION_MODE), GOLD, BOLD)
- .append(text(" [", DARK_GRAY).append(text("BETA", RED).append(text("]", DARK_GRAY))))) // temporary BETA tag
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_CITY_INSPIRATION_MODE), true)
- .build())
- .setEnchanted(builder.getPlotTypeSetting().getId() == PlotType.CITY_INSPIRATION_MODE.getId())
- .build());
+ boolean inspirationModeDisabled = PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.DISABLE_CITY_INSPIRATION_MODE); // TODO remove or enhance as soon CIM is working again
+ getMenu().getSlot(15).setItem(!inspirationModeDisabled ?
+ new ItemBuilder(BaseItems.PLOT_CITY_INSPIRATION_MODE.getItem())
+ .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SELECT_CITY_INSPIRATION_MODE), GOLD, BOLD)
+ .append(text(" [", DARK_GRAY).append(text("BETA", RED).append(text("]", DARK_GRAY))))) // temporary BETA tag
+ .setLore(new LoreBuilder()
+ .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_CITY_INSPIRATION_MODE), true)
+ .build())
+ .setEnchanted(builder.getPlotType().getId() == PlotType.CITY_INSPIRATION_MODE.getId())
+ .build() : Utils.DEFAULT_ITEM);
+
+
// Set selected glass pane
int selectedPlotTypeSlot = 13;
- if (builder.getPlotTypeSetting() == PlotType.FOCUS_MODE)
+ if (builder.getPlotType() == PlotType.FOCUS_MODE)
selectedPlotTypeSlot = 11;
- if (builder.getPlotTypeSetting() == PlotType.CITY_INSPIRATION_MODE)
+ if (builder.getPlotType() == PlotType.CITY_INSPIRATION_MODE)
selectedPlotTypeSlot = 15;
getMenu().getSlot(selectedPlotTypeSlot - 9).setItem(new ItemBuilder(Material.LIME_STAINED_GLASS_PANE, 1).setName(empty()).build());
-
// Set back item
getMenu().getSlot(22).setItem(MenuItems.backMenuItem(getMenuPlayer()));
}
@@ -106,22 +87,28 @@ protected void setMenuItemsAsync() {
protected void setItemClickEventsAsync() {
// Set click event for plot type items
getMenu().getSlot(11).setClickHandler(((clickPlayer, clickInformation) -> {
- builder.setPlotTypeSetting(PlotType.FOCUS_MODE);
+ boolean successful = builder.setPlotType(PlotType.FOCUS_MODE);
+ if (!successful) return;
getMenuPlayer().playSound(getMenuPlayer().getLocation(), Utils.SoundUtils.DONE_SOUND, 1f, 1f);
reloadMenuAsync();
}));
getMenu().getSlot(13).setClickHandler(((clickPlayer, clickInformation) -> {
- builder.setPlotTypeSetting(PlotType.LOCAL_INSPIRATION_MODE);
+ boolean successful = builder.setPlotType(PlotType.LOCAL_INSPIRATION_MODE);
+ if (!successful) return;
getMenuPlayer().playSound(getMenuPlayer().getLocation(), Utils.SoundUtils.DONE_SOUND, 1f, 1f);
reloadMenuAsync();
}));
- getMenu().getSlot(15).setClickHandler(((clickPlayer, clickInformation) -> {
- builder.setPlotTypeSetting(PlotType.CITY_INSPIRATION_MODE);
- getMenuPlayer().playSound(getMenuPlayer().getLocation(), Utils.SoundUtils.DONE_SOUND, 1f, 1f);
- reloadMenuAsync();
- }));
+ boolean inspirationModeDisabled = PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.DISABLE_CITY_INSPIRATION_MODE); // TODO improve or remove when CIM ist working again
+ if (!inspirationModeDisabled) {
+ getMenu().getSlot(15).setClickHandler(((clickPlayer, clickInformation) -> {
+ boolean successful = builder.setPlotType(PlotType.CITY_INSPIRATION_MODE);
+ if (!successful) return;
+ getMenuPlayer().playSound(getMenuPlayer().getLocation(), Utils.SoundUtils.DONE_SOUND, 1f, 1f);
+ reloadMenuAsync();
+ }));
+ }
// Set click event for back item
getMenu().getSlot(22).setClickHandler((clickPlayer, clickInformation) -> new SettingsMenu(clickPlayer));
@@ -130,9 +117,9 @@ protected void setItemClickEventsAsync() {
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build())
- .pattern("111111111")
- .pattern("000000000")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewMenu.java
deleted file mode 100644
index 03b40ed77..000000000
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewMenu.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.alpsbte.plotsystem.core.menus;
-
-import com.alpsbte.alpslib.utils.item.ItemBuilder;
-import com.alpsbte.alpslib.utils.item.LegacyLoreBuilder;
-import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.core.system.Builder;
-import com.alpsbte.plotsystem.core.system.Country;
-import com.alpsbte.plotsystem.core.system.plot.Plot;
-import com.alpsbte.plotsystem.utils.Utils;
-import com.alpsbte.plotsystem.utils.enums.Status;
-import com.alpsbte.plotsystem.utils.io.LangPaths;
-import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.BaseItems;
-import com.alpsbte.plotsystem.utils.items.MenuItems;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.ipvp.canvas.mask.BinaryMask;
-import org.ipvp.canvas.mask.Mask;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static net.kyori.adventure.text.Component.text;
-
-public class ReviewMenu extends AbstractPaginatedMenu {
- private List countries = new ArrayList<>();
- private Country filteredCountry = null;
-
- public ReviewMenu(Player player) {
- super(6, 4, LangUtil.getInstance().get(player, LangPaths.Review.MANAGE_AND_REVIEW_PLOTS), player);
- }
-
- @Override
- protected List getSource() {
- List plots = new ArrayList<>();
- try {
- countries = Builder.byUUID(getMenuPlayer().getUniqueId()).getAsReviewer().getCountries();
- plots.addAll(Plot.getPlots(countries, Status.unreviewed));
- plots.addAll(Plot.getPlots(countries, Status.unfinished));
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
- return plots;
- }
-
- @Override
- protected void setPreviewItems() {
- // Set close item
- getMenu().getSlot(49).setItem(MenuItems.closeMenuItem(getMenuPlayer()));
-
- super.setPreviewItems();
- }
-
- @Override
- protected void setPaginatedMenuItemsAsync(List source) {
- // Set filter item
- getMenu().getSlot(7).setItem(getFilterItem(getMenuPlayer()));
-
- // Set unreviewed and unfinished plot items
- List plots = getFilteredPlots(source);
- for (int i = 0; i < plots.size(); i++) {
- try {
- Plot plot = plots.get(i);
- List lines = new ArrayList<>();
- lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.ID) + ": §f" + plot.getID());
- lines.add("");
- lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.OWNER) + ": §f" + plot.getPlotOwner().getName());
- if (!plot.getPlotMembers().isEmpty()) lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.MEMBERS) + ": §f" + plot.getPlotMembers().stream().map(m -> {
- try {return m.getName();} catch (SQLException ex) {PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);}
- return "";
- }).collect(Collectors.joining(", "))
- );
- lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.CITY) + ": §f" + plot.getCity().getName());
- lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.COUNTRY) + ": §f" + plot.getCity().getCountry().getName());
- lines.add("§7" + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.DIFFICULTY) + ": §f" + plot.getDifficulty().name().charAt(0) + plot.getDifficulty().name().substring(1).toLowerCase());
-
- getMenu().getSlot(i + 9).setItem(new ItemBuilder(plot.getStatus() == Status.unfinished ? Material.MAP : Material.FILLED_MAP, 1)
- .setName("§b§l" + LangUtil.getInstance().get(getMenuPlayer(), plot.getStatus() == Status.unfinished ? LangPaths.Review.MANAGE_PLOT : LangPaths.Review.REVIEW_PLOT))
- .setLore(lines)
- .build());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenu().getSlot(i).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
- }
- }
-
- @Override
- protected void setPaginatedItemClickEventsAsync(List source) {
- // Set click event for unreviewed and unfinished plot items
- List plots = getFilteredPlots(source);
- for (int i = 0; i < plots.size(); i++) {
- Plot plot = plots.get(i);
- getMenu().getSlot(i + 9).setClickHandler((player, info) -> {
- try {
- if (plot.getStatus() == Status.unfinished) {
- new PlotActionsMenu(getMenuPlayer(), plot);
- return;
- }
-
- player.performCommand("review " + plot.getID());
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- getMenuPlayer().closeInventory();
- }
- });
- }
- }
-
- @Override
- protected void setMenuItemsAsync() {
- // Set previous page item
- if (hasPreviousPage()) getMenu().getSlot(46).setItem(MenuItems.previousPageItem(getMenuPlayer()));
-
- // Set next page item
- if (hasNextPage()) getMenu().getSlot(52).setItem(MenuItems.nextPageItem(getMenuPlayer()));
- }
-
- @Override
- protected void setItemClickEventsAsync() {
- // Set click event for filter item
- getMenu().getSlot(7).setClickHandler((clickPlayer, clickInformation) -> {
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
- if (countries.isEmpty()) return;
-
- if (filteredCountry == null) {
- filteredCountry = countries.get(0);
- } else {
- int index = countries.indexOf(filteredCountry);
- filteredCountry = index + 1 >= countries.size() ? null : countries.get(index + 1);
- }
-
- reloadMenuAsync(false);
- });
-
- // Set click event for previous page item
- getMenu().getSlot(46).setClickHandler((clickPlayer, clickInformation) -> {
- if (hasPreviousPage()) {
- previousPage();
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
- }
- });
-
- // Set click event for close item
- getMenu().getSlot(49).setClickHandler((clickPlayer, clickInformation) -> clickPlayer.closeInventory());
-
- // Set click event for next page item
- getMenu().getSlot(52).setClickHandler((clickPlayer, clickInformation) -> {
- if (hasNextPage()) {
- nextPage();
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
- }
- });
- }
-
- @Override
- protected Mask getMask() {
- return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
- .pattern("111111111")
- .pattern("000000000")
- .pattern("000000000")
- .pattern("000000000")
- .pattern("000000000")
- .pattern("111101111")
- .build();
- }
-
- private List getFilteredPlots(List plots) {
- List filteredPlots = plots.stream().map(p -> (Plot) p).collect(Collectors.toList());
- if (filteredCountry != null) filteredPlots = filteredPlots.stream().filter(p -> {
- try {
- return p.getCity().getCountry().getID() == filteredCountry.getID();
- } catch (SQLException ex) {PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);}
- return false;
- }).collect(Collectors.toList());
- return filteredPlots;
- }
-
- private ItemStack getFilterItem(Player langPlayer) {
- LegacyLoreBuilder LegacyLoreBuilder = new LegacyLoreBuilder();
- LegacyLoreBuilder.addLine((filteredCountry == null ? "§b§l> §f§l" : "§7") + LangUtil.getInstance().get(langPlayer, LangPaths.MenuDescription.FILTER));
- LegacyLoreBuilder.emptyLine();
-
- countries.forEach(c -> {
- if (filteredCountry != null && filteredCountry.getID() == c.getID()) {
- LegacyLoreBuilder.addLine("§b§l> §f§l" + filteredCountry.getName());
- } else LegacyLoreBuilder.addLine("§7" + c.getName());
- });
-
- return new ItemBuilder(MenuItems.filterItem(getMenuPlayer()))
- .setLore(LegacyLoreBuilder.build())
- .setEnchanted(filteredCountry != null)
- .build();
- }
-
- /**
- * @return Menu item
- */
- public static ItemStack getMenuItem(Player player) {
- return new ItemBuilder(BaseItems.REVIEW_ITEM.getItem())
- .setName("§b§l" + LangUtil.getInstance().get(player, LangPaths.MenuTitle.REVIEW_PLOTS) + " §7(" + LangUtil.getInstance().get(player, LangPaths.Note.Action.RIGHT_CLICK) + ")")
- .setEnchanted(true)
- .build();
- }
-}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewPlotMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewPlotMenu.java
deleted file mode 100644
index e6a5b2913..000000000
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/ReviewPlotMenu.java
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2025, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.alpsbte.plotsystem.core.menus;
-
-import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
-import com.alpsbte.alpslib.utils.item.ItemBuilder;
-import com.alpsbte.alpslib.utils.item.LoreBuilder;
-import com.alpsbte.plotsystem.PlotSystem;
-import com.alpsbte.plotsystem.core.system.Builder;
-import com.alpsbte.plotsystem.core.system.Review;
-import com.alpsbte.plotsystem.core.system.plot.Plot;
-import com.alpsbte.plotsystem.core.system.plot.utils.PlotUtils;
-import com.alpsbte.plotsystem.utils.Utils;
-import com.alpsbte.plotsystem.utils.chat.ChatInput;
-import com.alpsbte.plotsystem.utils.chat.PlayerFeedbackChatInput;
-import com.alpsbte.plotsystem.utils.enums.Status;
-import com.alpsbte.plotsystem.utils.io.LangPaths;
-import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.BaseItems;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
-import com.alpsbte.plotsystem.utils.items.MenuItems;
-import com.sk89q.worldedit.WorldEditException;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.ipvp.canvas.mask.BinaryMask;
-import org.ipvp.canvas.mask.Mask;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Objects;
-
-import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
-import static net.kyori.adventure.text.format.TextDecoration.BOLD;
-
-public class ReviewPlotMenu extends AbstractMenu {
- private final Plot plot;
-
- boolean sentWarning = false;
-
- public ReviewPlotMenu(Player player, Plot plot) {
- super(6, LangUtil.getInstance().get(player, LangPaths.MenuTitle.REVIEW_PLOT, Integer.toString(plot.getID())), player);
- this.plot = plot;
- }
-
- @Override
- protected void setPreviewItems() {
- final ItemStack[] itemPointZero = new ItemStack[4];
- final ItemStack[] itemPointOne = new ItemStack[4];
- final ItemStack[] itemPointTwo = new ItemStack[4];
- final ItemStack[] itemPointThree = new ItemStack[4];
- final ItemStack[] itemPointFour = new ItemStack[4];
- final ItemStack[] itemPointFive = new ItemStack[4];
-
- for (int i = 0; i < 54; i++) {
- int column = (i % 9) + 1;
- int row = (i - (i % 9)) / 9 + 1;
- int position = ((i + 1) - (i + 1) % 9) / 54;
- if (column > 2 && column < 9 && row > 1 && row < 6) {
- if ((i + 1) % 9 == 3) {
- itemPointZero[position] = getZeroPointItem();
-
- //Add Enchantment
- ItemMeta itemMeta = itemPointZero[position].getItemMeta();
- Objects.requireNonNull(itemMeta).addEnchant(Enchantment.POWER, 1, true);
- itemPointZero[position].setItemMeta(itemMeta);
- getMenu().getSlot(i).setItem(itemPointZero[(i - (i + 1) % 9) / 54]);
- } else if ((i + 1) % 9 == 4) {
- itemPointOne[position] = getOnePointItem();
- getMenu().getSlot(i).setItem(itemPointOne[(i - (i + 1) % 9) / 54]);
- } else if ((i + 1) % 9 == 5) {
- itemPointTwo[position] = getTwoPointItem();
- getMenu().getSlot(i).setItem(itemPointTwo[(i - (i + 1) % 9) / 54]);
- } else if ((i + 1) % 9 == 6) {
- itemPointThree[position] = getThreePointItem();
- getMenu().getSlot(i).setItem(itemPointThree[(i - (i + 1) % 9) / 54]);
- } else if ((i + 1) % 9 == 7) {
- itemPointFour[position] = getFourPointItem();
- getMenu().getSlot(i).setItem(itemPointFour[(i - (i + 1) % 9) / 54]);
- } else if ((i + 1) % 9 == 8) {
- itemPointFive[position] = getFivePointItem();
- getMenu().getSlot(i).setItem(itemPointFive[(i - (i + 1) % 9) / 54]);
- }
- }
- }
-
- getMenu().getSlot(4).setItem(MenuItems.loadingItem(Material.MAP, getMenuPlayer()));
-
- getMenu().getSlot(10).setItem(getAccuracyItem());
- getMenu().getSlot(19).setItem(getBlockPaletteItem());
- getMenu().getSlot(28).setItem(getDetailingItem());
- getMenu().getSlot(37).setItem(getTechniqueItem());
-
- getMenu().getSlot(48).setItem(getSubmitItem());
- getMenu().getSlot(50).setItem(getCancelItem());
-
- super.setPreviewItems();
- }
-
- @Override
- protected void setMenuItemsAsync() {
- // Set back item
- getMenu().getSlot(1).setItem(MenuItems.backMenuItem(getMenuPlayer()));
-
- // Set plot information item
- getMenu().getSlot(4).setItem(getPlotInfoItem());
-
- // Set review information item
- getMenu().getSlot(7).setItem(getReviewInfoItem());
- }
-
- @Override
- protected void setItemClickEventsAsync() {
- // Set click event for back item
- getMenu().getSlot(1).setClickHandler((clickPlayer, clickInformation) -> new ReviewMenu(getMenuPlayer()));
-
- // Set click event for close item
- getMenu().getSlot(50).setClickHandler((clickPlayer, clickInformation) -> clickPlayer.closeInventory());
-
- // Set click event for plot info item
- getMenu().getSlot(4).setClickHandler((clickPlayer, clickInformation) -> {
- try {
- new PlotActionsMenu(clickPlayer, plot);
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
- });
-
- // Set click event for submit item
- getMenu().getSlot(48).setClickHandler((clickPlayer, clickInformation) -> {
- Bukkit.getScheduler().runTaskAsynchronously(PlotSystem.getPlugin(), () -> {
- try {
- StringBuilder score = new StringBuilder();
-
- int totalRating = 0;
- boolean isRejected = false;
-
- for (int i = 0; i < 4; i++) {
- for (int j = 0; j < 6; j++) {
- if (Objects.requireNonNull(getMenu().getSlot(11 + (i * 9) + j).getItem(clickPlayer).getItemMeta()).hasEnchant(Enchantment.POWER)) {
- if (i == 3) {
- score.append(j);
- } else {
- score.append(j).append(",");
- }
- totalRating += j;
- if (j == 0) isRejected = true;
- }
- }
- }
- if (totalRating <= 8) isRejected = true;
-
- if (totalRating == 0 && !sentWarning) {
- clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_WILL_GET_ABANDONED)));
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.CREATE_PLOT_SOUND, 1, 1);
- sentWarning = true;
- return;
- } else if (isRejected && !sentWarning) {
- clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_WILL_GET_REJECTED)));
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.CREATE_PLOT_SOUND, 1, 1);
- sentWarning = true;
- return;
- } else if (totalRating == 0) {
- plot.setStatus(Status.unfinished);
- Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> clickPlayer.performCommand("plot abandon " + plot.getID()));
- return;
- }
- Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> clickPlayer.closeInventory());
-
- if (plot.isReviewed()) {
- plot.getReview().setRating(score.toString());
- plot.getReview().setReviewer(clickPlayer.getUniqueId());
- } else new Review(plot.getID(), clickPlayer.getUniqueId(), score.toString());
-
- double totalRatingWithMultiplier = totalRating * Plot.getMultiplierByDifficulty(plot.getDifficulty());
- totalRating = (int) Math.floor(totalRatingWithMultiplier);
- plot.setTotalScore(totalRating);
-
- Component reviewerConfirmationMessage;
-
- if (!isRejected) {
- clickPlayer.sendMessage(Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.SAVING_PLOT)));
- Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> {
- try {
- PlotSystem.getPlugin().getComponentLogger().warn(text("Saving plot schematic (ID: " + plot.getID() + ")..."));
- if (!PlotUtils.savePlotAsSchematic(plot)) {
- clickPlayer.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Error.ERROR_OCCURRED)));
- PlotSystem.getPlugin().getComponentLogger().warn(text("Could not save finished plot schematic (ID: " + plot.getID() + ")!"));
- }
- } catch (IOException | SQLException | WorldEditException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("Could not save finished plot schematic (ID: " + plot.getID() + ")!"), ex);
- }
- });
-
- plot.setStatus(Status.completed);
- plot.getReview().setFeedbackSent(false);
- plot.getReview().setFeedback("No Feedback");
- plot.getPlotOwner().addCompletedBuild(1);
-
- // Remove Plot from Owner
- plot.getPlotOwner().removePlot(plot.getSlot());
-
- if (plot.getPlotMembers().isEmpty()) {
- // Plot was made alone
- reviewerConfirmationMessage = Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_MARKED_REVIEWED, Integer.toString(plot.getID()), plot.getPlotOwner().getName()));
-
- // Builder gets 100% of score
- plot.getPlotOwner().addScore(totalRating);
- } else {
- // Plot was made in a group
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < plot.getPlotMembers().size(); i++) {
- sb.append(i == plot.getPlotMembers().size() - 1 ?
- plot.getPlotMembers().get(i).getName() :
- plot.getPlotMembers().get(i).getName() + ", ");
- }
- reviewerConfirmationMessage = Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_MARKED_REVIEWED, Integer.toString(plot.getID()), sb.toString()));
-
- // Score gets split between all participants
- plot.getPlotOwner().addScore(plot.getSharedScore());
-
- for (Builder builder : plot.getPlotMembers()) {
- // Score gets split between all participants
- builder.addScore(plot.getSharedScore());
- builder.addCompletedBuild(1);
-
- // Remove Slot from Member
- builder.removePlot(builder.getSlot(plot));
- }
- }
- } else {
- if (!plot.getPlotMembers().isEmpty()) {
- // Plot was made alone
- reviewerConfirmationMessage = Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_REJECTED, Integer.toString(plot.getID()), plot.getPlotOwner().getName()));
- } else {
- // Plot was made in a group
- StringBuilder sb = new StringBuilder();
-
- for (int i = 0; i < plot.getPlotMembers().size(); i++) {
- sb.append(i == plot.getPlotMembers().size() - 1 ?
- plot.getPlotMembers().get(i).getName() :
- plot.getPlotMembers().get(i).getName() + ", ");
- }
- reviewerConfirmationMessage = Utils.ChatUtils.getInfoFormat(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Message.Info.PLOT_REJECTED, Integer.toString(plot.getID()), sb.toString()));
- }
-
- PlotUtils.Actions.undoSubmit(plot);
- }
-
- boolean finalIsRejected = isRejected;
- Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> {
- for (Player player : plot.getWorld().getBukkitWorld().getPlayers()) {
- player.teleport(Utils.getSpawnLocation());
- }
-
- // Delete plot world after reviewing
- try {
- if (!finalIsRejected && plot.getPlotType().hasOnePlotPerWorld())
- plot.getWorld().deleteWorld();
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
-
- clickPlayer.sendMessage(reviewerConfirmationMessage);
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.FINISH_PLOT_SOUND, 1f, 1f);
-
- try {
- ChatInput.awaitChatInput.put(clickPlayer.getUniqueId(),
- new PlayerFeedbackChatInput(clickPlayer.getUniqueId(), plot.getReview()));
- PlayerFeedbackChatInput.sendChatInputMessage(clickPlayer);
- } catch (SQLException ex) {PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);}
- });
-
- for (Builder member : plot.getPlotMembers()) {
- if (member.isOnline()) PlotUtils.ChatFormatting.sendFeedbackMessage(Collections.singletonList(plot), member.getPlayer());
- }
-
- if (plot.getPlotOwner().isOnline()) {
- PlotUtils.ChatFormatting.sendFeedbackMessage(Collections.singletonList(plot), plot.getPlotOwner().getPlayer());
- plot.getReview().setFeedbackSent(true);
- }
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- }
- });
- });
-
- // Set click event for point selection items
- for (int i = 0; i < 54; i++) {
- int slot = i;
-
- int column = (slot % 9) + 1;
- int row = (slot - (slot % 9)) / 9 + 1;
-
- ItemMeta meta = getMenu().getSlot(slot).getItem(getMenuPlayer()).getItemMeta();
-
- if (column > 2 && column < 9 && row > 1 && row < 6) {
- //Go through the whole points row
- getMenu().getSlot(i).setClickHandler((clickPlayer, clickInformation) -> {
- for (int j = 0; j < 6; j++) {
- if (!Objects.requireNonNull(getMenu().getSlot(slot - (column - 1) + j + 2).getItem(clickPlayer).getItemMeta()).hasEnchant(Enchantment.POWER)) continue;
-
- ItemStack itemPrevious = getMenu().getSlot(slot - (column - 1) + j + 2).getItem(clickPlayer);
- ItemMeta metaPrevious = itemPrevious.getItemMeta();
- assert metaPrevious != null;
- metaPrevious.removeEnchant(Enchantment.POWER);
- itemPrevious.setItemMeta(metaPrevious);
- getMenu().getSlot(slot - (column - 1) + j + 2).setItem(itemPrevious);
- }
-
- assert meta != null;
- meta.addEnchant(Enchantment.POWER, 1, true);
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
-
- ItemStack newItem = getMenu().getSlot(slot).getItem(clickPlayer);
- newItem.setItemMeta(meta);
- getMenu().getSlot(slot).setItem(newItem);
- sentWarning = false;
- });
- }
- }
- }
-
- @Override
- protected Mask getMask() {
- return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
- .pattern("101101101")
- .pattern("100000001")
- .pattern("100000001")
- .pattern("100000001")
- .pattern("100000001")
- .pattern("111010111")
- .build();
- }
-
- // --- Info Items ---
- private ItemStack getPlotInfoItem() {
- String plotOwner, city, country, difficulty;
- Player plotOwnerPlayer;
-
- try {
- plotOwner = plot.getPlotOwner().getName();
- city = plot.getCity().getName();
- country = plot.getCity().getCountry().getName();
- difficulty = plot.getDifficulty().name().charAt(0) + plot.getDifficulty().name().substring(1).toLowerCase();
-
- plotOwnerPlayer = plot.getPlotOwner().getPlayer();
- } catch (SQLException e) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), e);
- return MenuItems.errorItem(getMenuPlayer());
- }
-
-
- return new ItemBuilder(BaseItems.REVIEW_INFO_PLOT.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REVIEW_PLOT))
- .color(AQUA)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.ID) + ": ", GRAY).append(text(plot.getID(), WHITE)))
- .emptyLine()
- .addLines(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.OWNER) + ": ", GRAY).append(text(plotOwner, WHITE)),
- text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.CITY) + ": ", GRAY).append(text(city, WHITE)),
- text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.COUNTRY) + ": ", GRAY).append(text(country, WHITE)),
- text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Plot.DIFFICULTY) + ": ", GRAY).append(text(difficulty, WHITE)))
- .emptyLine()
- .addLine(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.PLAYER_LANGUAGE) + ": ", GRAY).append(text(LangUtil.getInstance().get(plotOwnerPlayer, "lang.name"), WHITE)))
- .build())
- .build();
- }
-
- private ItemStack getReviewInfoItem() {
- String points = LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS);
-
- return new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.INFO_BUTTON.getId()))
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.INFORMATION), AQUA).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLines(true, LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.INFORMATION))
- .emptyLine()
- .addLines(text(points + " <= 0: ", WHITE).append(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.ABANDONED), RED)),
- text(points + " <= 8: ", WHITE).append(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.REJECTED), YELLOW)),
- text(points + " > 8: ", WHITE).append(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.ACCEPTED), GREEN)))
- .build())
- .build();
- }
-
- // --- Category Items ---
- private ItemStack getAccuracyItem() {
- return new ItemBuilder(BaseItems.REVIEW_ACCURACY.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.ACCURACY))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLines(true, LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.ACCURACY_DESC))
- .build())
- .build();
- }
-
- private ItemStack getBlockPaletteItem() {
- return new ItemBuilder(BaseItems.REVIEW_BLOCK_PALETTE.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.BLOCK_PALETTE))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLines(true, LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.BLOCK_PALETTE_DESC))
- .build())
- .build();
- }
-
- private ItemStack getDetailingItem() {
- return new ItemBuilder(BaseItems.REVIEW_DETAILING.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.DETAILING))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLines(true, LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.DETAILING_DESC))
- .build())
- .build();
- }
-
- private ItemStack getTechniqueItem() {
- return new ItemBuilder(BaseItems.REVIEW_TECHNIQUE.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.TECHNIQUE))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLines(true, LangUtil.getInstance().get(getMenuPlayer(), LangPaths.Review.Criteria.TECHNIQUE_DESC))
- .build())
- .build();
- }
-
- // --- Button Items ---
- private ItemStack getSubmitItem() {
- return new ItemBuilder(BaseItems.REVIEW_SUBMIT.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SUBMIT))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SUBMIT_REVIEW), true)
- .build())
- .build();
- }
-
- private ItemStack getCancelItem() {
- return new ItemBuilder(BaseItems.REVIEW_CANCEL.getItem())
- .setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.CANCEL))
- .color(RED)
- .decoration(BOLD, true))
- .build();
- }
-
- // --- Point Items ---
- private ItemStack getZeroPointItem() {
- return new ItemBuilder(BaseItems.REVIEW_POINT_ZERO.getItem())
- .setName(text("0 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS))
- .color(GRAY)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-
- private ItemStack getOnePointItem() {
- return new ItemBuilder(BaseItems.REVIEW_POINT_ONE.getItem())
- .setName(text("1 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINT))
- .color(RED)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-
- private ItemStack getTwoPointItem() {
- ItemStack item = BaseItems.REVIEW_POINT_TWO.getItem();
- item.setAmount(2);
-
- return new ItemBuilder(item)
- .setName(text("2 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS))
- .color(GOLD)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-
- private ItemStack getThreePointItem() {
- ItemStack item = BaseItems.REVIEW_POINT_THREE.getItem();
- item.setAmount(3);
-
- return new ItemBuilder(item)
- .setName(text("3 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS))
- .color(YELLOW)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-
- private ItemStack getFourPointItem() {
- ItemStack item = BaseItems.REVIEW_POINT_FOUR.getItem();
- item.setAmount(4);
-
- return new ItemBuilder(item)
- .setName(text("4 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS))
- .color(DARK_GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-
- private ItemStack getFivePointItem() {
- ItemStack item = BaseItems.REVIEW_POINT_FIVE.getItem();
- item.setAmount(5);
-
- return new ItemBuilder(item)
- .setName(text("5 " + LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.REVIEW_POINTS))
- .color(GREEN)
- .decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.REVIEW_POINTS))
- .build())
- .build();
- }
-}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/SettingsMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/SettingsMenu.java
index 707d08784..546d61285 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/SettingsMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/SettingsMenu.java
@@ -1,50 +1,24 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
-import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
+import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
+import com.alpsbte.plotsystem.utils.items.BaseItems;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
import java.util.function.Consumer;
-import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class SettingsMenu extends AbstractMenu {
- private Consumer onBack = (player) -> player.performCommand("companion");
+ private Consumer onBack = player -> player.performCommand("companion");
public SettingsMenu(Player player) {
super(3, LangUtil.getInstance().get(player, LangPaths.MenuTitle.SETTINGS), player);
@@ -59,7 +33,7 @@ public SettingsMenu(Player player, Consumer onBack) {
protected void setMenuItemsAsync() {
// Set language item
getMenu().getSlot(11).setItem(
- new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.GLOBE_HEAD.getId()))
+ new ItemBuilder(BaseItems.LANGUAGE_ITEM.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SELECT_LANGUAGE), GOLD, BOLD))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_LANGUAGE))
@@ -68,7 +42,7 @@ protected void setMenuItemsAsync() {
// Set Plot type item
getMenu().getSlot(15).setItem(
- new ItemBuilder(AlpsHeadUtils.getCustomHead(CustomHeads.PLOT_TYPE_BUTTON.getId()))
+ new ItemBuilder(BaseItems.PLOT_TYPE.getItem())
.setName(text(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuTitle.SELECT_PLOT_TYPE), GOLD, BOLD))
.setLore(new LoreBuilder()
.addLine(LangUtil.getInstance().get(getMenuPlayer(), LangPaths.MenuDescription.SELECT_PLOT_TYPE))
@@ -94,9 +68,9 @@ protected void setItemClickEventsAsync() {
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build())
- .pattern("111111111")
- .pattern("000000000")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/SpecialToolsMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/SpecialToolsMenu.java
index 7b1f788e7..0db6c7885 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/SpecialToolsMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/SpecialToolsMenu.java
@@ -1,35 +1,11 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2023, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
+import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import net.kyori.adventure.text.Component;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
@@ -73,9 +49,9 @@ protected void setItemClickEventsAsync() {
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
- .pattern("111111111")
- .pattern("000000000")
+ .item(Utils.DEFAULT_ITEM)
+ .pattern(Utils.FULL_MASK)
+ .pattern(Utils.EMPTY_MASK)
.pattern("111101111")
.build();
}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CityProjectMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CityProjectMenu.java
index 803c40edf..e9ab62abc 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CityProjectMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CityProjectMenu.java
@@ -1,31 +1,7 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2025, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus.companion;
-import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.menus.AbstractPaginatedMenu;
import com.alpsbte.plotsystem.core.menus.tutorial.TutorialsMenu;
import com.alpsbte.plotsystem.core.system.Builder;
@@ -40,14 +16,12 @@
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
-import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@@ -58,7 +32,7 @@ public class CityProjectMenu extends AbstractPaginatedMenu {
private PlotDifficulty selectedPlotDifficulty;
CityProjectMenu(Player player, @NotNull Country country, PlotDifficulty selectedPlotDifficulty) {
- super(6, 4, country.getName() + " → " + LangUtil.getInstance().get(player, LangPaths.MenuTitle.COMPANION_SELECT_CITY), player);
+ super(6, 4, country.getName(player) + " → " + LangUtil.getInstance().get(player, LangPaths.MenuTitle.COMPANION_SELECT_CITY), player);
this.country = country;
this.selectedPlotDifficulty = selectedPlotDifficulty;
}
@@ -68,31 +42,25 @@ protected void setPreviewItems() {
getMenu().getSlot(0).setItem(MenuItems.getRandomItem(getMenuPlayer())); // Set random selection item
getMenu().getSlot(1).setItem(MenuItems.backMenuItem(getMenuPlayer()));
- for (Map.Entry entry : CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, country.getContinent())).entrySet()) {
- getMenu().getSlot(entry.getKey()).setItem(entry.getValue().item);
- }
+ Map footerItems = CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, country.getContinent()));
+ footerItems.forEach((index, footerItem) -> getMenu().getSlot(index).setItem(footerItem.item()));
// Set loading item for plots difficulty item
getMenu().getSlot(6).setItem(CompanionMenu.getDifficultyItem(getMenuPlayer(), selectedPlotDifficulty));
// Set tutorial item
getMenu().getSlot(7).setItem(PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.TUTORIAL_ENABLE) ?
- TutorialsMenu.getTutorialItem(getMenuPlayer()) : new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build());
+ TutorialsMenu.getTutorialItem(getMenuPlayer()) : Utils.DEFAULT_ITEM);
// Set previous page item
- if (hasPreviousPage())
- getMenu().getSlot(45).setItem(MenuItems.previousPageItem(getMenuPlayer()));
+ getMenu().getSlot(45).setItem(hasPreviousPage() ? MenuItems.previousPageItem(getMenuPlayer()) : Utils.DEFAULT_ITEM);
// Set next page item
- if (hasNextPage())
- getMenu().getSlot(53).setItem(MenuItems.nextPageItem(getMenuPlayer()));
+ getMenu().getSlot(53).setItem(hasNextPage() ? MenuItems.nextPageItem(getMenuPlayer()) : Utils.DEFAULT_ITEM);
super.setPreviewItems();
}
- @Override
- protected void setMenuItemsAsync() {}
-
@Override
protected void setItemClickEventsAsync() {
getMenu().getSlot(0).setClickHandler((clickPlayer, clickInformation) ->
@@ -101,24 +69,24 @@ protected void setItemClickEventsAsync() {
getMenu().getSlot(1).setClickHandler((clickPlayer, clickInformation) -> new CountryMenu(clickPlayer, country.getContinent(), selectedPlotDifficulty));
// Set click event for previous page item
- getMenu().getSlot(45).setClickHandler((clickPlayer, clickInformation) -> {
- if (hasPreviousPage()) {
+ if (hasPreviousPage()) {
+ getMenu().getSlot(45).setClickHandler((clickPlayer, clickInformation) -> {
previousPage();
clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
- }
- });
+ });
+ }
// Set click event for next page item
- getMenu().getSlot(53).setClickHandler((clickPlayer, clickInformation) -> {
- if (!hasNextPage()) return;
- nextPage();
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
- });
-
- for (Map.Entry entry : CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, country.getContinent())).entrySet()) {
- getMenu().getSlot(entry.getKey()).setClickHandler(entry.getValue().clickHandler);
+ if (hasNextPage()) {
+ getMenu().getSlot(53).setClickHandler((clickPlayer, clickInformation) -> {
+ nextPage();
+ clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.INVENTORY_CLICK_SOUND, 1, 1);
+ });
}
+ Map footerItems = CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, country.getContinent()));
+ footerItems.forEach((index, footerItem) -> getMenu().getSlot(index).setClickHandler(footerItem.clickHandler()));
+
// Set click event for plots difficulty item
getMenu().getSlot(6).setClickHandler(((clickPlayer, clickInformation) -> {
selectedPlotDifficulty = CompanionMenu.clickEventPlotDifficulty(selectedPlotDifficulty, clickPlayer, getMenu());
@@ -134,14 +102,16 @@ public static boolean generateRandomPlot(Player player, @NotNull List getValidCityProjects(PlotDifficulty selectedPlotDifficulty, Player player, Country country) {
- return CityProject.getCityProjects(country, true).stream().filter(test -> {
- if (test instanceof CityProject project) {
- var pd = selectedPlotDifficulty;
- try {
- if (pd == null) pd = Plot.getPlotDifficultyForBuilder(project.getID(), Builder.byUUID(player.getUniqueId())).get();
- if (pd == null) pd = PlotDifficulty.EASY;
- return project.isVisible() && project.getOpenPlotsForPlayer(project.getID(), pd) > 0;
- } catch (SQLException | ExecutionException | InterruptedException e) {
- sqlError(player, e);
- }
- } else {
- return false;
+ public static @NotNull @Unmodifiable List getValidCityProjects(PlotDifficulty selectedPlotDifficulty, Player player, @NotNull Country country) {
+ return DataProvider.CITY_PROJECT.getByCountryCode(country.getCode(), true).stream().filter(test -> {
+ if (!(test instanceof CityProject project)) return false;
+ var pd = selectedPlotDifficulty;
+ try {
+ if (pd == null) pd = Plot.getPlotDifficultyForBuilder(project, Builder.byUUID(player.getUniqueId())).get();
+ if (pd == null) pd = PlotDifficulty.EASY;
+
+ return project.isVisible() && !DataProvider.PLOT.getPlots(project, pd, Status.unclaimed).isEmpty();
+ } catch (ExecutionException | InterruptedException e) {
+ sqlError(player, e);
}
return false;
}).toList();
@@ -170,7 +138,7 @@ public static List getValidCityProjects(PlotDifficulty selectedPlot
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
+ .item(Utils.DEFAULT_ITEM)
.pattern("001111001")
.pattern(Utils.EMPTY_MASK)
.pattern(Utils.EMPTY_MASK)
@@ -182,7 +150,7 @@ protected Mask getMask() {
@Override
protected List getSource() {
- if (projects == null) projects = CityProject.getCityProjects(country, true);
+ if (projects == null) projects = DataProvider.CITY_PROJECT.getByCountryCode(country.getCode(), true);
return projects;
}
@@ -191,12 +159,7 @@ protected void setPaginatedMenuItemsAsync(@NotNull List source) {
List cities = source.stream().map(l -> (CityProject) l).toList();
int slot = 9;
for (CityProject city : cities) {
- try {
- getMenu().getSlot(slot).setItem(city.getItem(getMenuPlayer(), selectedPlotDifficulty));
- } catch (SQLException e) {
- Utils.logSqlException(e);
- getMenu().getSlot(slot).setItem(MenuItems.errorItem(getMenuPlayer()));
- }
+ getMenu().getSlot(slot).setItem(city.getItem(getMenuPlayer(), selectedPlotDifficulty));
slot++;
}
}
@@ -215,24 +178,24 @@ protected void setPaginatedItemClickEventsAsync(@NotNull List source) {
clickPlayer.closeInventory();
Builder builder = Builder.byUUID(clickPlayer.getUniqueId());
- int cityID = city.getID();
try {
- PlotDifficulty plotDifficultyForCity = selectedPlotDifficulty != null ? selectedPlotDifficulty : Plot.getPlotDifficultyForBuilder(cityID, builder).get();
- if (plotDifficultyForCity == null || Plot.getPlots(cityID, plotDifficultyForCity, Status.unclaimed).isEmpty()) {
+ PlotDifficulty plotDifficultyForCity = selectedPlotDifficulty != null ? selectedPlotDifficulty : Plot.getPlotDifficultyForBuilder(city, builder).get();
+ List unclaimedPlots = DataProvider.PLOT.getPlots(city, plotDifficultyForCity, Status.unclaimed);
+ if (unclaimedPlots.isEmpty()) {
clickPlayer.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(clickPlayer, LangPaths.Message.Error.NO_PLOTS_LEFT)));
clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.ERROR_SOUND, 1, 1);
return;
}
- if (selectedPlotDifficulty != null && PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.ENABLE_SCORE_REQUIREMENT) && !Plot.hasPlotDifficultyScoreRequirement(builder, selectedPlotDifficulty)) {
+ if (selectedPlotDifficulty != null && PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.ENABLE_SCORE_REQUIREMENT) && !DataProvider.DIFFICULTY.builderMeetsRequirements(builder, selectedPlotDifficulty)) {
clickPlayer.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(clickPlayer, LangPaths.Message.Error.PLAYER_NEEDS_HIGHER_SCORE)));
clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.ERROR_SOUND, 1, 1);
return;
}
- new DefaultPlotGenerator(cityID, plotDifficultyForCity, builder);
- } catch (SQLException | ExecutionException | InterruptedException ex) {
+ new DefaultPlotGenerator(city, plotDifficultyForCity, builder);
+ } catch (ExecutionException | InterruptedException ex) {
sqlError(clickPlayer, ex);
}
});
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CompanionMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CompanionMenu.java
index d950def03..72d40fa5b 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CompanionMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CompanionMenu.java
@@ -1,40 +1,16 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2025, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus.companion;
-import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.menus.BuilderUtilitiesMenu;
import com.alpsbte.plotsystem.core.menus.PlayerPlotsMenu;
import com.alpsbte.plotsystem.core.menus.PlotActionsMenu;
import com.alpsbte.plotsystem.core.menus.SettingsMenu;
import com.alpsbte.plotsystem.core.menus.tutorial.TutorialsMenu;
import com.alpsbte.plotsystem.core.system.Builder;
-import com.alpsbte.plotsystem.core.system.Country;
+import com.alpsbte.plotsystem.core.system.Difficulty;
import com.alpsbte.plotsystem.core.system.plot.Plot;
import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.enums.Continent;
@@ -44,13 +20,14 @@
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import com.alpsbte.plotsystem.utils.items.BaseItems;
-import com.alpsbte.plotsystem.utils.items.CustomHeads;
import com.alpsbte.plotsystem.utils.items.MenuItems;
+import net.kyori.adventure.text.TextComponent;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.ipvp.canvas.Menu;
+import org.jetbrains.annotations.NotNull;
-import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -59,13 +36,18 @@
import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class CompanionMenu {
- private CompanionMenu() {}
+ private CompanionMenu() {throw new IllegalStateException("Utility class");}
+
public static boolean hasContinentView() {
- return Arrays.stream(Continent.values()).map(continent -> Country.getCountries(continent).size()).filter(count -> count > 0).count() > 1;
+ // TODO: make this run async
+ return Arrays.stream(Continent.values()).map(continent -> DataProvider.COUNTRY.getCountriesByContinent(continent).size()).filter(count -> count > 0).count() > 1;
}
/**
@@ -77,7 +59,8 @@ public static void open(Player player) {
if (hasContinentView()) {
new ContinentMenu(player);
} else {
- Optional continent = Arrays.stream(Continent.values()).filter(c -> !Country.getCountries(c).isEmpty()).findFirst();
+ // TODO: make this run async
+ Optional continent = Arrays.stream(Continent.values()).filter(c -> !DataProvider.COUNTRY.getCountriesByContinent(c).isEmpty()).findFirst();
if (continent.isEmpty()) {
player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(player, LangPaths.Message.Error.ERROR_OCCURRED)));
@@ -96,7 +79,7 @@ public static void open(Player player) {
* @param returnToMenu a lambda to call when needing to return to current menu
* @return FooterItems indexed by slot number
*/
- public static Map getFooterItems(int startingSlot, Player player, Consumer returnToMenu) {
+ public static @NotNull Map getFooterItems(int startingSlot, Player player, Consumer returnToMenu) {
HashMap items = new HashMap<>();
// Set builder utilities menu item
items.put(startingSlot + 5, new FooterItem(BuilderUtilitiesMenu.getMenuItem(player), (clickPlayer, clickInformation) -> new BuilderUtilitiesMenu(clickPlayer)));
@@ -116,18 +99,13 @@ public static Map getFooterItems(int startingSlot, Player p
final int i_ = i;
- Plot plot = builder.getPlot(Slot.values()[i]);
- items.put(startingSlot + 1 + i, new FooterItem(builder.getPlotMenuItem(plot, Slot.values()[i].ordinal(), player), (clickPlayer, clickInformation) -> {
+ Plot plot = builder.getSlot(Slot.values()[i]);
+ ItemStack slotItem = getPlotMenuItem(plot, i, player);
+ items.put(startingSlot + 1 + i, new FooterItem(slotItem, (clickPlayer, clickInformation) -> {
if (plot == null) return;
- try {
- new PlotActionsMenu(clickPlayer, builder.getPlot(Slot.values()[i_]));
- } catch (SQLException ex) {
- clickPlayer.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(clickPlayer, LangPaths.Message.Error.ERROR_OCCURRED)));
- clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.ERROR_SOUND, 1, 1);
- PlotSystem.getPlugin().getComponentLogger().error(text("An error occurred while opening the plot actions menu!"), ex);
- }
+ new PlotActionsMenu(clickPlayer, builder.getSlot(Slot.values()[i_]));
}));
- } catch (NullPointerException | SQLException ex) {
+ } catch (NullPointerException ex) {
PlotSystem.getPlugin().getComponentLogger().error(text("An error occurred while placing player slot items!"), ex);
items.put(startingSlot + 1 + i, new FooterItem(MenuItems.errorItem(player)));
}
@@ -142,31 +120,32 @@ public static ItemStack getDifficultyItem(Player player, PlotDifficulty selected
if (selectedPlotDifficulty != null) {
switch (selectedPlotDifficulty) {
case EASY:
- item = AlpsHeadUtils.getCustomHead(CustomHeads.GREEN_CONCRETE.getId()); break;
+ item = BaseItems.DIFFICULTY_EASY.getItem(); break;
case MEDIUM:
- item = AlpsHeadUtils.getCustomHead(CustomHeads.YELLOW_CONCRETE.getId()); break;
+ item = BaseItems.DIFFICULTY_MEDIUM.getItem(); break;
case HARD:
- item = AlpsHeadUtils.getCustomHead(CustomHeads.RED_CONCRETE.getId()); break;
+ item = BaseItems.DIFFICULTY_HARD.getItem(); break;
default:
break;
}
- } else item = AlpsHeadUtils.getCustomHead(CustomHeads.WHITE_CONCRETE.getId());
-
- try {
- return new ItemBuilder(item)
- .setName(text(LangUtil.getInstance().get(player, LangPaths.MenuTitle.PLOT_DIFFICULTY), AQUA).decoration(BOLD, true))
- .setLore(new LoreBuilder()
- .emptyLine()
- .addLines(selectedPlotDifficulty != null ? Utils.ItemUtils.getFormattedDifficulty(selectedPlotDifficulty) : text(LangUtil.getInstance().get(player, LangPaths.Difficulty.AUTOMATIC), WHITE).decoration(BOLD, true),
- selectedPlotDifficulty != null ? text(LangUtil.getInstance().get(player, LangPaths.Difficulty.SCORE_MULTIPLIER) + ": ", GRAY).append(text("x" + Plot.getMultiplierByDifficulty(selectedPlotDifficulty), WHITE)) : empty())
- .emptyLine()
- .addLine(text(LangUtil.getInstance().get(player, LangPaths.MenuDescription.PLOT_DIFFICULTY), GRAY))
- .build())
- .build();
- } catch (SQLException ex) {
- PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
- return MenuItems.errorItem(player);
+ } else item = BaseItems.DIFFICULTY_AUTOMATIC.getItem();
+
+ Optional difficulty = DataProvider.DIFFICULTY.getDifficultyByEnum(selectedPlotDifficulty);
+ if (difficulty.isEmpty() && selectedPlotDifficulty != null) {
+ PlotSystem.getPlugin().getComponentLogger().error(text("No database entry for difficulty " + selectedPlotDifficulty.name() + " was found!"));
}
+ double scoreMultiplier = difficulty.map(Difficulty::getMultiplier).orElse(0.0);
+
+ return new ItemBuilder(item)
+ .setName(text(LangUtil.getInstance().get(player, LangPaths.MenuTitle.PLOT_DIFFICULTY), AQUA).decoration(BOLD, true))
+ .setLore(new LoreBuilder()
+ .emptyLine()
+ .addLines(selectedPlotDifficulty != null ? Utils.ItemUtils.getFormattedDifficulty(selectedPlotDifficulty, player) : text(LangUtil.getInstance().get(player, LangPaths.Difficulty.AUTOMATIC), WHITE).decoration(BOLD, true),
+ selectedPlotDifficulty != null ? text(LangUtil.getInstance().get(player, LangPaths.Difficulty.SCORE_MULTIPLIER) + ": ", GRAY).append(text("x" + scoreMultiplier, WHITE)) : empty())
+ .emptyLine()
+ .addLine(text(LangUtil.getInstance().get(player, LangPaths.MenuDescription.PLOT_DIFFICULTY), GRAY))
+ .build())
+ .build();
}
/**
@@ -208,18 +187,38 @@ public static void clickEventTutorialItem(Menu menu) {
});
}
- public static class FooterItem {
- public final ItemStack item;
- public final org.ipvp.canvas.slot.Slot.ClickHandler clickHandler;
+ public static ItemStack getPlotMenuItem(Plot plot, int slotIndex, Player langPlayer) {
+ String nameText = LangUtil.getInstance().get(langPlayer, LangPaths.MenuTitle.SLOT).toUpperCase() + " " + (slotIndex + 1);
+ ItemStack baseItem = plot == null ? BaseItems.PLOT_SLOT_EMPTY.getItem().clone() : BaseItems.PLOT_SLOT_FILLED.getItem().clone();
+ baseItem.setAmount(1 + slotIndex);
+ ArrayList lore;
- FooterItem(ItemStack item, org.ipvp.canvas.slot.Slot.ClickHandler clickHandler) {
- this.item = item;
- this.clickHandler = clickHandler;
+ if (plot == null) {
+ TextComponent slotDescriptionComp = text(LangUtil.getInstance().get(langPlayer, LangPaths.MenuDescription.SLOT), GRAY);
+ lore = new LoreBuilder()
+ .addLine(slotDescriptionComp)
+ .build();
+ } else {
+ String plotIdText = LangUtil.getInstance().get(langPlayer, LangPaths.Plot.ID);
+ String plotCityText = LangUtil.getInstance().get(langPlayer, LangPaths.Plot.CITY);
+ String plotDifficultyText = LangUtil.getInstance().get(langPlayer, LangPaths.Plot.DIFFICULTY);
+ String statusText = LangUtil.getInstance().get(langPlayer, LangPaths.Database.STATUS + "." + plot.getStatus().name() + ".name");
+
+ TextComponent statusComp = text(LangUtil.getInstance().get(langPlayer, LangPaths.Plot.STATUS) + ": ", GOLD)
+ .decoration(BOLD, true)
+ .append(text(statusText, GRAY));
+ lore = new LoreBuilder()
+ .addLines(text(plotIdText + ": ", GRAY).append(text(plot.getId(), WHITE)),
+ text(plotCityText + ": ", GRAY).append(text(plot.getCityProject().getName(langPlayer), WHITE)),
+ text(plotDifficultyText + ": ", GRAY).append(text(plot.getDifficulty().name().charAt(0) + plot.getDifficulty().name().substring(1).toLowerCase(), WHITE)),
+ empty(),
+ statusComp)
+ .build();
}
- FooterItem(ItemStack item) {
- this.item = item;
- this.clickHandler = null;
- }
+ return new ItemBuilder(baseItem)
+ .setName(text(nameText, GOLD).decoration(BOLD, true))
+ .setLore(lore)
+ .build();
}
}
\ No newline at end of file
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/ContinentMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/ContinentMenu.java
index 9ab39aa10..381dbe734 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/ContinentMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/ContinentMenu.java
@@ -1,39 +1,12 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2025, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus.companion;
-import com.alpsbte.alpslib.utils.item.ItemBuilder;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.menus.AbstractMenu;
-import com.alpsbte.plotsystem.core.system.Country;
import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.enums.Continent;
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
@@ -60,9 +33,8 @@ public class ContinentMenu extends AbstractMenu {
protected void setPreviewItems() {
getMenu().getSlot(0).setItem(MenuItems.getRandomItem(getMenuPlayer())); // Set random selection item
- for (Map.Entry entry : CompanionMenu.getFooterItems(9 * 4, getMenuPlayer(), ContinentMenu::new).entrySet()) {
- getMenu().getSlot(entry.getKey()).setItem(entry.getValue().item);
- }
+ Map footerItems = CompanionMenu.getFooterItems(9 * 4, getMenuPlayer(), ContinentMenu::new);
+ footerItems.forEach((index, footerItem) -> getMenu().getSlot(index).setItem(footerItem.item()));
super.setPreviewItems();
}
@@ -79,7 +51,7 @@ protected void setItemClickEventsAsync() {
List layout2 = new java.util.ArrayList<>(layout.values().stream().toList());
while (!layout2.isEmpty()) {
var rndContinent = layout2.get(Utils.getRandom().nextInt(layout2.size()));
- var successful = CountryMenu.generateRandomPlot(clickPlayer, Country.getCountries(rndContinent), null);
+ var successful = CountryMenu.generateRandomPlot(clickPlayer, DataProvider.COUNTRY.getCountriesByContinent(rndContinent), null);
if (successful) {
return;
} else {
@@ -92,19 +64,18 @@ protected void setItemClickEventsAsync() {
getMenu().getSlot(continent.getKey()).setClickHandler((clickPlayer, clickInfo) -> new CountryMenu(clickPlayer, continent.getValue()));
}
- for (Map.Entry entry : CompanionMenu.getFooterItems(9 * 4, getMenuPlayer(), ContinentMenu::new).entrySet()) {
- getMenu().getSlot(entry.getKey()).setClickHandler(entry.getValue().clickHandler);
- }
+ Map footerItems = CompanionMenu.getFooterItems(9 * 4, getMenuPlayer(), ContinentMenu::new);
+ footerItems.forEach((index, footerItem) -> getMenu().getSlot(index).setClickHandler(footerItem.clickHandler()));
}
@Override
protected Mask getMask() {
return BinaryMask.builder(getMenu())
- .item(new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(Component.empty()).build())
+ .item(Utils.DEFAULT_ITEM)
.pattern("011111111")
.pattern("010101010")
.pattern("111101111")
- .pattern("111111111")
+ .pattern(Utils.FULL_MASK)
.pattern("100010001")
.build();
}
diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CountryMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CountryMenu.java
index 4dab2b33a..91e500a78 100644
--- a/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CountryMenu.java
+++ b/src/main/java/com/alpsbte/plotsystem/core/menus/companion/CountryMenu.java
@@ -1,37 +1,13 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright © 2025, Alps BTE
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
package com.alpsbte.plotsystem.core.menus.companion;
import com.alpsbte.alpslib.utils.item.ItemBuilder;
import com.alpsbte.alpslib.utils.item.LoreBuilder;
import com.alpsbte.plotsystem.PlotSystem;
+import com.alpsbte.plotsystem.core.database.DataProvider;
import com.alpsbte.plotsystem.core.menus.AbstractMenu;
import com.alpsbte.plotsystem.core.menus.tutorial.TutorialsMenu;
import com.alpsbte.plotsystem.core.system.CityProject;
import com.alpsbte.plotsystem.core.system.Country;
-import com.alpsbte.plotsystem.core.system.plot.Plot;
import com.alpsbte.plotsystem.utils.Utils;
import com.alpsbte.plotsystem.utils.enums.Continent;
import com.alpsbte.plotsystem.utils.enums.PlotDifficulty;
@@ -40,27 +16,29 @@
import com.alpsbte.plotsystem.utils.io.LangPaths;
import com.alpsbte.plotsystem.utils.io.LangUtil;
import com.alpsbte.plotsystem.utils.items.MenuItems;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.ipvp.canvas.mask.BinaryMask;
import org.ipvp.canvas.mask.Mask;
import org.jetbrains.annotations.NotNull;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import static net.kyori.adventure.text.Component.empty;
import static net.kyori.adventure.text.Component.text;
-import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
+import static net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
import static net.kyori.adventure.text.format.TextDecoration.BOLD;
public class CountryMenu extends AbstractMenu {
private List countryProjects;
private final Continent selectedContinent;
- private PlotDifficulty selectedPlotDifficulty = null;
+ private PlotDifficulty selectedPlotDifficulty = PlotDifficulty.EASY;
CountryMenu(Player player, @NotNull Continent continent) {
super(6, LangUtil.getInstance().get(player, continent.langPath) + " → " + LangUtil.getInstance().get(player, LangPaths.MenuTitle.COMPANION_SELECT_COUNTRY), player);
@@ -81,11 +59,10 @@ protected void setPreviewItems() {
// Set tutorial item
getMenu().getSlot(7).setItem(PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.TUTORIAL_ENABLE) ?
- TutorialsMenu.getTutorialItem(getMenuPlayer()) : new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE, 1).setName(empty()).build());
+ TutorialsMenu.getTutorialItem(getMenuPlayer()) : Utils.DEFAULT_ITEM);
- for (Map.Entry entry : CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, selectedContinent)).entrySet()) {
- getMenu().getSlot(entry.getKey()).setItem(entry.getValue().item);
- }
+ Map footerItems = CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, selectedContinent));
+ footerItems.forEach((index, footerItem) -> getMenu().getSlot(index).setItem(footerItem.item()));
super.setPreviewItems();
}
@@ -93,10 +70,8 @@ protected void setPreviewItems() {
@Override
protected void setMenuItemsAsync() {
// Set city project items
- try {
- countryProjects = Country.getCountries(selectedContinent);
- setCountryItems();
- } catch (SQLException ex) {Utils.logSqlException(ex);}
+ countryProjects = DataProvider.COUNTRY.getCountriesByContinent(selectedContinent);
+ setCountryItems();
}
@Override
@@ -106,10 +81,14 @@ protected void setItemClickEventsAsync() {
// Set click event for plots difficulty item
getMenu().getSlot(6).setClickHandler((clickPlayer, clickInformation) -> {
- selectedPlotDifficulty = CompanionMenu.clickEventPlotDifficulty(selectedPlotDifficulty, clickPlayer, getMenu());
- try {
- setCountryItems();
- } catch (SQLException ex) {Utils.logSqlException(ex);}
+ selectedPlotDifficulty = (selectedPlotDifficulty == null ?
+ PlotDifficulty.values()[0] : selectedPlotDifficulty.ordinal() != PlotDifficulty.values().length - 1 ?
+ PlotDifficulty.values()[selectedPlotDifficulty.ordinal() + 1] : null);
+
+ getMenu().getSlot(6).setItem(CompanionMenu.getDifficultyItem(getMenuPlayer(), selectedPlotDifficulty));
+ clickPlayer.playSound(clickPlayer.getLocation(), Utils.SoundUtils.DONE_SOUND, 1, 1);
+
+ setCountryItems();
});
CompanionMenu.clickEventTutorialItem(getMenu());
@@ -124,9 +103,8 @@ protected void setItemClickEventsAsync() {
getMenu().getSlot(startingSlot + i).setClickHandler((clickPlayer, clickInformation) -> new CityProjectMenu(clickPlayer, country, selectedPlotDifficulty));
}
- for (Map.Entry entry : CompanionMenu.getFooterItems(45, getMenuPlayer(), player -> new CountryMenu(player, selectedContinent)).entrySet()) {
- getMenu().getSlot(entry.getKey()).setClickHandler(entry.getValue().clickHandler);
- }
+ Map
+ 
- 
-
-
# About The Project
The Plot System is an essential part of any BuildTheEarth server system,
meant to run alongside the classic Terra servers to make participating a lot easier
@@ -49,15 +48,23 @@ The plugin is mostly developed by the Alps-BTE team and is intended for everyone
If you have any questions regarding the setup or contribution, please do not hesitate to contact us.
All used Libraries and APIs are listed below.
+
# Features
## Plot Types
-The focus mode is the old well-known mode that was also used by default before the release of v3.0. Build your plot on a floating island in an empty void world. Simple and straightforward, like in the good old days.
+
+The focus mode is the old well-known mode that was also used by default before the release of v3.0. Build your plot on a
+floating island in an empty void world. Simple and straightforward, like in the good old days.
-
## Other Features
-✔️ Support for **multiple cities** as well as for **continents** and **countries/states**