Skip to content

Commit 6f701f4

Browse files
softpaksoftpak
committed
Changes to be committed: New version(1.10.2).
 modified: README.md modified: pom.xml modified: src.patch
1 parent 390c08a commit 6f701f4

File tree

3 files changed

+2028
-771
lines changed

3 files changed

+2028
-771
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
####Minecraft Server with Multi-core CPU.
55
ForkJoin maybe the way to solve ticking issues.
66

7-
* It`s based on PaperSpigot v1.10.2. See http://www.spigotmc.org/ for details.
7+
* It`s based on Spigot v1.10.2. See http://www.spigotmc.org/ for details.
88

99
####Software & Hardware Requirements
1010

@@ -26,7 +26,7 @@ Hardware :
2626
2. Import the project in Netbeans or Eclipse.
2727
3. Patch src.patch with "patch -p1 < ../src.patch" command in src folder.
2828
4. Then build the project in your IDE tools.
29-
5. The jar file can be found in target folder like "paper-1.X.X.jar".
29+
5. The jar file can be found in target folder like "spigot-1.X.X-R0.1-SNAPSHOT.jar".
3030
6. Enjoy the new server with multi-core CPU.
3131

3232
####Settings

‎pom.xml

+70-34
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.destroystokyo.paper</groupId>
5-
<artifactId>paper</artifactId>
4+
<groupId>org.spigotmc</groupId>
5+
<artifactId>spigot</artifactId>
66
<packaging>jar</packaging>
77
<version>1.10.2-R0.1-SNAPSHOT</version>
8-
<name>Paper</name>
9-
<url>https://github.com/PaperMC/Paper</url>
8+
<name>Spigot</name>
9+
<url>http://www.spigotmc.org</url>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,22 +15,21 @@
1515
<minecraft_version>1_10_R1</minecraft_version>
1616
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
1717
<buildtag.suffix></buildtag.suffix>
18-
<!--Paper - Bump to 1.8 - This will haunt me -->
1918
<maven.compiler.source>1.8</maven.compiler.source>
2019
<maven.compiler.target>1.8</maven.compiler.target>
2120
</properties>
2221

2322
<parent>
24-
<groupId>com.destroystokyo.paper</groupId>
25-
<artifactId>paper-parent</artifactId>
23+
<groupId>org.spigotmc</groupId>
24+
<artifactId>spigot-parent</artifactId>
2625
<version>dev-SNAPSHOT</version>
2726
<relativePath>../pom.xml</relativePath>
2827
</parent>
2928

3029
<dependencies>
3130
<dependency>
32-
<groupId>com.destroystokyo.paper</groupId>
33-
<artifactId>paper-api</artifactId>
31+
<groupId>org.spigotmc</groupId>
32+
<artifactId>spigot-api</artifactId>
3433
<version>${project.version}</version>
3534
<scope>compile</scope>
3635
</dependency>
@@ -64,12 +63,6 @@
6463
<version>5.1.37</version>
6564
<scope>compile</scope>
6665
</dependency>
67-
<dependency>
68-
<groupId>co.aikar</groupId>
69-
<artifactId>fastutil-lite</artifactId>
70-
<version>1.0</version>
71-
<scope>compile</scope>
72-
</dependency>
7366
<dependency>
7467
<groupId>net.sf.trove4j</groupId>
7568
<artifactId>trove4j</artifactId>
@@ -100,22 +93,34 @@
10093

10194
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
10295
<build>
103-
<finalName>paper-${minecraft.version}</finalName>
104-
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
10596
<plugins>
10697
<plugin>
107-
<groupId>com.lukegb.mojo</groupId>
108-
<artifactId>gitdescribe-maven-plugin</artifactId>
109-
<version>1.3</version>
110-
<configuration>
111-
<outputPrefix>git-Paper-</outputPrefix>
112-
<scmDirectory>..</scmDirectory>
113-
</configuration>
98+
<groupId>net.md-5</groupId>
99+
<artifactId>scriptus</artifactId>
100+
<version>0.2</version>
114101
<executions>
115102
<execution>
116-
<phase>compile</phase>
103+
<id>ex-spigot</id>
104+
<configuration>
105+
<format>git-Spigot-%s</format>
106+
<scmDirectory>../</scmDirectory>
107+
<descriptionProperty>spigot.desc</descriptionProperty>
108+
</configuration>
109+
<phase>initialize</phase>
110+
<goals>
111+
<goal>describe</goal>
112+
</goals>
113+
</execution>
114+
<execution>
115+
<id>ex-craftbukkit</id>
116+
<configuration>
117+
<format>-%s</format>
118+
<scmDirectory>../../CraftBukkit</scmDirectory>
119+
<descriptionProperty>craftbukkit.desc</descriptionProperty>
120+
</configuration>
121+
<phase>initialize</phase>
117122
<goals>
118-
<goal>gitdescribe</goal>
123+
<goal>describe</goal>
119124
</goals>
120125
</execution>
121126
</executions>
@@ -125,12 +130,11 @@
125130
<artifactId>maven-jar-plugin</artifactId>
126131
<version>2.6</version>
127132
<configuration>
128-
<forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
129133
<archive>
130134
<manifestEntries>
131135
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
132136
<Implementation-Title>CraftBukkit</Implementation-Title>
133-
<Implementation-Version>${describe}</Implementation-Version>
137+
<Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
134138
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
135139
<Specification-Title>Bukkit</Specification-Title>
136140
<Specification-Version>${api.version}</Specification-Version>
@@ -159,6 +163,26 @@
159163
</archive>
160164
</configuration>
161165
</plugin>
166+
<plugin>
167+
<groupId>org.codehaus.mojo</groupId>
168+
<artifactId>animal-sniffer-maven-plugin</artifactId>
169+
<version>1.14</version>
170+
<executions>
171+
<execution>
172+
<phase>process-classes</phase>
173+
<goals>
174+
<goal>check</goal>
175+
</goals>
176+
</execution>
177+
</executions>
178+
<configuration>
179+
<signature>
180+
<groupId>org.codehaus.mojo.signature</groupId>
181+
<artifactId>java18</artifactId>
182+
<version>1.0</version>
183+
</signature>
184+
</configuration>
185+
</plugin>
162186
<plugin>
163187
<groupId>org.apache.maven.plugins</groupId>
164188
<artifactId>maven-shade-plugin</artifactId>
@@ -170,13 +194,11 @@
170194
<goal>shade</goal>
171195
</goals>
172196
<configuration>
173-
<createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
174197
<relocations>
175-
<!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
176-
<!--<relocation>-->
177-
<!--<pattern>joptsimple</pattern>-->
178-
<!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>-->
179-
<!--</relocation>-->
198+
<relocation>
199+
<pattern>joptsimple</pattern>
200+
<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
201+
</relocation>
180202
<relocation>
181203
<pattern>jline</pattern>
182204
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
@@ -210,6 +232,20 @@
210232
<artifactId>maven-compiler-plugin</artifactId>
211233
<!-- versions after this appear to be broken -->
212234
<version>3.1</version>
235+
<configuration>
236+
<!-- we use the Eclipse compiler as it doesn't need a JDK -->
237+
<compilerId>eclipse</compilerId>
238+
<!-- source and target are ignored if this isn't true -->
239+
<optimize>true</optimize>
240+
</configuration>
241+
<dependencies>
242+
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
243+
<dependency>
244+
<groupId>org.codehaus.plexus</groupId>
245+
<artifactId>plexus-compiler-eclipse</artifactId>
246+
<version>2.5.0-spigotmc</version>
247+
</dependency>
248+
</dependencies>
213249
</plugin>
214250
<plugin>
215251
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)