Skip to content

Commit

Permalink
Updated to allow building; not actually tested
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zenexer
Zenexer committed Dec 29, 2014
1 parent a202aad commit fff534b
Show file tree
Hide file tree
Showing 18 changed files with 201 additions and 34 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target/
artifacts/
.idea/
28 changes: 28 additions & 0 deletions Assembly/Assembly.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/assembly" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="ForgePluginBukkit" />
<orderEntry type="module" module-name="ForgePluginEquivalentExchange" />
<orderEntry type="module" module-name="ForgePluginRailcraft" />
<orderEntry type="module" module-name="ForgePluginRedpower" />
<orderEntry type="module" module-name="ForgePluginTubeStuff" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion Assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ForgePluginTubestuff</artifactId>
<artifactId>ForgePluginTubeStuff</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
22 changes: 22 additions & 0 deletions ForgePlugin.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
24 changes: 24 additions & 0 deletions ForgePluginBukkit/ForgePluginBukkit.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
23 changes: 23 additions & 0 deletions ForgePluginEquivalentExchange/ForgePluginEquivalentExchange.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
8 changes: 4 additions & 4 deletions ForgePluginEquivalentExchange/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -94,15 +94,15 @@
</build>
<dependencies>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2</version>
<version>1.2.30</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.6</version>
<version>1.14.8</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ForgePluginEquivalentExchange/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
23 changes: 23 additions & 0 deletions ForgePluginRailcraft/ForgePluginRailcraft.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
8 changes: 4 additions & 4 deletions ForgePluginRailcraft/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -67,15 +67,15 @@
</build>
<dependencies>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2</version>
<version>1.2.30</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.6</version>
<version>1.14.8</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ForgePluginRailcraft/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
23 changes: 23 additions & 0 deletions ForgePluginRedpower/ForgePluginRedpower.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
8 changes: 4 additions & 4 deletions ForgePluginRedpower/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -71,15 +71,15 @@
</build>
<dependencies>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2</version>
<version>1.2.30</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.6</version>
<version>1.14.8</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ForgePluginRedpower/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
23 changes: 23 additions & 0 deletions ForgePluginTubeStuff/ForgePluginTubeStuff.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
</component>
</module>
8 changes: 4 additions & 4 deletions ForgePluginTubeStuff/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -67,15 +67,15 @@
</build>
<dependencies>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2</version>
<version>1.2.30</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.6</version>
<version>1.14.8</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ForgePluginTubeStuff/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
26 changes: 13 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@

<repositories>
<repository>
<!--
mvn deploy:deploy-file -Durl=file://$PWD/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
mvn deploy:deploy-file -Durl=file://%CD%/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
-->
<id>local-repo</id>
<url>file://${project.basedir}/../lib</url>
<id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
</repository>
<repository>
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/content/groups/public/</url>
<id>spigot-repo</id>
<url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>mcstats-repo</id>
<url>http://repo.mcstats.org/content/repositories/public</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
<!--
mvn deploy:deploy-file -Durl=file://$PWD/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
mvn deploy:deploy-file -Durl=file://%CD%/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
-->
<id>local-repo</id>
<url>file://${project.basedir}/../lib</url>
</repository>
</repositories>

Expand Down Expand Up @@ -108,14 +108,14 @@

<dependencies>
<dependency>
<groupId>net.milkbowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2</version>
<version>1.2.30</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.6</version>
<version>1.14.8</version>
</dependency>
<!-- Replaced by technic-pack:tekkit -->
<!--dependency>
Expand Down

0 comments on commit fff534b

Please sign in to comment.