Skip to content

Commit 72eb6dd

Browse files
committed
First commit
1 parent 6d05f9c commit 72eb6dd

227 files changed

Lines changed: 36295 additions & 678 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
1-
# Compiled class file
2-
*.class
3-
4-
# Log file
5-
*.log
6-
7-
# BlueJ files
8-
*.ctxt
9-
10-
# Mobile Tools for Java (J2ME)
11-
.mtj.tmp/
12-
13-
# Package Files #
14-
*.jar
15-
*.war
16-
*.nar
17-
*.ear
18-
*.zip
19-
*.tar.gz
20-
*.rar
21-
22-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
23-
hs_err_pid*
24-
replay_pid*
1+
# Project files
2+
.settings/
3+
.idea/
4+
.classpath
5+
.project
6+
*.iml
7+
8+
# Build files
9+
target/
10+
bin/
11+
dependency-reduced-pom.xml
12+
*.jardesc
13+
*.lnk

ISSUE_TEMPLATE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!--
2+
** DO NOT IGNORE **
3+
Issue posts that fail to follow the instructions here will be automatically closed!
4+
Please include:
5+
- A detailed description of your issue or feature request
6+
- Link to server log & Citizens config (using e.g. pastebin.com) ESPECIALLY if it's a pathfinding issue
7+
- **Spigot and Citizens versions!** Use in-game commands "/version" and "/version citizens" and screenshot or copy/paste the EXACT output of BOTH commands!
8+
- FOR LAG RELATED ISSUES: please include server specs, number of NPCs, saves.yml and timings from WarmRoast or other profiler (NOT just Spigot timings, though that can be included as well)
9+
-->
10+
11+
The output of command `/version` on my server is: **(PLEASE FILL IN)**
12+
The output of command `/version citizens` on my server is: **(PLEASE FILL IN)**

LICENSE

Lines changed: 21 additions & 654 deletions
Large diffs are not rendered by default.

dist/pom.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>net.citizensnpcs</groupId>
7+
<artifactId>citizens-parent</artifactId>
8+
<version>2.0.27-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>citizens</artifactId>
11+
<packaging>pom</packaging>
12+
<build>
13+
<plugins>
14+
<plugin>
15+
<groupId>org.apache.maven.plugins</groupId>
16+
<artifactId>maven-assembly-plugin</artifactId>
17+
<configuration>
18+
<finalName>AzuriteCitizens</finalName>
19+
<appendAssemblyId>false</appendAssemblyId>
20+
</configuration>
21+
<version>3.2.0</version>
22+
<executions>
23+
<execution>
24+
<id>package-all</id>
25+
<phase>package</phase>
26+
<goals>
27+
<goal>single</goal>
28+
</goals>
29+
<configuration>
30+
<appendAssemblyId>false</appendAssemblyId>
31+
<descriptors>
32+
<descriptor>src/main/assembly/all-jar.xml</descriptor>
33+
</descriptors>
34+
</configuration>
35+
</execution>
36+
</executions>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
<dependencies>
41+
<dependency>
42+
<groupId>${project.groupId}</groupId>
43+
<artifactId>citizens-main</artifactId>
44+
<version>${project.version}</version>
45+
<type>jar</type>
46+
<scope>compile</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>${project.groupId}</groupId>
50+
<artifactId>citizens-v1_8_R3</artifactId>
51+
<version>${project.version}</version>
52+
<type>jar</type>
53+
<scope>compile</scope>
54+
</dependency>
55+
</dependencies>
56+
</project>

dist/src/main/assembly/all-jar.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<assembly
2+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
5+
<id>all-jar</id>
6+
<formats>
7+
<format>jar</format>
8+
</formats>
9+
<includeBaseDirectory>false</includeBaseDirectory>
10+
11+
<dependencySets>
12+
<dependencySet>
13+
<unpack>true</unpack>
14+
<useTransitiveDependencies>false</useTransitiveDependencies>
15+
</dependencySet>
16+
</dependencySets>
17+
</assembly>

main/lib/Vault.jar

290 KB
Binary file not shown.

