Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyberpwnn
cyberpwnn committed Jan 2, 2019
1 parent dd45669 commit 9c15341
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 73 deletions.
59 changes: 13 additions & 46 deletions dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
<groupId>com.volmit</groupId>
<artifactId>Phantom</artifactId>
<name>Phantom</name>
<version>3.1.27${build}</version>
<scm>
<connection>scm:git:git://github.com/PhantomAPI/Phantom.git</connection>
<developerConnection>scm:git:[email protected]:PhantomAPI/Phantom.git</developerConnection>
<url>https://github.com/PhantomAPI/Phantom</url>
</scm>
<version>3.1.28</version>
<build>
<resources>
<resource>
Expand Down Expand Up @@ -42,27 +37,6 @@
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
<configuration>
<doUpdate>true</doUpdate>
<shortRevisionLength>12</shortRevisionLength>
</configuration>
</execution>
</executions>
<configuration>
<doUpdate>true</doUpdate>
<shortRevisionLength>12</shortRevisionLength>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -77,17 +51,17 @@
<configuration>
<executable>C:\Users\cyberpwn\Documents\development\workspace\Phantom/scripts/release.bat</executable>
<arguments>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.27.${buildNumber}.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.27.${buildNumber}\Phantom-3.1.27.${buildNumber}.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.28.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.28\Phantom-3.1.28.jar</argument>
</arguments>
</configuration>
</execution>
</executions>
<configuration>
<executable>C:\Users\cyberpwn\Documents\development\workspace\Phantom/scripts/release.bat</executable>
<arguments>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.27.${buildNumber}.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.27.${buildNumber}\Phantom-3.1.27.${buildNumber}.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.28.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.28\Phantom-3.1.28.jar</argument>
</arguments>
</configuration>
</plugin>
Expand Down Expand Up @@ -131,9 +105,6 @@
</plugin>
</plugins>
</build>
<properties>
<build>.${buildNumber}</build>
</properties>
</profile>
<profile>
<id>development</id>
Expand Down Expand Up @@ -182,6 +153,14 @@
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>plotsquared</id>
<url>http://ci.athion.net/job/PlotSquared/ws/mvn/</url>
</repository>
<repository>
<id>sk89q</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
</repositories>
<dependencies>
<dependency>
Expand All @@ -198,18 +177,6 @@
<artifactId>json-simple</artifactId>
<groupId>com.googlecode.json-simple</groupId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
<exclusion>
<artifactId>snakeyaml</artifactId>
<groupId>org.yaml</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
Expand Down
27 changes: 1 addition & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.volmit</groupId>
<artifactId>Phantom</artifactId>
<version>3.1.27${build}</version>
<version>3.1.28</version>
<name>Phantom</name>
<properties>
<build></build>
Expand All @@ -14,36 +14,11 @@
<javadoc.opts>-Xdoclint:none</javadoc.opts>
<libs>${project.basedir}/lib</libs>
</properties>
<scm>
<url>https://github.com/PhantomAPI/Phantom</url>
<connection>scm:git:git://github.com/PhantomAPI/Phantom.git</connection>
<developerConnection>scm:git:[email protected]:PhantomAPI/Phantom.git</developerConnection>
</scm>
<profiles>
<profile>
<id>release</id>
<properties>
<build>.${buildNumber}</build>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doUpdate>true</doUpdate>
<shortRevisionLength>12</shortRevisionLength>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/volmit/phantom/plugin/StructuredModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ public void run()
{
try
{
new File(Phantom.getModuleManager().getDataFolder(), getInfo().name()).mkdirs();
VIO.writeAll(new File(new File(Phantom.getModuleManager().getDataFolder(), getInfo().name()), "structure.json"), computeMetadata().toString(2));
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/phantom/world/WorldEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@SuppressWarnings("deprecation")
public class WorldEditor
{
public World getAsyncWorld(World world)
public static World getAsyncWorld(World world)
{
return SVC.get(WorldEditSVC.class).getAsyncWorld(world);
}
Expand Down

0 comments on commit 9c15341

Please sign in to comment.