Skip to content

Commit fff534b

Browse files
ZenexerZenexer
committed
Updated to allow building; not actually tested
1 parent a202aad commit fff534b

18 files changed

+201
-34
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target/
22
artifacts/
3+
.idea/

‎Assembly/Assembly.iml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/assembly" type="java-resource" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="module" module-name="ForgePluginBukkit" />
13+
<orderEntry type="module" module-name="ForgePluginEquivalentExchange" />
14+
<orderEntry type="module" module-name="ForgePluginRailcraft" />
15+
<orderEntry type="module" module-name="ForgePluginRedpower" />
16+
<orderEntry type="module" module-name="ForgePluginTubeStuff" />
17+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
18+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
19+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
21+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
22+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
23+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
24+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
25+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
26+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
27+
</component>
28+
</module>

‎Assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>${project.groupId}</groupId>
38-
<artifactId>ForgePluginTubestuff</artifactId>
38+
<artifactId>ForgePluginTubeStuff</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
4141
</dependencies>

‎ForgePlugin.iml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<excludeFolder url="file://$MODULE_DIR$/target" />
8+
</content>
9+
<orderEntry type="inheritedJdk" />
10+
<orderEntry type="sourceFolder" forTests="false" />
11+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
12+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
13+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
14+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
15+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
21+
</component>
22+
</module>

‎ForgePluginBukkit/ForgePluginBukkit.iml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<excludeFolder url="file://$MODULE_DIR$/target" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
14+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
15+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
21+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
22+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
23+
</component>
24+
</module>

‎ForgePluginEquivalentExchange/ForgePluginEquivalentExchange.iml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
13+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
14+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
15+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
22+
</component>
23+
</module>

‎ForgePluginEquivalentExchange/dependency-reduced-pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</plugin>
3737
<plugin>
3838
<artifactId>maven-shade-plugin</artifactId>
39-
<version>2.0</version>
39+
<version>2.1</version>
4040
<executions>
4141
<execution>
4242
<phase>package</phase>
@@ -94,15 +94,15 @@
9494
</build>
9595
<dependencies>
9696
<dependency>
97-
<groupId>net.milkbowl</groupId>
97+
<groupId>net.milkbowl.vault</groupId>
9898
<artifactId>Vault</artifactId>
99-
<version>1.2</version>
99+
<version>1.2.30</version>
100100
<scope>compile</scope>
101101
</dependency>
102102
<dependency>
103103
<groupId>org.projectlombok</groupId>
104104
<artifactId>lombok</artifactId>
105-
<version>0.11.6</version>
105+
<version>1.14.8</version>
106106
<scope>compile</scope>
107107
</dependency>
108108
<dependency>

‎ForgePluginEquivalentExchange/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-shade-plugin</artifactId>
45-
<version>2.0</version>
45+
<version>2.1</version>
4646
<executions>
4747
<execution>
4848
<phase>package</phase>

‎ForgePluginRailcraft/ForgePluginRailcraft.iml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
13+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
14+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
15+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
22+
</component>
23+
</module>

‎ForgePluginRailcraft/dependency-reduced-pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</plugin>
3737
<plugin>
3838
<artifactId>maven-shade-plugin</artifactId>
39-
<version>2.0</version>
39+
<version>2.1</version>
4040
<executions>
4141
<execution>
4242
<phase>package</phase>
@@ -67,15 +67,15 @@
6767
</build>
6868
<dependencies>
6969
<dependency>
70-
<groupId>net.milkbowl</groupId>
70+
<groupId>net.milkbowl.vault</groupId>
7171
<artifactId>Vault</artifactId>
72-
<version>1.2</version>
72+
<version>1.2.30</version>
7373
<scope>compile</scope>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.projectlombok</groupId>
7777
<artifactId>lombok</artifactId>
78-
<version>0.11.6</version>
78+
<version>1.14.8</version>
7979
<scope>compile</scope>
8080
</dependency>
8181
<dependency>

‎ForgePluginRailcraft/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-shade-plugin</artifactId>
45-
<version>2.0</version>
45+
<version>2.1</version>
4646
<executions>
4747
<execution>
4848
<phase>package</phase>

‎ForgePluginRedpower/ForgePluginRedpower.iml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
13+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
14+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
15+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
22+
</component>
23+
</module>

