Davo
/
Dynmap-WorldGuard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Davo:master
Branches Tags
Davo:master
Davo:recommended
..
compare: Davo:recommended
Branches Tags
Davo:master
Davo:recommended

No commits in common. 'master' and 'recommended' have entirely different histories.
master ... recommende

9 changed files with 803 additions and 742 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 1
      .travis.yml
  2. 6
      README.md
  3. BIN
      WGCustomFlags-1.7.jar
  4. 62
      pom.xml
  5. 945
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
  6. 526
      src/main/java/org/dynmap/worldguard/MetricsLite.java
  7. 5
      src/main/resources/plugin.yml
  8. BIN
      worldedit-bukkit-6.1.jar
  9. BIN
      worldguard-6.1.jar

1
.travis.yml
Unescape View File

@ -1 +0,0 @@
language: java

6
README.md
Unescape View File

@ -1,6 +0,0 @@
# Dynmap-WorldGuard
Display WorldGuard region information on Dynmap maps
Working with MC 1.14.4 and latest WorldGuard and WorldEdit.
Downloads: https://drive.google.com/drive/u/0/folders/1FI8xUSTV1iMRwJ1fxF2tBc4tyALrNP2A

BIN
WGCustomFlags-1.7.jar
View File

Binary file not shown.

62
pom.xml
Unescape View File

@ -2,6 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>Dynmap-WorldGuard</artifactId> <artifactId>Dynmap-WorldGuard</artifactId>
<version>0.80</version>
<build> <build>
<resources> <resources>
@ -33,32 +34,6 @@
<target>1.7</target> <target>1.7</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>org.dynmap:Dynmap-WorldGuard</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.sk89q.squirrelid</pattern>
<shadedPattern>com.sk89q.worldguard.util.profile</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -71,21 +46,13 @@
<id>dynmap-repo</id> <id>dynmap-repo</id>
<url>http://repo.mikeprimm.com/</url> <url>http://repo.mikeprimm.com/</url>
</repository> </repository>
<repository>
<releases>
</releases>
<snapshots>
</snapshots>
<id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>us.dynmap</groupId> <groupId>us.dynmap</groupId>
<artifactId>dynmap-api</artifactId> <artifactId>dynmap-api</artifactId>
<version>3.0-SNAPSHOT</version> <version>2.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
@ -93,20 +60,25 @@
<version>1.7.10-R0.1-SNAPSHOT</version> <version>1.7.10-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q.worldguard</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldguard-bukkit</artifactId> <artifactId>WorldGuard</artifactId>
<version>7.0.0</version> <version>6.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/worldguard-6.1.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldedit-bukkit</artifactId> <artifactId>WorldEdit</artifactId>
<version>7.0.0</version> <version>6.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/worldedit-bukkit-6.1.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>squirrelid</artifactId> <artifactId>WGCustomFlags</artifactId>
<version>0.2.0</version> <version>1.7</version>
<scope>system</scope>
<systemPath>${project.basedir}/WGCustomFlags-1.7.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<version>1.2-SNAPSHOT</version> </project>
</project>

945
src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
View File

File diff suppressed because it is too large Load Diff

526
src/main/java/org/dynmap/worldguard/MetricsLite.java
Unescape View File

