returnValue = new LinkedList<>();
// To avoid spurious missing argument errors we never print errors if help is required.
if (!jsapResult.getBoolean("help"))
{
diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/BlockWrapper.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/BlockWrapper.java
index 997ccc1e3..d8f31240c 100644
--- a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/BlockWrapper.java
+++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/BlockWrapper.java
@@ -1,6 +1,7 @@
package com.thevoxelbox.voxelsniper.util;
import com.boydti.fawe.bukkit.wrapper.AsyncBlock;
+import org.bukkit.Material;
import org.bukkit.World;
/**
@@ -10,6 +11,7 @@ public class BlockWrapper
{
private int id;
+ private Material type;
private int x;
private int y;
private int z;
@@ -38,6 +40,10 @@ public class BlockWrapper
return this.data;
}
+ public Material getType() {
+ return type;
+ }
+
/**
* @return the id
*/
@@ -131,4 +137,9 @@ public class BlockWrapper
{
this.z = z;
}
+
+ public void setType(Material type) {
+ this.type = type;
+ }
+
}
diff --git a/favs/src/main/resources/plugin.yml b/favs/src/main/resources/plugin.yml
index fa6b1e7b1..6c5f76cd9 100644
--- a/favs/src/main/resources/plugin.yml
+++ b/favs/src/main/resources/plugin.yml
@@ -7,7 +7,7 @@ load: STARTUP
database: false
depend: [WorldEdit]
api-version: 1.13
-#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PlotMe, PreciousStones]
+#softdepend: [WorldGuard, PlotSquared, MCore, Factions, GriefPrevention, Residence, Towny, PreciousStones]
commands:
'/p':
description: VoxelSniper perform command
@@ -146,6 +146,7 @@ permissions:
voxelsniper.brush.ellipsoid: true
voxelsniper.brush.eraser: true
voxelsniper.brush.erode: true
+ voxelsniper.brush.erodeblend: true
voxelsniper.brush.extrude: true
voxelsniper.brush.filldown: true
voxelsniper.brush.flatocean: true
@@ -190,6 +191,7 @@ permissions:
voxelsniper.brush.voxeldisc: true
voxelsniper.brush.voxeldiscface: true
voxelsniper.brush.warp: true
+ voxelsniper.brush.wallsider: true
voxelsniper.goto: true
voxelsniper.sniper: true
voxelsniper.sniper:
@@ -228,6 +230,7 @@ permissions:
voxelsniper.brush.entityremoval: true
voxelsniper.brush.eraser: true
voxelsniper.brush.erode: true
+ voxelsniper.brush.erodeblend: true
voxelsniper.brush.extrude: true
voxelsniper.brush.filldown: true
voxelsniper.brush.flatocean: true
@@ -279,6 +282,7 @@ permissions:
voxelsniper.brush.voxeldisc: true
voxelsniper.brush.voxeldiscface: true
voxelsniper.brush.warp: true
+ voxelsniper.brush.wallsider: true
voxelsniper.brush.ball:
default: op
voxelsniper.brush.biome:
@@ -333,6 +337,8 @@ permissions:
default: op
voxelsniper.brush.erode:
default: op
+ voxelsniper.brush.erodeblend:
+ default: op
voxelsniper.brush.extrude:
default: op
voxelsniper.brush.filldown:
@@ -433,5 +439,7 @@ permissions:
default: op
voxelsniper.brush.voxeldiscface:
default: op
+ voxelsniper.brush.wallsider:
+ default: op
voxelsniper.brush.warp:
default: op
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e0b3fb8d7..db93606ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Mar 25 18:59:14 EDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/splash.txt b/splash.txt
index 70cf461ed..c63b561f2 100644
--- a/splash.txt
+++ b/splash.txt
@@ -10,7 +10,6 @@
======= By Empire92 and WorldEdit team =======
If you encounter trouble:
- - Read COMPILING.md if you haven't yet
- Run `build` in a separate Gradle run
- Use gradlew and not gradle
- Ask us!
diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle
index 5e5b3f48b..acefe8c9b 100644
--- a/worldedit-bukkit/build.gradle
+++ b/worldedit-bukkit/build.gradle
@@ -1,90 +1,88 @@
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'maven'
-
-repositories {
- maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
- maven { url "https://ci.athion.net/job/FAWE-WorldGuard-1.13/lastSuccessfulBuild/artifact/mvn" }
-}
-
-dependencies {
- compile project(':worldedit-core')
- compile 'com.sk89q:dummypermscompat:1.8'
- compile 'com.destroystokyo.paper:paper-api:1.13-R0.1-SNAPSHOT'
- compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT'
- testCompile 'org.mockito:mockito-core:1.9.0-rc1'
- compile 'net.milkbowl.vault:VaultAPI:1.5.6'
- compile 'com.massivecraft:factions:2.8.0'
- compile 'com.drtshock:factions:1.6.9.5'
- compile 'com.factionsone:FactionsOne:1.2.2'
- compile 'me.ryanhamshire:GriefPrevention:11.5.2'
- compile 'com.massivecraft:mcore:7.0.1'
- compile 'net.sacredlabyrinth.Phaed:PreciousStones:10.0.4-SNAPSHOT'
- compile 'net.jzx7:regios:5.9.9'
- compile 'com.bekvon.bukkit.residence:Residence:4.5._13.1'
- compile 'com.palmergames.bukkit:towny:0.84.0.9'
- compile 'com.worldcretornica:plotme_core:0.16.3'
- compile 'com.thevoxelbox.voxelsniper:voxelsniper:5.171.0'
- compile 'com.comphenix.protocol:ProtocolLib-API:4.4.0-SNAPSHOT'
- compile 'com.wasteofplastic:askyblock:3.0.8.2'
- compile 'com.sk89q:worldguard-core:latest'
- compile 'com.sk89q:worldguard-legacy:latest'
-}
-
-processResources {
- from (sourceSets.main.resources.srcDirs) {
- expand 'internalVersion': project.internalVersion
- include 'plugin.yml'
- }
-
- from (sourceSets.main.resources.srcDirs) {
- exclude 'plugin.yml'
- }
-}
-
-jar.archiveName="fawe-bukkit-${project.parent.version}.jar"
-jar.destinationDir = file '../mvn/com/boydti/fawe-bukkit/' + project.parent.version
-task createPom << {
- pom {
- project {
- groupId 'com.boydti'
- artifactId 'fawe-bukkit'
- version project.parent.version
- }
- }
- .getEffectivePom()
- .setDependencies(new ArrayList<>())
- .writeTo("../mvn/com/boydti/fawe-bukkit/${project.parent.version}/fawe-bukkit-${project.parent.version}.pom")
- pom {
- project {
- groupId 'com.boydti'
- artifactId 'fawe-bukkit'
- version 'latest'
- }
- }
- .getEffectivePom()
- .setDependencies(new ArrayList<>())
- .writeTo("../mvn/com/boydti/fawe-bukkit/latest/fawe-bukkit-latest.pom")
-}
-task copyFiles {
- doLast {
- copy {
- from "../mvn/com/boydti/fawe-bukkit/${project.parent.version}/"
- into '../mvn/com/boydti/fawe-bukkit/latest/'
- include('*.jar')
- rename ("fawe-bukkit-${project.parent.version}.jar", 'fawe-bukkit-latest.jar')
- }
- }
-}
-
-shadowJar {
- dependencies {
- include(dependency(':worldedit-core'))
- }
- archiveName = "${parent.name}-${project.name.replaceAll("worldedit-", "")}-${parent.version}.jar"
- destinationDir = file '../target'
-}
-
-build.dependsOn(shadowJar)
-build.finalizedBy(copyFiles)
-copyFiles.dependsOn(createPom)
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'maven'
+
+repositories {
+ maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
+}
+
+dependencies {
+ compile project(':worldedit-core')
+ compile 'net.milkbowl.vault:VaultAPI:1.7'
+ compile 'com.sk89q:dummypermscompat:1.10'
+ compile 'com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT'
+ compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT'
+ testCompile 'org.mockito:mockito-core:1.9.0-rc1'
+ compile 'com.massivecraft:factions:2.8.0'
+ compile 'com.drtshock:factions:1.6.9.5'
+ compile 'com.factionsone:FactionsOne:1.2.2'
+ compile 'me.ryanhamshire:GriefPrevention:11.5.2'
+ compile 'com.massivecraft:mcore:7.0.1'
+ compile 'net.sacredlabyrinth.Phaed:PreciousStones:10.0.4-SNAPSHOT'
+ compile 'net.jzx7:regios:5.9.9'
+ compile 'com.bekvon.bukkit.residence:Residence:4.5._13.1'
+ compile 'com.palmergames.bukkit:towny:0.84.0.9'
+ compile 'com.thevoxelbox.voxelsniper:voxelsniper:5.171.0'
+ compile 'com.comphenix.protocol:ProtocolLib-API:4.4.0-SNAPSHOT'
+ compile 'com.wasteofplastic:askyblock:3.0.8.2'
+ compileOnly 'com.sk89q.worldguard:worldguard-core:7.0.0-20190215.210421-39'
+ compileOnly 'com.sk89q.worldguard:worldguard-legacy:7.0.0-20190215.210421-39'
+}
+
+processResources {
+ from (sourceSets.main.resources.srcDirs) {
+ expand 'internalVersion': project.internalVersion
+ include 'plugin.yml'
+ }
+
+ from (sourceSets.main.resources.srcDirs) {
+ exclude 'plugin.yml'
+ }
+}
+
+jar.archiveName="fawe-bukkit-${project.parent.version}.jar"
+jar.destinationDir = file '../mvn/com/boydti/fawe-bukkit/' + project.parent.version
+task createPom << {
+ pom {
+ project {
+ groupId 'com.boydti'
+ artifactId 'fawe-bukkit'
+ version project.parent.version
+ }
+ }
+ .getEffectivePom()
+ .setDependencies(new ArrayList<>())
+ .writeTo("../mvn/com/boydti/fawe-bukkit/${project.parent.version}/fawe-bukkit-${project.parent.version}.pom")
+ pom {
+ project {
+ groupId 'com.boydti'
+ artifactId 'fawe-bukkit'
+ version 'latest'
+ }
+ }
+ .getEffectivePom()
+ .setDependencies(new ArrayList<>())
+ .writeTo("../mvn/com/boydti/fawe-bukkit/latest/fawe-bukkit-latest.pom")
+}
+task copyFiles {
+ doLast {
+ copy {
+ from "../mvn/com/boydti/fawe-bukkit/${project.parent.version}/"
+ into '../mvn/com/boydti/fawe-bukkit/latest/'
+ include('*.jar')
+ rename ("fawe-bukkit-${project.parent.version}.jar", 'fawe-bukkit-latest.jar')
+ }
+ }
+}
+
+shadowJar {
+ dependencies {
+ include(dependency(':worldedit-core'))
+ }
+ archiveName = "${parent.name}-${project.name.replaceAll("worldedit-", "")}-${parent.version}.jar"
+ destinationDir = file '../target'
+}
+
+build.dependsOn(shadowJar)
+build.finalizedBy(copyFiles)
+copyFiles.dependsOn(createPom)
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BStats.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BStats.java
new file mode 100644
index 000000000..1bcc86214
--- /dev/null
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BStats.java
@@ -0,0 +1,704 @@
+package org.bstats.bukkit;
+
+import com.boydti.fawe.Fawe;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.ServicePriority;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * bStats collects some data for plugin authors.
+ *
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
+@SuppressWarnings({"WeakerAccess", "unused"}) public class BStats {
+
+ static {
+ // You can use the property to disable the check in your test environment
+ if (System.getProperty("bstats.relocatecheck") == null || !System
+ .getProperty("bstats.relocatecheck").equals("false")) {
+ // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+ final String defaultPackage = new String(
+ new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k',
+ 'k', 'i', 't'});
+ final String examplePackage =
+ new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+ // We want to make sure nobody just copy & pastes the example and use the wrong package names
+ if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class
+ .getPackage().getName().equals(examplePackage)) {
+ throw new IllegalStateException(
+ "bStats Metrics class has not been relocated correctly!");
+ }
+ }
+ }
+
+ // The version of this bStats class
+ public static final int B_STATS_VERSION = 1;
+
+ // The url to which the data is sent
+ private static final String URL = "https://bStats.org/submitData/bukkit";
+
+ // Is bStats enabled on this server?
+ private boolean enabled;
+
+ // Should failed requests be logged?
+ private static boolean logFailedRequests;
+
+ // Should the sent data be logged?
+ private static boolean logSentData;
+
+ // Should the response text be logged?
+ private static boolean logResponseStatusText;
+
+ // The uuid of the server
+ private static String serverUUID;
+
+ // The plugin
+ private final Plugin plugin;
+
+ // A list with all custom charts
+ private final List charts = new ArrayList<>();
+
+ /**
+ * Class constructor.
+ *
+ * @param plugin The plugin which stats should be submitted.
+ */
+ public BStats(Plugin plugin) {
+ if (plugin == null) {
+ throw new IllegalArgumentException("Plugin cannot be null!");
+ }
+ this.plugin = plugin;
+
+ // Get the config file
+ File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+ File configFile = new File(bStatsFolder, "config.yml");
+ YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+ // Check if the config file exists
+ if (!config.isSet("serverUuid")) {
+
+ // Add default values
+ config.addDefault("enabled", true);
+ // Every server gets it's unique random id.
+ config.addDefault("serverUuid", UUID.randomUUID().toString());
+ // Should failed request be logged?
+ config.addDefault("logFailedRequests", false);
+ // Should the sent data be logged?
+ config.addDefault("logSentData", false);
+ // Should the response text be logged?
+ config.addDefault("logResponseStatusText", false);
+
+ // Inform the server owners about bStats
+ config.options().header(
+ "bStats collects some data for plugin authors like how many servers are using their plugins.\n"
+ + "To honor their work, you should not disable it.\n"
+ + "This has nearly no effect on the server performance!\n"
+ + "Check out https://bStats.org/ to learn more :)").copyDefaults(true);
+ try {
+ config.save(configFile);
+ } catch (IOException ignored) {
+ }
+ }
+
+ // Load the data
+ enabled = config.getBoolean("enabled", true);
+ serverUUID = config.getString("serverUuid");
+ logFailedRequests = config.getBoolean("logFailedRequests", false);
+ logSentData = config.getBoolean("logSentData", false);
+ logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+
+ if (enabled) {
+ boolean found = false;
+ // Search for all other bStats Metrics classes to see if we are the first one
+ for (Class service : Bukkit.getServicesManager().getKnownServices()) {
+ try {
+ service.getField("B_STATS_VERSION"); // Our identifier :)
+ found = true; // We aren't the first
+ break;
+ } catch (NoSuchFieldException ignored) {
+ }
+ }
+ // Register our service
+ Bukkit.getServicesManager()
+ .register(BStats.class, this, plugin, ServicePriority.Normal);
+ if (!found) {
+ // We are the first!
+ startSubmitting();
+ }
+ }
+ }
+
+ /**
+ * Checks if bStats is enabled.
+ *
+ * @return Whether bStats is enabled or not.
+ */
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ /**
+ * Adds a custom chart.
+ *
+ * @param chart The chart to add.
+ */
+ public void addCustomChart(CustomChart chart) {
+ if (chart == null) {
+ throw new IllegalArgumentException("Chart cannot be null!");
+ }
+ charts.add(chart);
+ }
+
+ /**
+ * Starts the Scheduler which submits our data every 30 minutes.
+ */
+ private void startSubmitting() {
+ final Timer timer =
+ new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+ timer.scheduleAtFixedRate(new TimerTask() {
+ @Override public void run() {
+ if (!plugin.isEnabled()) { // Plugin was disabled
+ timer.cancel();
+ return;
+ }
+ // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
+ // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+ Bukkit.getScheduler().runTask(plugin, () -> submitData());
+ }
+ }, 1000 * 60 * 5, 1000 * 60 * 30);
+ // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+ // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
+ // WARNING: Just don't do it!
+ }
+
+ /**
+ * Gets the plugin specific data.
+ * This method is called using Reflection.
+ *
+ * @return The plugin specific data.
+ */
+ public JSONObject getPluginData() {
+ JSONObject data = new JSONObject();
+
+ String pluginName = "FastAsyncWorldEdit";
+ String pluginVersion = Fawe.get().getVersion() + "";
+
+ data.put("pluginName", pluginName); // Append the name of the plugin
+ data.put("pluginVersion", pluginVersion); // Append the version of the plugin
+ JSONArray customCharts = new JSONArray();
+ for (CustomChart customChart : charts) {
+ // Add the data of the custom charts
+ JSONObject chart = customChart.getRequestJsonObject();
+ if (chart == null) { // If the chart is null, we skip it
+ continue;
+ }
+ customCharts.add(chart);
+ }
+ data.put("customCharts", customCharts);
+
+ return data;
+ }
+
+ /**
+ * Gets the server specific data.
+ *
+ * @return The server specific data.
+ */
+ private JSONObject getServerData() {
+ // Minecraft specific data
+ int playerAmount = getPlayerCount();
+ int onlineMode = Fawe.imp().isOnlineMode() ? 1 : 0;
+ String serverVersion = Fawe.imp().getPlatformVersion();
+
+ // OS/Java specific data
+ String javaVersion = System.getProperty("java.version");
+ String osName = System.getProperty("os.name");
+ String osArch = System.getProperty("os.arch");
+ String osVersion = System.getProperty("os.version");
+ int coreCount = Runtime.getRuntime().availableProcessors();
+
+ JSONObject data = new JSONObject();
+
+ data.put("serverUUID", serverUUID);
+
+ data.put("playerAmount", playerAmount);
+ data.put("onlineMode", onlineMode);
+ data.put("bukkitVersion", serverVersion);
+
+ data.put("javaVersion", javaVersion);
+ data.put("osName", osName);
+ data.put("osArch", osArch);
+ data.put("osVersion", osVersion);
+ data.put("coreCount", coreCount);
+
+ return data;
+ }
+
+ public int getPlayerCount() {
+ return Fawe.imp() == null ? 1 : Fawe.imp().getPlayerCount();
+ }
+
+ /**
+ * Collects the data and sends it afterwards.
+ */
+ private void submitData() {
+ final JSONObject data = getServerData();
+
+ JSONArray pluginData = new JSONArray();
+ // Search for all other bStats Metrics classes to get their plugin data
+ for (Class service : Bukkit.getServicesManager().getKnownServices()) {
+ try {
+ service.getField("B_STATS_VERSION"); // Our identifier :)
+
+ for (RegisteredServiceProvider provider : Bukkit.getServicesManager()
+ .getRegistrations(service)) {
+ try {
+ pluginData.add(provider.getService().getMethod("getPluginData")
+ .invoke(provider.getProvider()));
+ } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
+ }
+ }
+ } catch (NoSuchFieldException ignored) {
+ }
+ }
+
+ data.put("plugins", pluginData);
+
+ // Create a new thread for the connection to the bStats server
+ new Thread(() -> {
+ try {
+ // Send the data
+ sendData(plugin, data);
+ } catch (Exception e) {
+ // Something went wrong! :(
+ if (logFailedRequests) {
+ plugin.getLogger()
+ .log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(),
+ e);
+ }
+ }
+ }).start();
+ }
+
+ /**
+ * Sends the data to the bStats server.
+ *
+ * @param plugin Any plugin. It's just used to get a logger instance.
+ * @param data The data to send.
+ * @throws Exception If the request failed.
+ */
+ private static void sendData(Plugin plugin, JSONObject data) throws Exception {
+ if (data == null) {
+ throw new IllegalArgumentException("Data cannot be null!");
+ }
+ if (Bukkit.isPrimaryThread()) {
+ throw new IllegalAccessException(
+ "This method must not be called from the main thread!");
+ }
+ if (logSentData) {
+ plugin.getLogger().info("Sending data to bStats: " + data.toString());
+ }
+ HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+ // Compress the data to save bandwidth
+ byte[] compressedData = compress(data.toString());
+
+ // Add headers
+ connection.setRequestMethod("POST");
+ connection.addRequestProperty("Accept", "application/json");
+ connection.addRequestProperty("Connection", "close");
+ connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
+ connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
+ connection.setRequestProperty("Content-Type",
+ "application/json"); // We send our data in JSON format
+ connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+ // Send data
+ connection.setDoOutput(true);
+ try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+ outputStream.write(compressedData);
+ outputStream.flush();
+ }
+
+ StringBuilder builder;
+ try (InputStream inputStream = connection.getInputStream();
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(inputStream))) {
+
+ builder = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ builder.append(line);
+ }
+ }
+ if (logResponseStatusText) {
+ plugin.getLogger()
+ .info("Sent data to bStats and received response: " + builder.toString());
+ }
+ }
+
+ /**
+ * Gzips the given String.
+ *
+ * @param str The string to gzip.
+ * @return The gzipped String.
+ * @throws IOException If the compression failed.
+ */
+ private static byte[] compress(final String str) throws IOException {
+ if (str == null) {
+ return null;
+ }
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+ gzip.write(str.getBytes(StandardCharsets.UTF_8));
+ gzip.close();
+ return outputStream.toByteArray();
+ }
+
+ /**
+ * Represents a custom chart.
+ */
+ public static abstract class CustomChart {
+
+ // The id of the chart
+ final String chartId;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ */
+ CustomChart(String chartId) {
+ if (chartId == null || chartId.isEmpty()) {
+ throw new IllegalArgumentException("ChartId cannot be null or empty!");
+ }
+ this.chartId = chartId;
+ }
+
+ private JSONObject getRequestJsonObject() {
+ JSONObject chart = new JSONObject();
+ chart.put("chartId", chartId);
+ try {
+ JSONObject data = getChartData();
+ if (data == null) {
+ // If the data is null we don't send the chart.
+ return null;
+ }
+ chart.put("data", data);
+ } catch (Throwable t) {
+ if (logFailedRequests) {
+ Bukkit.getLogger().log(Level.WARNING,
+ "Failed to get data for custom chart with id " + chartId, t);
+ }
+ return null;
+ }
+ return chart;
+ }
+
+ protected abstract JSONObject getChartData() throws Exception;
+
+ }
+
+
+ /**
+ * Represents a custom simple pie.
+ */
+ public static class SimplePie extends CustomChart {
+
+ private final Callable callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SimplePie(String chartId, Callable callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ String value = callable.call();
+ if (value == null || value.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("value", value);
+ return data;
+ }
+ }
+
+
+ /**
+ * Represents a custom advanced pie.
+ */
+ public static class AdvancedPie extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public AdvancedPie(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue() == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ values.put(entry.getKey(), entry.getValue());
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+ }
+
+
+ /**
+ * Represents a custom drilldown pie.
+ */
+ public static class DrilldownPie extends CustomChart {
+
+ private final Callable>> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public DrilldownPie(String chartId, Callable>> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override public JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map> map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean reallyAllSkipped = true;
+ for (Map.Entry> entryValues : map.entrySet()) {
+ JSONObject value = new JSONObject();
+ boolean allSkipped = true;
+ for (Map.Entry valueEntry : map.get(entryValues.getKey())
+ .entrySet()) {
+ value.put(valueEntry.getKey(), valueEntry.getValue());
+ allSkipped = false;
+ }
+ if (!allSkipped) {
+ reallyAllSkipped = false;
+ values.put(entryValues.getKey(), value);
+ }
+ }
+ if (reallyAllSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+ }
+
+
+ /**
+ * Represents a custom single line chart.
+ */
+ public static class SingleLineChart extends CustomChart {
+
+ private final Callable callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SingleLineChart(String chartId, Callable callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ int value = callable.call();
+ if (value == 0) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("value", value);
+ return data;
+ }
+
+ }
+
+
+ /**
+ * Represents a custom multi line chart.
+ */
+ public static class MultiLineChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public MultiLineChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue() == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ values.put(entry.getKey(), entry.getValue());
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+
+ /**
+ * Represents a custom simple bar chart.
+ */
+ public static class SimpleBarChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public SimpleBarChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ for (Map.Entry entry : map.entrySet()) {
+ JSONArray categoryValues = new JSONArray();
+ categoryValues.add(entry.getValue());
+ values.put(entry.getKey(), categoryValues);
+ }
+ data.put("values", values);
+ return data;
+ }
+
+ }
+
+
+ /**
+ * Represents a custom advanced bar chart.
+ */
+ public static class AdvancedBarChart extends CustomChart {
+
+ private final Callable> callable;
+
+ /**
+ * Class constructor.
+ *
+ * @param chartId The id of the chart.
+ * @param callable The callable which is used to request the chart data.
+ */
+ public AdvancedBarChart(String chartId, Callable> callable) {
+ super(chartId);
+ this.callable = callable;
+ }
+
+ @Override protected JSONObject getChartData() throws Exception {
+ JSONObject data = new JSONObject();
+ JSONObject values = new JSONObject();
+ Map map = callable.call();
+ if (map == null || map.isEmpty()) {
+ // Null = skip the chart
+ return null;
+ }
+ boolean allSkipped = true;
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue().length == 0) {
+ continue; // Skip this invalid
+ }
+ allSkipped = false;
+ JSONArray categoryValues = new JSONArray();
+ for (int categoryValue : entry.getValue()) {
+ categoryValues.add(categoryValue);
+ }
+ values.put(entry.getKey(), categoryValues);
+ }
+ if (allSkipped) {
+ // Null = skip the chart
+ return null;
+ }
+ data.put("values", values);
+ return data;
+ }
+ }
+
+}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
index 3881f1ffd..25eea21b9 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitPlayer.java
@@ -8,7 +8,6 @@ import com.boydti.fawe.wrappers.PlayerWrapper;
import java.lang.reflect.Method;
import java.util.UUID;
-import com.intellectualcrafters.plot.config.C;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import org.bukkit.Bukkit;
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
index 909f51ed9..550a1fe8e 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
@@ -24,13 +24,11 @@ import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.regions.FaweMaskManager;
import com.boydti.fawe.util.Jars;
import com.boydti.fawe.util.MainUtil;
-import com.boydti.fawe.util.ReflectionUtils;
import com.boydti.fawe.util.TaskManager;
import com.boydti.fawe.util.cui.CUI;
import com.boydti.fawe.util.image.ImageViewer;
-import com.boydti.fawe.util.metrics.BStats;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.world.World;
+import org.bstats.bukkit.BStats;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
@@ -41,7 +39,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.Vector;
@@ -74,8 +71,6 @@ public class FaweBukkit implements IFawe, Listener {
return this.vault;
}
- private List locations = Arrays.asList(new Vector(0, 5, 0));
-
public FaweBukkit(Plugin plugin) {
this.plugin = plugin;
try {
@@ -110,28 +105,25 @@ public class FaweBukkit implements IFawe, Listener {
}
// Registered delayed Event Listeners
- TaskManager.IMP.task(new Runnable() {
- @Override
- public void run() {
- // This class
- Bukkit.getPluginManager().registerEvents(FaweBukkit.this, FaweBukkit.this.plugin);
+ TaskManager.IMP.task(() -> {
+ // This class
+ Bukkit.getPluginManager().registerEvents(FaweBukkit.this, FaweBukkit.this.plugin);
- // The tick limiter
- try {
- Class.forName("sun.misc.SharedSecrets");
- new ChunkListener_8();
- } catch (ClassNotFoundException e) {
- new ChunkListener_9();
- }
-
- /*try {
- Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent");
- new AsyncTabCompleteListener(WorldEditPlugin.getInstance());
- } catch (Throwable ignore)
- {
- Bukkit.getPluginManager().registerEvents(new SyncTabCompleteListener(WorldEditPlugin.getInstance()), plugin);
- }*/
+ // The tick limiter
+ try {
+ Class.forName("sun.misc.SharedSecrets");
+ new ChunkListener_8();
+ } catch (ClassNotFoundException e) {
+ new ChunkListener_9();
}
+
+ /*try {
+ Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent");
+ new AsyncTabCompleteListener(WorldEditPlugin.getInstance());
+ } catch (Throwable ignore)
+ {
+ Bukkit.getPluginManager().registerEvents(new SyncTabCompleteListener(WorldEditPlugin.getInstance()), plugin);
+ }*/
});
}
@@ -265,42 +257,8 @@ public class FaweBukkit implements IFawe, Listener {
}
}
- @Override
- public void startMetrics() {
- Metrics metrics = new Metrics(plugin);
- metrics.start();
- TaskManager.IMP.task(new Runnable() {
- @Override
- public void run() {
- ArrayList> services = new ArrayList(Bukkit.getServicesManager().getKnownServices());
- services.forEach(service -> {
- try {
- service.getField("B_STATS_VERSION");
- ArrayList> providers = new ArrayList(Bukkit.getServicesManager().getRegistrations(service));
- for (RegisteredServiceProvider provider : providers) {
- Object instance = provider.getProvider();
-
- // Link it to FAWE's metrics instead
- BStats.linkMetrics(instance);
-
- // Disable the other metrics
- Bukkit.getServicesManager().unregister(service, instance);
- try {
- Class clazz = instance.getClass();
- Field logFailedRequests = ReflectionUtils.findField(clazz, boolean.class);
- logFailedRequests.set(null, false);
- Field url = null;
- try { url = clazz.getDeclaredField("URL"); } catch (NoSuchFieldException ignore) {
- for (Field field : clazz.getDeclaredFields()) if (ReflectionUtils.setAccessible(field).get(null).toString().startsWith("http")) { url = field; break; }
- }
- if (url != null) ReflectionUtils.setFailsafeFieldValue(url, null, null);
- } catch (NoSuchFieldError | IllegalAccessException ignore) {}
- catch (Throwable e) {}
- }
- } catch (NoSuchFieldException ignored) { }
- });
- }
- });
+ @Override public void startMetrics() {
+ BStats bStats = new BStats(plugin);
}
public ItemUtil getItemUtil() {
@@ -335,11 +293,11 @@ public class FaweBukkit implements IFawe, Listener {
public String getDebugInfo() {
StringBuilder msg = new StringBuilder();
List pl = new ArrayList<>();
- msg.append("server.plugins: \n");
+ msg.append("server.version: " + Bukkit.getVersion() + " / " + Bukkit.getBukkitVersion() + "\n");
+ msg.append("Plugins: \n");
for (Plugin p : Bukkit.getPluginManager().getPlugins()) {
msg.append(" - " + p.getName() + ": " + p.getDescription().getVersion() + "\n");
}
- msg.append("server.version: " + Bukkit.getVersion() + " / " + Bukkit.getBukkitVersion() + "\n");
return msg.toString();
}
@@ -387,12 +345,8 @@ public class FaweBukkit implements IFawe, Listener {
debug("=======================================");
ignore.printStackTrace();
debug("=======================================");
- TaskManager.IMP.laterAsync(new Runnable() {
- @Override
- public void run() {
- MainUtil.sendAdmin("&cNo NMS placer found, see console!");
- }
- }, 1);
+ TaskManager.IMP.laterAsync(
+ () -> MainUtil.sendAdmin("&cNo NMS placer found, see console!"), 1);
hasNMS = false;
}
return new BukkitQueue_All(world);
@@ -443,12 +397,8 @@ public class FaweBukkit implements IFawe, Listener {
debug("=======================================");
error.printStackTrace();
debug("=======================================");
- TaskManager.IMP.laterAsync(new Runnable() {
- @Override
- public void run() {
- MainUtil.sendAdmin("&cNo NMS placer found, see console!");
- }
- }, 1);
+ TaskManager.IMP.laterAsync(
+ () -> MainUtil.sendAdmin("&cNo NMS placer found, see console!"), 1);
hasNMS = false;
}
}
@@ -480,15 +430,6 @@ public class FaweBukkit implements IFawe, Listener {
MainUtil.handleError(e);
}
}
- final Plugin plotmePlugin = Bukkit.getServer().getPluginManager().getPlugin("PlotMe");
- if ((plotmePlugin != null) && plotmePlugin.isEnabled()) {
- try {
- managers.add(new PlotMeFeature(plotmePlugin, this));
- Fawe.debug("Plugin 'PlotMe' found. Using it now.");
- } catch (final Throwable e) {
- MainUtil.handleError(e);
- }
- }
final Plugin townyPlugin = Bukkit.getServer().getPluginManager().getPlugin("Towny");
if ((townyPlugin != null) && townyPlugin.isEnabled()) {
try {
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java
deleted file mode 100644
index ff1deca39..000000000
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/Metrics.java
+++ /dev/null
@@ -1,584 +0,0 @@
-package com.boydti.fawe.bukkit;
-
-import com.boydti.fawe.Fawe;
-import com.boydti.fawe.object.io.FastByteArrayOutputStream;
-import com.boydti.fawe.object.io.PGZIPOutputStream;
-import com.boydti.fawe.util.MainUtil;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.logging.Level;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.scheduler.BukkitTask;
-
-public class Metrics {
-
- /**
- * The current revision number.
- */
- private static final int REVISION = 7;
- /**
- * The base url of the metrics domain.
- */
- private static final String BASE_URL = "http://report.mcstats.org";
- /**
- * The url used to report a server's status.
- */
- private static final String REPORT_URL = "/plugin/%s";
- /**
- * Interval of time to ping (in minutes).
- */
- private static final int PING_INTERVAL = 15;
- /**
- * The plugin this metrics submits for.
- */
- private final Plugin plugin;
- /**
- * All of the custom graphs to submit to metrics.
- */
- private final Set graphs = Collections.synchronizedSet(new HashSet());
- /**
- * Unique server id.
- */
- private final String guid;
- /**
- * Debug mode.
- */
- private final boolean debug;
- /**
- * The scheduled task.
- */
- private volatile BukkitTask task = null;
-
- public Metrics(Plugin plugin) {
- if (plugin == null) {
- throw new IllegalArgumentException("Plugin cannot be null");
- }
- this.plugin = plugin;
- this.guid = UUID.randomUUID().toString();
- this.debug = false;
- }
-
- /**
- * GZip compress a string of bytes.
- *
- * @param input
- *
- * @return byte[] the file as a byte array
- */
- public static byte[] gzip(String input) {
- FastByteArrayOutputStream baos = new FastByteArrayOutputStream();
- PGZIPOutputStream gzos = null;
- try {
- gzos = new PGZIPOutputStream(baos);
- gzos.write(input.getBytes("UTF-8"));
- } catch (IOException e) {
- MainUtil.handleError(e);
- } finally {
- if (gzos != null) {
- try {
- gzos.close();
- } catch (IOException ignore) {
- }
- }
- }
- return baos.toByteArray();
- }
-
- /**
- * Appends a json encoded key/value pair to the given string builder.
- *
- * @param json
- * @param key
- * @param value
- *
- */
- private static void appendJSONPair(StringBuilder json, String key, String value) {
- boolean isValueNumeric = false;
- try {
- if (value.equals("0") || !value.endsWith("0")) {
- Double.parseDouble(value);
- isValueNumeric = true;
- }
- } catch (NumberFormatException e) {
- isValueNumeric = false;
- }
- if (json.charAt(json.length() - 1) != '{') {
- json.append(',');
- }
- json.append(escapeJSON(key));
- json.append(':');
- if (isValueNumeric) {
- json.append(value);
- } else {
- json.append(escapeJSON(value));
- }
- }
-
- /**
- * Escape a string to create a valid JSON string
- *
- * @param text
- *
- * @return String
- */
- private static String escapeJSON(String text) {
- StringBuilder builder = new StringBuilder();
- builder.append('"');
- for (int index = 0; index < text.length(); index++) {
- char chr = text.charAt(index);
- switch (chr) {
- case '"':
- case '\\':
- builder.append('\\');
- builder.append(chr);
- break;
- case '\b':
- builder.append("\\b");
- break;
- case '\t':
- builder.append("\\t");
- break;
- case '\n':
- builder.append("\\n");
- break;
- case '\r':
- builder.append("\\r");
- break;
- default:
- if (chr < ' ') {
- String t = "000" + Integer.toHexString(chr);
- builder.append("\\u" + t.substring(t.length() - 4));
- } else {
- builder.append(chr);
- }
- break;
- }
- }
- builder.append('"');
- return builder.toString();
- }
-
- /**
- * Encode text as UTF-8
- *
- * @param text the text to encode
- *
- * @return the encoded text, as UTF-8
- */
- private static String urlEncode(String text) throws UnsupportedEncodingException {
- return URLEncoder.encode(text, "UTF-8");
- }
-
- /**
- * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
- * website. Plotters can be added to the graph object returned.
- *
- * @param name The name of the graph
- *
- * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
- */
- public Graph createGraph(String name) {
- if (name == null) {
- throw new IllegalArgumentException("Graph name cannot be null");
- }
- // Construct the graph object
- Graph graph = new Graph(name);
- // Now we can add our graph
- this.graphs.add(graph);
- // and return back
- return graph;
- }
-
- /**
- * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
- *
- * @param graph The name of the graph
- */
- public void addGraph(Graph graph) {
- if (graph == null) {
- throw new IllegalArgumentException("Graph cannot be null");
- }
- this.graphs.add(graph);
- }
-
- /**
- * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
- * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
- * ticks.
- *
- * @return True if statistics measuring is running, otherwise false.
- */
- public boolean start() {
- // Is metrics already running?
- if (this.task != null) {
- return true;
- }
- // Begin hitting the server with glorious data
- this.task = this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, new Runnable() {
- private boolean firstPost = true;
-
- @Override
- public void run() {
- try {
- postPlugin(!this.firstPost);
- // After the first post we set firstPost to
- // false
- // Each post thereafter will be a ping
- this.firstPost = false;
- } catch (IOException e) {
- MainUtil.handleError(e);
- if (Metrics.this.debug) {
- Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
- }
- }
- }
- }, 0, PING_INTERVAL * 1200);
- return true;
- }
-
- /**
- * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
- *
- * @throws IOException
- */
- public void enable() {
- // Enable Task, if it is not running
- if (this.task == null) {
- start();
- }
- }
-
- /**
- * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
- *
- */
- public void disable() {
- // Disable Task, if it is running
- if (this.task != null) {
- this.task.cancel();
- this.task = null;
- }
- }
-
- /**
- * Gets the File object of the config file that should be used to store
- * data such as the GUID and opt-out status.
- *
- * @return the File object for the config file
- */
- public File getConfigFile() {
- // I believe the easiest way to get the base folder (e.g craftbukkit set
- // via -P) for plugins to use
- // is to abuse the plugin object we already have
- // plugin.getDataFolder() => base/plugins/PluginA/
- // pluginsFolder => base/plugins/
- // The base is not necessarily relative to the startup directory.
- File pluginsFolder = this.plugin.getDataFolder().getParentFile();
- // return => base/plugins/PluginMetrics/config.yml
- return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
- }
-
- /**
- * Generic method that posts a plugin to the metrics website.
- */
- private void postPlugin(boolean isPing) throws IOException {
- // Server software specific section
- PluginDescriptionFile description = this.plugin.getDescription();
- String pluginName = description.getName();
- boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
- String pluginVersion = description.getVersion();
- String serverVersion = Bukkit.getVersion();
- int playersOnline = 0;
- try {
- if (Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).getReturnType() == Collection.class) {
- playersOnline = ((Collection) Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).invoke(null)).size();
- } else {
- playersOnline = ((Player[]) Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).invoke(null)).length;
- }
- } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
- ex.printStackTrace();
- }
- // END server software specific section -- all code below does not use
- // any code outside of this class / Java
- // Construct the post data
- StringBuilder json = new StringBuilder(1024);
- json.append('{');
- // The plugin's description file containing all of the plugin data such as name, version, author, etc
- appendJSONPair(json, "guid", this.guid);
- appendJSONPair(json, "plugin_version", pluginVersion);
- appendJSONPair(json, "server_version", serverVersion);
- appendJSONPair(json, "players_online", Integer.toString(playersOnline));
- // New data as of R6
- String osname = System.getProperty("os.name");
- String osarch = System.getProperty("os.arch");
- String osversion = System.getProperty("os.version");
- String java_version = System.getProperty("java.version");
- int coreCount = Runtime.getRuntime().availableProcessors();
- // normalize os arch .. amd64 -> x86_64
- if (osarch.equals("amd64")) {
- osarch = "x86_64";
- }
- appendJSONPair(json, "osname", osname);
- appendJSONPair(json, "osarch", osarch);
- appendJSONPair(json, "osversion", osversion);
- appendJSONPair(json, "cores", Integer.toString(coreCount));
- appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0");
- appendJSONPair(json, "java_version", java_version);
- // If we're pinging, append it
- if (isPing) {
- appendJSONPair(json, "ping", "1");
- }
- if (!this.graphs.isEmpty()) {
- synchronized (this.graphs) {
- json.append(',');
- json.append('"');
- json.append("graphs");
- json.append('"');
- json.append(':');
- json.append('{');
- boolean firstGraph = true;
- for (Graph graph : this.graphs) {
- StringBuilder graphJson = new StringBuilder();
- graphJson.append('{');
- for (Plotter plotter : graph.getPlotters()) {
- appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
- }
- graphJson.append('}');
- if (!firstGraph) {
- json.append(',');
- }
- json.append(escapeJSON(graph.getName()));
- json.append(':');
- json.append(graphJson);
- firstGraph = false;
- }
- json.append('}');
- }
- }
- // close json
- json.append('}');
- // Create the url
- URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
- // Connect to the website
- URLConnection connection;
- // Mineshafter creates a socks proxy, so we can safely bypass it
- // It does not reroute POST requests so we need to go around it
- if (isMineshafterPresent()) {
- connection = url.openConnection(Proxy.NO_PROXY);
- } else {
- connection = url.openConnection();
- }
- byte[] uncompressed = json.toString().getBytes();
- byte[] compressed = gzip(json.toString());
- // Headers
- connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
- connection.addRequestProperty("Content-Type", "application/json");
- connection.addRequestProperty("Content-Encoding", "gzip");
- connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.setDoOutput(true);
- if (this.debug) {
- Fawe.debug("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
- }
- try {
- try (OutputStream os = connection.getOutputStream()) {
- os.write(compressed);
- os.flush();
- }
- String response;
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
- response = reader.readLine();
- if (this.debug) {
- Fawe.debug("[Metrics] Response for " + pluginName + ": " + response);
- }
- }
- if (response == null || response.startsWith("ERR") || response.startsWith("7")) {
- if (response == null) {
- response = "null";
- } else if (response.startsWith("7")) {
- response = response.substring(response.startsWith("7,") ? 2 : 1);
- }
- throw new IOException(response);
- } else {
- // Is this the first update this hour?
- if ("1".equals(response) || response.contains("This is your first update this hour")) {
- synchronized (this.graphs) {
- for (Graph graph : this.graphs) {
- for (Plotter plotter : graph.getPlotters()) {
- plotter.reset();
- }
- }
- }
- }
- }
- } catch (Exception e) {
- if (this.debug) {
- MainUtil.handleError(e);
- }
- }
- }
-
- /**
- * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
- *
- * @return true if mineshafter is installed on the server
- */
- private boolean isMineshafterPresent() {
- try {
- Class.forName("mineshafter.MineServer");
- return true;
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
-
- /**
- * Represents a custom graph on the website
- */
- public static class Graph {
-
- /**
- * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
- * rejected
- */
- private final String name;
- /**
- * The set of plotters that are contained within this graph
- */
- private final Set plotters = new LinkedHashSet<>();
-
- private Graph(String name) {
- this.name = name;
- }
-
- /**
- * Gets the graph's name
- *
- * @return the Graph's name
- */
- public String getName() {
- return this.name;
- }
-
- /**
- * Add a plotter to the graph, which will be used to plot entries
- *
- * @param plotter the plotter to add to the graph
- */
- public void addPlotter(Plotter plotter) {
- this.plotters.add(plotter);
- }
-
- /**
- * Remove a plotter from the graph
- *
- * @param plotter the plotter to remove from the graph
- */
- public void removePlotter(Plotter plotter) {
- this.plotters.remove(plotter);
- }
-
- /**
- * Gets an unmodifiable set of the plotter objects in the graph
- *
- * @return an unmodifiable {@link Set} of the plotter objects
- */
- public Set getPlotters() {
- return Collections.unmodifiableSet(this.plotters);
- }
-
- @Override
- public int hashCode() {
- return this.name.hashCode();
- }
-
- @Override
- public boolean equals(Object object) {
- if (!(object instanceof Graph)) {
- return false;
- }
- Graph graph = (Graph) object;
- return graph.name.equals(this.name);
- }
-
- /**
- * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
- */
- protected void onOptOut() {
- }
- }
-
- /**
- * Interface used to collect custom data for a plugin
- */
- public abstract static class Plotter {
-
- /**
- * The plot's name
- */
- private final String name;
-
- /**
- * Construct a plotter with the default plot name
- */
- public Plotter() {
- this("Default");
- }
-
- /**
- * Construct a plotter with a specific plot name
- *
- * @param name the name of the plotter to use, which will show up on the website
- */
- public Plotter(String name) {
- this.name = name;
- }
-
- /**
- * Get the current value for the plotted point. Since this function defers to an external function it may or may
- * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
- * from any thread so care should be taken when accessing resources that need to be synchronized.
- *
- * @return the current value for the point to be plotted.
- */
- public abstract int getValue();
-
- /**
- * Get the column name for the plotted point
- *
- * @return the plotted point's column name
- */
- public String getColumnName() {
- return this.name;
- }
-
- /**
- * Called after the website graphs have been updated
- */
- public void reset() {
- }
-
- @Override
- public int hashCode() {
- return getColumnName().hashCode();
- }
-
- @Override
- public boolean equals(Object object) {
- if (!(object instanceof Plotter)) {
- return false;
- }
- Plotter plotter = (Plotter) object;
- return plotter.name.equals(this.name) && plotter.getValue() == getValue();
- }
- }
-}
\ No newline at end of file
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java
index 30bffb79b..53a59d24d 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java
@@ -1,7 +1,8 @@
package com.boydti.fawe.bukkit.adapter.v1_13_1;
import com.sk89q.util.ReflectionUtil;
-import com.sk89q.worldedit.blocks.BlockMaterial;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
+
import net.minecraft.server.v1_13_R2.*;
import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
index 9726b20fd..628956cdf 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
@@ -22,22 +22,20 @@ package com.boydti.fawe.bukkit.adapter.v1_13_1;
import com.boydti.fawe.Fawe;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
-import com.sk89q.jnbt.*;
import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.BlockMaterial;
+import com.sk89q.jnbt.*;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.bukkit.adapter.CachedBukkitAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.internal.Constants;
+import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.state.*;
import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.block.*;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
import net.minecraft.server.v1_13_R2.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -49,14 +47,13 @@ import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock;
import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.entity.Player;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
-import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -69,7 +66,6 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
private final Field nbtListTagListField;
private final Method nbtCreateTagMethod;
- private Method chunkSetTypeMethod;
static {
// A simple test
@@ -88,13 +84,6 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
// The method to create an NBTBase tag given its type ID
nbtCreateTagMethod = NBTBase.class.getDeclaredMethod("createTag", byte.class);
nbtCreateTagMethod.setAccessible(true);
-
- // 1.13.2 Adaptation to find the a/setType method
- try {
- chunkSetTypeMethod = Chunk.class.getMethod("setType", BlockPosition.class, IBlockData.class, boolean.class);
- }catch(NoSuchMethodException e) {
- chunkSetTypeMethod = Chunk.class.getMethod("a", BlockPosition.class, IBlockData.class, boolean.class);
- }
}
private int[] idbToStateOrdinal;
@@ -186,7 +175,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
@Override
public BlockMaterial getMaterial(BlockState state) {
- BlockTypes type = state.getBlockType();
+ BlockType type = state.getBlockType();
IBlockData bs = ((CraftBlockData) Bukkit.createBlockData(state.getAsString())).getState();
return new BlockMaterial_1_13(bs.getBlock(), bs);
}
@@ -213,7 +202,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
@SuppressWarnings("deprecation")
@Override
- public BlockState getBlock(Location location) {
+ public BaseBlock getBlock(Location location) {
checkNotNull(location);
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
@@ -229,11 +218,11 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
if (te != null) {
NBTTagCompound tag = new NBTTagCompound();
readTileEntityIntoTag(te, tag); // Load data
- return new BaseBlock(state, (CompoundTag) toNative(tag));
+ return state.toBaseBlock((CompoundTag) toNative(tag));
}
}
- return state;
+ return state.toBaseBlock();
}
@Override
@@ -260,10 +249,13 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
} else {
existing = section.getType(x & 15, y & 15, z & 15);
}
- BlockPosition pos = null;
- CompoundTag nativeTag = state.getNbtData();
+
+ BlockPosition pos = new BlockPosition(x, y, z);
+
+ nmsChunk.d(pos); // Force delete the old tile entity
+
+ CompoundTag nativeTag = state instanceof BaseBlock ? ((BaseBlock)state).getNbtData() : null;
if (nativeTag != null || existing instanceof TileEntityBlock) {
- pos = new BlockPosition(x, y, z);
nmsWorld.setTypeAndData(pos, blockData, 0);
// remove tile
if (nativeTag != null) {
@@ -285,18 +277,12 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
sections[y4] = section = new ChunkSection(y4 << 4, nmsWorld.worldProvider.g());
}
if (existing.e() != blockData.e() || existing.getMaterial().f() != blockData.getMaterial().f()) {
- try {
- chunkSetTypeMethod.invoke(nmsChunk, pos = new BlockPosition(x, y, z), blockData, false);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- logger.warning("Error when setting block!");
- e.printStackTrace();
- }
+ nmsChunk.setType(pos = new BlockPosition(x, y, z), blockData, false);
} else {
section.setType(x & 15, y & 15, z & 15, blockData);
}
}
if (update) {
- if (pos == null) pos = new BlockPosition(x, y, z);
nmsWorld.getMinecraftWorld().notify(pos, existing, blockData, 0);
}
return true;
@@ -325,7 +311,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
public org.bukkit.entity.Entity createEntity(Location location, BaseEntity state) {
checkNotNull(location);
checkNotNull(state);
-
+ if (state.getType() == com.sk89q.worldedit.world.entity.EntityTypes.PLAYER) return null;
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
WorldServer worldServer = craftWorld.getHandle();
@@ -353,7 +339,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
@SuppressWarnings("unchecked")
@Override
- public Map getProperties(BlockType blockType) {
+ public Map> getProperties(BlockType blockType) {
Block block;
try {
block = IRegistry.BLOCK.getOrDefault(new MinecraftKey(blockType.getNamespace(), blockType.getResource()));
@@ -365,7 +351,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
logger.warning("Failed to find properties for " + blockType.getId());
return Collections.emptyMap();
}
- Map properties = Maps.newLinkedHashMap();
+ Map> properties = Maps.newLinkedHashMap();
BlockStateList blockStateList = block.getStates();
for (IBlockState state : blockStateList.d()) {
Property property;
@@ -411,17 +397,19 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
}
return new CompoundTag(values);
} else if (foreign instanceof NBTTagByte) {
- return new ByteTag(((NBTTagByte) foreign).asByte()); // getByte
+ return new ByteTag(((NBTTagByte) foreign).asByte());
} else if (foreign instanceof NBTTagByteArray) {
return new ByteArrayTag(((NBTTagByteArray) foreign).c()); // data
} else if (foreign instanceof NBTTagDouble) {
return new DoubleTag(((NBTTagDouble) foreign).asDouble()); // getDouble
} else if (foreign instanceof NBTTagFloat) {
- return new FloatTag(((NBTTagFloat) foreign).asFloat()); // getFloat
+ return new FloatTag(((NBTTagFloat) foreign).asFloat());
} else if (foreign instanceof NBTTagInt) {
- return new IntTag(((NBTTagInt) foreign).asInt()); // getInt
+ return new IntTag(((NBTTagInt) foreign).asInt());
} else if (foreign instanceof NBTTagIntArray) {
return new IntArrayTag(((NBTTagIntArray) foreign).d()); // data
+ } else if (foreign instanceof NBTTagLongArray) {
+ return new LongArrayTag(((NBTTagLongArray) foreign).d()); // data
} else if (foreign instanceof NBTTagList) {
try {
return toNativeList((NBTTagList) foreign);
@@ -430,13 +418,13 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
return new ListTag(ByteTag.class, new ArrayList());
}
} else if (foreign instanceof NBTTagLong) {
- return new LongTag(((NBTTagLong) foreign).asLong()); // getLong
+ return new LongTag(((NBTTagLong) foreign).asLong());
} else if (foreign instanceof NBTTagShort) {
- return new ShortTag(((NBTTagShort) foreign).asShort()); // getShort
+ return new ShortTag(((NBTTagShort) foreign).asShort());
} else if (foreign instanceof NBTTagString) {
- return new StringTag(foreign.asString()); // data
+ return new StringTag(foreign.asString());
} else if (foreign instanceof NBTTagEnd) {
- return EndTag.INSTANCE;
+ return new EndTag();
} else {
throw new IllegalArgumentException("Don't know how to make native " + foreign.getClass().getCanonicalName());
}
@@ -454,7 +442,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
*/
public ListTag toNativeList(NBTTagList foreign) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
List values = new ArrayList<>();
- int type = foreign.getTypeId();
+ int type = foreign.d();
List foreignList;
foreignList = (List) nbtListTagListField.get(foreign);
@@ -497,9 +485,11 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
return new NBTTagInt(((IntTag) foreign).getValue());
} else if (foreign instanceof IntArrayTag) {
return new NBTTagIntArray(((IntArrayTag) foreign).getValue());
+ } else if (foreign instanceof LongArrayTag) {
+ return new NBTTagLongArray(((LongArrayTag) foreign).getValue());
} else if (foreign instanceof ListTag) {
NBTTagList tag = new NBTTagList();
- ListTag foreignList = (ListTag) foreign;
+ ListTag foreignList = (ListTag) foreign;
for (Tag t : foreignList.getValue()) {
tag.add(fromNative(t));
}
@@ -539,4 +529,26 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
BlockMaterial_1_13 material = (BlockMaterial_1_13) state.getMaterial();
return material.getCraftBlockData();
}
-}
\ No newline at end of file
+
+ @Override
+ public void sendFakeNBT(Player player, BlockVector3 pos, CompoundTag nbtData) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void notifyAndLightBlock(Location position, BlockState previousType) {
+ this.setBlock(position.getChunk(), position.getBlockX(), position.getBlockY(), position.getBlockZ(), previousType, true);
+ }
+
+ @Override
+ public boolean setBlock(Location location, BlockStateHolder state, boolean notifyAndLight) {
+ return this.setBlock(location.getChunk(), location.getBlockX(), location.getBlockY(), location.getBlockZ(), state, notifyAndLight);
+ }
+
+ @Override
+ public void sendFakeOP(Player player) {
+ // TODO Auto-generated method stub
+
+ }
+}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/JsonString.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/JsonString.java
index e59fb2e70..115bdf66e 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/JsonString.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/JsonString.java
@@ -29,7 +29,7 @@ final class JsonString implements JsonRepresentedObject, ConfigurationSerializab
}
public Map serialize() {
- HashMap theSingleValue = new HashMap();
+ HashMap theSingleValue = new HashMap<>();
theSingleValue.put("stringValue", _value);
return theSingleValue;
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/Reflection.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/Reflection.java
index d0e7b60c7..17e5e4280 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/Reflection.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/chat/Reflection.java
@@ -177,12 +177,12 @@ public final class Reflection {
*/
public synchronized static Method getMethod(Class clazz, String name, Class... args) {
if (!_loadedMethods.containsKey(clazz)) {
- _loadedMethods.put(clazz, new HashMap>, Method>>());
+ _loadedMethods.put(clazz, new HashMap<>());
}
Map>, Method>> loadedMethodNames = _loadedMethods.get(clazz);
if (!loadedMethodNames.containsKey(name)) {
- loadedMethodNames.put(name, new HashMap>, Method>());
+ loadedMethodNames.put(name, new HashMap<>());
}
Map>, Method> loadedSignatures = loadedMethodNames.get(name);
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/GriefPreventionFilter.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/GriefPreventionFilter.java
index a67438547..1f49830de 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/GriefPreventionFilter.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/GriefPreventionFilter.java
@@ -1,9 +1,10 @@
package com.boydti.fawe.bukkit.filter;
+import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.regions.general.CuboidRegionFilter;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.sk89q.worldedit.BlockVector2D;
+import com.boydti.fawe.util.TaskManager;
+import com.sk89q.worldedit.math.BlockVector2;
+
import java.util.ArrayDeque;
import java.util.Collection;
import me.ryanhamshire.GriefPrevention.Claim;
@@ -34,8 +35,8 @@ public class GriefPreventionFilter extends CuboidRegionFilter {
org.bukkit.Location bot = claim.getGreaterBoundaryCorner();
if (world.equals(bot.getWorld())) {
org.bukkit.Location top = claim.getGreaterBoundaryCorner();
- BlockVector2D pos1 = new BlockVector2D(bot.getBlockX(), bot.getBlockZ());
- BlockVector2D pos2 = new BlockVector2D(top.getBlockX(), top.getBlockZ());
+ BlockVector2 pos1 = BlockVector2.at(bot.getBlockX(), bot.getBlockZ());
+ BlockVector2 pos2 = BlockVector2.at(top.getBlockX(), top.getBlockZ());
add(pos1, pos2);
}
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java
index e9b8a6bf3..b195a9368 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/filter/WorldGuardFilter.java
@@ -5,7 +5,7 @@ import com.boydti.fawe.FaweAPI;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.regions.general.CuboidRegionFilter;
import com.boydti.fawe.util.TaskManager;
-import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -33,14 +33,14 @@ public class WorldGuardFilter extends CuboidRegionFilter {
public void run(Object value) {
WorldGuardFilter.this.manager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(FaweAPI.getWorld(world.getName()));
for (ProtectedRegion region : manager.getRegions().values()) {
- BlockVector min = region.getMinimumPoint();
- BlockVector max = region.getMaximumPoint();
+ BlockVector3 min = region.getMinimumPoint();
+ BlockVector3 max = region.getMaximumPoint();
if (max.getBlockX() - min.getBlockX() > 1024 || max.getBlockZ() - min.getBlockZ() > 1024) {
Fawe.debug("Large or complex region shapes cannot be optimized. Filtering will be slower");
large = true;
break;
}
- add(min.toVector2D(), max.toVector2D());
+ add(min.toBlockVector2(), max.toBlockVector2());
}
}
});
@@ -49,8 +49,8 @@ public class WorldGuardFilter extends CuboidRegionFilter {
@Override
public boolean containsChunk(int chunkX, int chunkZ) {
if (!large) return super.containsChunk(chunkX, chunkZ);
- BlockVector pos1 = new BlockVector(chunkX << 4, 0, chunkZ << 4);
- BlockVector pos2 = new BlockVector(pos1.getBlockX() + 15, 255, pos1.getBlockZ() + 15);
+ BlockVector3 pos1 = BlockVector3.at(chunkX << 4, 0, chunkZ << 4);
+ BlockVector3 pos2 = BlockVector3.at(pos1.getBlockX() + 15, 255, pos1.getBlockZ() + 15);
ProtectedCuboidRegion chunkRegion = new ProtectedCuboidRegion("unimportant", pos1, pos2);
ApplicableRegionSet set = manager.getApplicableRegions(chunkRegion);
return set.size() > 0 && !set.getRegions().iterator().next().getId().equals("__global__");
@@ -59,8 +59,8 @@ public class WorldGuardFilter extends CuboidRegionFilter {
@Override
public boolean containsRegion(int mcaX, int mcaZ) {
if (!large) return super.containsRegion(mcaX, mcaZ);
- BlockVector pos1 = new BlockVector(mcaX << 9, 0, mcaZ << 9);
- BlockVector pos2 = new BlockVector(pos1.getBlockX() + 511, 255, pos1.getBlockZ() + 511);
+ BlockVector3 pos1 = BlockVector3.at(mcaX << 9, 0, mcaZ << 9);
+ BlockVector3 pos2 = BlockVector3.at(pos1.getBlockX() + 511, 255, pos1.getBlockZ() + 511);
ProtectedCuboidRegion regionRegion = new ProtectedCuboidRegion("unimportant", pos1, pos2);
ApplicableRegionSet set = manager.getApplicableRegions(regionRegion);
return set.size() > 0 && !set.getRegions().iterator().next().getId().equals("__global__");
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/BukkitImageListener.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/BukkitImageListener.java
index 68bb97377..e175ff1d5 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/BukkitImageListener.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/BukkitImageListener.java
@@ -14,6 +14,9 @@ import com.sk89q.worldedit.*;
import com.sk89q.worldedit.command.tool.BrushTool;
import com.sk89q.worldedit.command.tool.InvalidToolBindException;
import com.sk89q.worldedit.command.tool.brush.Brush;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
+
import java.util.ArrayDeque;
import java.util.Collection;
import java.util.Iterator;
@@ -69,7 +72,7 @@ public class BukkitImageListener implements Listener {
String name = player.getName().toLowerCase();
if (!event.getMessage().toLowerCase().contains(name)) {
ArrayDeque buffered = fp.getMeta("CFIBufferedMessages");
- if (buffered == null) fp.setMeta("CFIBufferedMessaged", buffered = new ArrayDeque());
+ if (buffered == null) fp.setMeta("CFIBufferedMessaged", buffered = new ArrayDeque<>());
String full = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
buffered.add(full);
iter.remove();
@@ -100,7 +103,7 @@ public class BukkitImageListener implements Listener {
if (event.getHand() == EquipmentSlot.OFF_HAND) return;
} catch (NoSuchFieldError | NoSuchMethodError ignored) {}
- List target = player.getLastTwoTargetBlocks((Set) null, 100);
+ List target = player.getLastTwoTargetBlocks(null, 100);
if (target.isEmpty()) return;
Block targetBlock = target.get(0);
@@ -148,7 +151,7 @@ public class BukkitImageListener implements Listener {
if (generator == null) return null;
ImageViewer viewer = generator.getImageViewer();
- if (viewer == null || !(viewer instanceof BukkitImageViewer)) return null;
+ if (!(viewer instanceof BukkitImageViewer)) return null;
BukkitImageViewer biv = (BukkitImageViewer) viewer;
return biv;
@@ -182,12 +185,7 @@ public class BukkitImageListener implements Listener {
if (frames == null || tool == null) {
viewer.selectFrame(itemFrame);
player.updateInventory();
- TaskManager.IMP.laterAsync(new Runnable() {
- @Override
- public void run() {
- viewer.view(generator);
- }
- }, 1);
+ TaskManager.IMP.laterAsync(() -> viewer.view(generator), 1);
return;
}
@@ -246,27 +244,24 @@ public class BukkitImageListener implements Listener {
if (worldX < 0 || worldX > width || worldZ < 0 || worldZ > length) return;
- Vector wPos = new Vector(worldX, 0, worldZ);
- fp.runAction(new Runnable() {
- @Override
- public void run() {
- viewer.refresh();
- int topY = generator.getNearestSurfaceTerrainBlock(wPos.getBlockX(), wPos.getBlockZ(), 255, 0, 255);
- wPos.mutY(topY);
+ fp.runAction(() -> {
+ BlockVector3 wPos = BlockVector3.at(worldX, 0, worldZ);
+ viewer.refresh();
+ int topY = generator.getNearestSurfaceTerrainBlock(wPos.getBlockX(), wPos.getBlockZ(), 255, 0, 255);
+ wPos = wPos.withY(topY);
- EditSession es = new EditSessionBuilder(fp.getWorld()).player(fp).combineStages(false).autoQueue(false).blockBag(null).limitUnlimited().build();
- ExtentTraverser last = new ExtentTraverser(es.getExtent()).last();
- if (last.get() instanceof FastWorldEditExtent) last = last.previous();
- last.setNext(generator);
- try {
- brush.build(es, wPos, context.getMaterial(), context.getSize());
- } catch (WorldEditException e) {
- e.printStackTrace();
- }
- es.flushQueue();
- viewer.view(generator);
+ EditSession es = new EditSessionBuilder(fp.getWorld()).player(fp).combineStages(false).autoQueue(false).blockBag(null).limitUnlimited().build();
+ ExtentTraverser last = new ExtentTraverser(es.getExtent()).last();
+ if (last.get() instanceof FastWorldEditExtent) last = last.previous();
+ last.setNext(generator);
+ try {
+ brush.build(es, wPos, context.getMaterial(), context.getSize());
+ } catch (WorldEditException e) {
+ e.printStackTrace();
}
+ es.flushQueue();
+ viewer.view(generator);
}, true, true);
@@ -277,4 +272,4 @@ public class BukkitImageListener implements Listener {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java
index f5e2fe05c..2053d8f9c 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java
@@ -22,15 +22,16 @@ import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.WrappedBlockData;
import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.event.platform.BlockInteractEvent;
import com.sk89q.worldedit.event.platform.Interaction;
import com.sk89q.worldedit.extension.platform.PlatformManager;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
+
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -62,12 +63,12 @@ public class CFIPacketListener implements Listener {
this.protocolmanager = ProtocolLibrary.getProtocolManager();
// Direct digging to the virtual world
- registerBlockEvent(PacketType.Play.Client.BLOCK_DIG, false, new RunnableVal3() {
+ registerBlockEvent(PacketType.Play.Client.BLOCK_DIG, false, new RunnableVal3() {
@Override
- public void run(PacketEvent event, VirtualWorld gen, Vector pt) {
+ public void run(PacketEvent event, VirtualWorld gen, BlockVector3 pt) {
try {
Player plr = event.getPlayer();
- Vector realPos = pt.add(gen.getOrigin());
+ BlockVector3 realPos = pt.add(gen.getOrigin().toBlockPoint());
if (!sendBlockChange(plr, gen, pt, Interaction.HIT)) {
gen.setBlock(pt, EditSession.nullBlock);
}
@@ -78,9 +79,9 @@ public class CFIPacketListener implements Listener {
});
// Direct placing to the virtual world
- RunnableVal3 placeTask = new RunnableVal3() {
+ RunnableVal3 placeTask = new RunnableVal3() {
@Override
- public void run(PacketEvent event, VirtualWorld gen, Vector pt) {
+ public void run(PacketEvent event, VirtualWorld gen, BlockVector3 pt) {
try {
Player plr = event.getPlayer();
List hands = event.getPacket().getHands().getValues();
@@ -89,17 +90,13 @@ public class CFIPacketListener implements Listener {
PlayerInventory inv = plr.getInventory();
ItemStack hand = enumHand == EnumWrappers.Hand.MAIN_HAND ? inv.getItemInMainHand() : inv.getItemInOffHand();
if (hand != null && hand.getType().isBlock()) {
- switch (hand.getType()) {
- case AIR:
- case CAVE_AIR:
- case VOID_AIR:
- break;
- default:
- BlockStateHolder block = BukkitAdapter.asBlockState(hand);
- if (block != null) {
- gen.setBlock(pt, block);
- return;
- }
+ Material type = hand.getType();
+ if (!type.isEmpty()) {
+ BlockStateHolder block = BukkitAdapter.asBlockState(hand);
+ if (block != null) {
+ gen.setBlock(pt, block);
+ return;
+ }
}
}
pt = getRelPos(event, gen);
@@ -113,9 +110,9 @@ public class CFIPacketListener implements Listener {
registerBlockEvent(PacketType.Play.Client.USE_ITEM, true, placeTask);
// Cancel block change packets where the real world overlaps with the virtual one
- registerBlockEvent(PacketType.Play.Server.BLOCK_CHANGE, false, new RunnableVal3() {
+ registerBlockEvent(PacketType.Play.Server.BLOCK_CHANGE, false, new RunnableVal3() {
@Override
- public void run(PacketEvent event, VirtualWorld gen, Vector pt) {
+ public void run(PacketEvent event, VirtualWorld gen, BlockVector3 pt) {
// Do nothing
}
});
@@ -128,7 +125,7 @@ public class CFIPacketListener implements Listener {
VirtualWorld gen = getGenerator(event);
if (gen != null) {
- Vector origin = gen.getOrigin();
+ BlockVector3 origin = gen.getOrigin().toBlockPoint();
PacketContainer packet = event.getPacket();
StructureModifier ints = packet.getIntegers();
int cx = ints.read(0);
@@ -137,7 +134,7 @@ public class CFIPacketListener implements Listener {
int ocx = origin.getBlockX() >> 4;
int ocz = origin.getBlockZ() >> 4;
- if (gen.contains(new Vector((cx - ocx) << 4, 0, (cz - ocz) << 4))) {
+ if (gen.contains(BlockVector3.at((cx - ocx) << 4, 0, (cz - ocz) << 4))) {
event.setCancelled(true);
Player plr = event.getPlayer();
@@ -163,8 +160,8 @@ public class CFIPacketListener implements Listener {
Location pos = player.getLocation();
VirtualWorld gen = getGenerator(event);
if (gen != null) {
- Vector origin = gen.getOrigin();
- Vector pt = new Vector(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
+ BlockVector3 origin = gen.getOrigin().toBlockPoint();
+ BlockVector3 pt = BlockVector3.at(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
StructureModifier ints = event.getPacket().getIntegers();
int id = ints.read(0);
@@ -188,21 +185,19 @@ public class CFIPacketListener implements Listener {
Location pos = player.getLocation();
VirtualWorld gen = getGenerator(event);
if (gen != null) {
- Vector origin = gen.getOrigin();
- Vector from = new Vector(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
+ BlockVector3 origin = gen.getOrigin().toBlockPoint();
+ BlockVector3 from = BlockVector3.at(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
PacketContainer packet = event.getPacket();
StructureModifier doubles = packet.getDoubles();
- Vector to = new Vector(doubles.read(0), doubles.read(1), doubles.read(2));
+ BlockVector3 to = BlockVector3.at(doubles.read(0), doubles.read(1), doubles.read(2));
if (gen.contains(to.subtract(origin)) && from.distanceSq(to) < 8) {
int id = packet.getIntegers().read(0);
PacketContainer reply = new PacketContainer(PacketType.Play.Client.TELEPORT_ACCEPT);
reply.getIntegers().write(0, id);
try {
protocolmanager.recieveClientPacket(player, reply);
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
}
event.setCancelled(true);
@@ -220,10 +215,10 @@ public class CFIPacketListener implements Listener {
if (gen != null) {
PacketContainer packet = event.getPacket();
ChunkCoordIntPair chunk = packet.getChunkCoordIntPairs().read(0);
- Vector origin = gen.getOrigin();
+ BlockVector3 origin = gen.getOrigin().toBlockPoint();
int cx = chunk.getChunkX() - (origin.getBlockX() >> 4);
int cz = chunk.getChunkZ() - (origin.getBlockX() >> 4);
- if (gen.contains(new Vector(cx << 4, 0, cz << 4))) {
+ if (gen.contains(BlockVector3.at(cx << 4, 0, cz << 4))) {
event.setCancelled(true);
}
}
@@ -246,14 +241,14 @@ public class CFIPacketListener implements Listener {
}
}
- private boolean sendBlockChange(Player plr, VirtualWorld gen, Vector pt, Interaction action) {
+ private boolean sendBlockChange(Player plr, VirtualWorld gen, BlockVector3 pt, Interaction action) {
PlatformManager platform = WorldEdit.getInstance().getPlatformManager();
com.sk89q.worldedit.entity.Player actor = FawePlayer.wrap(plr).getPlayer();
- com.sk89q.worldedit.util.Location location = new com.sk89q.worldedit.util.Location(actor.getWorld(), pt);
+ com.sk89q.worldedit.util.Location location = new com.sk89q.worldedit.util.Location(actor.getWorld(), pt.toVector3());
BlockInteractEvent toCall = new BlockInteractEvent(actor, location, action);
platform.handleBlockInteract(toCall);
if (toCall.isCancelled() || action == Interaction.OPEN) {
- Vector realPos = pt.add(gen.getOrigin());
+ BlockVector3 realPos = pt.add(gen.getOrigin().toBlockPoint());
BlockStateHolder block = gen.getBlock(pt);
sendBlockChange(plr, realPos, block);
return true;
@@ -261,7 +256,7 @@ public class CFIPacketListener implements Listener {
return false;
}
- private void sendBlockChange(Player plr, Vector pt, BlockStateHolder block) {
+ private void sendBlockChange(Player plr, BlockVector3 pt, BlockStateHolder block) {
plr.sendBlockChange(new Location(plr.getWorld(), pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()), BukkitAdapter.adapt(block));
}
@@ -280,20 +275,20 @@ public class CFIPacketListener implements Listener {
return null;
}
- private Vector getRelPos(PacketEvent event, VirtualWorld generator) {
+ private BlockVector3 getRelPos(PacketEvent event, VirtualWorld generator) {
PacketContainer packet = event.getPacket();
StructureModifier position = packet.getBlockPositionModifier();
BlockPosition loc = position.readSafely(0);
if (loc == null) return null;
- Vector origin = generator.getOrigin();
- Vector pt = new Vector(loc.getX() - origin.getBlockX(), loc.getY() - origin.getBlockY(), loc.getZ() - origin.getBlockZ());
+ BlockVector3 origin = generator.getOrigin().toBlockPoint();
+ BlockVector3 pt = BlockVector3.at(loc.getX() - origin.getBlockX(), loc.getY() - origin.getBlockY(), loc.getZ() - origin.getBlockZ());
return pt;
}
- private void handleBlockEvent(PacketEvent event, boolean relative, RunnableVal3 task) {
+ private void handleBlockEvent(PacketEvent event, boolean relative, RunnableVal3 task) {
VirtualWorld gen = getGenerator(event);
if (gen != null) {
- Vector pt = getRelPos(event, gen);
+ BlockVector3 pt = getRelPos(event, gen);
if (pt != null) {
if (relative) pt = getRelative(event, pt);
if (gen.contains(pt)) {
@@ -304,7 +299,7 @@ public class CFIPacketListener implements Listener {
}
}
- private void registerBlockEvent(PacketType type, boolean relative, RunnableVal3 task) {
+ private void registerBlockEvent(PacketType type, boolean relative, RunnableVal3 task) {
protocolmanager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, type) {
@Override
public void onPacketReceiving(final PacketEvent event) {
@@ -318,7 +313,7 @@ public class CFIPacketListener implements Listener {
});
}
- private Vector getRelative(PacketEvent container, Vector pt) {
+ private BlockVector3 getRelative(PacketEvent container, BlockVector3 pt) {
PacketContainer packet = container.getPacket();
StructureModifier dirs = packet.getDirections();
EnumWrappers.Direction dir = dirs.readSafely(0);
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
index 701cd3e30..54e9f0bc9 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/BukkitMask.java
@@ -1,7 +1,8 @@
package com.boydti.fawe.bukkit.regions;
import com.boydti.fawe.regions.FaweMask;
-import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.math.BlockVector3;
+
import org.bukkit.Location;
public class BukkitMask extends FaweMask {
@@ -11,6 +12,6 @@ public class BukkitMask extends FaweMask {
}
public BukkitMask(Location pos1, Location pos2, String name) {
- super(new BlockVector(pos1.getBlockX(), pos1.getBlockY(), pos1.getBlockZ()), new BlockVector(pos2.getBlockX(), pos2.getBlockY(), pos2.getBlockZ()), name);
+ super(BlockVector3.at(pos1.getBlockX(), pos1.getBlockY(), pos1.getBlockZ()), BlockVector3.at(pos2.getBlockX(), pos2.getBlockY(), pos2.getBlockZ()), name);
}
}
\ No newline at end of file
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FreeBuildRegion.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FreeBuildRegion.java
index 1ef42cdcb..e1aa7bbc9 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FreeBuildRegion.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FreeBuildRegion.java
@@ -5,8 +5,8 @@ import com.boydti.fawe.bukkit.wrapper.AsyncWorld;
import com.boydti.fawe.object.FawePlayer;
import com.boydti.fawe.object.queue.NullFaweQueue;
import com.boydti.fawe.regions.FaweMask;
-import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.block.BlockTypes;
@@ -55,8 +55,8 @@ public class FreeBuildRegion extends BukkitMaskManager {
World bukkitWorld = player.parent.getWorld();
AsyncWorld asyncWorld = AsyncWorld.wrap(bukkitWorld);
- Vector vec1 = new Vector(0, 0, 0);
- Vector vec2 = vec1;
+ BlockVector3 vec1 = BlockVector3.at(0, 0, 0);
+ BlockVector3 vec2 = vec1;
Location pos1 = BukkitAdapter.adapt(bukkitWorld, vec1);
Location pos2 = BukkitAdapter.adapt(bukkitWorld, vec2);
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
deleted file mode 100644
index ee57961a9..000000000
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PlotMeFeature.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.boydti.fawe.bukkit.regions;
-
-import com.boydti.fawe.bukkit.FaweBukkit;
-import com.boydti.fawe.object.FawePlayer;
-import com.worldcretornica.plotme_core.Plot;
-import com.worldcretornica.plotme_core.PlotMe_Core;
-import com.worldcretornica.plotme_core.bukkit.PlotMe_CorePlugin;
-import com.worldcretornica.plotme_core.bukkit.api.BukkitPlayer;
-import com.worldcretornica.plotme_core.bukkit.api.BukkitWorld;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.Plugin;
-
-public class PlotMeFeature extends BukkitMaskManager implements Listener {
- FaweBukkit plugin;
- PlotMe_Core plotme;
-
- public PlotMeFeature(final Plugin plotmePlugin, final FaweBukkit p3) {
- super(plotmePlugin.getName());
- this.plotme = ((PlotMe_CorePlugin) plotmePlugin).getAPI();
- this.plugin = p3;
-
- }
- public boolean isAllowed(Player player, Plot plot, MaskType type) {
- return plot != null && type == MaskType.MEMBER ? plot.isAllowed(player.getUniqueId()) : player.getUniqueId().equals(plot.getOwnerId());
- }
-
- @Override
- public BukkitMask getMask(final FawePlayer fp, MaskType type) {
- final Player player = fp.parent;
- final Location location = player.getLocation();
- final Plot plot = this.plotme.getPlotMeCoreManager().getPlotById(new BukkitPlayer(player));
- if (plot == null) {
- return null;
- }
- if (isAllowed(player, plot, type)) {
- final Location pos1 = new Location(location.getWorld(), this.plotme.getGenManager(player.getWorld().getName()).bottomX(plot.getId(), new BukkitWorld(player.getWorld())), 0, this.plotme
- .getGenManager(player.getWorld().getName()).bottomZ(plot.getId(), new BukkitWorld(player.getWorld())));
- final Location pos2 = new Location(location.getWorld(), this.plotme.getGenManager(player.getWorld().getName()).topX(plot.getId(), new BukkitWorld(player.getWorld())), 256, this.plotme
- .getGenManager(player.getWorld().getName()).topZ(plot.getId(), new BukkitWorld(player.getWorld())));
- return new BukkitMask(pos1, pos2) {
- @Override
- public String getName() {
- return plot.getId();
- }
-
- @Override
- public boolean isValid(FawePlayer player, MaskType type) {
- return isAllowed((Player) player.parent, plot, type);
- }
- };
- }
- return null;
- }
-}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
index dccb3952a..7b0af05b5 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/PreciousStonesFeature.java
@@ -3,7 +3,8 @@ package com.boydti.fawe.bukkit.regions;
import com.boydti.fawe.bukkit.FaweBukkit;
import com.boydti.fawe.object.FawePlayer;
import com.boydti.fawe.regions.FaweMask;
-import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.math.BlockVector3;
+
import java.util.List;
import net.sacredlabyrinth.Phaed.PreciousStones.PreciousStones;
import net.sacredlabyrinth.Phaed.PreciousStones.field.Field;
@@ -40,8 +41,8 @@ public class PreciousStonesFeature extends BukkitMaskManager implements Listener
boolean member = fp.hasPermission("fawe.preciousstones.member");
for (final Field myField : fields) {
if (isAllowed(player, myField, type, member)) {
- BlockVector pos1 = new BlockVector(myField.getMinx(), myField.getMiny(), myField.getMinz());
- BlockVector pos2 = new BlockVector(myField.getMaxx(), myField.getMaxy(), myField.getMaxz());
+ BlockVector3 pos1 = BlockVector3.at(myField.getMinx(), myField.getMiny(), myField.getMinz());
+ BlockVector3 pos2 = BlockVector3.at(myField.getMaxx(), myField.getMaxy(), myField.getMaxz());
return new FaweMask(pos1, pos2, "FIELD: " + myField) {
@Override
public boolean isValid(FawePlayer player, MaskType type) {
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
index 156753f4a..cb7a91675 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
@@ -7,8 +7,8 @@ import com.boydti.fawe.object.FawePlayer;
import com.boydti.fawe.object.RegionWrapper;
import com.boydti.fawe.regions.FaweMask;
import com.boydti.fawe.regions.general.RegionFilter;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.AbstractRegion;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Polygonal2DRegion;
@@ -61,7 +61,7 @@ public class Worldguard extends BukkitMaskManager implements Listener {
if (global != null && isAllowed(player, global)) {
return global;
}
- final ApplicableRegionSet regions = manager.getApplicableRegions(new Vector(loc.getX(), loc.getY(), loc.getZ()));
+ final ApplicableRegionSet regions = manager.getApplicableRegions(BlockVector3.at(loc.getX(), loc.getY(), loc.getZ()));
for (final ProtectedRegion region : regions) {
if (isAllowed(player, region)) {
return region;
@@ -145,27 +145,27 @@ public class Worldguard extends BukkitMaskManager implements Listener {
}
@Override
- public Vector getMinimumPoint() {
+ public BlockVector3 getMinimumPoint() {
return region.getMinimumPoint();
}
@Override
- public Vector getMaximumPoint() {
+ public BlockVector3 getMaximumPoint() {
return region.getMaximumPoint();
}
@Override
- public void expand(Vector... changes) {
+ public void expand(BlockVector3... changes) {
throw new UnsupportedOperationException("Region is immutable");
}
@Override
- public void contract(Vector... changes) {
+ public void contract(BlockVector3... changes) {
throw new UnsupportedOperationException("Region is immutable");
}
@Override
- public boolean contains(Vector position) {
+ public boolean contains(BlockVector3 position) {
return region.contains(position);
}
}
@@ -179,8 +179,8 @@ public class Worldguard extends BukkitMaskManager implements Listener {
}
if (region instanceof ProtectedPolygonalRegion) {
ProtectedPolygonalRegion casted = (ProtectedPolygonalRegion) region;
- BlockVector max = region.getMaximumPoint();
- BlockVector min = region.getMinimumPoint();
+ BlockVector3 max = region.getMaximumPoint();
+ BlockVector3 min = region.getMinimumPoint();
return new Polygonal2DRegion(null, casted.getPoints(), min.getBlockY(), max.getBlockY());
}
return new AdaptedRegion(region);
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/WorldguardFlag.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/WorldguardFlag.java
index 21e673f41..3f3f1a842 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/WorldguardFlag.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/WorldguardFlag.java
@@ -5,7 +5,7 @@ import com.boydti.fawe.bukkit.filter.WorldGuardFilter;
import com.boydti.fawe.object.FawePlayer;
import com.boydti.fawe.regions.FaweMask;
import com.boydti.fawe.regions.general.RegionFilter;
-import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.AbstractRegion;
import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard;
@@ -65,45 +65,45 @@ public class WorldguardFlag extends BukkitMaskManager implements Listener {
}
@Override
- public Vector getMinimumPoint() {
- Vector point = null;
+ public BlockVector3 getMinimumPoint() {
+ BlockVector3 point = null;
for (Map.Entry entry : manager.getRegions().entrySet()) {
- Vector p = entry.getValue().getMinimumPoint();
+ BlockVector3 p = entry.getValue().getMinimumPoint();
if (point == null) {
point = p;
continue;
}
- point = Vector.getMinimum(point, p);
+ point = point.getMinimum(p);
}
return point;
}
@Override
- public Vector getMaximumPoint() {
- Vector point = null;
+ public BlockVector3 getMaximumPoint() {
+ BlockVector3 point = null;
for (Map.Entry entry : manager.getRegions().entrySet()) {
- Vector p = entry.getValue().getMaximumPoint();
+ BlockVector3 p = entry.getValue().getMaximumPoint();
if (point == null) {
point = p;
continue;
}
- point = Vector.getMaximum(point, p);
+ point = point.getMaximum(p);
}
return point;
}
@Override
- public void expand(Vector... changes) {
+ public void expand(BlockVector3... changes) {
throw new UnsupportedOperationException("Region is immutable");
}
@Override
- public void contract(Vector... changes) {
+ public void contract(BlockVector3... changes) {
throw new UnsupportedOperationException("Region is immutable");
}
@Override
- public boolean contains(Vector position) {
+ public boolean contains(BlockVector3 position) {
// Make sure that all these flags are not denied. Denies override allows. WorldGuardExtraFlags can add Flags.WORLDEDIT
return manager.getApplicableRegions(position).testState(localplayer, Flags.BUILD, Flags.BLOCK_PLACE, Flags.BLOCK_BREAK);
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java
index df5f92f87..28015ebb0 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java
@@ -69,7 +69,7 @@ public class ItemUtil {
if (nativeTag != null) return (CompoundTag) nativeTag;
}
Tag nativeTag = BukkitQueue_0.toNative(nmsTag);
- map.put(nmsTag.hashCode(), new WeakReference(nativeTag));
+ map.put(nmsTag.hashCode(), new WeakReference<>(nativeTag));
return null;
}
} catch (Throwable e) {
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/VaultUtil.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/VaultUtil.java
index dfc2cde83..4d0751c94 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/VaultUtil.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/VaultUtil.java
@@ -8,7 +8,8 @@ public class VaultUtil {
public final Permission permission;
public VaultUtil() {
- final RegisteredServiceProvider permissionProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
+ final RegisteredServiceProvider permissionProvider =
+ Bukkit.getServer().getServicesManager().getRegistration(Permission.class);
if (permissionProvider != null) {
this.permission = permissionProvider.getProvider();
} else {
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/cui/StructureCUI.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/cui/StructureCUI.java
index 15a397bf8..b1e389cc6 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/cui/StructureCUI.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/cui/StructureCUI.java
@@ -13,11 +13,12 @@ import com.comphenix.protocol.wrappers.BlockPosition;
import com.comphenix.protocol.wrappers.nbt.NbtBase;
import com.comphenix.protocol.wrappers.nbt.NbtCompound;
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
-import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.internal.cui.CUIEvent;
import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
+import com.sk89q.worldedit.math.BlockVector3;
+
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
@@ -33,10 +34,10 @@ import org.bukkit.entity.Player;
public class StructureCUI extends CUI {
private boolean cuboid = true;
- private Vector pos1;
- private Vector pos2;
+ private BlockVector3 pos1;
+ private BlockVector3 pos2;
- private Vector remove;
+ private BlockVector3 remove;
private NbtCompound removeTag;
private BlockState state;
@@ -56,7 +57,7 @@ public class StructureCUI extends CUI {
int x = Integer.parseInt(param[1]);
int y = Integer.parseInt(param[2]);
int z = Integer.parseInt(param[3]);
- Vector pos = new Vector(x, y, z);
+ BlockVector3 pos = BlockVector3.at(x, y, z);
if (id == 0) {
pos1 = pos;
} else {
@@ -123,7 +124,7 @@ public class StructureCUI extends CUI {
}
}
- private void sendNbt(Vector pos, NbtCompound compound) {
+ private void sendNbt(BlockVector3 pos, NbtCompound compound) {
Player player = this.getPlayer().parent;
ProtocolManager manager = ProtocolLibrary.getProtocolManager();
@@ -158,8 +159,8 @@ public class StructureCUI extends CUI {
remove = null;
}
if (pos1 == null || pos2 == null) return;
- Vector min = Vector.getMinimum(pos1, pos2);
- Vector max = Vector.getMaximum(pos1, pos2);
+ BlockVector3 min = pos1.getMinimum(pos2);
+ BlockVector3 max = pos1.getMaximum(pos2);
// Position
double rotX = playerLoc.getYaw();
@@ -187,7 +188,7 @@ public class StructureCUI extends CUI {
NbtCompound compound = constructStructureNbt(x, y, z, posX, posY, posZ, sizeX, sizeY, sizeZ);
Block block = player.getWorld().getBlockAt(x, y, z);
- remove = new Vector(x, y, z);
+ remove = BlockVector3.at(x, y, z);
state = BukkitAdapter.adapt(block.getBlockData());
removeTag = compound;
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
index 79a039f96..96483b7c5 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
@@ -13,7 +13,6 @@ import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.ListTag;
import com.sk89q.jnbt.LongTag;
import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
@@ -23,6 +22,8 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
@@ -103,7 +104,7 @@ public class BukkitChunk_All extends IntFaweChunk {
int[][] sections = getCombinedIdArrays();
final int bx = getX() << 4;
final int bz = getZ() << 4;
- boolean update = adapter != null ? adapter.isChunkInUse(chunk) : true;
+ boolean update = adapter == null || adapter.isChunkInUse(chunk);
if (layer == -1) {
if (adapter != null)
{
@@ -157,7 +158,7 @@ public class BukkitChunk_All extends IntFaweChunk {
HashSet entsToRemove = this.getEntityRemoves();
if (!entsToRemove.isEmpty()) {
for (Entity entity : chunk.getEntities()) {
- if (entsToRemove.contains(entity.getUniqueId())) {
+ if (entsToRemove.contains(entity.getUniqueId()) && !(entity instanceof Player)) {
entity.remove();
}
}
@@ -232,43 +233,40 @@ public class BukkitChunk_All extends IntFaweChunk {
if (combined == 0) continue;
int xx = bx + x;
- BlockTypes type = BlockTypes.getFromStateId(combined);
+ BlockType type = BlockTypes.getFromStateId(combined);
if (type == BlockTypes.__RESERVED__) continue;
- switch (type) {
- case AIR:
- case CAVE_AIR:
- case VOID_AIR:
- if (!place) {
- mutableLoc.setX(xx);
- mutableLoc.setY(yy);
- mutableLoc.setZ(zz);
+ String s = type.getResource().toUpperCase();
+ if (type.getMaterial().isAir()) {
+ if (!place) {
+ mutableLoc.setX(xx);
+ mutableLoc.setY(yy);
+ mutableLoc.setZ(zz);
+ setBlock(adapter, chunk, mutableLoc, combined, update);
+ }
+ continue;
+ }
+ if (place) {
+ if (type.getMaterial().hasContainer() && adapter != null) {
+ CompoundTag nbt = getTile(x, yy, z);
+ if (nbt != null) {
+ synchronized (BukkitChunk_All.this) {
+ BaseBlock state =
+ BaseBlock.getFromInternalId(combined, nbt);
+ adapter.setBlock(chunk, xx, yy, zz, state, update);
+ }
+ continue;
+ }
+ }
+ if (type.getMaterial().isTicksRandomly()) {
+ synchronized (BukkitChunk_All.this) {
setBlock(adapter, chunk, mutableLoc, combined, update);
}
- continue;
- default:
- if (place) {
- if (type.getMaterial().hasContainer() && adapter != null) {
- CompoundTag nbt = getTile(x, yy, z);
- if (nbt != null) {
- synchronized (BukkitChunk_All.this) {
- BaseBlock state = BaseBlock.getFromInternalId(combined, nbt);
- adapter.setBlock(chunk, xx, yy, zz, state, update);
- }
- continue;
- }
- }
- if (type.getMaterial().isTicksRandomly()) {
- synchronized (BukkitChunk_All.this) {
- setBlock(adapter, chunk, mutableLoc, combined, update);
- }
- } else {
- mutableLoc.setX(xx);
- mutableLoc.setY(yy);
- mutableLoc.setZ(zz);
- setBlock(adapter, chunk, mutableLoc, combined, update);
- }
- }
- continue;
+ } else {
+ mutableLoc.setX(xx);
+ mutableLoc.setY(yy);
+ mutableLoc.setZ(zz);
+ setBlock(adapter, chunk, mutableLoc, combined, update);
+ }
}
}
}
@@ -277,65 +275,61 @@ public class BukkitChunk_All extends IntFaweChunk {
for (;index < 4096; index++) {
int j = place ? index : 4095 - index;
int combined = newArray[j];
- BlockTypes type = BlockTypes.getFromStateId(combined);
+ BlockType type = BlockTypes.getFromStateId(combined);
if (type == BlockTypes.__RESERVED__) continue;
- switch (type) {
- case AIR:
- case CAVE_AIR:
- case VOID_AIR:
- if (!place) {
- int x = cacheX[j];
- int z = cacheZ[j];
- int y = cacheY[j];
- mutableLoc.setX(bx + x);
- mutableLoc.setY(y);
- mutableLoc.setZ(bz + z);
- setBlock(adapter, chunk, mutableLoc, combined, update);
- }
- break;
- default:
- boolean light = type.getMaterial().getLightValue() > 0;
- if (light) {
- if (place) {
- continue;
- }
- light = light && getParent().getSettings().LIGHTING.MODE != 0;
- if (light) {
- parent.enableLighting(disableResult);
- }
- } else if (!place) {
- continue;
- }
+ if (type.getMaterial().isAir()) {
+ if (!place) {
int x = cacheX[j];
int z = cacheZ[j];
int y = cacheY[j];
- if (type.getMaterial().hasContainer() && adapter != null) {
- CompoundTag tile = getTile(x, y, z);
- if (tile != null) {
- synchronized (BukkitChunk_All.this) {
- BaseBlock state = BaseBlock.getFromInternalId(combined, tile);
- adapter.setBlock(chunk, bx + x, y, bz + z, state, update);
- }
- break;
- }
+ mutableLoc.setX(bx + x);
+ mutableLoc.setY(y);
+ mutableLoc.setZ(bz + z);
+ setBlock(adapter, chunk, mutableLoc, combined, update);
+ }
+ continue;
+ } else {
+ boolean light = type.getMaterial().getLightValue() > 0;
+ if (light) {
+ if (place) {
+ continue;
}
- if (type.getMaterial().isTicksRandomly()) {
+ light = light && getParent().getSettings().LIGHTING.MODE != 0;
+ if (light) {
+ parent.enableLighting(disableResult);
+ }
+ } else if (!place) {
+ continue;
+ }
+ int x = cacheX[j];
+ int z = cacheZ[j];
+ int y = cacheY[j];
+ if (type.getMaterial().hasContainer() && adapter != null) {
+ CompoundTag tile = getTile(x, y, z);
+ if (tile != null) {
synchronized (BukkitChunk_All.this) {
- mutableLoc.setX(bx + x);
- mutableLoc.setY(y);
- mutableLoc.setZ(bz + z);
- setBlock(adapter, chunk, mutableLoc, combined, update);
+ BaseBlock state = BaseBlock.getFromInternalId(combined, tile);
+ adapter.setBlock(chunk, bx + x, y, bz + z, state, update);
}
- } else {
+ break;
+ }
+ }
+ if (type.getMaterial().isTicksRandomly()) {
+ synchronized (BukkitChunk_All.this) {
mutableLoc.setX(bx + x);
mutableLoc.setY(y);
mutableLoc.setZ(bz + z);
setBlock(adapter, chunk, mutableLoc, combined, update);
}
- if (light) {
- parent.disableLighting(disableResult);
- }
- break;
+ } else {
+ mutableLoc.setX(bx + x);
+ mutableLoc.setY(y);
+ mutableLoc.setZ(bz + z);
+ setBlock(adapter, chunk, mutableLoc, combined, update);
+ }
+ if (light) {
+ parent.disableLighting(disableResult);
+ }
}
if (System.currentTimeMillis() - start > recommended) {
index++;
@@ -356,12 +350,12 @@ public class BukkitChunk_All extends IntFaweChunk {
}
public void setBlock(BukkitImplAdapter adapter, Chunk chunk, Location location, int combinedId, boolean update) {
- com.sk89q.worldedit.world.block.BlockState state = com.sk89q.worldedit.world.block.BlockState.getFromInternalId(combinedId);
+ com.sk89q.worldedit.world.block.BaseBlock base = com.sk89q.worldedit.world.block.BlockState.getFromInternalId(combinedId).toBaseBlock();
if (adapter != null) {
- adapter.setBlock(chunk, (int) location.getX(), (int) location.getY(), (int) location.getZ(), state, update);
+ adapter.setBlock(chunk, (int) location.getX(), (int) location.getY(), (int) location.getZ(), base, update);
} else {
Block block = location.getWorld().getBlockAt(location);
- block.setBlockData(BukkitAdapter.adapt(state), false);
+ block.setBlockData(BukkitAdapter.adapt(base), false);
}
}
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
index ac294817f..65ae8e00d 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
@@ -113,14 +113,15 @@ public abstract class BukkitQueue_0 extends NMSMa
WirePacket packet = null;
int viewDistance = Bukkit.getViewDistance();
try {
- for (int i = 0; i < players.length; i++) {
+ for (FawePlayer fawePlayer : players) {
int cx = chunk.getX();
int cz = chunk.getZ();
- Player player = ((BukkitPlayer) players[i]).parent;
+ Player player = ((BukkitPlayer) fawePlayer).parent;
Location loc = player.getLocation();
- if (Math.abs((loc.getBlockX() >> 4) - cx) <= viewDistance && Math.abs((loc.getBlockZ() >> 4) - cz) <= viewDistance) {
+ if (Math.abs((loc.getBlockX() >> 4) - cx) <= viewDistance
+ && Math.abs((loc.getBlockZ() >> 4) - cz) <= viewDistance) {
if (packet == null) {
byte[] data;
byte[] buffer = new byte[8192];
@@ -128,12 +129,12 @@ public abstract class BukkitQueue_0 extends NMSMa
chunk = (FaweChunk) chunk.getChunk();
}
// TODO FIXME
-// if (chunk instanceof MCAChunk) {
-// data = new MCAChunkPacket((MCAChunk) chunk, true, true, hasSky()).apply(buffer);
-// } else {
-// data = new FaweChunkPacket(chunk, true, true, hasSky()).apply(buffer);
-// }
-// packet = new WirePacket(PacketType.Play.Server.MAP_CHUNK, data);
+ // if (chunk instanceof MCAChunk) {
+ // data = new MCAChunkPacket((MCAChunk) chunk, true, true, hasSky()).apply(buffer);
+ // } else {
+ // data = new FaweChunkPacket(chunk, true, true, hasSky()).apply(buffer);
+ // }
+ // packet = new WirePacket(PacketType.Play.Server.MAP_CHUNK, data);
}
manager.sendWirePacket(player, packet);
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
index bdb0dff98..8960efd76 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.bukkit.Chunk;
@@ -153,7 +154,7 @@ public class BukkitQueue_All extends BukkitQueue_0();
+ if (unloaded == null) unloaded = new ArrayDeque<>();
unloaded.add(chunk);
}
}
@@ -180,19 +181,16 @@ public class BukkitQueue_All extends BukkitQueue_0 finalUnloaded = unloaded;
- TaskManager.IMP.async(new Runnable() {
- @Override
- public void run() {
- for (Chunk chunk : finalUnloaded) {
- int cx = chunk.getX();
- int cz = chunk.getZ();
- if (world.isChunkLoaded(cx, cz)) continue;
- SetQueue.IMP.addTask(() -> {
- world.loadChunk(chunk.getX(), chunk.getZ(), false);
- world.refreshChunk(chunk.getX(), chunk.getZ());
- });
+ TaskManager.IMP.async(() -> {
+ for (Chunk chunk : finalUnloaded) {
+ int cx = chunk.getX();
+ int cz = chunk.getZ();
+ if (world.isChunkLoaded(cx, cz)) continue;
+ SetQueue.IMP.addTask(() -> {
+ world.loadChunk(chunk.getX(), chunk.getZ(), false);
+ world.refreshChunk(chunk.getX(), chunk.getZ());
+ });
- }
}
});
// load chunks
@@ -333,7 +331,7 @@ public class BukkitQueue_All extends BukkitQueue_0imp().getPlugin();
plm.registerEvents(this, plugin);
try { plm.registerEvents(new ChunkListener_8Plus(this), plugin); } catch (Throwable ignore) {}
- TaskManager.IMP.repeat(new Runnable() {
- @Override
- public void run() {
- rateLimit--;
- physicsFreeze = false;
- itemFreeze = false;
- lastZ = Integer.MIN_VALUE;
- physSkip = 0;
- physCancelPair = Long.MIN_VALUE;
- physCancel = false;
+ TaskManager.IMP.repeat(() -> {
+ rateLimit--;
+ physicsFreeze = false;
+ itemFreeze = false;
+ lastZ = Integer.MIN_VALUE;
+ physSkip = 0;
+ physCancelPair = Long.MIN_VALUE;
+ physCancel = false;
- counter.clear();
- for (Long2ObjectMap.Entry entry : badChunks.long2ObjectEntrySet()) {
- long key = entry.getLongKey();
- int x = MathMan.unpairIntX(key);
- int z = MathMan.unpairIntY(key);
- counter.put(key, badLimit);
- }
- badChunks.clear();
+ counter.clear();
+ for (Long2ObjectMap.Entry entry : badChunks.long2ObjectEntrySet()) {
+ long key = entry.getLongKey();
+ int x = MathMan.unpairIntX(key);
+ int z = MathMan.unpairIntY(key);
+ counter.put(key, badLimit);
}
+ badChunks.clear();
}, Settings.IMP.TICK_LIMITER.INTERVAL);
}
}
@@ -381,4 +378,4 @@ public abstract class ChunkListener implements Listener {
return;
}
}
-}
\ No newline at end of file
+}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/FaweAdapter_All.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/FaweAdapter_All.java
index 781cfe9b8..6c8dbb19b 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/FaweAdapter_All.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/FaweAdapter_All.java
@@ -18,7 +18,7 @@
//import com.sk89q.jnbt.StringTag;
//import com.sk89q.jnbt.Tag;
//import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
+//import com.sk89q.worldedit.world.block.BlockState;
//import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
//import com.sk89q.worldedit.entity.BaseEntity;
//import com.sk89q.worldedit.internal.Constants;
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java
index 369f9a71a..20592715a 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/PaperChunkCallback.java
@@ -5,8 +5,8 @@ import org.bukkit.World;
public abstract class PaperChunkCallback {
public PaperChunkCallback(World world, int x, int z) {
- world.getChunkAtAsync(x, z, chunk -> PaperChunkCallback.this.onLoad(chunk));
+ world.getChunkAtAsync(x, z, PaperChunkCallback.this::onLoad);
}
public abstract void onLoad(Chunk chunk);
-}
\ No newline at end of file
+}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
index e13815f15..a41583620 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
@@ -9,7 +9,10 @@ import java.util.Collection;
import java.util.List;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
+
+import org.bukkit.FluidCollisionMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Biome;
@@ -20,6 +23,9 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.RayTraceResult;
+import org.bukkit.util.Vector;
public class AsyncBlock implements Block {
@@ -198,9 +204,10 @@ public class AsyncBlock implements Block {
@Override
public BlockFace getFace(Block block) {
BlockFace[] directions = BlockFace.values();
- for(int i = 0; i < directions.length; ++i) {
- BlockFace face = directions[i];
- if(this.getX() + face.getModX() == block.getX() && this.getY() + face.getModY() == block.getY() && this.getZ() + face.getModZ() == block.getZ()) {
+ for (BlockFace face : directions) {
+ if (this.getX() + face.getModX() == block.getX()
+ && this.getY() + face.getModY() == block.getY()
+ && this.getZ() + face.getModZ() == block.getZ()) {
return face;
}
}
@@ -210,11 +217,10 @@ public class AsyncBlock implements Block {
@Override
public AsyncBlockState getState() {
int combined = queue.getCombinedId4Data(x, y, z, 0);
- BlockTypes type = BlockTypes.getFromStateId(combined);
- switch (type) {
- case SIGN:
- case WALL_SIGN:
- return new AsyncSign(this, combined);
+ BlockType type = BlockTypes.getFromStateId(combined);
+ String s = type.getResource().toUpperCase();
+ if (type == BlockTypes.SIGN || type == BlockTypes.WALL_SIGN) {
+ return new AsyncSign(this, combined);
}
return new AsyncBlockState(this, combined);
}
@@ -267,20 +273,13 @@ public class AsyncBlock implements Block {
@Override
public boolean isEmpty() {
- switch (getType()) {
- case AIR:
- case CAVE_AIR:
- case VOID_AIR:
- return true;
- default:
- return false;
- }
+ return getType().isEmpty();
}
@Override
public boolean isLiquid() {
int combined = queue.getCombinedId4Data(x, y, z, 0);
- BlockTypes type = BlockTypes.getFromStateId(combined);
+ BlockType type = BlockTypes.getFromStateId(combined);
return type.getMaterial().isLiquid();
}
@@ -343,4 +342,19 @@ public class AsyncBlock implements Block {
public void removeMetadata(String metadataKey, Plugin owningPlugin) {
this.getUnsafeBlock().removeMetadata(metadataKey, owningPlugin);
}
+
+ @Override
+ public boolean isPassable() {
+ return this.getUnsafeBlock().isPassable();
+ }
+
+ @Override
+ public RayTraceResult rayTrace(Location arg0, Vector arg1, double arg2, FluidCollisionMode arg3) {
+ return this.getUnsafeBlock().rayTrace(arg0, arg1, arg2, arg3);
+ }
+
+ @Override
+ public BoundingBox getBoundingBox() {
+ return this.getUnsafeBlock().getBoundingBox();
+ }
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
index 84d9d33cc..c536f9f8a 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncChunk.java
@@ -29,7 +29,7 @@ public class AsyncChunk implements Chunk {
@Override
public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof Chunk)) {
+ if (!(obj instanceof Chunk)) {
return false;
}
Chunk other = (Chunk) obj;
@@ -88,14 +88,14 @@ public class AsyncChunk implements Chunk {
BukkitQueue_0 bq = (BukkitQueue_0) queue;
if (world.isChunkLoaded(x, z)) {
long pair = MathMan.pairInt(x, z);
- Long originalKeep = bq.keepLoaded.get(pair);
- bq.keepLoaded.put(pair, Long.MAX_VALUE);
+ Long originalKeep = BukkitQueue_0.keepLoaded.get(pair);
+ BukkitQueue_0.keepLoaded.put(pair, Long.MAX_VALUE);
if (world.isChunkLoaded(x, z)) {
task.run();
if (originalKeep != null) {
- bq.keepLoaded.put(pair, originalKeep);
+ BukkitQueue_0.keepLoaded.put(pair, originalKeep);
} else {
- bq.keepLoaded.remove(pair);
+ BukkitQueue_0.keepLoaded.remove(pair);
}
return task.value;
}
@@ -182,4 +182,14 @@ public class AsyncChunk implements Chunk {
public boolean isSlimeChunk() {
return false;
}
+
+ @Override
+ public boolean isForceLoaded() {
+ return world.isChunkForceLoaded(x, z);
+ }
+
+ @Override
+ public void setForceLoaded(boolean arg0) {
+ world.getChunkAt(x, z).setForceLoaded(arg0);
+ }
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
index 4b04493be..2c2bda098 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
@@ -18,8 +18,11 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
import java.util.function.Supplier;
+import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.bukkit.*;
import org.bukkit.block.Biome;
@@ -39,7 +42,9 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
+import org.bukkit.util.BoundingBox;
import org.bukkit.util.Consumer;
+import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
/**
@@ -109,7 +114,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
this.parent = parent;
this.queue = queue;
if (queue instanceof BukkitQueue_0) {
- this.adapter = (BukkitImplAdapter) ((BukkitQueue_0) queue).getAdapter();
+ this.adapter = BukkitQueue_0.getAdapter();
} else {
try {
this.adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
@@ -136,12 +141,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
if (queue != this.queue) {
if (this.queue != null) {
final FaweQueue oldQueue = this.queue;
- TaskManager.IMP.async(new Runnable() {
- @Override
- public void run() {
- oldQueue.flush();
- }
- });
+ TaskManager.IMP.async(oldQueue::flush);
}
this.queue = queue;
}
@@ -268,7 +268,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
public int getHighestBlockYAt(int x, int z) {
for (int y = getMaxHeight() - 1; y >= 0; y--) {
int stateId = queue.getCachedCombinedId4Data(x, y, z, BlockTypes.AIR.getInternalId());
- BlockTypes type = BlockTypes.getFromStateId(stateId);
+ BlockType type = BlockTypes.getFromStateId(stateId);
if (!type.getMaterial().isAir()) return y;
}
return 0;
@@ -349,7 +349,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
@Override
public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof World)) {
+ if (!(obj instanceof World)) {
return false;
}
World other = (World) obj;
@@ -566,7 +566,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
return TaskManager.IMP.sync(new RunnableVal>() {
@Override
public void run(Collection value) {
- this.value = (Collection) parent.getEntitiesByClass(classes);
+ this.value = parent.getEntitiesByClass(classes);
}
});
}
@@ -576,7 +576,7 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
return TaskManager.IMP.sync(new RunnableVal>() {
@Override
public void run(Collection value) {
- this.value = (Collection) parent.getEntitiesByClass(cls);
+ this.value = parent.getEntitiesByClass(cls);
}
});
}
@@ -794,22 +794,12 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
@Override
@Deprecated
public FallingBlock spawnFallingBlock(Location location, Material material, byte data) throws IllegalArgumentException {
- return TaskManager.IMP.sync(new Supplier() {
- @Override
- public FallingBlock get() {
- return parent.spawnFallingBlock(location, material, data);
- }
- });
+ return TaskManager.IMP.sync(() -> parent.spawnFallingBlock(location, material, data));
}
@Override
public FallingBlock spawnFallingBlock(Location location, BlockData blockData) throws IllegalArgumentException {
- return TaskManager.IMP.sync(new Supplier() {
- @Override
- public FallingBlock get() {
- return parent.spawnFallingBlock(location, blockData);
- }
- });
+ return TaskManager.IMP.sync(() -> parent.spawnFallingBlock(location, blockData));
}
@Override
@@ -1181,4 +1171,106 @@ public class AsyncWorld extends DelegateFaweQueue implements World, HasFaweQueue
}
});
}
+
+ @Override
+ public CompletableFuture getChunkAtAsync(int arg0, int arg1, boolean arg2) {
+ return parent.getChunkAtAsync(arg0, arg1, arg2);
+ }
+
+ @Override
+ public Collection getNearbyEntities(BoundingBox arg0) {
+ return parent.getNearbyEntities(arg0);
+ }
+
+ @Override
+ public Collection getNearbyEntities(BoundingBox arg0, Predicate arg1) {
+ return parent.getNearbyEntities(arg0, arg1);
+ }
+
+ @Override
+ public Collection getNearbyEntities(Location arg0, double arg1, double arg2, double arg3,
+ Predicate arg4) {
+ return parent.getNearbyEntities(arg0, arg1, arg2, arg3, arg4);
+ }
+
+ @Override
+ public boolean isChunkForceLoaded(int arg0, int arg1) {
+ return parent.isChunkForceLoaded(arg0, arg1);
+ }
+
+ @Override
+ public boolean isDayTime() {
+ return parent.isDayTime();
+ }
+
+ @Override
+ public Location locateNearestStructure(Location arg0, StructureType arg1, int arg2, boolean arg3) {
+ return parent.locateNearestStructure(arg0, arg1, arg2, arg3);
+ }
+
+ @Override
+ public RayTraceResult rayTrace(Location arg0, Vector arg1, double arg2, FluidCollisionMode arg3, boolean arg4,
+ double arg5, Predicate arg6) {
+ return parent.rayTrace(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ }
+
+ @Override
+ public RayTraceResult rayTraceBlocks(Location arg0, Vector arg1, double arg2) {
+ return parent.rayTraceBlocks(arg0, arg1, arg2);
+ }
+
+ @Override
+ public RayTraceResult rayTraceBlocks(Location arg0, Vector arg1, double arg2, FluidCollisionMode arg3) {
+ return parent.rayTraceBlocks(arg0, arg1, arg2, arg3);
+ }
+
+ @Override
+ public RayTraceResult rayTraceBlocks(Location arg0, Vector arg1, double arg2, FluidCollisionMode arg3,
+ boolean arg4) {
+ return parent.rayTraceBlocks(arg0, arg1, arg2, arg3, arg4);
+ }
+
+ @Override
+ public RayTraceResult rayTraceEntities(Location arg0, Vector arg1, double arg2) {
+ return parent.rayTraceEntities(arg0, arg1, arg2);
+ }
+
+ @Override
+ public RayTraceResult rayTraceEntities(Location arg0, Vector arg1, double arg2, double arg3) {
+ return parent.rayTraceEntities(arg0, arg1, arg2, arg3);
+ }
+
+ @Override
+ public RayTraceResult rayTraceEntities(Location arg0, Vector arg1, double arg2, Predicate arg3) {
+ return parent.rayTraceEntities(arg0, arg1, arg2, arg3);
+ }
+
+ @Override
+ public RayTraceResult rayTraceEntities(Location arg0, Vector arg1, double arg2, double arg3,
+ Predicate arg4) {
+ return parent.rayTraceEntities(arg0, arg1, arg2, arg3, arg4);
+ }
+
+ @Override
+ public void spawnParticle(Particle arg0, Location arg1, int arg2, double arg3, double arg4, double arg5,
+ double arg6, T arg7, boolean arg8) {
+ parent.spawnParticle(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+ }
+
+ @Override
+ public void spawnParticle(Particle arg0, double arg1, double arg2, double arg3, int arg4, double arg5,
+ double arg6, double arg7, double arg8, T arg9, boolean arg10) {
+ parent.spawnParticle(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+
+ }
+
+ @Override
+ public void setChunkForceLoaded(int x, int z, boolean forced) {
+ parent.setChunkForceLoaded(x, z, forced);
+ }
+
+ @Override
+ public Collection getForceLoadedChunks() {
+ return parent.getForceLoadedChunks();
+ }
}
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java
index 54018dc14..1dfb8ab9d 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncSign.java
@@ -14,6 +14,8 @@ public class AsyncSign extends AsyncBlockState implements Sign {
public AsyncSign(AsyncBlock block, int combined) {
super(block, combined);
}
+
+ private boolean isEditable = false;
@Override
public String[] getLines() {
@@ -51,4 +53,14 @@ public class AsyncSign extends AsyncBlockState implements Sign {
map.put("Text" + (index + 1), new StringTag(toJson(line)));
}
}
+
+ @Override
+ public boolean isEditable() {
+ return this.isEditable;
+ }
+
+ @Override
+ public void setEditable(boolean arg0) {
+ this.isEditable = arg0;
+ }
}
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
index 01f04546b..4775d86c4 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
@@ -95,6 +95,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
bPermissionsResolver.class,
GroupManagerResolver.class,
NijiPermissionsResolver.class,
+ VaultResolver.class,
DinnerPermsResolver.class,
FlatFilePermissionsResolver.class
};
@@ -283,7 +284,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
if (plugin instanceof PermissionsProvider) {
setPluginPermissionsResolver(plugin);
} else if ("permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name)
- || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)) {
+ || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)
+ || "vault".equalsIgnoreCase(name)) {
load();
}
}
@@ -294,7 +296,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
if (event.getPlugin() instanceof PermissionsProvider
|| "permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name)
- || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)) {
+ || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)
+ || "vault".equalsIgnoreCase(name)) {
load();
}
}
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/VaultResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/VaultResolver.java
new file mode 100644
index 000000000..a97017ceb
--- /dev/null
+++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/VaultResolver.java
@@ -0,0 +1,116 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.wepif;
+
+import com.sk89q.util.yaml.YAMLProcessor;
+import net.milkbowl.vault.permission.Permission;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.RegisteredServiceProvider;
+
+public class VaultResolver implements PermissionsResolver {
+
+ private static Permission perms = null;
+
+ public static PermissionsResolver factory(Server server, YAMLProcessor config) {
+ if (server.getPluginManager().getPlugin("Vault") == null) {
+ return null;
+ }
+ RegisteredServiceProvider rsp = server.getServicesManager().getRegistration(Permission.class);
+ perms = rsp.getProvider();
+ if (perms == null) {
+ return null;
+ }
+
+ return new VaultResolver(server);
+ }
+
+ private final Server server;
+
+ public VaultResolver(Server server) {
+ this.server = server;
+ }
+
+ @Override
+ public void load() {
+ }
+
+ @Override
+ public String getDetectionMessage() {
+ return "Vault detected! Using Vault for permissions";
+ }
+
+ @Override
+ public boolean hasPermission(String name, String permission) {
+ return hasPermission(server.getOfflinePlayer(name), permission);
+ }
+
+ @Override
+ public boolean hasPermission(String worldName, String name, String permission) {
+ return hasPermission(worldName, server.getOfflinePlayer(name), permission);
+ }
+
+ @Override
+ public boolean inGroup(String player, String group) {
+ return inGroup(server.getOfflinePlayer(player), group);
+ }
+
+ @Override
+ public String[] getGroups(String player) {
+ return getGroups(server.getOfflinePlayer(player));
+ }
+
+ @Override
+ public boolean hasPermission(OfflinePlayer player, String permission) {
+ Player onlinePlayer = player.getPlayer();
+ if (onlinePlayer == null) {
+ return perms.playerHas(null, player, permission);
+ } else {
+ return perms.playerHas(onlinePlayer.getWorld().getName(), player, permission);
+ }
+ }
+
+ @Override
+ public boolean hasPermission(String worldName, OfflinePlayer player, String permission) {
+ return perms.playerHas(worldName, player, permission);
+ }
+
+ @Override
+ public boolean inGroup(OfflinePlayer player, String group) {
+ Player onlinePlayer = player.getPlayer();
+ if (onlinePlayer == null) {
+ return perms.playerInGroup(null, player, group);
+ } else {
+ return perms.playerInGroup(onlinePlayer, group);
+ }
+ }
+
+ @Override
+ public String[] getGroups(OfflinePlayer player) {
+ Player onlinePlayer = player.getPlayer();
+ if (onlinePlayer == null) {
+ return perms.getPlayerGroups(null, player);
+ } else {
+ return perms.getPlayerGroups(onlinePlayer);
+ }
+ }
+
+}
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
index 885a961b3..e68587283 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
@@ -19,12 +19,13 @@
package com.sk89q.worldedit.bukkit;
-import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.bukkit.adapter.IBukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.SimpleBukkitAdapter;
import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockState;
@@ -34,6 +35,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.item.ItemType;
+
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
@@ -84,7 +86,11 @@ public enum BukkitAdapter {
return getAdapter().adapt(location);
}
- public static org.bukkit.Location adapt(org.bukkit.World world, Vector position) {
+ public static org.bukkit.Location adapt(org.bukkit.World world, Vector3 position) {
+ return getAdapter().adapt(world, position);
+ }
+
+ public static org.bukkit.Location adapt(org.bukkit.World world, BlockVector3 position) {
return getAdapter().adapt(world, position);
}
@@ -92,10 +98,14 @@ public enum BukkitAdapter {
return getAdapter().adapt(world, location);
}
- public static Vector asVector(org.bukkit.Location location) {
+ public static Vector3 asVector(org.bukkit.Location location) {
return getAdapter().asVector(location);
}
+ public static BlockVector3 asBlockVector(org.bukkit.Location location) {
+ return getAdapter().asBlockVector(location);
+ }
+
public static Entity adapt(org.bukkit.entity.Entity entity) {
return getAdapter().adapt(entity);
}
@@ -132,12 +142,12 @@ public enum BukkitAdapter {
return getAdapter().adapt(blockData);
}
- public static BlockTypes adapt(Material material) {
+ public static BlockType adapt(Material material) {
return getAdapter().adapt(material);
}
- public static BlockData adapt(BlockStateHolder block) {
- return getAdapter().adapt(block);
+ public static > BlockData adapt(B block) {
+ return getAdapter().adapt(block);
}
public static BlockData getBlockData(int combinedId) {
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java
new file mode 100644
index 000000000..24cbe0f6b
--- /dev/null
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java
@@ -0,0 +1,52 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.registry.Category;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.registry.BlockCategoryRegistry;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class BukkitBlockCategoryRegistry implements BlockCategoryRegistry {
+
+ private Set getFromBukkitTag(Tag tag) {
+ return tag.getValues().stream().map(BukkitAdapter::asBlockType).collect(Collectors.toSet());
+ }
+
+ @Override
+ public Set getCategorisedByName(String category) {
+ String[] split = category.split(":");
+ String namespace = split.length > 1 ? split[0] : "minecraft";
+ String key = split.length > 1 ? split[1] : category;
+ Tag tag = Bukkit.getTag(Tag.REGISTRY_BLOCKS, new NamespacedKey(namespace, key), Material.class);
+ return getFromBukkitTag(tag);
+ }
+
+ @Override
+ public Set getAll(Category category) {
+ return getCategorisedByName(category.getId());
+ }
+}
\ No newline at end of file
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
index 7795a0022..0264ba49e 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
@@ -20,9 +20,9 @@
package com.sk89q.worldedit.bukkit;
import com.bekvon.bukkit.residence.commands.material;
-import com.sk89q.worldedit.blocks.BlockMaterial;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.command.tool.BlockDataCyler;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -83,7 +83,7 @@ public class BukkitBlockRegistry extends BundledBlockRegistry {
@Nullable
@Override
- public Map getProperties(BlockType blockType) {
+ public Map> getProperties(BlockType blockType) {
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
if (adapter != null) {
return adapter.getProperties(blockType);
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
index 3d289df5d..55929af02 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
@@ -19,24 +19,22 @@
package com.sk89q.worldedit.bukkit;
-import com.sk89q.worldedit.entity.metadata.Metadatable;
-import com.sk89q.worldedit.session.SessionKey;
-import com.sk89q.worldedit.util.auth.AuthorizationException;
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.internal.cui.CUIEvent;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-public class BukkitCommandSender implements Actor, Metadatable {
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.internal.cui.CUIEvent;
+import com.sk89q.worldedit.session.SessionKey;
+import com.sk89q.worldedit.util.auth.AuthorizationException;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+public class BukkitCommandSender implements Actor {
/**
* One time generated ID.
@@ -45,7 +43,6 @@ public class BukkitCommandSender implements Actor, Metadatable {
private CommandSender sender;
private WorldEditPlugin plugin;
- private ConcurrentHashMap meta;
public BukkitCommandSender(WorldEditPlugin plugin, CommandSender sender) {
checkNotNull(plugin);
@@ -56,12 +53,6 @@ public class BukkitCommandSender implements Actor, Metadatable {
this.sender = sender;
}
- @Override
- public synchronized Map getMetaMap() {
- if (meta == null) meta = new ConcurrentHashMap<>();
- return meta;
- }
-
@Override
public UUID getUniqueId() {
return DEFAULT_ID;
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java
index 5a20cdfbc..494a464ea 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java
@@ -21,6 +21,7 @@ package com.sk89q.worldedit.bukkit;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.worldedit.util.YAMLConfiguration;
+import com.sk89q.worldedit.util.report.Unreported;
import java.io.File;
@@ -30,7 +31,7 @@ import java.io.File;
public class BukkitConfiguration extends YAMLConfiguration {
public boolean noOpPermissions = false;
- private final WorldEditPlugin plugin;
+ @Unreported private final WorldEditPlugin plugin;
public BukkitConfiguration(YAMLProcessor config, WorldEditPlugin plugin) {
super(config, plugin.getLogger());
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
index 595a7fc9c..a5c7b0a60 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
@@ -71,6 +71,16 @@ public class BukkitEntity implements Entity {
}
}
+ @Override
+ public boolean setLocation(Location location) {
+ org.bukkit.entity.Entity entity = entityRef.get();
+ if (entity != null) {
+ return entity.teleport(BukkitAdapter.adapt(location));
+ } else {
+ return false;
+ }
+ }
+
@Override
public BaseEntity getState() {
org.bukkit.entity.Entity entity = entityRef.get();
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java
new file mode 100644
index 000000000..b5291b4e1
--- /dev/null
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java
@@ -0,0 +1,52 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.registry.Category;
+import com.sk89q.worldedit.world.item.ItemType;
+import com.sk89q.worldedit.world.registry.ItemCategoryRegistry;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class BukkitItemCategoryRegistry implements ItemCategoryRegistry {
+
+ private Set getFromBukkitTag(Tag tag) {
+ return tag.getValues().stream().map(BukkitAdapter::asItemType).collect(Collectors.toSet());
+ }
+
+ @Override
+ public Set getCategorisedByName(String category) {
+ String[] split = category.split(":");
+ String namespace = split.length > 1 ? split[0] : "minecraft";
+ String key = split.length > 1 ? split[1] : category;
+ Tag tag = Bukkit.getTag(Tag.REGISTRY_ITEMS, new NamespacedKey(namespace, key), Material.class);
+ return getFromBukkitTag(tag);
+ }
+
+ @Override
+ public Set getAll(Category category) {
+ return getCategorisedByName(category.getId());
+ }
+}
\ No newline at end of file
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
index be3f6ff1f..b3674e986 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
@@ -22,20 +22,25 @@ package com.sk89q.worldedit.bukkit;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.util.TaskManager;
import com.sk89q.util.StringUtil;
-import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItemStack;
+import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.extension.platform.AbstractPlayerActor;
import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.internal.cui.CUIEvent;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.session.SessionKey;
import com.sk89q.worldedit.util.HandSide;
import com.sk89q.worldedit.world.World;
-import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.gamemode.GameModes;
+
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -45,11 +50,12 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
-import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import javax.annotation.Nullable;
+
public class BukkitPlayer extends AbstractPlayerActor {
private Player player;
@@ -74,11 +80,11 @@ public class BukkitPlayer extends AbstractPlayerActor {
}
@Override
- public BlockState getBlockInHand(HandSide handSide) throws WorldEditException {
+ public BaseBlock getBlockInHand(HandSide handSide) throws WorldEditException {
ItemStack itemStack = handSide == HandSide.MAIN_HAND
? player.getInventory().getItemInMainHand()
: player.getInventory().getItemInOffHand();
- return BukkitAdapter.asBlockState(itemStack);
+ return BukkitAdapter.asBlockState(itemStack).toBaseBlock();
}
@Override
@@ -86,34 +92,38 @@ public class BukkitPlayer extends AbstractPlayerActor {
return player.getName();
}
+ @Override
+ public String getDisplayName() {
+ return player.getDisplayName();
+ }
+
@Override
public void giveItem(BaseItemStack itemStack) {
final PlayerInventory inv = player.getInventory();
ItemStack newItem = BukkitAdapter.adapt(itemStack);
- if (itemStack.getType() == WorldEdit.getInstance().getConfiguration().wandItem) {
+ if (itemStack.getType().getId().equalsIgnoreCase(WorldEdit.getInstance().getConfiguration().wandItem)) {
inv.remove(newItem);
}
final ItemStack item = player.getItemInHand();
player.setItemInHand(newItem);
- if (item != null) {
- HashMap overflow = inv.addItem(item);
- if (overflow != null && !overflow.isEmpty()) {
- TaskManager.IMP.sync(new RunnableVal