EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

It runs! And it's small!

Browse Source
This commit is contained in:
Mariell Hoversholm
2020-10-08 13:27:23 +02:00
committed by Alexander Söderberg
parent c198305b5e
commit e15b5a07fb
4 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Core/build.gradle.kts
View File

@ -1,11 +1,13 @@
import java.time.format.DateTimeFormatter
dependencies {
// Expected everywhere.
api("org.json:json:20200518")
api("javax.annotation:javax.annotation-api:1.3.2")
compileOnlyApi("javax.annotation:javax.annotation-api:1.3.2")
// Minecraft expectations
compileOnlyApi("com.google.guava:guava:21.0") // Minecraft uses v21.0
compileOnlyApi("com.google.code.gson:gson:2.8.0") // Minecraft uses v2.8.0
api("org.slf4j:slf4j-api:1.7.25") // Minecraft uses v1.7.25
// Platform expectations
compileOnlyApi("org.yaml:snakeyaml:1.26") // Some platforms provide this
@ -15,16 +17,40 @@ dependencies {
api("net.kyori:adventure-text-minimessage:4.0.0-SNAPSHOT")
// Guice
api("com.google.inject:guice:4.2.3")
api("com.google.inject.extensions:guice-assistedinject:4.2.3")
api("com.google.inject:guice:4.2.3") {
exclude(group = "com.google.guava")
}
api("com.google.inject.extensions:guice-assistedinject:4.2.3") {
exclude("com.google.inject", "guice")
}
compileOnlyApi("com.google.code.findbugs:annotations:3.0.1")
compileOnlyApi("javax.inject:javax.inject:1")
// Logging
api("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1")
// Plugins
compileOnlyApi("com.sk89q.worldedit:worldedit-core:7.2.0-SNAPSHOT") {
exclude(group = "bukkit-classloader-check")
exclude(group = "mockito-core")
exclude(group = "dummypermscompat")
}
testImplementation("com.sk89q.worldedit:worldedit-core:7.2.0-SNAPSHOT")
// Other libraries
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") {
exclude(group = "org.slf4j")
}
api("org.khelekore:prtree:1.7.0-SNAPSHOT")
api("aopalliance:aopalliance:1.0")
api("com.intellectualsites:Pipeline:1.4.0-SNAPSHOT")
api("com.intellectualsites:Pipeline:1.4.0-SNAPSHOT") {
exclude(group = "com.google.guava")
}
}
tasks.processResources {
filesMatching("plugin.properties") {
expand(
"version" to project.version.toString(),
"commit" to rootProject.grgit.head().abbreviatedId,
"date" to rootProject.grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd"))
)
}
}

16
Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
View File

@ -25,6 +25,9 @@
*/
package com.plotsquared.core.util;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonParseException;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.generator.ClassicPlotWorld;
@ -60,8 +63,6 @@ import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import org.json.JSONArray;
import org.json.JSONException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -106,6 +107,7 @@ import java.util.zip.GZIPOutputStream;
public abstract class SchematicHandler {
private static final Logger logger = LoggerFactory.getLogger("P2/" + SchematicHandler.class.getSimpleName());
private static final Gson GSON = new Gson();
public static SchematicHandler manager;
private final WorldUtil worldUtil;
private boolean exportAll = false;
@ -453,7 +455,7 @@ public abstract class SchematicHandler {
}
public List<String> getSaves(UUID uuid) {
String rawJSON = "";
String rawJSON;
try {
String website = Settings.Web.URL + "list.php?" + uuid.toString();
URL url = new URL(website);
@ -462,14 +464,14 @@ public abstract class SchematicHandler {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
rawJSON = reader.lines().collect(Collectors.joining());
}
JSONArray array = new JSONArray(rawJSON);
JsonArray array = GSON.fromJson(rawJSON, JsonArray.class);
List<String> schematics = new ArrayList<>();
for (int i = 0; i < array.length(); i++) {
String schematic = array.getString(i);
for (int i = 0; i < array.size(); i++) {
String schematic = array.get(i).getAsString();
schematics.add(schematic);
}
return schematics;
} catch (JSONException | IOException e) {
} catch (JsonParseException | IOException e) {
e.printStackTrace();
}
return null;