‎ForgePluginRedpower/dependency-reduced-pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</plugin>
3737
<plugin>
3838
<artifactId>maven-shade-plugin</artifactId>
39-
<version>2.0</version>
39+
<version>2.1</version>
4040
<executions>
4141
<execution>
4242
<phase>package</phase>
@@ -71,15 +71,15 @@
7171
</build>
7272
<dependencies>
7373
<dependency>
74-
<groupId>net.milkbowl</groupId>
74+
<groupId>net.milkbowl.vault</groupId>
7575
<artifactId>Vault</artifactId>
76-
<version>1.2</version>
76+
<version>1.2.30</version>
7777
<scope>compile</scope>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.projectlombok</groupId>
8181
<artifactId>lombok</artifactId>
82-
<version>0.11.6</version>
82+
<version>1.14.8</version>
8383
<scope>compile</scope>
8484
</dependency>
8585
<dependency>

‎ForgePluginRedpower/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-shade-plugin</artifactId>
45-
<version>2.0</version>
45+
<version>2.1</version>
4646
<executions>
4747
<execution>
4848
<phase>package</phase>

‎ForgePluginTubeStuff/ForgePluginTubeStuff.iml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: net.milkbowl.vault:Vault:1.2.30" level="project" />
13+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
14+
<orderEntry type="library" name="Maven: technic-pack:tekkit:1.2.5" level="project" />
15+
<orderEntry type="library" name="Maven: Tekkit:Railcraft:5.3.3" level="project" />
16+
<orderEntry type="library" name="Maven: Tekkit:EE2Server:1.4.6.5" level="project" />
17+
<orderEntry type="library" name="Maven: Tekkit:buildcraft:2.2.14" level="project" />
18+
<orderEntry type="library" name="Maven: Tekkit:Redpower:2.0p5b2" level="project" />
19+
<orderEntry type="library" name="Maven: Tekkit:tubestuff:49.1.2" level="project" />
20+
<orderEntry type="library" name="Maven: Tekkit:immibis-core:49.1.1" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
22+
</component>
23+
</module>

‎ForgePluginTubeStuff/dependency-reduced-pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</plugin>
3737
<plugin>
3838
<artifactId>maven-shade-plugin</artifactId>
39-
<version>2.0</version>
39+
<version>2.1</version>
4040
<executions>
4141
<execution>
4242
<phase>package</phase>
@@ -67,15 +67,15 @@
6767
</build>
6868
<dependencies>
6969
<dependency>
70-
<groupId>net.milkbowl</groupId>
70+
<groupId>net.milkbowl.vault</groupId>
7171
<artifactId>Vault</artifactId>
72-
<version>1.2</version>
72+
<version>1.2.30</version>
7373
<scope>compile</scope>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.projectlombok</groupId>
7777
<artifactId>lombok</artifactId>
78-
<version>0.11.6</version>
78+
<version>1.14.8</version>
7979
<scope>compile</scope>
8080
</dependency>
8181
<dependency>

‎ForgePluginTubeStuff/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-shade-plugin</artifactId>
45-
<version>2.0</version>
45+
<version>2.1</version>
4646
<executions>
4747
<execution>
4848
<phase>package</phase>

‎pom.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@
4444

4545
<repositories>
4646
<repository>
47-
<!--
48-
mvn deploy:deploy-file -Durl=file://$PWD/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
49-
mvn deploy:deploy-file -Durl=file://%CD%/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
50-
-->
51-
<id>local-repo</id>
52-
<url>file://${project.basedir}/../lib</url>
47+
<id>vault-repo</id>
48+
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
5349
</repository>
5450
<repository>
55-
<id>bukkit-repo</id>
56-
<url>http://repo.bukkit.org/content/groups/public/</url>
51+
<id>spigot-repo</id>
52+
<url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
5753
</repository>
5854
<repository>
5955
<id>mcstats-repo</id>
6056
<url>http://repo.mcstats.org/content/repositories/public</url>
6157
</repository>
6258
<repository>
63-
<id>vault-repo</id>
64-
<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
59+
<!--
60+
mvn deploy:deploy-file -Durl=file://$PWD/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
61+
mvn deploy:deploy-file -Durl=file://%CD%/lib -DcreateChecksum=true -DgeneratePom=true -Dpackaging= -DgroupId= -DartifactId= -Dversion= -Dfile=
62+
-->
63+
<id>local-repo</id>
64+
<url>file://${project.basedir}/../lib</url>
6565
</repository>
6666
</repositories>
6767

@@ -108,14 +108,14 @@
108108

109109
<dependencies>
110110
<dependency>
111-
<groupId>net.milkbowl</groupId>
111+
<groupId>net.milkbowl.vault</groupId>
112112
<artifactId>Vault</artifactId>
113-
<version>1.2</version>
113+
<version>1.2.30</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.projectlombok</groupId>
117117
<artifactId>lombok</artifactId>
118-
<version>0.11.6</version>
118+
<version>1.14.8</version>
119119
</dependency>
120120
<!-- Replaced by technic-pack:tekkit -->
121121
<!--dependency>

0 commit comments

Comments
 (0)