Mavenized project

.gitignore

@@ -1,14 +1,27 @@
+# TFM excludes
+/lib
+
 # Netbeans excludes
-nbproject/private/
-dist/
-build/
+/nbproject/private
+/dist
+/build
 manifest.mf
+nb-configuration.xml
 
 # Eclipse excludes
 .project
 .classpath
-bin/
-.settings/
+/bin
+/.settings
+
+# IntelliJ excludes
+*.iml
+*.ipr
+*.iws
+/.idea
+
+# Maven excludes
+/target
 
 # OS generated files
 .DS_Store
@@ -17,6 +30,3 @@ bin/
 .Trashes
 ehthumbs.db
 Thumbs.db
-
-# TFM files
-build.properties

build.properties

@@ -0,0 +1,4 @@
+#maven.buildNumber.plugin properties file
+#Wed Nov 18 21:37:05 CET 2015
+buildAuthor=ProzzaGuy
+buildNumber=13

build.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="TotalFreedomMod" default="default" basedir=".">
-    <description>Builds, tests, and runs the project TotalFreedomMod.</description>
-    <import file="nbproject/build-impl.xml" />
-
-    <!-- if "build.properties" exists, store that in "build.properties.exists" -->
-    <target name="-build-properties-exists">
-        <available property="build.properties.exists" file="build.properties"/>
-    </target>
-
-    <!-- Creates build.properties, unless it exists already -->
-    <target name="create-build-properties" depends="-build-properties-exists" unless="build.properties.exists">
-        <propertyfile file="build.properties" comment="Build information. Edit this to your liking.">
-            <entry key="program.builder" default="unknown" />
-        </propertyfile>
-    </target>
-
-    <!-- Pre-jar property generation -->
-    <target name="-pre-jar" depends="create-build-properties">
-
-        <!-- Determine git version -->
-        <exec executable="git" outputproperty="program.buildhead" failifexecutionfails="false" errorproperty="">
-            <arg value="describe"/>
-            <arg value="--tags"/>
-            <arg value="--always"/>
-            <arg value="HEAD"/>
-        </exec>
-        <condition property="repository.version" value="${program.buildhead}" else="unknown">
-            <and>
-                <isset property="program.buildhead"/>
-                <length string="${program.buildhead}" trim="yes" length="0" when="greater"/>
-            </and>
-        </condition>
-
-        <!-- Load build.properties file -->
-        <property file="build.properties"/>
-
-        <!-- Load buildnumber from build.properties, store in ${build.number} -->
-        <buildnumber file="build.properties" />
-
-        <!-- Write build info -->
-        <propertyfile file="${build.classes.dir}/build.properties">
-            <entry key="program.buildnumber" value="${build.number}" />
-            <entry key="program.buildhead" value="${program.buildhead}" />
-            <entry key="program.builder" value="${program.builder}" />
-            <entry key="program.builddate" type="date" value="now" pattern="yyyy-MM-dd hh:mm aa" />
-        </propertyfile>
-    </target>
-
-    <!-- Cleanup -->
-    <target name="-post-jar">
-        <delete file="${dist.dir}/README.TXT" />
-        <delete dir="${dist.dir}/lib/" />
-    </target>
-</project>

nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=7bf70ec5
-build.xml.script.CRC32=b1031e10
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7bf70ec5
-nbproject/build-impl.xml.script.CRC32=8511de95
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

nbproject/project.properties

@@ -1,104 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=TotalFreedomMod
-application.vendor=TotalFreedom
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=0
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.enableCommentFormatting=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/TotalFreedomMod.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${libs.SpigotServer.classpath}:\
-    ${libs.TF-Essentials.classpath}:\
-    ${libs.TF-WorldEdit.classpath}:\
-    ${libs.BukkitTelnet.classpath}:\
-    ${libs.Aero.classpath}:\
-    ${libs.Lombok.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src

nbproject/project.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>TotalFreedomMod</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots/>
-        </data>
-    </configuration>
-</project>

pom.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+
+    <groupId>me.totalfreedom</groupId>
+    <artifactId>TotalFreedomModMaven</artifactId>
+    <version>5.0</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <tfm.build.version>${project.version}</tfm.build.version>
+        <tfm.build.number>${maven.buildnumber}</tfm.build.number>
+        <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
+        <tfm.build.author>${buildAuthor}</tfm.build.author>
+        <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
+    </properties>
+
+    <name>TotalFreedomMod</name>
+    <description>Server modification for the TotalFreedom server</description>
+    <url>https://github.com/TotalFreedom/TotalFreedomMod</url>
+
+    <licenses>
+        <license>
+            <name>TotalFreedom General License</name>
+            <url>https://github.com/TotalFreedom/License/blob/master/LICENSE.md</url>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Total Freedom MC</name>
+        <url>https://totalfreedom.me</url>
+    </organization>
+
+    <scm>
+        <connection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</connection>
+        <developerConnection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</developerConnection>
+        <url>git@github.com:TotalFreedom/TotalFreedomMod.git</url>
+    </scm>
+
+    <repositories>
+        <repository>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.pravian</groupId>
+            <artifactId>Aero</artifactId>
+            <version>2.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.6</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.8.7-R0.1-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/Spigot-1.8.7.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>net.totalfreedom</groupId>
+            <artifactId>bukkittelnet</artifactId>
+            <version>4.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/BukkitTelnet-4.2.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>net.totalfreedom</groupId>
+            <artifactId>tf-worldedit</artifactId>
+            <version>6.1.0-TF</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/TF-WorldEdit-6.1.0.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>net.totalfreedom</groupId>
+            <artifactId>tf-essentials</artifactId>
+            <version>2.0-TF</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/TF-Essentials-2.0.jar</systemPath>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!-- Filter resources for build.properties -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+
+        <plugins>
+            <!-- Antrun -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <tasks>
+                                <propertyfile file="build.properties" comment="Build information. Edit this to your liking.">
+                                    <entry key="buildAuthor" default="unknown" />
+                                </propertyfile>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Properties -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${basedir}/build.properties</file>
+                            </files>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Compiler -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <compilerVersion>1.7</compilerVersion>
+                    <source>1.6</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <!-- Jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <!-- Git describe -->
+            <plugin>
+                <groupId>com.lukegb.mojo</groupId>
+                <artifactId>gitdescribe-maven-plugin</artifactId>
+                <version>3.0</version>
+                <executions>
+                    <execution>
+                        <id>git-describe</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>gitdescribe</goal>
+                        </goals>
+                        <configuration>
+                            <extraArguments>
+                                <param>--tags</param>
+                                <param>--always</param>
+                                <param>HEAD</param>
+                            </extraArguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Buildnumber -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
+                    <buildNumberPropertiesFileLocation>${basedir}/build.properties</buildNumberPropertiesFileLocation>
+                    <format>{0,number}</format>
+                    <items>
+                        <item>buildNumber</item>
+                    </items>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>