mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 17:43:44 +01:00 
			
		
		
		
	Clean the project
This commit is contained in:
		
							
								
								
									
										130
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										130
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,10 +1,126 @@ | |||||||
|  | ### Others ### | ||||||
| *.bat | *.bat | ||||||
|  | *.cmd | ||||||
|  | *.sh | ||||||
| *.prefs | *.prefs | ||||||
|  |  | ||||||
|  | ### Maven ### | ||||||
|  | target/ | ||||||
|  | pom.xml.tag | ||||||
|  | pom.xml.releaseBackup | ||||||
|  | pom.xml.versionsBackup | ||||||
|  | pom.xml.next | ||||||
|  | release.properties | ||||||
|  | dependency-reduced-pom.xml | ||||||
|  | buildNumber.properties | ||||||
|  | .mvn/timing.properties | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ### Java ### | ||||||
| *.class | *.class | ||||||
| /target/classes |  | ||||||
| /target/PlotSquared-Null.jar | # Mobile Tools for Java (J2ME) | ||||||
| /target/PlotSquared-Uber.jar | .mtj.tmp/ | ||||||
| /target/maven-archiver |  | ||||||
| *.project | # Package Files # | ||||||
| *.classpath | *.jar | ||||||
| /target/ | *.war | ||||||
|  | *.ear | ||||||
|  |  | ||||||
|  | # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||||||
|  | hs_err_pid* | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ### Intellij ### | ||||||
|  | # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm | ||||||
|  |  | ||||||
|  | *.iml | ||||||
|  |  | ||||||
|  | ## Directory-based project format: | ||||||
|  | .idea/ | ||||||
|  | # if you remove the above rule, at least ignore the following: | ||||||
|  |  | ||||||
|  | # User-specific stuff: | ||||||
|  | # .idea/workspace.xml | ||||||
|  | # .idea/tasks.xml | ||||||
|  | # .idea/dictionaries | ||||||
|  | # .idea/shelf | ||||||
|  |  | ||||||
|  | # Sensitive or high-churn files: | ||||||
|  | # .idea/dataSources.ids | ||||||
|  | # .idea/dataSources.xml | ||||||
|  | # .idea/sqlDataSources.xml | ||||||
|  | # .idea/dynamic.xml | ||||||
|  | # .idea/uiDesigner.xml | ||||||
|  |  | ||||||
|  | # Gradle: | ||||||
|  | # .idea/gradle.xml | ||||||
|  | # .idea/libraries | ||||||
|  |  | ||||||
|  | # Mongo Explorer plugin: | ||||||
|  | # .idea/mongoSettings.xml | ||||||
|  |  | ||||||
|  | ## File-based project format: | ||||||
|  | *.ipr | ||||||
|  | *.iws | ||||||
|  |  | ||||||
|  | ## Plugin-specific files: | ||||||
|  |  | ||||||
|  | # IntelliJ | ||||||
|  | /out/ | ||||||
|  |  | ||||||
|  | # mpeltonen/sbt-idea plugin | ||||||
|  | .idea_modules/ | ||||||
|  |  | ||||||
|  | # JIRA plugin | ||||||
|  | atlassian-ide-plugin.xml | ||||||
|  |  | ||||||
|  | # Crashlytics plugin (for Android Studio and IntelliJ) | ||||||
|  | com_crashlytics_export_strings.xml | ||||||
|  | crashlytics.properties | ||||||
|  | crashlytics-build.properties | ||||||
|  | fabric.properties | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ### Eclipse ### | ||||||
|  | *.pydevproject | ||||||
|  | .metadata | ||||||
|  | bin/ | ||||||
|  | tmp/ | ||||||
|  | *.tmp | ||||||
|  | *.bak | ||||||
|  | *.swp | ||||||
|  | *~.nib | ||||||
|  | local.properties | ||||||
|  | .settings/ | ||||||
|  | .loadpath | ||||||
|  |  | ||||||
|  | # Eclipse Core | ||||||
|  | .project | ||||||
|  |  | ||||||
|  | # External tool builders | ||||||
|  | .externalToolBuilders/ | ||||||
|  |  | ||||||
|  | # Locally stored "Eclipse launch configurations" | ||||||
|  | *.launch | ||||||
|  |  | ||||||
|  | # CDT-specific | ||||||
|  | .cproject | ||||||
|  |  | ||||||
|  | # JDT-specific (Eclipse Java Development Tools) | ||||||
|  | .classpath | ||||||
|  |  | ||||||
|  | # Java annotation processor (APT) | ||||||
|  | .factorypath | ||||||
|  |  | ||||||
|  | # PDT-specific | ||||||
|  | .buildpath | ||||||
|  |  | ||||||
|  | # sbteclipse plugin | ||||||
|  | .target | ||||||
|  |  | ||||||
|  | # TeXlipse plugin | ||||||
|  | .texlipse | ||||||
|  |  | ||||||
|  | # STS (Spring Tool Suite) | ||||||
|  | .springBeans | ||||||
|   | |||||||
							
								
								
									
										257
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										257
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -1,45 +1,82 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" | ||||||
|          xmlns="http://maven.apache.org/POM/4.0.0" |  | ||||||
|          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||||||
|     <modelVersion>4.0.0</modelVersion> |     <modelVersion>4.0.0</modelVersion> | ||||||
|  |  | ||||||
|     <groupId>com.intellectualcrafters</groupId> |     <groupId>com.intellectualcrafters</groupId> | ||||||
|  |     <artifactId>plotsquared</artifactId> | ||||||
|  |     <version>3.2.27-SNAPSHOT</version> | ||||||
|  |     <packaging>jar</packaging> | ||||||
|  |  | ||||||
|  |     <name>PlotSquared</name> | ||||||
|  |     <description>Reinventing the plotworld!</description> | ||||||
|  |     <url>http://www.spigotmc.org/resources/plotsquared.1177/</url> | ||||||
|  |  | ||||||
|  |     <organization> | ||||||
|  |         <name>IntellectualSites</name> | ||||||
|  |         <url>https://github.com/IntellectualSites</url> | ||||||
|  |     </organization> | ||||||
|  |  | ||||||
|  |     <scm> | ||||||
|  |         <connection>scm:git:https://github.com/IntellectualSites/PlotSquared.git</connection> | ||||||
|  |         <developerConnection>scm:git:git@github.com:IntellectualSites/PlotSquared.git</developerConnection> | ||||||
|  |         <url>https://github.com/IntellectualSites/PlotSquared</url> | ||||||
|  |     </scm> | ||||||
|  |  | ||||||
|  |     <!-- Not Official --> | ||||||
|  |     <ciManagement> | ||||||
|  |         <system>jenkins</system> | ||||||
|  |         <url>http://ci.xephi.fr/job/PlotSquared/</url> | ||||||
|  |     </ciManagement> | ||||||
|  |  | ||||||
|  |     <licenses> | ||||||
|  |         <license> | ||||||
|  |             <name>The GNU General Public Licence version 3 (GPLv3)</name> | ||||||
|  |             <url>http://www.gnu.org/licenses/gpl-3.0.html</url> | ||||||
|  |         </license> | ||||||
|  |     </licenses> | ||||||
|  |  | ||||||
|  |     <prerequisites> | ||||||
|  |         <maven>3.3.3</maven> | ||||||
|  |     </prerequisites> | ||||||
|  |  | ||||||
|     <properties> |     <properties> | ||||||
|         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||||||
|  |  | ||||||
|  |         <!-- Change Compiler Version (JDK) HERE! --> | ||||||
|  |         <javaVersion>1.7</javaVersion> | ||||||
|  |  | ||||||
|  |         <!-- Change Bukkit Version HERE! --> | ||||||
|  |         <bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion> | ||||||
|  |         <spongeVersion>3.1.0-SNAPSHOT</spongeVersion> | ||||||
|     </properties> |     </properties> | ||||||
|     <artifactId>PlotSquared</artifactId> |  | ||||||
|     <version>3.2.26</version> |  | ||||||
|     <name>PlotSquared</name> |  | ||||||
|     <packaging>jar</packaging> |  | ||||||
|     <build> |     <build> | ||||||
|         <finalName>PlotSquared-Uber</finalName> |         <finalName>${project.name}-Universal-${project.version}</finalName> | ||||||
|         <sourceDirectory>src/main/java</sourceDirectory> |         <sourceDirectory>src/main/java</sourceDirectory> | ||||||
|  |  | ||||||
|         <resources> |         <resources> | ||||||
|             <resource> |             <resource> | ||||||
|                 <filtering>true</filtering> |                 <filtering>true</filtering> | ||||||
|                 <excludes> |                 <includes> | ||||||
|                     <exclude>skyblock.template</exclude> |                     <include>plugin.yml</include> | ||||||
|                     <exclude>town.template</exclude> |                 </includes> | ||||||
|                 </excludes> |  | ||||||
|                 <directory>${basedir}/src/main/resources/</directory> |                 <directory>${basedir}/src/main/resources/</directory> | ||||||
|             </resource> |             </resource> | ||||||
|             <resource> |             <resource> | ||||||
|                 <filtering>false</filtering> |                 <filtering>false</filtering> | ||||||
|                 <includes> |                 <excludes> | ||||||
|                     <include>skyblock.template</include> |                     <exclude>plugin.yml</exclude> | ||||||
|                     <include>town.template</include> |                 </excludes> | ||||||
|                     <include>s_chinese.yml</include> |  | ||||||
|                     <include>s_chinese_unescaped.yml</include> |  | ||||||
|                     <include>german.yml</include> |  | ||||||
|                     <include>italian.yml</include> |  | ||||||
|                 </includes> |  | ||||||
|                 <directory>${basedir}/src/main/resources/</directory> |                 <directory>${basedir}/src/main/resources/</directory> | ||||||
|             </resource> |             </resource> | ||||||
|         </resources> |         </resources> | ||||||
|  |  | ||||||
|         <plugins> |         <plugins> | ||||||
|  |             <!-- TODO: split the project into more modules --> | ||||||
|             <plugin> |             <plugin> | ||||||
|                 <artifactId>maven-jar-plugin</artifactId> |                 <artifactId>maven-jar-plugin</artifactId> | ||||||
|                 <version>2.3.2</version> |                 <version>2.6</version> | ||||||
|                 <executions> |                 <executions> | ||||||
| 					<execution> | 					<execution> | ||||||
|                         <id>bukkit</id> |                         <id>bukkit</id> | ||||||
| @@ -48,12 +85,13 @@ | |||||||
|                         </goals> |                         </goals> | ||||||
|                         <phase>package</phase> |                         <phase>package</phase> | ||||||
|                         <configuration> |                         <configuration> | ||||||
|                             <finalName>PlotSquared-Bukkit</finalName> |                             <finalName>${project.name}-Bukkit-${project.version}</finalName> | ||||||
|                             <excludes> |                             <excludes> | ||||||
|                                 <exclude>**/com/plotsquared/sponge/**</exclude> |                                 <exclude>**/com/plotsquared/sponge/**</exclude> | ||||||
|                             </excludes> |                             </excludes> | ||||||
|                         </configuration> |                         </configuration> | ||||||
|                     </execution> |                     </execution> | ||||||
|  |  | ||||||
|                     <execution> |                     <execution> | ||||||
|                         <id>sponge</id> |                         <id>sponge</id> | ||||||
|                         <goals> |                         <goals> | ||||||
| @@ -61,13 +99,15 @@ | |||||||
|                         </goals> |                         </goals> | ||||||
|                         <phase>package</phase> |                         <phase>package</phase> | ||||||
|                         <configuration> |                         <configuration> | ||||||
|                             <finalName>PlotSquared-Sponge</finalName> |                             <finalName>${project.name}-Sponge-${project.version}</finalName> | ||||||
|                             <excludes> |                             <excludes> | ||||||
|                                 <exclude>**/com/plotsquared/bukkit/**</exclude> |                                 <exclude>**/com/plotsquared/bukkit/**</exclude> | ||||||
|                                 <exclude>**/com/intellectualcrafters/plot/api/*</exclude> |                                 <exclude>**/com/intellectualcrafters/plot/api/*</exclude> | ||||||
|                             </excludes> |                             </excludes> | ||||||
|                         </configuration> |                         </configuration> | ||||||
|                     </execution> |                     </execution> | ||||||
|  |  | ||||||
|  |                     <!-- Invalid | ||||||
|                     <execution> |                     <execution> | ||||||
|                         <id>api</id> |                         <id>api</id> | ||||||
|                         <goals> |                         <goals> | ||||||
| @@ -75,7 +115,7 @@ | |||||||
|                         </goals> |                         </goals> | ||||||
|                         <phase>package</phase> |                         <phase>package</phase> | ||||||
|                         <configuration> |                         <configuration> | ||||||
|                             <finalName>PlotSquared-Null</finalName> |                             <finalName>${project.name}-API-${project.version}</finalName> | ||||||
|                             <excludes> |                             <excludes> | ||||||
|                                 <exclude>**/com/plotsquared/bukkit/**</exclude> |                                 <exclude>**/com/plotsquared/bukkit/**</exclude> | ||||||
|                                 <exclude>**/com/plotsquared/sponge/**</exclude> |                                 <exclude>**/com/plotsquared/sponge/**</exclude> | ||||||
| @@ -83,16 +123,45 @@ | |||||||
|                             </excludes> |                             </excludes> | ||||||
|                         </configuration> |                         </configuration> | ||||||
|                     </execution> |                     </execution> | ||||||
|  |                     --> | ||||||
|                 </executions> |                 </executions> | ||||||
|             </plugin> |             </plugin> | ||||||
|  |  | ||||||
|             <plugin> |             <plugin> | ||||||
|  |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|                 <artifactId>maven-compiler-plugin</artifactId> |                 <artifactId>maven-compiler-plugin</artifactId> | ||||||
|                 <version>2.3.2</version> |                 <version>3.3</version> | ||||||
|                 <configuration> |                 <configuration> | ||||||
|                     <source>1.7</source> |                     <source>1.7</source> | ||||||
|                     <target>1.7</target> |                     <target>${javaVersion}</target> | ||||||
|                 </configuration> |                 </configuration> | ||||||
|             </plugin> |             </plugin> | ||||||
|  |  | ||||||
|  |             <plugin> | ||||||
|  |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|  |                 <artifactId>maven-shade-plugin</artifactId> | ||||||
|  |                 <version>2.4.3</version> | ||||||
|  |                 <configuration> | ||||||
|  |                     <createDependencyReducedPom>false</createDependencyReducedPom> | ||||||
|  |                     <minimizeJar>false</minimizeJar> | ||||||
|  |                     <relocations> | ||||||
|  |                         <relocation> | ||||||
|  |                             <pattern>com.google.gson</pattern> | ||||||
|  |                             <shadedPattern>com.plotsquared.libs.gson</shadedPattern> | ||||||
|  |                         </relocation> | ||||||
|  |                     </relocations> | ||||||
|  |                 </configuration> | ||||||
|  |                 <executions> | ||||||
|  |                     <execution> | ||||||
|  |                         <phase>package</phase> | ||||||
|  |                         <goals> | ||||||
|  |                             <goal>shade</goal> | ||||||
|  |                         </goals> | ||||||
|  |                     </execution> | ||||||
|  |                 </executions> | ||||||
|  |             </plugin> | ||||||
|  |  | ||||||
|  |             <!-- Useless ATM | ||||||
|             <plugin> |             <plugin> | ||||||
|                 <groupId>org.apache.maven.plugins</groupId> |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|                 <artifactId>maven-javadoc-plugin</artifactId> |                 <artifactId>maven-javadoc-plugin</artifactId> | ||||||
| @@ -101,37 +170,18 @@ | |||||||
|                     <additionalparam>-Xdoclint:none</additionalparam> |                     <additionalparam>-Xdoclint:none</additionalparam> | ||||||
|                 </configuration> |                 </configuration> | ||||||
|             </plugin> |             </plugin> | ||||||
|  |             --> | ||||||
|         </plugins> |         </plugins> | ||||||
|     </build> |     </build> | ||||||
|  |  | ||||||
|     <repositories> |     <repositories> | ||||||
|         <repository> |  | ||||||
|             <id>techcable-repo</id> |  | ||||||
|             <!-- Just leave the repositories section alone or bukkit won't work --> |  | ||||||
|             <url>http://repo.techcable.net/content/groups/public/</url> |  | ||||||
|         </repository> |  | ||||||
|         <repository> |  | ||||||
|             <id>empcraft-repo</id> |  | ||||||
|             <url>http://empcraft.com/maven2</url> |  | ||||||
|         </repository> |  | ||||||
|         <repository> |         <repository> | ||||||
|             <id>spigot-repo</id> |             <id>spigot-repo</id> | ||||||
|             <url>http://hub.spigotmc.org/nexus/content/groups/public/</url> |             <url>http://hub.spigotmc.org/nexus/content/groups/public/</url> | ||||||
|         </repository> |         </repository> | ||||||
|         <repository> |  | ||||||
|             <id>confuser-repo</id> |  | ||||||
|             <url>http://ci.frostcast.net/plugin/repository/everything</url> |  | ||||||
|         </repository> |  | ||||||
|         <repository> |  | ||||||
|             <id>sk80q</id> |  | ||||||
|             <url>http://maven.sk89q.com/artifactory/repo/</url> |  | ||||||
|         </repository> |  | ||||||
|         <repository> |  | ||||||
|             <id>vault-repo</id> |  | ||||||
|             <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url> |  | ||||||
|         </repository> |  | ||||||
|         <repository> |         <repository> | ||||||
|             <id>sponge-maven-repo</id> |             <id>sponge-maven-repo</id> | ||||||
|             <name>Sponge maven repo</name> |  | ||||||
|             <url>http://repo.spongepowered.org/maven</url> |             <url>http://repo.spongepowered.org/maven</url> | ||||||
|             <releases> |             <releases> | ||||||
|                 <enabled>true</enabled> |                 <enabled>true</enabled> | ||||||
| @@ -140,50 +190,131 @@ | |||||||
|                 <enabled>true</enabled> |                 <enabled>true</enabled> | ||||||
|             </snapshots> |             </snapshots> | ||||||
|         </repository> |         </repository> | ||||||
|  |  | ||||||
|  |         <repository> | ||||||
|  |             <id>sk89q</id> | ||||||
|  |             <url>http://maven.sk89q.com/repo/</url> | ||||||
|  |         </repository> | ||||||
|  |  | ||||||
|  |         <repository> | ||||||
|  |             <id>vault-repo</id> | ||||||
|  |             <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url> | ||||||
|  |         </repository> | ||||||
|     </repositories> |     </repositories> | ||||||
|  |  | ||||||
|     <dependencies> |     <dependencies> | ||||||
|  |  | ||||||
|  |         <!-- Bukkit API, http://www.spigotmc.org/ or http://bukkit.org/ --> | ||||||
|  |         <dependency> | ||||||
|  |             <groupId>org.bukkit</groupId> | ||||||
|  |             <artifactId>bukkit</artifactId> | ||||||
|  |             <version>${bukkitVersion}</version> | ||||||
|  |             <scope>provided</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|  |             <exclusions> | ||||||
|  |                 <exclusion> | ||||||
|  |                     <artifactId>junit</artifactId> | ||||||
|  |                     <groupId>junit</groupId> | ||||||
|  |                 </exclusion> | ||||||
|  |                 <exclusion> | ||||||
|  |                     <artifactId>gson</artifactId> | ||||||
|  |                     <groupId>com.google.code.gson</groupId> | ||||||
|  |                 </exclusion> | ||||||
|  |                 <exclusion> | ||||||
|  |                     <artifactId>persistence-api</artifactId> | ||||||
|  |                     <groupId>javax.persistence</groupId> | ||||||
|  |                 </exclusion> | ||||||
|  |             </exclusions> | ||||||
|  |         </dependency> | ||||||
|  |  | ||||||
|  |         <!-- Sponge API --> | ||||||
|  |         <dependency> | ||||||
|  |             <groupId>org.spongepowered</groupId> | ||||||
|  |             <artifactId>spongeapi</artifactId> | ||||||
|  |             <version>${spongeVersion}</version> | ||||||
|  |             <scope>provided</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|  |             <exclusions> | ||||||
|  |             	<exclusion> | ||||||
|  |             		<artifactId>jsr305</artifactId> | ||||||
|  |             		<groupId>com.google.code.findbugs</groupId> | ||||||
|  |             	</exclusion> | ||||||
|  |             </exclusions> | ||||||
|  |         </dependency> | ||||||
|  |  | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.websocket</groupId> |             <groupId>javax.websocket</groupId> | ||||||
|             <artifactId>javax.websocket-api</artifactId> |             <artifactId>javax.websocket-api</artifactId> | ||||||
|             <version>1.1</version> |             <version>1.1</version> | ||||||
|  |             <scope>compile</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|         </dependency> |         </dependency> | ||||||
|         <dependency> |  | ||||||
|             <groupId>org.spongepowered</groupId> |  | ||||||
|             <artifactId>spongeapi</artifactId> |  | ||||||
|             <version>2.1-SNAPSHOT</version> |  | ||||||
|         </dependency> |  | ||||||
|         <dependency> |  | ||||||
|             <groupId>org.bukkit</groupId> |  | ||||||
|             <artifactId>bukkit</artifactId> |  | ||||||
|             <version>1.8.3-R0.1-SNAPSHOT</version> |  | ||||||
|         </dependency> |  | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>com.sk89q</groupId> |             <groupId>com.sk89q</groupId> | ||||||
|             <artifactId>worldedit</artifactId> |             <artifactId>worldedit</artifactId> | ||||||
|             <version>6.0.0-SNAPSHOT</version> |             <version>6.0.0-SNAPSHOT</version> | ||||||
|             <type>jar</type> |             <scope>provided</scope> | ||||||
|             <scope>compile</scope> |             <optional>true</optional> | ||||||
|  |             <exclusions> | ||||||
|  |             	<exclusion> | ||||||
|  |             		<artifactId>truezip</artifactId> | ||||||
|  |             		<groupId>de.schlichtherle</groupId> | ||||||
|  |             	</exclusion> | ||||||
|  |             	<exclusion> | ||||||
|  |             		<artifactId>js</artifactId> | ||||||
|  |             		<groupId>rhino</groupId> | ||||||
|  |             	</exclusion> | ||||||
|  |             	<exclusion> | ||||||
|  |             		<artifactId>jsr305</artifactId> | ||||||
|  |             		<groupId>com.google.code.findbugs</groupId> | ||||||
|  |             	</exclusion> | ||||||
|  |             	<exclusion> | ||||||
|  |             		<artifactId>guava</artifactId> | ||||||
|  |             		<groupId>com.google.guava</groupId> | ||||||
|  |             	</exclusion> | ||||||
|  |             </exclusions> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |  | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>org.apache.commons</groupId> |             <groupId>org.apache.commons</groupId> | ||||||
|             <artifactId>commons-math3</artifactId> |             <artifactId>commons-math3</artifactId> | ||||||
|             <version>3.2</version> |             <version>3.6</version> | ||||||
|  |             <scope>compile</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|         </dependency> |         </dependency> | ||||||
|         <dependency> |  | ||||||
|  |         <!-- <dependency> | ||||||
|             <groupId>junit</groupId> |             <groupId>junit</groupId> | ||||||
|             <artifactId>junit</artifactId> |             <artifactId>junit</artifactId> | ||||||
|             <version>4.11</version> |             <version>4.12</version> | ||||||
|  |             <scope>test</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |         --> | ||||||
|  |  | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>net.milkbowl.vault</groupId> |             <groupId>net.milkbowl.vault</groupId> | ||||||
|             <artifactId>VaultAPI</artifactId> |             <artifactId>VaultAPI</artifactId> | ||||||
|             <version>1.5</version> |             <version>1.5</version> | ||||||
|             <scope>provided</scope> |             <scope>provided</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|  |             <exclusions> | ||||||
|  |                 <exclusion> | ||||||
|  |                     <groupId>org.bukkit</groupId> | ||||||
|  |                     <artifactId>bukkit</artifactId> | ||||||
|  |                 </exclusion> | ||||||
|  |             </exclusions> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |  | ||||||
|  |         <!-- GSON (required to provide 1.7.10 and below compatibility) --> | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>com.google.code.gson</groupId> |             <groupId>com.google.code.gson</groupId> | ||||||
|             <artifactId>gson</artifactId> |             <artifactId>gson</artifactId> | ||||||
|             <version>2.3.1</version> |             <version>2.5</version> | ||||||
|  |             <scope>compile</scope> | ||||||
|  |             <optional>true</optional> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |  | ||||||
|     </dependencies> |     </dependencies> | ||||||
| </project> | </project> | ||||||
| @@ -30,6 +30,7 @@ public class YamlConfiguration extends FileConfiguration { | |||||||
|     private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions); |     private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions); | ||||||
|      |      | ||||||
|     @Override |     @Override | ||||||
|  |     @SuppressWarnings("deprecation") | ||||||
|     public String saveToString() { |     public String saveToString() { | ||||||
|         yamlOptions.setIndent(options().indent()); |         yamlOptions.setIndent(options().indent()); | ||||||
|         yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); |         yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); | ||||||
|   | |||||||
| @@ -13,7 +13,6 @@ import java.util.regex.Pattern; | |||||||
|  |  | ||||||
| import com.intellectualcrafters.plot.config.C; | import com.intellectualcrafters.plot.config.C; | ||||||
| import com.intellectualcrafters.plot.object.PlotPlayer; | import com.intellectualcrafters.plot.object.PlotPlayer; | ||||||
| import com.intellectualcrafters.plot.util.Permissions; |  | ||||||
| import com.intellectualcrafters.plot.util.StringMan; | import com.intellectualcrafters.plot.util.StringMan; | ||||||
| import com.plotsquared.general.commands.Command; | import com.plotsquared.general.commands.Command; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; | |||||||
|  * SubCommand class |  * SubCommand class | ||||||
|  * |  * | ||||||
|  |  | ||||||
|  */ |  */ | ||||||
| @SuppressWarnings({ "deprecation" }) | @SuppressWarnings({ "deprecation" }) | ||||||
| public abstract class SubCommand extends com.plotsquared.general.commands.Command<PlotPlayer> { | public abstract class SubCommand extends com.plotsquared.general.commands.Command<PlotPlayer> { | ||||||
|      |      | ||||||
|   | |||||||
| @@ -30,7 +30,6 @@ import com.intellectualcrafters.plot.util.StringComparison; | |||||||
|  * Main Configuration Utility |  * Main Configuration Utility | ||||||
|  * |  * | ||||||
|  |  | ||||||
|  */ |  | ||||||
|  */ |  */ | ||||||
| public class Configuration { | public class Configuration { | ||||||
|      |      | ||||||
|   | |||||||
| @@ -45,7 +45,6 @@ import com.intellectualcrafters.plot.util.Permissions; | |||||||
|  |  | ||||||
|  |  | ||||||
|  */ |  */ | ||||||
| @SuppressWarnings("unused") |  | ||||||
| public class FlagManager { | public class FlagManager { | ||||||
|      |      | ||||||
|     private final static HashSet<String> reserved = new HashSet<>(); |     private final static HashSet<String> reserved = new HashSet<>(); | ||||||
|   | |||||||
| @@ -95,7 +95,6 @@ public class ConsoleColors { | |||||||
|             win = lin; |             win = lin; | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         @SuppressWarnings("unused") |  | ||||||
|         public String getWin() { |         public String getWin() { | ||||||
|             return win; |             return win; | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -186,7 +186,8 @@ public abstract class EventUtil { | |||||||
|                     if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) { |                     if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) { | ||||||
|                         return true; |                         return true; | ||||||
|                     } |                     } | ||||||
|                     return !(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s())); |                     // TODO: fix the commented dead code | ||||||
|  |                     return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s())); | ||||||
|                 } |                 } | ||||||
|                 return true; |                 return true; | ||||||
|             } |             } | ||||||
|   | |||||||
| @@ -28,7 +28,6 @@ import java.util.Collections; | |||||||
|  * String comparison library |  * String comparison library | ||||||
|  * |  * | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  */ |  */ | ||||||
| public class StringComparison<T> { | public class StringComparison<T> { | ||||||
|   | |||||||
| @@ -5,7 +5,6 @@ import java.io.OutputStream; | |||||||
| import java.net.HttpURLConnection; | import java.net.HttpURLConnection; | ||||||
| import java.net.URL; | import java.net.URL; | ||||||
| import java.nio.ByteBuffer; | import java.nio.ByteBuffer; | ||||||
| import java.util.Arrays; |  | ||||||
| import java.util.Collections; | import java.util.Collections; | ||||||
| import java.util.HashMap; | import java.util.HashMap; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ import java.nio.file.Path; | |||||||
| import java.nio.file.Paths; | import java.nio.file.Paths; | ||||||
| import java.sql.Connection; | import java.sql.Connection; | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.Arrays; |  | ||||||
| import java.util.Collections; | import java.util.Collections; | ||||||
| import java.util.HashMap; | import java.util.HashMap; | ||||||
| import java.util.Map.Entry; | import java.util.Map.Entry; | ||||||
| @@ -210,9 +209,13 @@ public class LikePlotMeConverter { | |||||||
|                         final String actualWorldName = getWorld(world); |                         final String actualWorldName = getWorld(world); | ||||||
|                         final String plotMeWorldName = world.toLowerCase(); |                         final String plotMeWorldName = world.toLowerCase(); | ||||||
|                         Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); // |                         Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); // | ||||||
|  |                         /* | ||||||
|  |                          * TODO: dead code | ||||||
|  |                          *  | ||||||
|                         if (pathwidth == null) { |                         if (pathwidth == null) { | ||||||
|                             pathwidth = 7; |                             pathwidth = 7; | ||||||
|                         } |                         } | ||||||
|  |                         */ | ||||||
|                         PS.get().config.set("worlds." + world + ".road.width", pathwidth); |                         PS.get().config.set("worlds." + world + ".road.width", pathwidth); | ||||||
|  |  | ||||||
|                         Integer pathheight = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); // |                         Integer pathheight = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); // | ||||||
|   | |||||||
| @@ -1,8 +1,6 @@ | |||||||
| package com.plotsquared.bukkit.util; | package com.plotsquared.bukkit.util; | ||||||
|  |  | ||||||
| import java.util.ArrayList; |  | ||||||
| import java.util.HashSet; | import java.util.HashSet; | ||||||
| import java.util.List; |  | ||||||
| import java.util.Random; | import java.util.Random; | ||||||
|  |  | ||||||
| import org.bukkit.Bukkit; | import org.bukkit.Bukkit; | ||||||
| @@ -15,11 +13,8 @@ import org.bukkit.generator.ChunkGenerator.BiomeGrid; | |||||||
| import org.bukkit.material.Directional; | import org.bukkit.material.Directional; | ||||||
| import org.bukkit.material.MaterialData; | import org.bukkit.material.MaterialData; | ||||||
|  |  | ||||||
| import com.intellectualcrafters.plot.flag.Flag; |  | ||||||
| import com.intellectualcrafters.plot.flag.FlagManager; |  | ||||||
| import com.intellectualcrafters.plot.generator.HybridUtils; | import com.intellectualcrafters.plot.generator.HybridUtils; | ||||||
| import com.intellectualcrafters.plot.object.Location; | import com.intellectualcrafters.plot.object.Location; | ||||||
| import com.intellectualcrafters.plot.object.Plot; |  | ||||||
| import com.intellectualcrafters.plot.object.PlotAnalysis; | import com.intellectualcrafters.plot.object.PlotAnalysis; | ||||||
| import com.intellectualcrafters.plot.object.PlotBlock; | import com.intellectualcrafters.plot.object.PlotBlock; | ||||||
| import com.intellectualcrafters.plot.object.RegionWrapper; | import com.intellectualcrafters.plot.object.RegionWrapper; | ||||||
|   | |||||||
| @@ -10,7 +10,6 @@ import java.util.concurrent.ConcurrentHashMap; | |||||||
| import com.intellectualcrafters.plot.config.C; | import com.intellectualcrafters.plot.config.C; | ||||||
| import com.intellectualcrafters.plot.util.Permissions; | import com.intellectualcrafters.plot.util.Permissions; | ||||||
|  |  | ||||||
| @SuppressWarnings("unused") |  | ||||||
| public class CommandManager<T extends CommandCaller> { | public class CommandManager<T extends CommandCaller> { | ||||||
|      |      | ||||||
|     final public ConcurrentHashMap<String, Command<T>> commands; |     final public ConcurrentHashMap<String, Command<T>> commands; | ||||||
|   | |||||||
| @@ -92,6 +92,9 @@ public class StateWrapper { | |||||||
|         return tags; |         return tags; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /* | ||||||
|  |      * TODO: Move this into the spongee module! | ||||||
|  |      * | ||||||
|     public Map<String, Tag> serializeItem(final org.spongepowered.api.item.inventory.ItemStack item) { |     public Map<String, Tag> serializeItem(final org.spongepowered.api.item.inventory.ItemStack item) { | ||||||
|         final Map<String, Tag> data = new HashMap<String, Tag>(); |         final Map<String, Tag> data = new HashMap<String, Tag>(); | ||||||
|          |          | ||||||
| @@ -99,6 +102,7 @@ public class StateWrapper { | |||||||
|          |          | ||||||
|         return data; |         return data; | ||||||
|     } |     } | ||||||
|  |     */ | ||||||
|      |      | ||||||
|     public Map<String, Tag> serializeItem(final ItemStack item) { |     public Map<String, Tag> serializeItem(final ItemStack item) { | ||||||
|         final Map<String, Tag> data = new HashMap<String, Tag>(); |         final Map<String, Tag> data = new HashMap<String, Tag>(); | ||||||
|   | |||||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user
	 Gabriele C
					Gabriele C