@ -1,5 +1,40 @@
/*
* Copyright 2011 Tyler Blair. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and contributors and should not be interpreted as representing official policies,
* either expressed or implied, of anybody else.
*/
package org.dynmap.worldguard; package org.dynmap.worldguard;
import org.bukkit.Bukkit;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.scheduler.BukkitTask;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -10,213 +45,314 @@ import java.net.Proxy;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.Collection;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.file.YamlConfigurationOptions;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
public class MetricsLite public class MetricsLite {
{
private static final int REVISION = 5; /**
private static final String BASE_URL = "http://mcstats.org"; * The current revision number
private static final String REPORT_URL = "/report/%s"; */
private static final int PING_INTERVAL = 10; private final static int REVISION = 5;
private final Plugin plugin;
private final YamlConfiguration configuration; /**
private final File configurationFile; * The base url of the metrics domain
private final String guid; */
private final Object optOutLock = new Object(); private static final String BASE_URL = "http://mcstats.org";
private volatile BukkitTask taskId = null;
/**
public MetricsLite(Plugin plugin) * The url used to report a server's status
throws IOException */
{ private static final String REPORT_URL = "/report/%s";
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null"); /**
* Interval of time to ping (in minutes)
*/
private final static int PING_INTERVAL = 10;
/**
* The plugin this metrics submits for
*/
private final Plugin plugin;
/**
* The plugin configuration file
*/
private final YamlConfiguration configuration;
/**
* The plugin configuration file
*/
private final File configurationFile;
/**
* Unique server id
*/
private final String guid;
/**
* Lock for synchronization
*/
private final Object optOutLock = new Object();
/**
* Id of the scheduled task
*/
private volatile BukkitTask taskId = null;
public MetricsLite(Plugin plugin) throws IOException {
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null");
}
this.plugin = plugin;
// load the config
configurationFile = getConfigFile();
configuration = YamlConfiguration.loadConfiguration(configurationFile);
// add some defaults
configuration.addDefault("opt-out", false);
configuration.addDefault("guid", UUID.randomUUID().toString());
// Do we need to create the file?
if (configuration.get("guid", null) == null) {
configuration.options().header("http://mcstats.org").copyDefaults(true);
configuration.save(configurationFile);
}
// Load the guid then
guid = configuration.getString("guid");
} }
this.plugin = plugin;
/**
this.configurationFile = getConfigFile(); * Start measuring statistics. This will immediately create an async repeating task as the plugin and send
this.configuration = YamlConfiguration.loadConfiguration(this.configurationFile); * the initial data to the metrics backend, and then after that it will post in increments of
* PING_INTERVAL * 1200 ticks.
this.configuration.addDefault("opt-out", Boolean.valueOf(false)); *
this.configuration.addDefault("guid", UUID.randomUUID().toString()); * @return True if statistics measuring is running, otherwise false.
if (this.configuration.get("guid", null) == null) */
{ public boolean start() {
this.configuration.options().header("http://mcstats.org").copyDefaults(true); synchronized (optOutLock) {
this.configuration.save(this.configurationFile); // Did we opt out?
if (isOptOut()) {
return false;
}
// Is metrics already running?
if (taskId != null) {
return true;
}
// Begin hitting the server with glorious data
taskId = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
private boolean firstPost = true;
public void run() {
try {
// This has to be synchronized or it can collide with the disable method.
synchronized (optOutLock) {
// Disable Task, if it is running and the server owner decided to opt-out
if (isOptOut() && (taskId != null)) {
taskId.cancel();
taskId = null;
}
}
// We use the inverse of firstPost because if it is the first time we are posting,
// it is not a interval ping, so it evaluates to FALSE
// Each time thereafter it will evaluate to TRUE, i.e PING!
postPlugin(!firstPost);
// After the first post we set firstPost to false
// Each post thereafter will be a ping
firstPost = false;
} catch (IOException e) {
//Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
}
}
}, 0, PING_INTERVAL * 1200);
return true;
}
} }
this.guid = this.configuration.getString("guid");
} /**
* Has the server owner denied plugin metrics?
public boolean start() *
{ * @return true if metrics should be opted out of it
synchronized (this.optOutLock) */
{ public boolean isOptOut() {
if (isOptOut()) { synchronized(optOutLock) {
return false; try {
} // Reload the metrics file
if (this.taskId != null) { configuration.load(getConfigFile());
return true; } catch (IOException ex) {
} Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
this.taskId = this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, new Runnable() return true;
{ } catch (InvalidConfigurationException ex) {
private boolean firstPost = true; Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
return true;
public void run()
{
try
{
synchronized (MetricsLite.this.optOutLock)
{
if ((MetricsLite.this.isOptOut()) && (MetricsLite.this.taskId != null))
{
MetricsLite.this.taskId.cancel();
MetricsLite.this.taskId = null;
}
} }
MetricsLite.this.postPlugin(!this.firstPost); return configuration.getBoolean("opt-out", false);
this.firstPost = false;
}
catch (IOException localIOException) {}
} }
}, 0L, 12000L);
return true;
} }
}
/**
public boolean isOptOut() * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
{ *
synchronized (this.optOutLock) * @throws IOException
{ */
try public void enable() throws IOException {
{ // This has to be synchronized or it can collide with the check in the task.
this.configuration.load(getConfigFile()); synchronized (optOutLock) {
} // Check if the server owner has already set opt-out, if not, set it.
catch (IOException ex) if (isOptOut()) {
{ configuration.set("opt-out", false);
Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); configuration.save(configurationFile);
return true; }
}
catch (InvalidConfigurationException ex) // Enable Task, if it is not running
{ if (taskId == null) {
Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); start();
return true; }
} }
return this.configuration.getBoolean("opt-out", false);
} }
}
/**
public void enable() * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
throws IOException *
{ * @throws IOException
synchronized (this.optOutLock) */
{ public void disable() throws IOException {
if (isOptOut()) // This has to be synchronized or it can collide with the check in the task.
{ synchronized (optOutLock) {
this.configuration.set("opt-out", Boolean.valueOf(false)); // Check if the server owner has already set opt-out, if not, set it.
this.configuration.save(this.configurationFile); if (!isOptOut()) {
} configuration.set("opt-out", true);
if (this.taskId == null) { configuration.save(configurationFile);
start(); }
}
// Disable Task, if it is running
if (taskId != null) {
taskId.cancel();
taskId = null;
}
}
} }
}
/**
public void disable() * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
throws IOException *
{ * @return the File object for the config file
synchronized (this.optOutLock) */
{ public File getConfigFile() {
if (!isOptOut()) // 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
this.configuration.set("opt-out", Boolean.valueOf(true)); // plugin.getDataFolder() => base/plugins/PluginA/
this.configuration.save(this.configurationFile); // pluginsFolder => base/plugins/
} // The base is not necessarily relative to the startup directory.
if (this.taskId != null) File pluginsFolder = plugin.getDataFolder().getParentFile();
{
this.taskId.cancel(); // return => base/plugins/PluginMetrics/config.yml
this.taskId = null; return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
}
} }
}
/**
public File getConfigFile() * Generic method that posts a plugin to the metrics website
{ */
File pluginsFolder = this.plugin.getDataFolder().getParentFile(); private void postPlugin(boolean isPing) throws IOException {
// The plugin's description file containg all of the plugin data such as name, version, author, etc
return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml"); final PluginDescriptionFile description = plugin.getDescription();
}
// Construct the post data
private void postPlugin(boolean isPing) final StringBuilder data = new StringBuilder();
throws IOException data.append(encode("guid")).append('=').append(encode(guid));
{ encodeDataPair(data, "version", description.getVersion());
PluginDescriptionFile description = this.plugin.getDescription(); encodeDataPair(data, "server", Bukkit.getVersion());
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size()));
StringBuilder data = new StringBuilder(); encodeDataPair(data, "revision", String.valueOf(REVISION));
data.append(encode("guid")).append('=').append(encode(this.guid));
encodeDataPair(data, "version", description.getVersion()); // If we're pinging, append it
encodeDataPair(data, "server", Bukkit.getVersion()); if (isPing) {
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size())); encodeDataPair(data, "ping", "true");
encodeDataPair(data, "revision", String.valueOf(5)); }
if (isPing) {
encodeDataPair(data, "ping", "true"); // Create the url
URL url = new URL(BASE_URL + String.format(REPORT_URL, encode(plugin.getDescription().getName())));
// 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();
}
connection.setDoOutput(true);
// Write the data
final OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
writer.write(data.toString());
writer.flush();
// Now read the response
final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
final String response = reader.readLine();
// close resources
writer.close();
reader.close();
if (response == null || response.startsWith("ERR")) {
throw new IOException(response); //Throw the exception
}
//if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
} }
URL url = new URL("http://mcstats.org" + String.format("/report/%s", new Object[] { encode(this.plugin.getDescription().getName()) }));
URLConnection connection; /**
URLConnection connection1; * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
if (isMineshafterPresent()) { *
connection1 = url.openConnection(Proxy.NO_PROXY); * @return true if mineshafter is installed on the server
} else { */
connection1 = url.openConnection(); private boolean isMineshafterPresent() {
try {
Class.forName("mineshafter.MineServer");
return true;
} catch (Exception e) {
return false;
}
} }
connection1.setDoOutput(true);
/**
OutputStreamWriter writer = new OutputStreamWriter(connection1.getOutputStream()); * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
writer.write(data.toString()); * key/value pair MUST be included manually, e.g:</p>
writer.flush(); * <code>
* StringBuffer data = new StringBuffer();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection1.getInputStream())); * data.append(encode("guid")).append('=').append(encode(guid));
String response = reader.readLine(); * encodeDataPair(data, "version", description.getVersion());
* </code>
writer.close(); *
reader.close(); * @param buffer the stringbuilder to append the data pair onto
if ((response == null) || (response.startsWith("ERR"))) { * @param key the key value
throw new IOException(response); * @param value the value
*/
private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException {
buffer.append('&').append(encode(key)).append('=').append(encode(value));
} }
}
/**
private boolean isMineshafterPresent() * Encode text as UTF-8
{ *
try * @param text the text to encode
{ * @return the encoded text, as UTF-8
Class.forName("mineshafter.MineServer"); */
return true; private static String encode(final String text) throws UnsupportedEncodingException {
return URLEncoder.encode(text, "UTF-8");
} }
catch (Exception e) {}
return false; }
}
private static void encodeDataPair(StringBuilder buffer, String key, String value)
throws UnsupportedEncodingException
{
buffer.append('&').append(encode(key)).append('=').append(encode(value));
}
private static String encode(String text)
throws UnsupportedEncodingException
{
return URLEncoder.encode(text, "UTF-8");
}
}

5
src/main/resources/plugin.yml
Unescape View File

@ -1,6 +1,7 @@
name: Dynmap-WorldGuard name: Dynmap-WorldGuard
main: org.dynmap.worldguard.DynmapWorldGuardPlugin main: org.dynmap.worldguard.DynmapWorldGuardPlugin
version: "1.1-beta-3" version: "${project.version}"
author: mikeprimm author: mikeprimm
depend: [ dynmap, WorldGuard ] depend: [ dynmap, WorldGuard ]
softdepend: [ WGCustomFlags ]

BIN
worldedit-bukkit-6.1.jar
View File

Binary file not shown.

BIN
worldguard-6.1.jar
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save