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

Merge remote-tracking branch 'origin/breaking' into breaking

Browse Source
This commit is contained in:
Sauilitired 2018-12-24 01:50:45 +01:00
commit 4f43788307
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
4 changed files with 110 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java
View File

@ -78,7 +78,6 @@ public class BukkitSchematicHandler extends SchematicHandler {
new ListTag(CompoundTag.class, tileEntities)); new ListTag(CompoundTag.class, tileEntities));
whenDone.value = new CompoundTag(schematic); whenDone.value = new CompoundTag(schematic);
TaskManager.runTask(whenDone); TaskManager.runTask(whenDone);
System.gc();
}); });
return; return;
} }
@ -87,41 +86,40 @@ public class BukkitSchematicHandler extends SchematicHandler {
Location pos1 = new Location(world, region.minX, region.minY, region.minZ); Location pos1 = new Location(world, region.minX, region.minY, region.minZ);
Location pos2 = new Location(world, region.maxX, region.maxY, region.maxZ); Location pos2 = new Location(world, region.maxX, region.maxY, region.maxZ);
final int p1x = pos1.getX(); final int p1x = pos1.getX();
final int sy = pos1.getY();
final int p1z = pos1.getZ(); final int p1z = pos1.getZ();
final int p2x = pos2.getX(); final int p2x = pos2.getX();
final int p2z = pos2.getZ(); final int p2z = pos2.getZ();
final int sy = pos1.getY();
final int ey = pos2.getY(); final int ey = pos2.getY();
Iterator<Integer> yiter = IntStream.range(sy, ey).iterator(); Iterator<Integer> yiter = IntStream.range(sy, ey + 1).iterator();
TaskManager.runTask(new Runnable() { final Runnable yTask = new Runnable() {
@Override public void run() { @Override public void run() {
final Runnable yTask = this;
long ystart = System.currentTimeMillis(); long ystart = System.currentTimeMillis();
while (yiter.hasNext() while (yiter.hasNext()
&& System.currentTimeMillis() - ystart < 20) { && System.currentTimeMillis() - ystart < 20) {
final int fy = yiter.next(); final int y = yiter.next();
Iterator<Integer> ziter = IntStream.range(p1z, p2z).iterator(); Iterator<Integer> ziter =
TaskManager.runTask(new Runnable() { IntStream.range(p1z, p2z + 1).iterator();
final Runnable zTask = new Runnable() {
@Override public void run() { @Override public void run() {
final Runnable zTask = this;
long zstart = System.currentTimeMillis(); long zstart = System.currentTimeMillis();
Iterator<Integer> xiter =
IntStream.range(p1x, p2x).iterator();
while (ziter.hasNext() while (ziter.hasNext()
&& System.currentTimeMillis() - zstart < 20) { && System.currentTimeMillis() - zstart < 20) {
final int fz = ziter.next(); final int z = ziter.next();
TaskManager.runTask(new Runnable() { Iterator<Integer> xiter =
IntStream.range(p1x, p2x + 1).iterator();
final Runnable xTask = new Runnable() {
@Override public void run() { @Override public void run() {
long xstart = System.currentTimeMillis(); long xstart = System.currentTimeMillis();
final int ry = y - sy;
final int rz = z - p1z;
while (xiter.hasNext() while (xiter.hasNext()
&& System.currentTimeMillis() - xstart && System.currentTimeMillis() - xstart
< 20) { < 20) {
final int x = xiter.next(); final int x = xiter.next();
int rx = x - p1x; final int rx = x - p1x;
int ry = fy - sy;
int rz = fz - p1z;
BlockVector3 point = BlockVector3 point =
BlockVector3.at(x, fy, fz); BlockVector3.at(x, y, z);
BaseBlock block = BaseBlock block =
cuboidRegion.getWorld() cuboidRegion.getWorld()
.getFullBlock(point); .getFullBlock(point);
@ -169,28 +167,27 @@ public class BukkitSchematicHandler extends SchematicHandler {
buffer.write(blockId); buffer.write(blockId);
} }
if (xiter.hasNext()) { if (xiter.hasNext()) {
TaskManager.runTaskLater(this, 1); this.run();
} else {
zTask.run();
} }
} }
}); };
xTask.run();
} }
if (ziter.hasNext()) { if (ziter.hasNext()) {
TaskManager.runTaskLater(zTask, 1); this.run();
} else {
yTask.run();
} }
} }
}); };
zTask.run();
} }
if (yiter.hasNext()) { if (yiter.hasNext()) {
TaskManager.runTaskLater(yTask, 1); TaskManager.runTaskLater(this, 1);
} else { } else {
regionTask.run(); regionTask.run();
} }
} }
}); };
yTask.run();
} }
}); });
} }

