Prepare for updating server patches
This commit is contained in:
parent
79b873c901
commit
a8ef7aa56f
1193 changed files with 301 additions and 362 deletions
|
@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
|
|||
+/.factorypath
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b4534df4812
|
||||
index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b70fe1b4c2
|
||||
--- /dev/null
|
||||
+++ b/build.gradle.kts
|
||||
@@ -0,0 +1,170 @@
|
||||
@@ -0,0 +1,145 @@
|
||||
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
|
||||
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
|
||||
+import io.papermc.paperweight.util.*
|
||||
|
@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
|
|||
+ // This includes junit transitively for whatever reason
|
||||
+ isTransitive = false
|
||||
+ }
|
||||
+ runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
|
||||
+ runtimeOnly("mysql:mysql-connector-java:5.1.49")
|
||||
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
|
||||
+ runtimeOnly("mysql:mysql-connector-java:8.0.27")
|
||||
+
|
||||
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
|
||||
|
@ -105,35 +105,10 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
|
|||
+
|
||||
+relocation {
|
||||
+ // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
|
||||
+ val packageVersion = "1_17_R1"
|
||||
+ val packageVersion = "1_18_R1"
|
||||
+ relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
|
||||
+ exclude("org.bukkit.craftbukkit.Main*")
|
||||
+ }
|
||||
+
|
||||
+ fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
|
||||
+
|
||||
+ relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
|
||||
+ sequenceOf(
|
||||
+ "commons-codec:commons-codec" to "org.apache.commons.codec",
|
||||
+ "commons-io:commons-io" to "org.apache.commons.io",
|
||||
+ "it.unimi.dsi:fastutil" to "it.unimi",
|
||||
+ "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
|
||||
+ "org.ow2.asm:asm" to "org.objectweb.asm"
|
||||
+ ).forEach { (owner, pack) ->
|
||||
+ relocate(owner, pack to cb(pack))
|
||||
+ }
|
||||
+
|
||||
+ // runtimeOnly dependencies don't need an owner attached
|
||||
+ // owner is used for dev bundle generation, runtimeOnly deps are not included in dev bundle
|
||||
+ sequenceOf(
|
||||
+ "org.apache.http",
|
||||
+ "org.apache.maven",
|
||||
+ "org.codehaus.plexus",
|
||||
+ "org.eclipse.aether",
|
||||
+ "org.eclipse.sisu"
|
||||
+ ).forEach { pack ->
|
||||
+ relocate(pack to cb(pack))
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+tasks.shadowJar {
|
||||
|
@ -166,7 +141,7 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
|
|||
+ if (rootProject.childProjects["test-plugin"] != null) {
|
||||
+ val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
|
||||
+ inputs.file(testPluginJar)
|
||||
+ args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
|
||||
+ // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
|
||||
+ }
|
||||
+
|
||||
+ args("--nogui")
|
||||
|
@ -204,30 +179,20 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
|
|||
+}
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
deleted file mode 100644
|
||||
index c936167e107ab76cfb21febb9534353f481a95d3..0000000000000000000000000000000000000000
|
||||
index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..0000000000000000000000000000000000000000
|
||||
--- a/pom.xml
|
||||
+++ /dev/null
|
||||
@@ -1,472 +0,0 @@
|
||||
@@ -1,539 +0,0 @@
|
||||
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
- <modelVersion>4.0.0</modelVersion>
|
||||
- <groupId>org.spigotmc</groupId>
|
||||
- <artifactId>spigot</artifactId>
|
||||
- <packaging>jar</packaging>
|
||||
- <version>1.17.1-R0.1-SNAPSHOT</version>
|
||||
- <version>1.18-pre5-R0.1-SNAPSHOT</version>
|
||||
- <name>Spigot</name>
|
||||
- <url>https://www.spigotmc.org/</url>
|
||||
-
|
||||
- <properties>
|
||||
- <skipTests>true</skipTests>
|
||||
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
- <api.version>unknown</api.version>
|
||||
- <bt.name>git</bt.name>
|
||||
- <minecraft_version>1_17_R1</minecraft_version>
|
||||
- <maven.compiler.source>1.8</maven.compiler.source>
|
||||
- <maven.compiler.target>1.8</maven.compiler.target>
|
||||
- </properties>
|
||||
-
|
||||
- <parent>
|
||||
- <groupId>org.spigotmc</groupId>
|
||||
- <artifactId>spigot-parent</artifactId>
|
||||
|
@ -235,6 +200,24 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <relativePath>../pom.xml</relativePath>
|
||||
- </parent>
|
||||
-
|
||||
- <properties>
|
||||
- <skipTests>true</skipTests>
|
||||
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
- <api.version>unknown</api.version>
|
||||
- <bt.name>git</bt.name>
|
||||
- <minecraft_version>1_18_R1</minecraft_version>
|
||||
- <maven.compiler.source>16</maven.compiler.source>
|
||||
- <maven.compiler.target>16</maven.compiler.target>
|
||||
- </properties>
|
||||
-
|
||||
- <repositories>
|
||||
- <repository>
|
||||
- <id>minecraft-libraries</id>
|
||||
- <name>Minecraft Libraries</name>
|
||||
- <url>https://libraries.minecraft.net/</url>
|
||||
- </repository>
|
||||
- </repositories>
|
||||
-
|
||||
- <dependencies>
|
||||
- <dependency>
|
||||
- <groupId>org.spigotmc</groupId>
|
||||
|
@ -259,13 +242,6 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <artifactId>log4j-iostreams</artifactId>
|
||||
- <version>2.14.1</version>
|
||||
- <scope>compile</scope>
|
||||
- <exclusions>
|
||||
- <!-- included in minecraft-server -->
|
||||
- <exclusion>
|
||||
- <groupId>org.apache.logging.log4j</groupId>
|
||||
- <artifactId>log4j-api</artifactId>
|
||||
- </exclusion>
|
||||
- </exclusions>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.ow2.asm</groupId>
|
||||
|
@ -273,6 +249,85 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <version>9.2</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <!-- Mojang depends -->
|
||||
- <dependency>
|
||||
- <groupId>com.github.oshi</groupId>
|
||||
- <artifactId>oshi-core</artifactId>
|
||||
- <version>5.8.2</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>com.mojang</groupId>
|
||||
- <artifactId>authlib</artifactId>
|
||||
- <version>3.2.38</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>com.mojang</groupId>
|
||||
- <artifactId>brigadier</artifactId>
|
||||
- <version>1.0.18</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>com.mojang</groupId>
|
||||
- <artifactId>datafixerupper</artifactId>
|
||||
- <version>4.0.26</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>com.mojang</groupId>
|
||||
- <artifactId>javabridge</artifactId>
|
||||
- <version>1.2.24</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>commons-io</groupId>
|
||||
- <artifactId>commons-io</artifactId>
|
||||
- <version>2.11.0</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>io.netty</groupId>
|
||||
- <artifactId>netty-all</artifactId>
|
||||
- <version>4.1.68.Final</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>it.unimi.dsi</groupId>
|
||||
- <artifactId>fastutil</artifactId>
|
||||
- <version>8.5.6</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>net.sf.jopt-simple</groupId>
|
||||
- <artifactId>jopt-simple</artifactId>
|
||||
- <version>5.0.4</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.commons</groupId>
|
||||
- <artifactId>commons-lang3</artifactId>
|
||||
- <version>3.12.0</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.logging.log4j</groupId>
|
||||
- <artifactId>log4j-core</artifactId>
|
||||
- <version>2.14.1</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.logging.log4j</groupId>
|
||||
- <artifactId>log4j-slf4j18-impl</artifactId>
|
||||
- <version>2.14.1</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.slf4j</groupId>
|
||||
- <artifactId>slf4j-api</artifactId>
|
||||
- <version>1.8.0-beta4</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <!-- deprecated API depend -->
|
||||
- <dependency>
|
||||
- <groupId>com.googlecode.json-simple</groupId>
|
||||
|
@ -283,13 +338,13 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.xerial</groupId>
|
||||
- <artifactId>sqlite-jdbc</artifactId>
|
||||
- <version>3.34.0</version>
|
||||
- <version>3.36.0.3</version>
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>mysql</groupId>
|
||||
- <artifactId>mysql-connector-java</artifactId>
|
||||
- <version>5.1.49</version>
|
||||
- <version>8.0.27</version>
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- <!-- add these back in as they are not exposed by the API -->
|
||||
|
@ -439,87 +494,21 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- </goals>
|
||||
- <configuration>
|
||||
- <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
||||
- <filters>
|
||||
- <filter>
|
||||
- <artifact>org.spigotmc:minecraft-server</artifact>
|
||||
- <excludes>
|
||||
- <exclude>com/google/common/**</exclude>
|
||||
- <exclude>com/google/gson/**</exclude>
|
||||
- <exclude>com/google/thirdparty/**</exclude>
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- <filter>
|
||||
- <artifact>org.eclipse.sisu:org.eclipse.sisu.inject</artifact>
|
||||
- <excludes>
|
||||
- <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- </filters>
|
||||
- <artifactSet>
|
||||
- <includes>
|
||||
- <include>org.spigotmc:minecraft-server</include>
|
||||
- </includes>
|
||||
- </artifactSet>
|
||||
- <relocations>
|
||||
- <!-- Cannot be relocated as it breaks translation property keys -->
|
||||
- <!--
|
||||
- <relocation>
|
||||
- <pattern>joptsimple</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
|
||||
- </relocation>
|
||||
- -->
|
||||
- <relocation>
|
||||
- <pattern>jline</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>it.unimi</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.apache.commons.codec</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.apache.commons.io</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.io</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.apache.commons.lang3</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.lang3</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.apache.http</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.http</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.apache.maven</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.maven</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.codehaus.plexus</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.codehaus.plexus</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.eclipse.aether</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.aether</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.eclipse.sisu</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.sisu</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.objectweb.asm</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.libs.org.objectweb.asm</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>org.bukkit.craftbukkit</pattern>
|
||||
- <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
|
||||
- <excludes>
|
||||
- <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
|
||||
- <exclude>org.bukkit.craftbukkit.Main*</exclude>
|
||||
- </excludes>
|
||||
- </relocation>
|
||||
- </relocations>
|
||||
- <transformers>
|
||||
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
- <resource>META-INF/services/java.sql.Driver</resource>
|
||||
- </transformer>
|
||||
- </transformers>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
|
@ -527,22 +516,75 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <plugin>
|
||||
- <groupId>net.md-5</groupId>
|
||||
- <artifactId>specialsource-maven-plugin</artifactId>
|
||||
- <version>1.2.2</version>
|
||||
- <version>1.2.3</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <phase>package</phase>
|
||||
- <goals>
|
||||
- <goal>remap</goal>
|
||||
- </goals>
|
||||
- <id>remap-fields</id>
|
||||
- <id>remap-members</id>
|
||||
- <configuration>
|
||||
- <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-fields</srgIn>
|
||||
- <logFile>${project.build.directory}/server.txt</logFile>
|
||||
- <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
|
||||
- <reverse>true</reverse>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>net.nicoulaj.maven.plugins</groupId>
|
||||
- <artifactId>checksum-maven-plugin</artifactId>
|
||||
- <version>1.11</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <phase>package</phase>
|
||||
- <goals>
|
||||
- <goal>artifacts</goal>
|
||||
- <goal>dependencies</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <algorithms>
|
||||
- <algorithm>SHA-256</algorithm>
|
||||
- </algorithms>
|
||||
- <scopes>
|
||||
- <scope>compile</scope>
|
||||
- <scope>runtime</scope>
|
||||
- </scopes>
|
||||
- <shasumSummary>true</shasumSummary>
|
||||
- <transitive>true</transitive>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-assembly-plugin</artifactId>
|
||||
- <version>3.3.0</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <phase>package</phase>
|
||||
- <goals>
|
||||
- <goal>single</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <appendAssemblyId>false</appendAssemblyId>
|
||||
- <archive>
|
||||
- <manifest>
|
||||
- <addDefaultEntries>false</addDefaultEntries>
|
||||
- </manifest>
|
||||
- <manifestEntries>
|
||||
- <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
|
||||
- </manifestEntries>
|
||||
- </archive>
|
||||
- <descriptors>
|
||||
- <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
|
||||
- </descriptors>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-compiler-plugin</artifactId>
|
||||
- <version>3.8.1</version>
|
||||
|
@ -559,7 +601,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.eclipse.jdt</groupId>
|
||||
- <artifactId>ecj</artifactId>
|
||||
- <version>3.26.0</version>
|
||||
- <version>3.27.0</version>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
- </plugin>
|
||||
|
@ -612,7 +654,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>com.puppycrawl.tools</groupId>
|
||||
- <artifactId>checkstyle</artifactId>
|
||||
- <version>8.44</version>
|
||||
- <version>8.45.1</version>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
- </plugin>
|
||||
|
@ -624,7 +666,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
|
|||
- <execution>
|
||||
- <phase>process-classes</phase>
|
||||
- <goals>
|
||||
- <goal>check</goal>
|
||||
- <!--<goal>check</goal>-->
|
||||
- </goals>
|
||||
- </execution>
|
||||
- </executions>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue