Skip to content

Commit 381e38b

Browse files
committed
Merge pull request #1 from Techcable/multi-version
Support Multiple Versions
2 parents 0a86723 + da79bc8 commit 381e38b

21 files changed

+322
-813
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@ nbproject/project.properties
1111
nbproject/project.xml
1212
/nbproject/
1313
target/
14+
dependency-reduced-pom.xml
15+
16+
#Intellij
17+
/*.iml
18+
/.idea

pom.xml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.trc202</groupId>
44
<artifactId>combattag</artifactId>
5-
<version>6.3.2</version>
5+
<version>6.4.0-SNAPSHOT</version>
66
<name>CombatTag</name>
77
<properties>
88
<java.version>1.6</java.version>
@@ -11,7 +11,7 @@
1111

1212
<repositories>
1313
<repository>
14-
<id>techcable-repo</id> <!-- Houses war, crackshot, and craftbukkit -->
14+
<id>techcable-repo</id> <!-- Houses war, crackshot, and NPCLib -->
1515
<url>http://repo.techcable.net/content/groups/public/</url>
1616
</repository>
1717
<repository>
@@ -26,10 +26,10 @@
2626

2727
<dependencies>
2828
<dependency>
29-
<groupId>org.bukkit</groupId>
30-
<artifactId>craftbukkit</artifactId>
31-
<version>1.8.3-R0.1-SNAPSHOT</version>
32-
<scope>provided</scope>
29+
<groupId>net.techcable</groupId>
30+
<artifactId>npclib</artifactId>
31+
<version>1.1.1-SNAPSHOT</version>
32+
<scope>compile</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.bukkit</groupId>
@@ -87,7 +87,27 @@
8787
<target>${java.version}</target>
8888
</configuration>
8989
</plugin>
90-
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-shade-plugin</artifactId>
93+
<version>2.3</version>
94+
<executions>
95+
<execution>
96+
<phase>package</phase>
97+
<goals>
98+
<goal>shade</goal>
99+
</goals>
100+
<configuration>
101+
<relocations>
102+
<relocation>
103+
<pattern>net.techcable.npclib</pattern>
104+
<shadedPattern>com.trc202.CombatTag.libs.npclib</shadedPattern>
105+
</relocation>
106+
</relocations>
107+
</configuration>
108+
</execution>
109+
</executions>
110+
</plugin>
91111
</plugins>
92112
</build>
93113

src/main/java/com/topcat/npclib/NPCManager.java

Lines changed: 0 additions & 208 deletions
This file was deleted.

src/main/java/com/topcat/npclib/NPCUtils.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)