52
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
View File

@ -43,34 +43,32 @@ public class Save extends SubCommand {
plot.addRunning(); plot.addRunning();
SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() { SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
@Override public void run(final CompoundTag value) { @Override public void run(final CompoundTag value) {
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(() -> {
@Override public void run() { String time = (System.currentTimeMillis() / 1000) + "";
String time = (System.currentTimeMillis() / 1000) + ""; Location[] corners = plot.getCorners();
Location[] corners = plot.getCorners(); corners[0].setY(0);
corners[0].setY(0); corners[1].setY(255);
corners[1].setY(255); int size = (corners[1].getX() - corners[0].getX()) + 1;
int size = (corners[1].getX() - corners[0].getX()) + 1; PlotId id = plot.getId();
PlotId id = plot.getId(); String world1 = plot.getArea().toString().replaceAll(";", "-")
String world = plot.getArea().toString().replaceAll(";", "-") .replaceAll("[^A-Za-z0-9]", "");
.replaceAll("[^A-Za-z0-9]", ""); final String file =
final String file = time + '_' + world1 + '_' + id.x + '_' + id.y + '_' + size;
time + '_' + world + '_' + id.x + '_' + id.y + '_' + size; UUID uuid = player.getUUID();
UUID uuid = player.getUUID(); SchematicHandler.manager.upload(value, uuid, file, new RunnableVal<URL>() {
SchematicHandler.manager.upload(value, uuid, file, new RunnableVal<URL>() { @Override public void run(URL url) {
@Override public void run(URL url) { plot.removeRunning();
plot.removeRunning(); if (url == null) {
if (url == null) { MainUtil.sendMessage(player, C.SAVE_FAILED);
MainUtil.sendMessage(player, C.SAVE_FAILED); return;
return;
}
MainUtil.sendMessage(player, C.SAVE_SUCCESS);
List<String> schematics = player.getMeta("plot_schematics");
if (schematics != null) {
schematics.add(file);
}
} }
}); MainUtil.sendMessage(player, C.SAVE_SUCCESS);
} List<String> schematics = player.getMeta("plot_schematics");
if (schematics != null) {
schematics.add(file);
}
}
});
}); });
} }
}); });

112
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
View File