main/pom.xml

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
<!-- Citizens build file -->
2+
3+
<project xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
7+
<parent>
8+
<groupId>net.citizensnpcs</groupId>
9+
<artifactId>citizens-parent</artifactId>
10+
<version>2.0.27-SNAPSHOT</version>
11+
</parent>
12+
<artifactId>citizens-main</artifactId>
13+
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<citizensapi.version>${project.version}</citizensapi.version>
17+
<powermock.version>1.4.12</powermock.version>
18+
</properties>
19+
20+
<repositories>
21+
<repository>
22+
<id>spigot-repo</id>
23+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
24+
</repository>
25+
<repository>
26+
<id>everything</id>
27+
<url>http://repo.citizensnpcs.co</url>
28+
</repository>
29+
<repository>
30+
<id>jitpack.io</id>
31+
<url>https://jitpack.io</url>
32+
</repository>
33+
</repositories>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.spigotmc</groupId>
38+
<artifactId>spigot</artifactId>
39+
<version>1.8.8-R0.1-SNAPSHOT</version>
40+
<type>jar</type>
41+
<scope>provided</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>net.sf.trove4j</groupId>
45+
<artifactId>trove4j</artifactId>
46+
<version>3.0.3</version>
47+
<scope>compile</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>net.citizensnpcs</groupId>
51+
<artifactId>citizensapi</artifactId>
52+
<version>${citizensapi.version}</version>
53+
<type>jar</type>
54+
<scope>compile</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.github.MilkBowl</groupId>
58+
<artifactId>VaultAPI</artifactId>
59+
<version>1.7</version>
60+
<scope>provided</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.powermock</groupId>
64+
<artifactId>powermock-module-junit4</artifactId>
65+
<version>${powermock.version}</version>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.powermock</groupId>
70+
<artifactId>powermock-api-mockito</artifactId>
71+
<version>${powermock.version}</version>
72+
<scope>test</scope>
73+
</dependency>
74+
</dependencies>
75+
76+
<url>http://www.citizensnpcs.co</url>
77+
<ciManagement>
78+
<system>jenkins</system>
79+
<url>http://ci.citizensnpcs.co</url>
80+
</ciManagement>
81+
<scm>
82+
<connection>scm:git:git://github.com/CitizensDev/Citizens2.git</connection>
83+
<developerConnection>scm:git:git:@github.com:CitizensDev/Citizens2.git</developerConnection>
84+
<url>https://github.com/CitizensDev/Citizens2/tree/master/</url>
85+
</scm>
86+
<build>
87+
<defaultGoal>clean package install javadoc:javadoc</defaultGoal>
88+
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
89+
90+
<resources>
91+
<resource>
92+
<targetPath>.</targetPath>
93+
<filtering>true</filtering>
94+
<directory>${basedir}/src/main/resources</directory>
95+
<includes>
96+
<include>plugin.yml</include>
97+
<include>*.properties</include>
98+
</includes>
99+
</resource>
100+
</resources>
101+
102+
<plugins>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-compiler-plugin</artifactId>
106+
<version>3.8.1</version>
107+
<configuration>
108+
<source>1.8</source>
109+
<target>1.8</target>
110+
</configuration>
111+
</plugin>
112+
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-jar-plugin</artifactId>
116+
<version>3.2.0</version>
117+
</plugin>
118+
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-shade-plugin</artifactId>
122+
<version>3.2.1</version>
123+
<executions>
124+
<execution>
125+
<phase>package</phase>
126+
<goals>
127+
<goal>shade</goal>
128+
</goals>
129+
<configuration>
130+
<minimizeJar>true</minimizeJar>
131+
<createDependencyReducedPom>false</createDependencyReducedPom>
132+
<filters>
133+
<filter>
134+
<artifact>net.citizensnpcs:citizensapi</artifact>
135+
<includes>
136+
<include>**</include>
137+
</includes>
138+
</filter>
139+
</filters>
140+
<relocations>
141+
<relocation>
142+
<pattern>gnu.trove</pattern>
143+
<shadedPattern>lib.trove</shadedPattern>
144+
</relocation>
145+
<relocation>
146+
<pattern>org.bstats</pattern>
147+
<shadedPattern>net.citizensnpcs.util.metrics</shadedPattern>
148+
</relocation>
149+
</relocations>
150+
</configuration>
151+
</execution>
152+
</executions>
153+
</plugin>
154+
155+
<plugin>
156+
<groupId>org.apache.maven.plugins</groupId>
157+
<artifactId>maven-javadoc-plugin</artifactId>
158+
<version>3.1.1</version>
159+
<configuration>
160+
<source>8</source>
161+
<author>false</author>
162+
<doclint>none</doclint>
163+
<links>
164+
<link>https://hub.spigotmc.org/javadocs/spigot</link>
165+
</links>
166+
<includeDependencySources>true</includeDependencySources>
167+
168+
<dependencySourceIncludes>
169+
<dependencySourceInclude>net.citizensnpcs:citizensapi</dependencySourceInclude>
170+
</dependencySourceIncludes>
171+
<excludePackageNames>net.citizensnpcs.commands</excludePackageNames>
172+
</configuration>
173+
</plugin>
174+
</plugins>
175+
</build>
176+
</project>

0 commit comments

Comments
 (0)