168 Zeilen
8.5 KiB
Diff
168 Zeilen
8.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
|
Subject: [PATCH] Build system changes
|
|
|
|
== AT ==
|
|
public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/net/URI;)Ljava/nio/file/Path;
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..e8c4e7379d46b1ba88110729b8ccbde00c68ce55 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -9,10 +9,9 @@ plugins {
|
|
dependencies {
|
|
implementation(project(":paper-api"))
|
|
implementation("jline:jline:2.12.1")
|
|
- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
|
|
- exclude(group = "org.apache.logging.log4j", module = "log4j-api")
|
|
- }
|
|
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
|
|
implementation("org.ow2.asm:asm:9.5")
|
|
+ implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
|
|
implementation("commons-lang:commons-lang:2.6")
|
|
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
|
|
runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
|
|
@@ -34,6 +33,7 @@ tasks.jar {
|
|
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
|
|
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
|
|
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
|
|
+ val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
|
|
attributes(
|
|
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
|
"Implementation-Title" to "CraftBukkit",
|
|
@@ -42,6 +42,9 @@ tasks.jar {
|
|
"Specification-Title" to "Bukkit",
|
|
"Specification-Version" to project.version,
|
|
"Specification-Vendor" to "Bukkit Team",
|
|
+ "Git-Branch" to gitBranch, // Paper
|
|
+ "Git-Commit" to gitHash, // Paper
|
|
+ "CraftBukkit-Package-Version" to craftbukkitPackageVersion, // Paper
|
|
)
|
|
for (tld in setOf("net", "com", "org")) {
|
|
attributes("$tld/bukkit", "Sealed" to true)
|
|
@@ -49,6 +52,11 @@ tasks.jar {
|
|
}
|
|
}
|
|
|
|
+tasks.compileJava {
|
|
+ // incremental compilation is currently broken due to patched files having compiled counterparts already on the compile classpath
|
|
+ options.setIncremental(false)
|
|
+}
|
|
+
|
|
publishing {
|
|
publications.create<MavenPublication>("maven") {
|
|
artifact(tasks.shadowJar)
|
|
@@ -75,6 +83,17 @@ tasks.shadowJar {
|
|
}
|
|
}
|
|
|
|
+// Paper start
|
|
+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
|
|
+ badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
|
|
+ jarToScan.set(tasks.shadowJar.flatMap { it.archiveFile })
|
|
+ classpath.from(configurations.compileClasspath)
|
|
+}
|
|
+tasks.check {
|
|
+ dependsOn(scanJar)
|
|
+}
|
|
+// Paper end
|
|
+
|
|
tasks.test {
|
|
exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
|
|
useJUnitPlatform()
|
|
@@ -133,7 +152,14 @@ tasks.registerRunTask("runReobf") {
|
|
classpath(runtimeClasspathWithoutVanillaServer)
|
|
}
|
|
|
|
+val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
|
|
+ src.runtimeClasspath.elements.map { elements ->
|
|
+ elements.filterNot { file -> file.asFile.endsWith("minecraft.jar") }
|
|
+ }
|
|
+}
|
|
tasks.registerRunTask("runDev") {
|
|
description = "Spin up a non-relocated Mojang-mapped test server"
|
|
- classpath(sourceSets.main.map { it.runtimeClasspath })
|
|
+ classpath(tasks.filterProjectDir.flatMap { it.outputJar })
|
|
+ classpath(runtimeClasspathForRunDev)
|
|
+ jvmArgs("-DPaper.isRunDev=true")
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
|
|
index 68e3d54c79924d72b22eb3bc142ff47aa1700895..d3300e43523429fdd0e61c5aa9aed2e6bc78e07e 100644
|
|
--- a/src/main/java/net/minecraft/resources/ResourceLocation.java
|
|
+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
|
|
@@ -26,6 +26,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
|
|
public static final char NAMESPACE_SEPARATOR = ':';
|
|
public static final String DEFAULT_NAMESPACE = "minecraft";
|
|
public static final String REALMS_NAMESPACE = "realms";
|
|
+ public static final String PAPER_NAMESPACE = "paper"; // Paper
|
|
private final String namespace;
|
|
private final String path;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
|
index 84dab998d5b91b9c5690e9e086b17a60b6dec058..2ac60ea28ce722cdef61cfdc69bbbdf391628238 100644
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
|
@@ -107,6 +107,17 @@ public class Main {
|
|
*/ // CraftBukkit end
|
|
|
|
try {
|
|
+ // Paper start
|
|
+ if (Boolean.getBoolean("Paper.isRunDev")) {
|
|
+ net.minecraft.server.packs.VanillaPackResourcesBuilder.developmentConfig = builder -> {
|
|
+ try {
|
|
+ builder.pushAssetPath(net.minecraft.server.packs.PackType.SERVER_DATA, net.minecraft.server.packs.VanillaPackResourcesBuilder.safeGetPath(java.util.Objects.requireNonNull(Main.class.getResource("/data/.paperassetsroot"), "Missing required .paperassetsroot file").toURI()).getParent());
|
|
+ } catch (java.net.URISyntaxException | IOException ex) {
|
|
+ throw new RuntimeException(ex);
|
|
+ }
|
|
+ };
|
|
+ }
|
|
+ // Paper end
|
|
|
|
Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
|
|
index 7db49f077704f03d1815f8382523199bd6c9a0dc..4ed8f38ba9c7b075b99a0da0e213a1e9d03ac717 100644
|
|
--- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
|
|
+++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
|
|
@@ -32,7 +32,7 @@ public class ServerPacksSource extends BuiltInPackSource {
|
|
|
|
@VisibleForTesting
|
|
public static VanillaPackResources createVanillaPackSource() {
|
|
- return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft").applyDevelopmentConfig().pushJarResources().build();
|
|
+ return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE).applyDevelopmentConfig().pushJarResources().build(); // Paper
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index effbf096caa179929a6809452c1c08d24163c536..85b8e4ca89e9745d0fa27501712113937770de1f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -209,7 +209,7 @@ public class Main {
|
|
}
|
|
|
|
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
|
|
- Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
|
|
+ Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
|
|
|
|
Calendar deadline = Calendar.getInstance();
|
|
deadline.add(Calendar.DAY_OF_YEAR, -7);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
@@ -11,7 +11,7 @@ public final class Versioning {
|
|
public static String getBukkitVersion() {
|
|
String result = "Unknown-Version";
|
|
|
|
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
|
|
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
|
|
Properties properties = new Properties();
|
|
|
|
if (stream != null) {
|
|
diff --git a/src/main/resources/data/.paperassetsroot b/src/main/resources/data/.paperassetsroot
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
|