AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

TotalFreedomMod 5.2 God (#69)

Browse Source
This commit is contained in:
Telesphoreo 2018-06-02 01:18:28 -07:00 committed by Seth
parent 435898550b
commit 7026423e8e
4 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
# TFM excludes # TFM excludes
/lib /lib
build.properties build.properties
git.properties
# Netbeans excludes # Netbeans excludes
/nbproject/private /nbproject/private

102
pom.xml
View File

@ -4,14 +4,14 @@
<groupId>me.totalfreedom</groupId> <groupId>me.totalfreedom</groupId>
<artifactId>totalfreedom</artifactId> <artifactId>totalfreedom</artifactId>
<version>5.0</version> <version>5.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tfm.build.version>${project.version}</tfm.build.version> <tfm.build.version>${project.version}</tfm.build.version>
<tfm.build.codename>Electrum</tfm.build.codename> <tfm.build.codename>God</tfm.build.codename>
<!-- <tfm.build.number>${maven.buildnumber}</tfm.build.number> --> <tfm.build.number>${maven.buildnumber}</tfm.build.number>
<tfm.build.date>${maven.build.timestamp}</tfm.build.date> <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
<tfm.build.author>${buildAuthor}</tfm.build.author> <tfm.build.author>${buildAuthor}</tfm.build.author>
<tfm.build.head>${buildHead}</tfm.build.head> <tfm.build.head>${buildHead}</tfm.build.head>
@ -60,7 +60,7 @@
</repository> </repository>
<repository> <repository>
<id>sk89q-snapshots</id> <id>sk89q-snapshots</id>
<url>http://maven.sk89q.com/artifactory/repo</url> <url>http://maven.sk89q.com/artifactory/repo/</url>
</repository> </repository>
</repositories> </repositories>
@ -159,9 +159,9 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>3.5.1_339-withDependencies</version> <version>JDA-3.6.0_354-withDependencies</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/JDA-3.5.1_339-withDependencies.jar</systemPath> <systemPath>${project.basedir}/lib/JDA-3.6.0_354-withDependencies.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
@ -192,6 +192,7 @@
<!-- Antrun --> <!-- Antrun -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version> <version>1.8</version>
<executions> <executions>
@ -199,8 +200,11 @@
<phase>initialize</phase> <phase>initialize</phase>
<configuration> <configuration>
<target> <target>
<propertyfile file="build.properties" comment="Build information. Edit this to your liking."> <propertyfile file="src/main/resources/build.properties" comment="Build information. Edit this to your liking.">
<entry key="buildAuthor" default="unknown" /> <entry key="buildAuthor" default="unknown" />
<entry key="buildNumber" default="0" />
<entry key="buildCodeName" default="${tfm.build.codename}" />
<entry key="buildVersion" default="${project.version}" />
</propertyfile> </propertyfile>
</target> </target>
</configuration> </configuration>
@ -209,8 +213,10 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Properties --> <!-- Properties -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -224,7 +230,7 @@
</goals> </goals>
<configuration> <configuration>
<files> <files>
<file>${basedir}/build.properties</file> <file>${basedir}/src/main/resources/build.properties</file>
</files> </files>
</configuration> </configuration>
</execution> </execution>
@ -254,26 +260,47 @@
<!-- Git describe --> <!-- Git describe -->
<plugin> <plugin>
<groupId>com.lukegb.mojo</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>gitdescribe-maven-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>3.0</version> <version>2.2.4</version>
<executions> <executions>
<execution> <execution>
<id>git-describe</id> <id>get-the-git-infos</id>
<phase>initialize</phase>
<goals> <goals>
<goal>gitdescribe</goal> <goal>revision</goal>
</goals> </goals>
<configuration> </execution>
<descriptionProperty>buildHead</descriptionProperty> <execution>
<extraArguments> <id>validate-the-git-infos</id>
<param>--tags</param> <goals>
<param>--always</param> <goal>validateRevision</goal>
<param>HEAD</param> </goals>
</extraArguments> <phase>package</phase>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<prefix>git</prefix>
<dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
<verbose>false</verbose>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${basedir}/src/main/resources/git.properties</generateGitPropertiesFilename>
<format>properties</format>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
<includeOnlyProperties>
<includeOnlyProperty>git.build.time</includeOnlyProperty>
<includeOnlyProperty>git.commit.id</includeOnlyProperty>
<includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
</includeOnlyProperties>
<gitDescribe>
<skip>false</skip>
<always>false</always>
<abbrev>7</abbrev>
<dirty>-dirty</dirty>
<match>*</match>
</gitDescribe>
</configuration>
</plugin> </plugin>
<!-- Buildnumber --> <!-- Buildnumber -->
@ -292,42 +319,13 @@
<configuration> <configuration>
<buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName> <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
<buildNumberPropertiesFileLocation>${basedir}/build.properties</buildNumberPropertiesFileLocation> <buildNumberPropertiesFileLocation>${basedir}/src/main/resources/build.properties</buildNumberPropertiesFileLocation>
<format>{0,number,#}</format> <format>{0,number,#}</format>
<items> <items>
<item>buildNumber</item> <item>buildNumber</item>
</items> </items>
</configuration> </configuration>
</plugin> </plugin>
<!-- Maven jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<outputDirectory>target/generated-sources</outputDirectory>
</configuration>
</plugin>
<!-- Maven shade -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<outputFile>target/${project.name}.jar</outputFile>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

18
src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View File

@ -283,18 +283,24 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
try try
{ {
final Properties props; final Properties props;
final Properties gitprops;
try (InputStream in = plugin.getResource("build.properties")) try (InputStream in = plugin.getResource("build.properties"))
{ {
props = new Properties(); props = new Properties();
props.load(in); props.load(in);
} }
try (InputStream in = plugin.getResource("git.properties"))
{
gitprops = new Properties();
gitprops.load(in);
}
author = props.getProperty("program.build.author", "unknown"); author = props.getProperty("buildAuthor", "unknown");
codename = props.getProperty("program.build.codename", "unknown"); codename = props.getProperty("buildCodeName", "unknown");
version = props.getProperty("program.build.version", "unknown"); version = props.getProperty("buildVersion", pluginVersion);
number = props.getProperty("program.build.number", "1"); number = props.getProperty("buildNumber", "1");
date = props.getProperty("program.build.date", "unknown"); date = gitprops.getProperty("git.build.time", "unknown");
head = props.getProperty("program.build.head", "unknown"); head = gitprops.getProperty("git.commit.id.abbrev", "unknown");
} }
catch (Exception ex) catch (Exception ex)
{ {

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_totalfreedommod.java
View File

@ -52,7 +52,7 @@ public class Command_totalfreedommod extends FreedomCommand
msg("Running on " + ConfigEntry.SERVER_NAME.getString() + ".", ChatColor.GOLD); msg("Running on " + ConfigEntry.SERVER_NAME.getString() + ".", ChatColor.GOLD);
msg("Created by Madgeek1450 and Prozza.", ChatColor.GOLD); msg("Created by Madgeek1450 and Prozza.", ChatColor.GOLD);
msg(String.format("Version " msg(String.format("Version "
+ ChatColor.BLUE + "%s %s.%s " + ChatColor.GOLD + "(" + ChatColor.BLUE + "%s - %s Build %s " + ChatColor.GOLD + "("
+ ChatColor.BLUE + "%s" + ChatColor.GOLD + ")", + ChatColor.BLUE + "%s" + ChatColor.GOLD + ")",
build.codename, build.codename,
build.version, build.version,