@ -114,68 +114,66 @@ public class MainUtil {
whenDone.run(); whenDone.run();
return; return;
} }
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(() -> {
@Override public void run() { try {
try { String boundary = Long.toHexString(System.currentTimeMillis());
String boundary = Long.toHexString(System.currentTimeMillis()); URLConnection con = new URL(website).openConnection();
URLConnection con = new URL(website).openConnection(); con.setDoOutput(true);
con.setDoOutput(true); con.setRequestProperty("Content-Type",
con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
"multipart/form-data; boundary=" + boundary); try (OutputStream output = con.getOutputStream();
try (OutputStream output = con.getOutputStream(); PrintWriter writer = new PrintWriter(
PrintWriter writer = new PrintWriter( new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) {
new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) { String CRLF = "\r\n";
String CRLF = "\r\n"; writer.append("--" + boundary).append(CRLF);
writer.append("--" + boundary).append(CRLF); writer.append("Content-Disposition: form-data; name=\"param\"")
writer.append("Content-Disposition: form-data; name=\"param\"") .append(CRLF);
.append(CRLF); writer.append("Content-Type: text/plain; charset=" + StandardCharsets.UTF_8
writer.append("Content-Type: text/plain; charset=" + StandardCharsets.UTF_8 .displayName()).append(CRLF);
.displayName()).append(CRLF); String param = "value";
String param = "value"; writer.append(CRLF).append(param).append(CRLF).flush();
writer.append(CRLF).append(param).append(CRLF).flush(); writer.append("--" + boundary).append(CRLF);
writer.append("--" + boundary).append(CRLF); writer.append(
writer.append( "Content-Disposition: form-data; name=\"schematicFile\"; filename=\""
"Content-Disposition: form-data; name=\"schematicFile\"; filename=\"" + filename + '"').append(CRLF);
+ filename + '"').append(CRLF); writer.append(
writer.append( "Content-Type: " + URLConnection.guessContentTypeFromName(filename))
"Content-Type: " + URLConnection.guessContentTypeFromName(filename)) .append(CRLF);
.append(CRLF); writer.append("Content-Transfer-Encoding: binary").append(CRLF);
writer.append("Content-Transfer-Encoding: binary").append(CRLF); writer.append(CRLF).flush();
writer.append(CRLF).flush(); writeTask.value = new AbstractDelegateOutputStream(output) {
writeTask.value = new AbstractDelegateOutputStream(output) { @Override public void close() {
@Override public void close() { } // Don't close
} // Don't close };
}; writeTask.run();
writeTask.run(); output.flush();
output.flush(); writer.append(CRLF).flush();
writer.append(CRLF).flush(); writer.append("--" + boundary + "--").append(CRLF).flush();
writer.append("--" + boundary + "--").append(CRLF).flush(); }
try (Reader response = new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8)) {
final char[] buffer = new char[256];
final StringBuilder result = new StringBuilder();
while (true) {
final int r = response.read(buffer);
if (r < 0) {
break;
}
result.append(buffer, 0, r);
} }
// try (Reader response = new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8)) { if (!result.toString().startsWith("Success")) {
// final char[] buffer = new char[256]; PlotSquared.debug(result);
// final StringBuilder result = new StringBuilder();
// while (true) {
// final int r = response.read(buffer);
// if (r < 0) {
// break;
// }
// result.append(buffer, 0, r);
// }
// if (!result.toString().startsWith("Success")) {
// PS.debug(result);
// }
// } catch (IOException e) {
// e.printStackTrace();
// }
int responseCode = ((HttpURLConnection) con).getResponseCode();
if (responseCode == 200) {
whenDone.value = url;
} }
TaskManager.runTask(whenDone);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
TaskManager.runTask(whenDone);
} }
int responseCode = ((HttpURLConnection) con).getResponseCode();
if (responseCode == 200) {
whenDone.value = url;
}
TaskManager.runTask(whenDone);
} catch (IOException e) {
e.printStackTrace();
TaskManager.runTask(whenDone);
} }
}); });
} }

14
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
View File

@ -412,14 +412,11 @@ public abstract class SchematicHandler {
} }
MainUtil.upload(uuid, file, "schematic", new RunnableVal<OutputStream>() { MainUtil.upload(uuid, file, "schematic", new RunnableVal<OutputStream>() {
@Override public void run(OutputStream output) { @Override public void run(OutputStream output) {
try { try (NBTOutputStream nos = new NBTOutputStream(
try (GZIPOutputStream gzip = new GZIPOutputStream(output, true)) { new GZIPOutputStream(output, true))) {
try (NBTOutputStream nos = new NBTOutputStream(gzip)) { nos.writeNamedTag("Schematic", tag);
nos.writeNamedTag("Schematic", tag); } catch (IOException e1) {
} e1.printStackTrace();
}
} catch (IOException e) {
e.printStackTrace();
} }
} }
}, whenDone); }, whenDone);
@ -476,6 +473,7 @@ public abstract class SchematicHandler {
}); });
} }
public class UnsupportedFormatException extends Exception { public class UnsupportedFormatException extends Exception {
/** /**
* Throw with a message. * Throw with a message.