EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 16:46:45 +01:00
Code Issues Projects Releases Wiki Activity

finished trim command

Browse Source
This commit is contained in:
boy0001 2015-01-08 02:18:07 +11:00
parent ce388ed018
commit 1c39a017ac
3 changed files with 150 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -59,6 +59,9 @@ import org.bukkit.entity.Player;
@SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Trim extends SubCommand { @SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Trim extends SubCommand {
public static boolean TASK = false;
private static int TASK_ID = 0;
public Trim() { public Trim() {
super("trim", "plots.admin", "Delete unmodified portions of your plotworld", "trim", "", CommandCategory.DEBUG, false); super("trim", "plots.admin", "Delete unmodified portions of your plotworld", "trim", "", CommandCategory.DEBUG, false);
} }
@ -97,127 +100,27 @@ import org.bukkit.entity.Player;
PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX); PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
return false; return false;
} }
World world = Bukkit.getWorld(args[1]);
if (world == null) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_WORLD);
return false;
}
HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(world);
HybridPlotWorld plotworld = (HybridPlotWorld) PlotMain.getWorldSettings(world);
String worldname = world.getName();
String arg = args[0].toLowerCase(); String arg = args[0].toLowerCase();
PlotId id = getId(arg);
if (id != null) {
if (manager == null) {
PlotMain.sendConsoleSenderMessage(C.NOT_VALID_HYBRID_PLOT_WORLD);
return false;
}
Plot plot = PlotHelper.getPlot(world, id);
boolean modified = false;
if (plot.hasOwner()) {
modified = HybridPlotManager.checkModified(plot, 0);
}
PlayerFunctions.sendMessage(plr, "Modified: "+modified);
// trim ID
return true;
}
if (!arg.equals("all")) { if (!arg.equals("all")) {
PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX); PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
return false; return false;
} }
sendMessage("Initializing..."); final World world = Bukkit.getWorld(args[1]);
String directory = new File(".").getAbsolutePath() + File.separator + world.getName() + File.separator + "region"; if (world == null || PlotMain.getWorldSettings(world) == null) {
File folder = new File(directory); PlayerFunctions.sendMessage(plr, C.NOT_VALID_WORLD);
File[] regionFiles = folder.listFiles();
ArrayList<ChunkLoc> chunkChunks = new ArrayList<>();
sendMessage("Step 1: Bulk chunk trim");
int count = 0;
for (File file : regionFiles) {
String name = file.getName();
if (name.endsWith("mca")) {
if (file.getTotalSpace() <= 8192) {
file.delete();
}
else {
boolean delete = false;
Path path = Paths.get(file.getPath());
try {
BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
long creation = attr.creationTime().toMillis();
long modification = file.lastModified();
long diff = Math.abs(creation - modification);
if (diff < 10000) {
count++;
file.delete();
delete = true;
}
} catch (Exception e) {
}
if (!delete) {
String[] split = name.split("\\.");
try {
int x = Integer.parseInt(split[1]);
int z = Integer.parseInt(split[2]);
ChunkLoc loc = new ChunkLoc(x, z);
chunkChunks.add(loc);
}
catch (Exception e) { }
}
}
}
}
count = 0;
PlotMain.sendConsoleSenderMessage("&6 - bulk trim removed " + (count * 256) + " chunks");
if (manager == null) {
sendMessage("Could not continue as the selected world is not a HybridPlotWorld");
return false; return false;
} }
sendMessage("Step 2: Plot trim"); if (runTrimTask(world)) {
{ sendMessage(C.TRIM_START.s());
Set<Plot> plots = getOldPlots(world.getName()); return true;
PlotMain.sendConsoleSenderMessage("&6 - found "+plots.size()+" expired plots");
for (Plot plot : plots) {
boolean modified = false;
if (plot.hasOwner()) {
modified = HybridPlotManager.checkModified(plot, 0);
}
if (plot.owner == null || !HybridPlotManager.checkModified(plot, plotworld.REQUIRED_CHANGES)) {
PlotMain.removePlot(worldname, id, true);
count++;
}
}
} }
PlotMain.sendConsoleSenderMessage("&6 - plot trim removed " + count + " plots"); sendMessage(C.TRIM_IN_PROGRESS.s());
sendMessage("Step 3: Chunk trim"); return false;
for (ChunkLoc loc : chunkChunks) {
int sx = loc.x << 4;
int sz = loc.z << 4;
boolean delete = true;
loop:
for (int x = sx; x < sx + 16; x++) {
for (int z = sz; z < sz + 16; z++) {
Chunk chunk = world.getChunkAt(x, z);
if (hasPlot(world, chunk)) {
delete = false;
break loop;
}
}
}
if (delete) {
deleteRegionFile(worldname, loc);
}
}
return true;
} }
public Set<Plot> getOldPlots(String world) { public ArrayList<Plot> getOldPlots(String world) {
final Collection<Plot> plots = PlotMain.getPlots(world).values(); final Collection<Plot> plots = PlotMain.getPlots(world).values();
final Set<Plot> toRemove = new HashSet<>(); final ArrayList<Plot> toRemove = new ArrayList<>();
Set<UUID> remove = new HashSet<>(); Set<UUID> remove = new HashSet<>();
Set<UUID> keep = new HashSet<>(); Set<UUID> keep = new HashSet<>();
for (Plot plot : plots) { for (Plot plot : plots) {
@ -246,15 +149,141 @@ import org.bukkit.entity.Player;
return toRemove; return toRemove;
} }
public void deleteRegionFile(String world, ChunkLoc loc) { public boolean runTrimTask(final World world) {
String directory = new File(".").getAbsolutePath() + File.separator + world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca"; if (Trim.TASK) {
File file = new File(directory); return false;
if (file.exists()) {
file.delete();
} }
Trim.TASK = true;
runTask(new Runnable() {
@Override
public void run() {
final HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(world);
final HybridPlotWorld plotworld = (HybridPlotWorld) PlotMain.getWorldSettings(world);
final String worldname = world.getName();
String directory = new File(".").getAbsolutePath() + File.separator + world.getName() + File.separator + "region";
File folder = new File(directory);
File[] regionFiles = folder.listFiles();
ArrayList<ChunkLoc> chunkChunks = new ArrayList<>();
for (File file : regionFiles) {
String name = file.getName();
if (name.endsWith("mca")) {
if (file.getTotalSpace() <= 8192) {
file.delete();
}
else {
boolean delete = false;
Path path = Paths.get(file.getPath());
try {
BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
long creation = attr.creationTime().toMillis();
long modification = file.lastModified();
long diff = Math.abs(creation - modification);
if (diff < 10000) {
PlotMain.sendConsoleSenderMessage("&6 - Deleted region "+name+" (max 256 chunks)");
file.delete();
delete = true;
}
} catch (Exception e) {
}
if (!delete) {
String[] split = name.split("\\.");
try {
int x = Integer.parseInt(split[1]);
int z = Integer.parseInt(split[2]);
ChunkLoc loc = new ChunkLoc(x, z);
chunkChunks.add(loc);
}
catch (Exception e) { }
}
}
}
}
final ArrayList<Plot> plots = getOldPlots(world.getName());
int count2 = 0;
Trim.TASK_ID = Bukkit.getScheduler().scheduleSyncRepeatingTask(PlotMain.getMain(), new Runnable() {
@Override
public void run() {
if (manager != null && plots.size() > 0) {
Plot plot = plots.get(0);
boolean modified = false;
if (plot.hasOwner()) {
modified = HybridPlotManager.checkModified(plot, 0);
}
if (plot.owner == null || !HybridPlotManager.checkModified(plot, plotworld.REQUIRED_CHANGES)) {
PlotMain.removePlot(worldname, plot.id, true);
}
plots.remove(0);
}
else {
trimPlots(world);
Trim.TASK = false;
sendMessage("Done!");
Bukkit.getScheduler().cancelTask(Trim.TASK_ID);
return;
}
}
}, 1, 1);
}
});
return true;
}
private void trimPlots(World world) {
String worldname = world.getName();
ArrayList<ChunkLoc> chunks = getChunkChunks(world);
for (ChunkLoc loc : chunks) {
int sx = loc.x << 4;
int sz = loc.z << 4;
boolean delete = true;
loop:
for (int x = sx; x < sx + 16; x++) {
for (int z = sz; z < sz + 16; z++) {
Chunk chunk = world.getChunkAt(x, z);
if (hasPlot(world, chunk)) {
delete = false;
break loop;
}
}
}
if (delete) {
deleteRegionFile(worldname, loc);
}
}
}
public void deleteRegionFile(final String world, final ChunkLoc loc) {
runTask(new Runnable() {
@Override
public void run() {
String directory = new File(".").getAbsolutePath() + File.separator + world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
File file = new File(directory);
PlotMain.sendConsoleSenderMessage("&6 - Deleted region "+file.getName()+" (max 256 chunks)");
if (file.exists()) {
file.delete();
}
}
});
} }
public ArrayList<ChunkLoc> getChunkChunks(World world) {
File[] regionFiles = new File(new File(".").getAbsolutePath() + File.separator + world.getName() + File.separator + "region").listFiles();
ArrayList<ChunkLoc> chunks = new ArrayList<>();
for (File file : regionFiles) {
String name = file.getName();
if (name.endsWith("mca")) {
String[] split = name.split("\\.");
try {
chunks.add(new ChunkLoc(Integer.parseInt(split[1]), Integer.parseInt(split[2])));
} catch (Exception e) { }
}
}
return chunks;
}
private boolean hasPlot(World world, Chunk chunk) { private boolean hasPlot(World world, Chunk chunk) {
int x1 = chunk.getX() << 4; int x1 = chunk.getX() << 4;
int z1 = chunk.getZ() << 4; int z1 = chunk.getZ() << 4;
@ -264,12 +293,12 @@ import org.bukkit.entity.Player;
Location bot = new Location(world, x1, 0, z1); Location bot = new Location(world, x1, 0, z1);
Plot plot; Plot plot;
plot = PlotHelper.getCurrentPlot(bot); plot = PlotHelper.getCurrentPlot(bot);
if (plot.owner != null) { if (plot != null && plot.owner != null) {
return true; return true;
} }
Location top = new Location(world, x2, 0, z2); Location top = new Location(world, x2, 0, z2);
plot = PlotHelper.getCurrentPlot(top); plot = PlotHelper.getCurrentPlot(top);
if (plot.owner != null) { if (plot != null && plot.owner != null) {
return true; return true;
} }
return false; return false;

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -188,6 +188,8 @@ public enum C {
* trim * trim
*/ */
TRIM_SYNTAX("Use /plot trim <all|x;y> <world>"), TRIM_SYNTAX("Use /plot trim <all|x;y> <world>"),
TRIM_START("Starting a world trim task..."),
TRIM_IN_PROGRESS("A world trim task is already in progress!"),
NOT_VALID_HYBRID_PLOT_WORLD("The hybrid plot manager is required to perform this action"), NOT_VALID_HYBRID_PLOT_WORLD("The hybrid plot manager is required to perform this action"),
/* /*
* No <plot> * No <plot>

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
View File

@ -93,12 +93,12 @@ import java.util.HashSet;
return true; return true;
} }
requiredChanges -= changes; requiredChanges -= changes;
changes = checkModified(requiredChanges, world, botx, topx, hpw.PLOT_HEIGHT + 2, world.getMaxHeight(), botz, topz, air); changes = checkModified(requiredChanges, world, botx, topx, hpw.PLOT_HEIGHT + 2, world.getMaxHeight() - 1, botz, topz, air);
if (changes == -1) { if (changes == -1) {
return true; return true;
} }
requiredChanges -= changes; requiredChanges -= changes;
changes = checkModified(requiredChanges, world, botx, topx, 1, hpw.PLOT_HEIGHT, botz, topz, hpw.MAIN_BLOCK); changes = checkModified(requiredChanges, world, botx, topx, 1, hpw.PLOT_HEIGHT - 1, botz, topz, hpw.MAIN_BLOCK);
if (changes == -1) { if (changes == -1) {
return true; return true;
} }