core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install remapped server jar to paper package space 

Spigot has been stripping the minecraft-server jar down in order to
reduce it's size, primarily by removing classes they don't use from
fastutil. as we use fastutil and offer it as API, this is useless
to us, and creates headaches when it breaks builds due to spigots
version of this being installed.
This commit is contained in:
Shane Freeder 2020-09-01 23:20:58 +01:00
parent 1ab021ddca
commit 563f77ad23
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06eb7d4121 100644 index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403805ea2fa 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
@ -28,7 +28,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version> <api.version>unknown</api.version>
<minecraft.version>1.16.2</minecraft.version> <minecraft.version>1.16.2</minecraft.version>
@@ -19,16 +18,22 @@ @@ -19,21 +18,27 @@
</properties> </properties>
<parent> <parent>
@ -46,15 +46,21 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId> + <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId> + <artifactId>paper-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.spigotmc</groupId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-mojangapi</artifactId>
+ <version>${project.version}</version> + <version>${project.version}</version>
+ <scope>compile</scope> + <scope>compile</scope>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>com.destroystokyo.paper</groupId> + <groupId>io.papermc</groupId>
+ <artifactId>paper-mojangapi</artifactId> <artifactId>minecraft-server</artifactId>
<version>${project.version}</version> <version>${minecraft.version}-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>
@@ -50,6 +55,17 @@ @@ -50,6 +55,17 @@
<version>8.0.1</version> <version>8.0.1</version>
<scope>compile</scope> <scope>compile</scope>
@ -100,8 +106,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
- <descriptionProperty>spigot.desc</descriptionProperty> - <descriptionProperty>spigot.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
+ <phase>compile</phase> - <goals>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
- </goals> - </goals>
- </execution> - </execution>
@ -113,7 +118,8 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
- <descriptionProperty>craftbukkit.desc</descriptionProperty> - <descriptionProperty>craftbukkit.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
- <goals> + <phase>compile</phase>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
+ <goal>gitdescribe</goal> + <goal>gitdescribe</goal>
</goals> </goals>

2
scripts/remap.sh
View File

@ -72,7 +72,7 @@ fi
echo "Installing remapped jar..." echo "Installing remapped jar..."
cd "$workdir/CraftBukkit" # Need to be in a directory with a valid POM at the time of install. cd "$workdir/CraftBukkit" # Need to be in a directory with a valid POM at the time of install.
mvn install:install-file -q -Dfile="$jarpath-mapped.jar" -Dpackaging=jar -DgroupId=org.spigotmc -DartifactId=minecraft-server -Dversion="$minecraftversion-SNAPSHOT" mvn install:install-file -q -Dfile="$jarpath-mapped.jar" -Dpackaging=jar -DgroupId=io.papermc -DartifactId=minecraft-server -Dversion="$minecraftversion-SNAPSHOT"
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo "Failed to install remapped jar." echo "Failed to install remapped jar."
exit 1 exit 1