mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-21 11:45:19 +01:00
parent
bd62d1a1c7
commit
70b6636f50
@ -433,6 +433,22 @@ public class Settings extends Config {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Deprecated(forRemoval = true, since = "6.0.0")
|
||||||
|
@Comment("Schematic interface related settings")
|
||||||
|
public static class Web {
|
||||||
|
|
||||||
|
@Comment({"The web interface for schematics", " - All schematics are anonymous and private",
|
||||||
|
" - Downloads can be deleted by the user",
|
||||||
|
" - Supports plot uploads, downloads and saves",})
|
||||||
|
public static String URL =
|
||||||
|
"https://schem.intellectualsites.com/plots/";
|
||||||
|
@Comment({"Whether or not the legacy web interface will be used for /plot download and /plot save",
|
||||||
|
"Note that this will be removed in future versions. Updating to Arkitektonika is highly suggested"})
|
||||||
|
public static boolean LEGACY_WEBINTERFACE = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Comment("Schematic web interface related settings")
|
@Comment("Schematic web interface related settings")
|
||||||
public static class Arkitektonika {
|
public static class Arkitektonika {
|
||||||
|
|
||||||
|
@ -544,6 +544,14 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded;
|
return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated in favour of {@link HybridPlotWorld#getSchematicRoot()}
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.9.0")
|
||||||
|
public File getRoot() {
|
||||||
|
return this.root;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the root folder for this world's generation schematics. May be null if schematics not initialised via
|
* Get the root folder for this world's generation schematics. May be null if schematics not initialised via
|
||||||
* {@link HybridPlotWorld#setupSchematics()}
|
* {@link HybridPlotWorld#setupSchematics()}
|
||||||
|
@ -120,6 +120,84 @@ public abstract class SchematicHandler {
|
|||||||
this.subscriberFactory = subscriberFactory;
|
this.subscriberFactory = subscriberFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(forRemoval = true, since = "6.0.0")
|
||||||
|
public static void upload(
|
||||||
|
@Nullable UUID uuid,
|
||||||
|
final @Nullable String file,
|
||||||
|
final @NonNull String extension,
|
||||||
|
final @Nullable RunnableVal<OutputStream> writeTask,
|
||||||
|
final @NonNull RunnableVal<URL> whenDone
|
||||||
|
) {
|
||||||
|
if (writeTask == null) {
|
||||||
|
TaskManager.runTask(whenDone);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final String filename;
|
||||||
|
final String website;
|
||||||
|
if (uuid == null) {
|
||||||
|
uuid = UUID.randomUUID();
|
||||||
|
website = Settings.Web.URL + "upload.php?" + uuid;
|
||||||
|
filename = "plot." + extension;
|
||||||
|
} else {
|
||||||
|
website = Settings.Web.URL + "save.php?" + uuid;
|
||||||
|
filename = file + '.' + extension;
|
||||||
|
}
|
||||||
|
final URL url;
|
||||||
|
try {
|
||||||
|
url = new URL(Settings.Web.URL + "?key=" + uuid + "&type=" + extension);
|
||||||
|
} catch (MalformedURLException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
whenDone.run();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
TaskManager.runTaskAsync(() -> {
|
||||||
|
try {
|
||||||
|
String boundary = Long.toHexString(System.currentTimeMillis());
|
||||||
|
URLConnection con = new URL(website).openConnection();
|
||||||
|
con.setDoOutput(true);
|
||||||
|
con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
|
||||||
|
try (OutputStream output = con.getOutputStream();
|
||||||
|
PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) {
|
||||||
|
String CRLF = "\r\n";
|
||||||
|
writer.append("--").append(boundary).append(CRLF);
|
||||||
|
writer.append("Content-Disposition: form-data; name=\"param\"").append(CRLF);
|
||||||
|
writer.append("Content-Type: text/plain; charset=").append(StandardCharsets.UTF_8.displayName()).append(CRLF);
|
||||||
|
String param = "value";
|
||||||
|
writer.append(CRLF).append(param).append(CRLF).flush();
|
||||||
|
writer.append("--").append(boundary).append(CRLF);
|
||||||
|
writer.append("Content-Disposition: form-data; name=\"schematicFile\"; filename=\"").append(filename)
|
||||||
|
.append(String.valueOf('"')).append(CRLF);
|
||||||
|
writer.append("Content-Type: ").append(URLConnection.guessContentTypeFromName(filename)).append(CRLF);
|
||||||
|
writer.append("Content-Transfer-Encoding: binary").append(CRLF);
|
||||||
|
writer.append(CRLF).flush();
|
||||||
|
writeTask.value = new AbstractDelegateOutputStream(output) {
|
||||||
|
@Override
|
||||||
|
public void close() {
|
||||||
|
} // Don't close
|
||||||
|
};
|
||||||
|
writeTask.run();
|
||||||
|
output.flush();
|
||||||
|
writer.append(CRLF).flush();
|
||||||
|
writer.append("--").append(boundary).append("--").append(CRLF).flush();
|
||||||
|
}
|
||||||
|
String content;
|
||||||
|
try (Scanner scanner = new Scanner(con.getInputStream()).useDelimiter("\\A")) {
|
||||||
|
content = scanner.next().trim();
|
||||||
|
}
|
||||||
|
if (!content.startsWith("<")) {
|
||||||
|
}
|
||||||
|
int responseCode = ((HttpURLConnection) con).getResponseCode();
|
||||||
|
if (responseCode == 200) {
|
||||||
|
whenDone.value = url;
|
||||||
|
}
|
||||||
|
TaskManager.runTask(whenDone);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
TaskManager.runTask(whenDone);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public boolean exportAll(
|
public boolean exportAll(
|
||||||
Collection<Plot> collection,
|
Collection<Plot> collection,
|
||||||
final File outputDir,
|
final File outputDir,
|
||||||
@ -436,6 +514,24 @@ public abstract class SchematicHandler {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(forRemoval = true, since = "6.0.0")
|
||||||
|
public void upload(final CompoundTag tag, UUID uuid, String file, RunnableVal<URL> whenDone) {
|
||||||
|
if (tag == null) {
|
||||||
|
TaskManager.runTask(whenDone);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
upload(uuid, file, "schem", new RunnableVal<>() {
|
||||||
|
@Override
|
||||||
|
public void run(OutputStream output) {
|
||||||
|
try (NBTOutputStream nos = new NBTOutputStream(new GZIPOutputStream(output, true))) {
|
||||||
|
nos.writeNamedTag("Schematic", tag);
|
||||||
|
} catch (IOException e1) {
|
||||||
|
e1.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, whenDone);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saves a schematic to a file path.
|
* Saves a schematic to a file path.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user