Skip to content

1.7.1 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
george112n wants to merge 11 commits into
base: main
Choose a base branch
from
Open

1.7.1 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a1f648d
Working on new features:
LM-Wolfert May 5, 2025
f4d2c05
Added /plotsystem update location [name] <xmin> <ymin> <zmin> <xmax> …
LM-Wolfert May 10, 2025
24ce454
Record create and update location to share part of the code as it use…
LM-Wolfert May 10, 2025
fd840ea
Before deleting a location make sure there are no players in that world.
LM-Wolfert May 10, 2025
39bd41a
Update outlines when changing plot difficulty, fix bug with location …
LM-Wolfert May 15, 2025
b8dec3f
Don't allow the update location to make the location smaller.
LM-Wolfert May 24, 2025
5d3bf1f
Don't allow plots to be under review or under verification on server …
LM-Wolfert Jun 12, 2025
45ff505
Merge remote-tracking branch 'refs/remotes/origin/release/1.7.1' into…
Jun 22, 2025
570ec51
Merge pull request #12 from BTEUK/feature/recommended-tutorials
george112n Jun 22, 2025
4556ae0
Merge branch 'develop' into release/1.7.1
LM-Wolfert Jun 22, 2025
d502cbd
Merge pull request #10 from BTEUK/release/1.7.1
LM-Wolfert Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>com.github.BTEUK</groupId>
<artifactId>Network</artifactId>
<version>c8a9ff8b97</version>
<version>e05f892a0e</version>
<scope>provided</scope>
</dependency>

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/net/bteuk/plotsystem/PlotSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,8 @@ public void enablePlugin() {
// Create list of users.
users = new ArrayList<>();

// Remove all plots 'under review' on this server.
plotSQL.update(
"UPDATE plot_data AS pd INNER JOIN location_data AS ld ON ld.name=pd.location SET pd.status='submitted' WHERE pd.status='reviewing' AND ld.server='" + SERVER_NAME + "';");
plotSQL.update("UPDATE plot_submission AS ps INNER JOIN plot_data AS pd ON ps.plot_id=pd.id SET ps.status='submitted' WHERE ps.status='under review' AND pd.location IN (SELECT name FROM location_data WHERE server='" + SERVER_NAME + "');");
plotSQL.update("UPDATE plot_submission AS ps INNER JOIN plot_data AS pd ON ps.plot_id=pd.id SET ps.status='awaiting verification' WHERE ps.status='under verification' AND pd.location IN (SELECT name FROM location_data WHERE server='" + SERVER_NAME + "');");

// Create gui item
gui = new ItemStack(Material.NETHER_STAR);
Expand Down Expand Up @@ -188,7 +187,7 @@ public void enablePlugin() {

// Get all active plots (unclaimed, claimed, submitted, reviewing) and add holograms.
List<Integer> active_plots = plotSQL.getIntList(
"SELECT pd.id FROM plot_data AS pd INNER JOIN location_data AS ld ON ld.name=pd.location WHERE pd.status IN ('unclaimed','claimed','submitted','reviewing') AND " +
"SELECT pd.id FROM plot_data AS pd INNER JOIN location_data AS ld ON ld.name=pd.location WHERE pd.status IN ('unclaimed','claimed','submitted') AND " +
"ld.server='" + SERVER_NAME + "';");
active_plots.forEach(plot -> PlotHelper.addPlotHologram(new PlotHologram(plot)));
}
Expand Down
284 changes: 9 additions & 275 deletions src/main/java/net/bteuk/plotsystem/commands/CreateCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,23 @@
package net.bteuk.plotsystem.commands;

import com.sk89q.worldedit.math.BlockVector3;
import net.bteuk.network.Network;
import net.bteuk.network.eventing.events.EventManager;
import net.bteuk.network.lib.utils.ChatUtils;
import net.bteuk.network.sql.GlobalSQL;
import net.bteuk.network.sql.PlotSQL;
import net.bteuk.network.utils.NetworkUser;
import net.bteuk.plotsystem.PlotSystem;
import net.bteuk.plotsystem.gui.CreatePlotGui;
import net.bteuk.plotsystem.gui.CreateZoneGui;
import net.bteuk.plotsystem.utils.CopyRegionFormat;
import net.bteuk.plotsystem.utils.User;
import net.bteuk.plotsystem.utils.plugins.Multiverse;
import net.bteuk.plotsystem.utils.plugins.WorldEditor;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;

import static java.lang.Math.max;
import static java.lang.Math.min;
import static net.bteuk.network.utils.Constants.MAX_Y;
import static net.bteuk.network.utils.Constants.MIN_Y;
import static net.bteuk.plotsystem.PlotSystem.LOGGER;

public class CreateCommand {

private final GlobalSQL globalSQL;
private final PlotSQL plotSQL;

public CreateCommand(GlobalSQL globalSQL, PlotSQL plotSQL) {

this.globalSQL = globalSQL;
this.plotSQL = plotSQL;
public final class CreateCommand {

private CreateCommand() {
// Do nothing
}

public void create(CommandSender sender, String[] args) {
public static void create(CommandSender sender, String[] args) {

if (args.length < 2) {

Expand All @@ -54,14 +28,14 @@ public void create(CommandSender sender, String[] args) {

switch (args[1]) {
case "plot" -> createPlot(sender);
case "location" -> createLocation(sender, args);
case "location" -> LocationCommand.createLocation(sender, args);
case "zone" -> createZone(sender);
default -> sender.sendMessage(ChatUtils.error("/plotsystem create [plot, location, zone]"));
}

}

private void createPlot(CommandSender sender) {
private static void createPlot(CommandSender sender) {

// Check if the sender is a player
if (!(sender instanceof Player)) {
Expand Down Expand Up @@ -104,249 +78,7 @@ private void createPlot(CommandSender sender) {

}

private void createLocation(CommandSender sender, String[] args) {

// Check if the sender is a player.
// If so, check if they have permission.
if (sender instanceof Player p) {
if (!p.hasPermission("uknet.plots.create.location")) {

p.sendMessage(ChatUtils.error("You do not have permission to use this command!"));
return;

}
}

// Check if they have enough args.
if (args.length < 9) {

sender.sendMessage(ChatUtils.error("/plotsystem create location [name] <Xmin> <Ymin> <Zmin> <Xmax> <Ymax> <Zmax>"));
return;

}

int xmin;
int ymin;
int zmin;

int xmax;
int ymax;
int zmax;

// Check if the coordinates are actual numbers.
try {

xmin = Integer.parseInt(args[3]);
ymin = Integer.parseInt(args[4]);
zmin = Integer.parseInt(args[5]);

xmax = Integer.parseInt(args[6]);
ymax = Integer.parseInt(args[7]);
zmax = Integer.parseInt(args[8]);

} catch (NumberFormatException e) {

sender.sendMessage(ChatUtils.error("/plotsystem create location [name] <Xmin> <Ymin> <Zmin> <Xmax> <Ymax> <Zmax>"));
return;

}

// Check if the location name is unique.
if (plotSQL.hasRow("SELECT name FROM location_data WHERE name='" + args[2] + "';")) {

sender.sendMessage(ChatUtils.error("The location ")
.append(Component.text(args[2], NamedTextColor.DARK_RED))
.append(ChatUtils.error(" already exists.")));
return;

}

// Get the exact regions of the selected coordinates.
int regionXMin = Math.floorDiv(xmin, 512);
int regionZMin = Math.floorDiv(zmin, 512);

int regionXMax = Math.floorDiv(xmax, 512);
int regionZMax = Math.floorDiv(zmax, 512);

// Calculate the coordinate transformation.
int xTransform = -(regionXMin * 512);
int zTransform = -(regionZMin * 512);

// Create the world and add the regions.
Multiverse.createVoidWorld(args[2]);

String saveWorld = PlotSystem.getInstance().getConfig().getString("save_world");

if (saveWorld == null) {
sender.sendMessage(ChatUtils.error("The save world is not set in config."));
return;
}

// Get worlds.
World copy = Bukkit.getWorld(saveWorld);
World paste = Bukkit.getWorld(args[2]);

// Check that the worlds are not null, else delete the Multiverse world.
if (copy == null || paste == null) {

sender.sendMessage("An error occurred, please contact an admin.");
Multiverse.deleteWorld(args[2]);
return;

}

// Copy paste the regions in the save world.
// Iterate through the regions one-by-one.
// Run it asynchronously to not freeze the server.
sender.sendMessage(ChatUtils.success("Transferring terrain, this may take a while."));

// Create atomic boolean to query whether a region can be copied.
AtomicBoolean isReady = new AtomicBoolean(true);

// Create a list of regions to copy paste.
ArrayList<CopyRegionFormat> regions = new ArrayList<>();

final int yMin = max(ymin, MIN_Y);
final int yMax = min(ymax, MAX_Y - 1);

for (int i = regionXMin; i <= regionXMax; i++) {
for (int j = regionZMin; j <= regionZMax; j++) {

// Split the region into 4 equal segments of 256x256.
regions.add(new CopyRegionFormat(
copy, paste,
BlockVector3.at(i * 512, yMin, j * 512),
BlockVector3.at(i * 512 + 255, yMax, j * 512 + 255),
BlockVector3.at(i * 512 + xTransform, yMin, j * 512 + zTransform))
);

regions.add(new CopyRegionFormat(
copy, paste,
BlockVector3.at(i * 512 + 256, yMin, j * 512),
BlockVector3.at(i * 512 + 511, yMax, j * 512 + 255),
BlockVector3.at(i * 512 + 256 + xTransform, yMin, j * 512 + zTransform))
);

regions.add(new CopyRegionFormat(
copy, paste,
BlockVector3.at(i * 512, yMin, j * 512 + 256),
BlockVector3.at(i * 512 + 255, yMax, j * 512 + 511),
BlockVector3.at(i * 512 + xTransform, yMin, j * 512 + 256 + zTransform))
);

regions.add(new CopyRegionFormat(
copy, paste,
BlockVector3.at(i * 512 + 256, yMin, j * 512 + 256),
BlockVector3.at(i * 512 + 511, yMax, j * 512 + 511),
BlockVector3.at(i * 512 + 256 + xTransform, yMin, j * 512 + 256 + zTransform))
);
}
}

LOGGER.info("Add segments to list, there are " + regions.size());
sender.sendMessage(ChatUtils.success("Added " + regions.size() + " segments of 256x256 to the list to be copied."));

// Iterate until all regions are done.
Bukkit.getScheduler().runTaskAsynchronously(PlotSystem.getInstance(), () -> {

while (!regions.isEmpty()) {

if (isReady.get()) {

// Set isReady to false so the loop will wait until the previous copy-paste is done.
isReady.set(false);

CopyRegionFormat regionFormat = regions.getFirst();

Bukkit.getScheduler().runTaskAsynchronously(PlotSystem.getInstance(), () -> {

if (!WorldEditor.largeCopy(regionFormat.minPoint, regionFormat.maxPoint, regionFormat.pasteMinPoint, copy, paste)) {
sender.sendMessage(ChatUtils.error("An error occured while transferring the terrain."));
} else {
regions.remove(regionFormat);
sender.sendMessage(ChatUtils.success("Segment copied, there are ")
.append(Component.text(regions.size(), NamedTextColor.DARK_AQUA))
.append(ChatUtils.success(" remaining.")));
LOGGER.info("Segment copied, there are " + regions.size() + " remaining.");
isReady.set(true);
}

});
}
}

sender.sendMessage(ChatUtils.success("Terrain transfer has been completed."));

int coordMin = globalSQL.addCoordinate(new Location(
Bukkit.getWorld(args[2]),
(regionXMin * 512), MIN_Y, (regionZMin * 512), 0, 0));

int coordMax = globalSQL.addCoordinate(new Location(
Bukkit.getWorld(args[2]),
((regionXMax * 512) + 511), MAX_Y - 1, ((regionZMax * 512) + 511), 0, 0));

// Add the location to the database.
if (plotSQL.update("INSERT INTO location_data(name, alias, server, coordMin, coordMax, xTransform, zTransform) VALUES('"
+ args[2] + "','" + args[2] + "','" + PlotSystem.SERVER_NAME + "'," + coordMin + "," + coordMax + "," + xTransform + "," + zTransform + ");")) {

sender.sendMessage(ChatUtils.success("Created new location ")
.append(Component.text(args[2], NamedTextColor.DARK_AQUA)));

// Set the status of all effected regions in the region database.
for (int i = regionXMin; i <= regionXMax; i++) {
for (int j = regionZMin; j <= regionZMax; j++) {

String region = i + "," + j;

// Change region status in region database.
// If it already exists remove members.
globalSQL.update("INSERT INTO server_events(uuid,type,server,event) VALUES(NULL,'network','"
+ globalSQL.getString("SELECT name FROM server_data WHERE type='EARTH';") + "'," +
"'region set plotsystem " + region + "');");

// Add region to database.
plotSQL.update("INSERT INTO regions(region,server,location) VALUES('" + region + "','" + PlotSystem.SERVER_NAME + "','" + args[2] + "');");

}
}

} else {

sender.sendMessage(ChatUtils.error("An error occurred, please check the console for more info."));
LOGGER.warning("An error occured while adding new location!");

}

// If sender is a player teleport them to the location.
if (sender instanceof Player p) {

// Get middle.
double x = ((globalSQL.getDouble("SELECT x FROM coordinates WHERE id=" + coordMax + ";") +
globalSQL.getDouble("SELECT x FROM coordinates WHERE id=" + coordMin + ";")) / 2) +
plotSQL.getInt("SELECT xTransform FROM location_data WHERE name='" + args[2] + "';");

double z = ((globalSQL.getDouble("SELECT z FROM coordinates WHERE id=" + coordMax + ";") +
globalSQL.getDouble("SELECT z FROM coordinates WHERE id=" + coordMin + ";")) / 2) +
plotSQL.getInt("SELECT zTransform FROM location_data WHERE name='" + args[2] + "';");

// Teleport to the location.
World world = Bukkit.getWorld(args[2]);

double y = 64;
if (world != null) {
y = world.getHighestBlockYAt((int) x, (int) z);
y++;
}

EventManager.createTeleportEvent(false, p.getUniqueId().toString(), "network", "teleport " + args[2] + " " + x + " " + y + " " + z + " "
+ p.getLocation().getYaw() + " " + p.getLocation().getPitch(),
"&aTeleported to location &3" + plotSQL.getString("SELECT alias FROM location_data WHERE name='" + args[2] + "';"), p.getLocation());
}

});
}

public void createZone(CommandSender sender) {
public static void createZone(CommandSender sender) {

// Check if the sender is a player
if (!(sender instanceof Player)) {
Expand Down Expand Up @@ -375,6 +107,8 @@ public void createZone(CommandSender sender) {

}

PlotSQL plotSQL = Network.getInstance().getPlotSQL();

// If the player already has a zones, cancel, as this is the maximum.
// Lastly there is a limit of 21 total zones at a time.
if (plotSQL.hasRow("SELECT id FROM zone_members WHERE uuid='" + u.player.getUniqueId() + "' AND is_owner=1;")) {
Expand Down
Loading