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. 60
      pom.xml
  5. 929
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
  6. 516
      src/main/java/org/dynmap/worldguard/MetricsLite.java
  7. 3
      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.

60
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>

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

File diff suppressed because it is too large Load Diff

516
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";
private static final String REPORT_URL = "/report/%s";
private static final int PING_INTERVAL = 10;
private final Plugin plugin;
private final YamlConfiguration configuration;
private final File configurationFile;
private final String guid;
private final Object optOutLock = new Object();
private volatile BukkitTask taskId = null;
public MetricsLite(Plugin plugin)
throws IOException
{
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null");
}
this.plugin = plugin;
this.configurationFile = getConfigFile(); /**
this.configuration = YamlConfiguration.loadConfiguration(this.configurationFile); * The current revision number
*/
private final static int REVISION = 5;
this.configuration.addDefault("opt-out", Boolean.valueOf(false)); /**
this.configuration.addDefault("guid", UUID.randomUUID().toString()); * The base url of the metrics domain
if (this.configuration.get("guid", null) == null) */
{ private static final String BASE_URL = "http://mcstats.org";
this.configuration.options().header("http://mcstats.org").copyDefaults(true);
this.configuration.save(this.configurationFile); /**
} * The url used to report a server's status
this.guid = this.configuration.getString("guid"); */
} private static final String REPORT_URL = "/report/%s";
public boolean start() /**
{ * Interval of time to ping (in minutes)
synchronized (this.optOutLock) */
{ private final static int PING_INTERVAL = 10;
if (isOptOut()) {
return false;
}
if (this.taskId != null) {
return true;
}
this.taskId = this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, new Runnable()
{
private boolean firstPost = 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);
this.firstPost = false; /**
} * The plugin this metrics submits for
catch (IOException localIOException) {} */
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);
} }
}, 0L, 12000L);
return true; // Load the guid then
guid = configuration.getString("guid");
} }
}
/**
public boolean isOptOut() * 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
synchronized (this.optOutLock) * PING_INTERVAL * 1200 ticks.
{ *
try * @return True if statistics measuring is running, otherwise false.
{ */
this.configuration.load(getConfigFile()); public boolean start() {
} synchronized (optOutLock) {
catch (IOException ex) // Did we opt out?
{ if (isOptOut()) {
Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); return false;
return true; }
}
catch (InvalidConfigurationException ex) // Is metrics already running?
{ if (taskId != null) {
Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); return true;
return true; }
}
return this.configuration.getBoolean("opt-out", false); // 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;
}
} }
}
/**
public void enable() * Has the server owner denied plugin metrics?
throws IOException *
{ * @return true if metrics should be opted out of it
synchronized (this.optOutLock) */
{ public boolean isOptOut() {
if (isOptOut()) synchronized(optOutLock) {
{ try {
this.configuration.set("opt-out", Boolean.valueOf(false)); // Reload the metrics file
this.configuration.save(this.configurationFile); configuration.load(getConfigFile());
} } catch (IOException ex) {
if (this.taskId == null) { Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
start(); return true;
} } catch (InvalidConfigurationException ex) {
Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
return true;
}
return configuration.getBoolean("opt-out", false);
}
} }
}
/**
public void disable() * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
throws IOException *
{ * @throws IOException
synchronized (this.optOutLock) */
{ public void enable() 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(true)); // 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", false);
if (this.taskId != null) configuration.save(configurationFile);
{ }
this.taskId.cancel();
this.taskId = null; // Enable Task, if it is not running
} if (taskId == null) {
start();
}
}
} }
}
/**
public File getConfigFile() * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
{ *
File pluginsFolder = this.plugin.getDataFolder().getParentFile(); * @throws IOException
*/
return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml"); public void disable() throws IOException {
} // This has to be synchronized or it can collide with the check in the task.
synchronized (optOutLock) {
private void postPlugin(boolean isPing) // Check if the server owner has already set opt-out, if not, set it.
throws IOException if (!isOptOut()) {
{ configuration.set("opt-out", true);
PluginDescriptionFile description = this.plugin.getDescription(); configuration.save(configurationFile);
}
StringBuilder data = new StringBuilder();
data.append(encode("guid")).append('=').append(encode(this.guid)); // Disable Task, if it is running
encodeDataPair(data, "version", description.getVersion()); if (taskId != null) {
encodeDataPair(data, "server", Bukkit.getVersion()); taskId.cancel();
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size())); taskId = null;
encodeDataPair(data, "revision", String.valueOf(5)); }
if (isPing) { }
encodeDataPair(data, "ping", "true");
} }
URL url = new URL("http://mcstats.org" + String.format("/report/%s", new Object[] { encode(this.plugin.getDescription().getName()) }));
URLConnection connection; /**
URLConnection connection1; * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
if (isMineshafterPresent()) { *
connection1 = url.openConnection(Proxy.NO_PROXY); * @return the File object for the config file
} else { */
connection1 = url.openConnection(); 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 = plugin.getDataFolder().getParentFile();
// return => base/plugins/PluginMetrics/config.yml
return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
} }
connection1.setDoOutput(true);
OutputStreamWriter writer = new OutputStreamWriter(connection1.getOutputStream()); /**
writer.write(data.toString()); * Generic method that posts a plugin to the metrics website
writer.flush(); */
private void postPlugin(boolean isPing) throws IOException {
// The plugin's description file containg all of the plugin data such as name, version, author, etc
final PluginDescriptionFile description = plugin.getDescription();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection1.getInputStream())); // Construct the post data
String response = reader.readLine(); final StringBuilder data = new StringBuilder();
data.append(encode("guid")).append('=').append(encode(guid));
encodeDataPair(data, "version", description.getVersion());
encodeDataPair(data, "server", Bukkit.getVersion());
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size()));
encodeDataPair(data, "revision", String.valueOf(REVISION));
writer.close(); // If we're pinging, append it
reader.close(); if (isPing) {
if ((response == null) || (response.startsWith("ERR"))) { encodeDataPair(data, "ping", "true");
throw new IOException(response); }
// 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
} }
}
/**
private boolean isMineshafterPresent() * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
{ *
try * @return true if mineshafter is installed on the server
{ */
Class.forName("mineshafter.MineServer"); private boolean isMineshafterPresent() {
return true; try {
Class.forName("mineshafter.MineServer");
return true;
} catch (Exception e) {
return false;
}
} }
catch (Exception e) {}
return false; /**
} * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
* key/value pair MUST be included manually, e.g:</p>
private static void encodeDataPair(StringBuilder buffer, String key, String value) * <code>
throws UnsupportedEncodingException * StringBuffer data = new StringBuffer();
{ * data.append(encode("guid")).append('=').append(encode(guid));
buffer.append('&').append(encode(key)).append('=').append(encode(value)); * encodeDataPair(data, "version", description.getVersion());
} * </code>
*
private static String encode(String text) * @param buffer the stringbuilder to append the data pair onto
throws UnsupportedEncodingException * @param key the key value
{ * @param value the value
return URLEncoder.encode(text, "UTF-8"); */
} private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException {
buffer.append('&').append(encode(key)).append('=').append(encode(value));
}
/**
* Encode text as UTF-8
*
* @param text the text to encode
* @return the encoded text, as UTF-8
*/
private static String encode(final String text) throws UnsupportedEncodingException {
return URLEncoder.encode(text, "UTF-8");
}
} }

3
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