Removed some old code, Maven stuff
- Removed remaining stuff of CreativeGlobalMechanic - Removed external JARs and put Maven shade for them - Added all dependencies to pom.xml
This commit is contained in:
parent
c8649cb5b0
commit
4cfa77b7f4
6 changed files with 65 additions and 49 deletions
Binary file not shown.
|
@ -1,35 +0,0 @@
|
||||||
Copyright (c) 2006-2015, the HTMLCleaner project
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use of this software in source and binary forms,
|
|
||||||
with or without modification, are permitted provided that the following
|
|
||||||
conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above
|
|
||||||
copyright notice, this list of conditions and the
|
|
||||||
following disclaimer.
|
|
||||||
|
|
||||||
* 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.
|
|
||||||
|
|
||||||
* The name of HtmlCleaner may not be used to endorse or promote
|
|
||||||
products derived from this software without specific prior
|
|
||||||
written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER 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.
|
|
||||||
|
|
||||||
You can contact Vladimir Nikic by sending e-mail to
|
|
||||||
nikic_vladimir@yahoo.com. Please include the word "HtmlCleaner" in the
|
|
||||||
subject line.
|
|
70
pom.xml
70
pom.xml
|
@ -36,14 +36,12 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<artifactSet>
|
<artifactSet>
|
||||||
<excludes>
|
<includes>
|
||||||
<exclude>classworlds:classworlds</exclude>
|
<include>htmlcleaner</include>
|
||||||
<exclude>junit:junit</exclude>
|
</includes>
|
||||||
<exclude>jmock:*</exclude>
|
<includes>
|
||||||
<exclude>*:xml-apis</exclude>
|
<include>reflections</include>
|
||||||
<exclude>org.apache.maven:lib:tests</exclude>
|
</includes>
|
||||||
<exclude>log4j:log4j:jar:</exclude>
|
|
||||||
</excludes>
|
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
<pluginExecution>
|
<pluginExecution>
|
||||||
<action>
|
<action>
|
||||||
|
@ -66,6 +64,24 @@
|
||||||
<id>jitpack.io</id>
|
<id>jitpack.io</id>
|
||||||
<url>https://jitpack.io/</url>
|
<url>https://jitpack.io/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>Essentials</id>
|
||||||
|
<url>http://repo.ess3.net/</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>Votifier</id>
|
||||||
|
<url>http://repo.howaner.de/</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>Minigames</id>
|
||||||
|
<url>http://maven.addstar.com.au/artifactory/release</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>vault-repo</id>
|
||||||
|
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
|
||||||
|
</repository>
|
||||||
|
<!-- <repository> <id>WorldEdit</id> <url>http://maven.sk89q.com/artifactory/repo</url>
|
||||||
|
</repository> -->
|
||||||
</repositories>
|
</repositories>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -84,6 +100,44 @@
|
||||||
<artifactId>ButtonCore</artifactId>
|
<artifactId>ButtonCore</artifactId>
|
||||||
<version>master-SNAPSHOT</version>
|
<version>master-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- https://mvnrepository.com/artifact/net.sourceforge.htmlcleaner/htmlcleaner -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.sourceforge.htmlcleaner</groupId>
|
||||||
|
<artifactId>htmlcleaner</artifactId>
|
||||||
|
<version>2.16</version>
|
||||||
|
</dependency>
|
||||||
|
<!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.reflections</groupId>
|
||||||
|
<artifactId>reflections</artifactId>
|
||||||
|
<version>0.9.10</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.ess3</groupId>
|
||||||
|
<artifactId>Essentials</artifactId>
|
||||||
|
<version>2.13.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.TBMCPlugins.ButtonCore</groupId>
|
||||||
|
<artifactId>Towny</artifactId>
|
||||||
|
<version>master-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.vexsoftware</groupId>
|
||||||
|
<artifactId>votifier</artifactId>
|
||||||
|
<version>1.9</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>au.com.mineauz</groupId>
|
||||||
|
<artifactId>Minigames</artifactId>
|
||||||
|
<version>1.8.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.milkbowl.vault</groupId>
|
||||||
|
<artifactId>VaultAPI</artifactId>
|
||||||
|
<version>1.6</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<artifactId>ButtonChat</artifactId>
|
<artifactId>ButtonChat</artifactId>
|
||||||
<organization>
|
<organization>
|
||||||
|
|
Binary file not shown.
|
@ -344,13 +344,10 @@ public class PlayerListener implements Listener {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if (cmd.equalsIgnoreCase("home") || cmd.equalsIgnoreCase("tpa") || cmd.equalsIgnoreCase("tp")) {
|
} else if (cmd.equalsIgnoreCase("home") || cmd.equalsIgnoreCase("tpa") || cmd.equalsIgnoreCase("tp")) {
|
||||||
MinigamePlayer mgp = Minigames.plugin.pdata.getMinigamePlayer(event.getPlayer());
|
|
||||||
String currentWorld = event.getPlayer().getLocation().getWorld().getName();
|
String currentWorld = event.getPlayer().getLocation().getWorld().getName();
|
||||||
Location currentLocation = event.getPlayer().getLocation();
|
Location currentLocation = event.getPlayer().getLocation();
|
||||||
TownyUniverse universe = Towny.getPlugin(Towny.class).getTownyUniverse();
|
TownyUniverse universe = Towny.getPlugin(Towny.class).getTownyUniverse();
|
||||||
if (mgp.isInMinigame() && mgp.getMinigame().getMechanic().getMechanic().equals("creativeglobal")) {
|
if (TownyUniverse.isWarTime()) {
|
||||||
mgp.setAllowTeleport(true);
|
|
||||||
} else if (TownyUniverse.isWarTime()) {
|
|
||||||
War war = universe.getWarEvent();
|
War war = universe.getWarEvent();
|
||||||
if (war.isWarZone(
|
if (war.isWarZone(
|
||||||
new WorldCoord(currentWorld, currentLocation.getBlockX(), currentLocation.getBlockZ()))) {
|
new WorldCoord(currentWorld, currentLocation.getBlockX(), currentLocation.getBlockZ()))) {
|
||||||
|
|
|
@ -66,7 +66,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
Instance = this;
|
Instance = this;
|
||||||
try {
|
/*try {
|
||||||
PluginMain.Instance.getLogger().info("Extracting necessary libraries...");
|
PluginMain.Instance.getLogger().info("Extracting necessary libraries...");
|
||||||
final File[] libs = new File[] { new File(getDataFolder(), "htmlcleaner-2.16.jar"),
|
final File[] libs = new File[] { new File(getDataFolder(), "htmlcleaner-2.16.jar"),
|
||||||
new File(getDataFolder(), "reflections-0.9.10.jar"),
|
new File(getDataFolder(), "reflections-0.9.10.jar"),
|
||||||
|
@ -86,7 +86,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
||||||
}
|
}
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}*/
|
||||||
|
|
||||||
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
|
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
|
||||||
CommandCaller.RegisterChatCommands(this);
|
CommandCaller.RegisterChatCommands(this);
|
||||||
|
|
Loading…
Reference in a new issue