SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität
9ae92d26b8
Paper/patches/server/0001-Setup-Gradle-project.patch

725 Zeilen
29 KiB
Diff
Originalformat Normale Ansicht Verlauf

Move patches around
2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Update email & name (DenWav) Also I think I prefer my few tiny patches to be GPL.
2021-07-20 04:07:53 +02:00
From: Kyle Wood <kyle@denwav.dev>
Move patches around
2021-06-11 14:02:28 +02:00
Date: Thu, 10 Dec 2020 20:54:19 -0800
Subject: [PATCH] Setup Gradle project
Add a note about deleting pom.xml in first patch
2021-06-17 03:46:15 +02:00
The pom.xml file is deleted in this patch so the patch will fail to
apply if there are changes made to it from upstream - thus notifying us
that changes were made.
Move patches around
2021-06-11 14:02:28 +02:00
diff --git a/.gitignore b/.gitignore
[ci skip] add vs code files to .gitignore (#5663)
2021-08-07 02:27:45 +02:00
index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f8c589937 100644
Move patches around
2021-06-11 14:02:28 +02:00
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.gradle/
+build/
+
# Eclipse stuff
/.classpath
/.project
[ci skip] add vs code files to .gitignore (#5663)
2021-08-07 02:27:45 +02:00
@@ -37,3 +40,7 @@ dependency-reduced-pom.xml
/src/main/resources/achievement
/src/main/resources/lang
+
+# vs code
+/.vscode
+/.factorypath
Move patches around
2021-06-11 14:02:28 +02:00
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b70fe1b4c2
Move patches around
2021-06-11 14:02:28 +02:00
--- /dev/null
+++ b/build.gradle.kts
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
@@ -0,0 +1,145 @@
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
[ci skip] Misc gradle updates (#6763)
2021-10-11 23:31:53 +02:00
+import io.papermc.paperweight.util.*
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
+import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
Fix artifact ids
2021-06-17 01:23:02 +02:00
+import java.util.Locale
Move patches around
2021-06-11 14:02:28 +02:00
+
+plugins {
+ java
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ `maven-publish`
Move patches around
2021-06-11 14:02:28 +02:00
+ id("com.github.johnrengelman.shadow")
+}
+
+repositories {
+ maven("https://libraries.minecraft.net/")
+}
+
+dependencies {
+ implementation(project(":Paper-API"))
+ implementation("jline:jline:2.12.1")
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+ }
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379) Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-13 19:08:34 +02:00
+ implementation("org.ow2.asm:asm:9.2")
Move patches around
2021-06-11 14:02:28 +02:00
+ implementation("com.googlecode.json-simple:json-simple:1.1.1") {
+ // This includes junit transitively for whatever reason
+ isTransitive = false
+ }
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
+ runtimeOnly("mysql:mysql-connector-java:8.0.27")
Move patches around
2021-06-11 14:02:28 +02:00
+
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+
+ testImplementation("junit:junit:4.13.1")
+ testImplementation("org.hamcrest:hamcrest-library:1.3")
+}
+
+tasks.jar {
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ archiveClassifier.set("dev")
+
Move patches around
2021-06-11 14:02:28 +02:00
+ manifest {
Add Paper version back to manifest, add `runShadow`, `runReobf`, and `runDev` tasks for testing
2021-06-12 03:10:12 +02:00
+ val git = Git(rootProject.layout.projectDirectory.path)
Trim whitspace off of git hash (oops)
2021-06-27 06:51:03 +02:00
+ val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
Make gradle take build number from env vars and add git build info (#5890) * Make gradle take build number from env vars * Add git information to manifest and version command/log * trim * Fix tests by adding NotNull annotations * rebase * Apply suggestions from kashike Co-authored-by: Riley Park <riley.park@meino.net> * Not always show branch * Why can't everything be NotNull by default? * Rebase Co-authored-by: Riley Park <riley.park@meino.net>
2021-06-23 19:19:44 +02:00
+ val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
[ci skip] Use commit timestamp instead of build time in manifest (#6161)
2021-07-12 08:24:48 +02:00
+ val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ attributes(
Move patches around
2021-06-11 14:02:28 +02:00
+ "Main-Class" to "org.bukkit.craftbukkit.Main",
+ "Implementation-Title" to "CraftBukkit",
Make gradle take build number from env vars and add git build info (#5890) * Make gradle take build number from env vars * Add git information to manifest and version command/log * trim * Fix tests by adding NotNull annotations * rebase * Apply suggestions from kashike Co-authored-by: Riley Park <riley.park@meino.net> * Not always show branch * Why can't everything be NotNull by default? * Rebase Co-authored-by: Riley Park <riley.park@meino.net>
2021-06-23 19:19:44 +02:00
+ "Implementation-Version" to "git-Paper-$implementationVersion",
[ci skip] Use commit timestamp instead of build time in manifest (#6161)
2021-07-12 08:24:48 +02:00
+ "Implementation-Vendor" to date, // Paper
Move patches around
2021-06-11 14:02:28 +02:00
+ "Specification-Title" to "Bukkit",
+ "Specification-Version" to project.version,
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ "Specification-Vendor" to "Bukkit Team",
+ )
+ for (tld in setOf("net", "com", "org")) {
+ attributes("$tld/bukkit", "Sealed" to true)
Move patches around
2021-06-11 14:02:28 +02:00
+ }
+ }
+}
+
Fix artifact ids
2021-06-17 01:23:02 +02:00
+publishing {
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ publications.create<MavenPublication>("maven") {
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ artifactId = rootProject.name.toLowerCase(Locale.ENGLISH)
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ artifact(tasks.reobfJar) {
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ classifier = null
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ }
Fix artifact ids
2021-06-17 01:23:02 +02:00
+ artifact(tasks.shadowJar)
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ }
+}
+
Setup dev bundle publishing (#6163)
2021-08-18 00:11:04 +02:00
+relocation {
Fix CB lib relocation (#6454)
2021-08-22 19:22:57 +02:00
+ // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
+ val packageVersion = "1_18_R1"
Fix CB lib relocation (#6454)
2021-08-22 19:22:57 +02:00
+ relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*")
+ }
Setup dev bundle publishing (#6163)
2021-08-18 00:11:04 +02:00
+}
+
+tasks.shadowJar {
+ archiveClassifier.set("mojang-mapped")
+
+ for (relocation in relocation.relocations.get()) {
+ relocate(relocation.fromPackage, relocation.toPackage) {
+ for (exclude in relocation.excludes) {
+ exclude(exclude)
+ }
+ }
Move patches around
2021-06-11 14:02:28 +02:00
+ }
Use `mergeServiceFiles()` instead of AppendingTransformer
2021-06-13 04:23:21 +02:00
+ mergeServiceFiles()
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
+ transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
Move patches around
2021-06-11 14:02:28 +02:00
+}
+
+tasks.test {
+ exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
+}
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
+
Update runDev task for Gradle 7.1 deprecations also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-16 07:10:05 +02:00
+fun TaskContainer.registerRunTask(
+ name: String, block: JavaExec.() -> Unit
+): TaskProvider<JavaExec> = register<JavaExec>(name) {
+ group = "paper"
+ standardInput = System.`in`
+ workingDir = rootProject.layout.projectDirectory.dir(
+ providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
+ ).get().asFile
[ci skip] Add a test plugin (#6133)
2021-07-09 12:04:33 +02:00
+
+ if (rootProject.childProjects["test-plugin"] != null) {
+ val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
+ inputs.file(testPluginJar)
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
+ // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
[ci skip] Add a test plugin (#6133)
2021-07-09 12:04:33 +02:00
+ }
+
Update runDev task for Gradle 7.1 deprecations also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-16 07:10:05 +02:00
+ args("--nogui")
+ systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
+ if (project.hasProperty("disableWatchdog")) {
+ systemProperty("disable.watchdog", true)
Add Paper version back to manifest, add `runShadow`, `runReobf`, and `runDev` tasks for testing
2021-06-12 03:10:12 +02:00
+ }
Update runDev task for Gradle 7.1 deprecations also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-16 07:10:05 +02:00
+ doFirst {
+ workingDir.mkdirs()
+ }
[ci skip] Misc gradle updates (#6763)
2021-10-11 23:31:53 +02:00
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
Update runDev task for Gradle 7.1 deprecations also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-16 07:10:05 +02:00
+ block(this)
+}
Add Paper version back to manifest, add `runShadow`, `runReobf`, and `runDev` tasks for testing
2021-06-12 03:10:12 +02:00
+
+tasks.registerRunTask("runShadow") {
+ description = "Spin up a test server from the shadowJar archiveFile"
+ classpath(tasks.shadowJar.flatMap { it.archiveFile })
+}
+
+tasks.registerRunTask("runReobf") {
+ description = "Spin up a test server from the reobfJar output jar"
+ classpath(tasks.reobfJar.flatMap { it.outputJar })
+}
+
+tasks.registerRunTask("runDev") {
+ description = "Spin up a non-shaded non-remapped test server"
Update runDev task for Gradle 7.1 deprecations also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-16 07:10:05 +02:00
+ classpath = java.sourceSets.main.get().runtimeClasspath
+ mainClass.set("org.bukkit.craftbukkit.Main")
Add Paper version back to manifest, add `runShadow`, `runReobf`, and `runDev` tasks for testing
2021-06-12 03:10:12 +02:00
+}
+
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
+class ModifiedLog4j2PluginsCacheFileTransformer : Transformer by Log4j2PluginsCacheFileTransformer() {
+ override fun canTransformResource(element: FileTreeElement): Boolean {
+ return PLUGIN_CACHE_FILE == element.name || element.name == "Log4j2Plugins.dat"
+ }
+}
Minor patch cleanup
2021-06-17 03:43:30 +02:00
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ea30a299 Add docs in ServerListPingEvent based on changes from 1.18 CraftBukkit Changes: 03f249f0 Generate bootstrap jar separately 3b214b5a SPIGOT-6803: Fix ServerPing not using the new logic for show players in 1.18 Spigot Changes: c07753b0 Rebuild patches
2021-11-23 22:11:33 +01:00
index 3610b0d8e10f873b8480864d6f73c20ae8c5d1f1..0000000000000000000000000000000000000000
Minor patch cleanup
2021-06-17 03:43:30 +02:00
--- a/pom.xml
+++ /dev/null
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
@@ -1,539 +0,0 @@
Minor patch cleanup
2021-06-17 03:43:30 +02:00
-<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>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>1.18-pre5-R0.1-SNAPSHOT</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <parent>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-parent</artifactId>
- <version>dev-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <properties>
- <skipTests>true</skipTests>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.version>unknown</api.version>
- <bt.name>git</bt.name>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <minecraft_version>1_18_R1</minecraft_version>
- <maven.compiler.source>16</maven.compiler.source>
- <maven.compiler.target>16</maven.compiler.target>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- </properties>
-
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <repositories>
- <repository>
- <id>minecraft-libraries</id>
- <name>Minecraft Libraries</name>
- <url>https://libraries.minecraft.net/</url>
- </repository>
- </repositories>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
-
- <dependencies>
- <dependency>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.spigotmc</groupId>
- <artifactId>minecraft-server</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>2.12.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-iostreams</artifactId>
- <version>2.14.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379) Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-13 19:08:34 +02:00
- <version>9.2</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <scope>compile</scope>
- </dependency>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <!-- 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>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <!-- deprecated API depend -->
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>3.36.0.3</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>8.0.27</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <scope>runtime</scope>
- </dependency>
- <!-- add these back in as they are not exposed by the API -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-resolver-provider</artifactId>
- <version>3.8.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
- <version>1.7.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-http</artifactId>
- <version>1.7.0</version>
- <scope>runtime</scope>
- </dependency>
- <!-- testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
- <build>
- <plugins>
- <plugin>
- <groupId>net.md-5</groupId>
- <artifactId>scriptus</artifactId>
- <version>0.4.1</version>
- <executions>
- <execution>
- <id>ex-spigot</id>
- <configuration>
- <format>${bt.name}-Spigot-%s</format>
- <scmDirectory>../</scmDirectory>
- <descriptionProperty>spigot.desc</descriptionProperty>
- </configuration>
- <phase>initialize</phase>
- <goals>
- <goal>describe</goal>
- </goals>
- </execution>
- <execution>
- <id>ex-craftbukkit</id>
- <configuration>
- <format>-%s</format>
- <scmDirectory>../../CraftBukkit</scmDirectory>
- <descriptionProperty>craftbukkit.desc</descriptionProperty>
- </configuration>
- <phase>initialize</phase>
- <goals>
- <goal>describe</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultEntries>false</addDefaultEntries>
- </manifest>
- <manifestEntries>
- <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
- <Implementation-Title>CraftBukkit</Implementation-Title>
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
- <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
- <Specification-Title>Bukkit</Specification-Title>
- <Specification-Version>${api.version}</Specification-Version>
- <Specification-Vendor>Bukkit Team</Specification-Vendor>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- <manifestSections>
- <manifestSection>
- <name>net/bukkit/</name>
- <manifestEntries>
- <Sealed>true</Sealed>
- </manifestEntries>
- </manifestSection>
- <manifestSection>
- <name>com/bukkit/</name>
- <manifestEntries>
- <Sealed>true</Sealed>
- </manifestEntries>
- </manifestSection>
- <manifestSection>
- <name>org/bukkit/</name>
- <manifestEntries>
- <Sealed>true</Sealed>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <dependencies>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>9.1</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>9.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <artifactSet>
- <includes>
- <include>org.spigotmc:minecraft-server</include>
- </includes>
- </artifactSet>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <relocations>
- <relocation>
- <pattern>org.bukkit.craftbukkit</pattern>
- <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
- <excludes>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <exclude>org.bukkit.craftbukkit.Main*</exclude>
- </excludes>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.md-5</groupId>
- <artifactId>specialsource-maven-plugin</artifactId>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>1.2.3</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>remap</goal>
- </goals>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <id>remap-members</id>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <configuration>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <logFile>${project.build.directory}/server.txt</logFile>
- <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <reverse>true</reverse>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <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>
- <archive>
- <manifest>
- <addDefaultEntries>false</addDefaultEntries>
- </manifest>
- <manifestEntries>
- <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
- </manifestEntries>
- </archive>
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ea30a299 Add docs in ServerListPingEvent based on changes from 1.18 CraftBukkit Changes: 03f249f0 Generate bootstrap jar separately 3b214b5a SPIGOT-6803: Fix ServerPing not using the new logic for show players in 1.18 Spigot Changes: c07753b0 Rebuild patches
2021-11-23 22:11:33 +01:00
- <attach>false</attach>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <descriptors>
- <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.8.8</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ecj</artifactId>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>3.27.0</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
- <configuration>
- <workingDirectory>${basedir}/target/test-server</workingDirectory>
- <excludes>
- <exclude>org/bukkit/craftbukkit/inventory/ItemStack*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>shadeSourcesJar</id>
- <properties>
- <shadeSourcesJar>true</shadeSourcesJar>
- <shadeSourcesContent>true</shadeSourcesContent>
- </properties>
- </profile>
- <profile>
- <id>development</id>
- <properties>
- <skipTests>false</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
- <version>3.1.2</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <version>8.45.1</version>
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
Prepare for updating server patches
2021-11-23 09:57:41 +01:00
- <!--<goal>check</goal>-->
Minor patch cleanup
2021-06-17 03:43:30 +02:00
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>remapped</id>
- <build>
- <plugins>
- <plugin>
- <groupId>net.md-5</groupId>
- <artifactId>specialsource-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>remap</goal>
- </goals>
- <id>remap-obf</id>
- <configuration>
- <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot</srgIn>
- <reverse>true</reverse>
- <remappedArtifactAttached>true</remappedArtifactAttached>
- <remappedClassifierName>remapped-obf</remappedClassifierName>
- </configuration>
- </execution>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>remap</goal>
- </goals>
- <id>remap-mojang</id>
- <configuration>
- <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
- <srgIn>org.spigotmc:minecraft-server:${project.version}:txt:maps-mojang</srgIn>
- <remappedArtifactAttached>true</remappedArtifactAttached>
- <remappedClassifierName>remapped-mojang</remappedClassifierName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
In neuem Issue referenzieren Permalink kopieren