OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

few fixes to make it actually run

Browse source
This commit is contained in:
MiniDigger | Martin 2021-06-12 02:22:53 +02:00
parent 4ee49ddf71
commit ee5185e59f
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build-data/mappings-patch.tiny
View file

@ -74,3 +74,7 @@ c net/minecraft/world/entity/projectile/EntityTippedArrow net/minecraft/world/en
# p 1 entry # p 1 entry
# p 2 context # p 2 context
# m (Lcom/google/gson/JsonObject;Lnet/minecraft/world/level/storage/loot/entries/LootEntryAbstract;Lcom/google/gson/JsonSerializationContext;)V serializeType serializeCustom # m (Lcom/google/gson/JsonObject;Lnet/minecraft/world/level/storage/loot/entries/LootEntryAbstract;Lcom/google/gson/JsonSerializationContext;)V serializeType serializeCustom
# missed mapping?
c net/minecraft/world/level/block/MultifaceBlock net/minecraft/world/level/block/MultifaceBlock
m (Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/IBlockAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;)Lnet/minecraft/world/level/block/state/IBlockData; c getStateForPlacement

2
patches/server/Build-system-changes.patch
View file

@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
} }
@@ -0,0 +0,0 @@ tasks.jar { @@ -0,0 +0,0 @@ tasks.jar {
"Implementation-Vendor" to Instant.now().epochSecond, "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
- "Specification-Vendor" to "Bukkit Team" - "Specification-Vendor" to "Bukkit Team"

4
patches/server/MC-Utils.patch
View file

@ -2302,7 +2302,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
} }
+ /* // Paper start - comment out useless overrides @Override + // Paper start - comment out useless overrides @Override - TODO figure out why this is suddenly important to keep
@Override @Override
public BlockPos.MutableBlockPos setX(int i) { public BlockPos.MutableBlockPos setX(int i) {
super.setX(i); super.setX(i);
@ -2310,7 +2310,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
super.setZ(i); super.setZ(i);
return this; return this;
} }
+ */ // Paper end + // Paper end
@Override @Override
public BlockPos immutable() { public BlockPos immutable() {

16
patches/server/Setup-Gradle-project.patch
View file

@ -22,7 +22,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
+import java.time.Instant +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import org.gradle.api.file.FileTreeElement
+import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
+import java.util.Date
+import java.text.SimpleDateFormat
+ +
+plugins { +plugins {
+ java + java
@ -62,7 +67,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ attributes(mapOf( + attributes(mapOf(
+ "Main-Class" to "org.bukkit.craftbukkit.Main", + "Main-Class" to "org.bukkit.craftbukkit.Main",
+ "Implementation-Title" to "CraftBukkit", + "Implementation-Title" to "CraftBukkit",
+ "Implementation-Vendor" to Instant.now().epochSecond, + "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
+ "Specification-Title" to "Bukkit", + "Specification-Title" to "Bukkit",
+ "Specification-Version" to project.version, + "Specification-Version" to project.version,
+ "Specification-Vendor" to "Bukkit Team" + "Specification-Vendor" to "Bukkit Team"
@ -88,8 +93,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ transform(AppendingTransformer::class.java) { + transform(AppendingTransformer::class.java) {
+ resource = "META-INF/services/java.sql.Driver" + resource = "META-INF/services/java.sql.Driver"
+ } + }
+ transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
+} +}
+ +
+tasks.test { +tasks.test {
+ exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") + exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
+} +}
+
+class ModifiedLog4j2PluginsCacheFileTransformer : Transformer by Log4j2PluginsCacheFileTransformer() {
+ override fun canTransformResource(element: FileTreeElement): Boolean {
+ return PLUGIN_CACHE_FILE == element.name || element.name == "Log4j2Plugins.dat"
+ }
+}