Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream

Browse Source
This commit is contained in:
lexikiq
2021-07-13 17:45:25 -04:00
parent 72462aa1e6
commit 31173eb72c
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,4 +3,4 @@ version = 1.17-R0.1-SNAPSHOT
mcVersion = 1.17 mcVersion = 1.17
packageVersion = 1_17_R1 packageVersion = 1_17_R1
paperRef = bb44da8420a5300c53e63843da8e7bb44cf45d2a paperRef = b015abb952ff46590e6cad65d82dd545336be0ff

28
patches/server/0001-Build-changes.patch
View File

@@ -5,18 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e44856654 100644 index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe88627a763 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -10,6 +10,7 @@ import java.nio.file.Files @@ -30,8 +30,8 @@ repositories {
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
+import java.net.URI // Parchment
plugins {
java
@@ -30,8 +31,8 @@ repositories {
} }
dependencies { dependencies {
@@ -27,16 +19,16 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0") implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -80,7 +81,7 @@ tasks.jar { @@ -81,7 +81,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
- "Implementation-Version" to "git-Paper-$implementationVersion", - "Implementation-Version" to "git-Paper-$implementationVersion",
+ "Implementation-Version" to "git-Parchment-$implementationVersion", // Parchment + "Implementation-Version" to "git-Parchment-$implementationVersion", // Parchment
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -102,6 +103,26 @@ publishing { @@ -103,6 +103,26 @@ publishing {
classifier = null classifier = null
} }
artifact(tasks.shadowJar) artifact(tasks.shadowJar)
@@ -57,13 +49,13 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
+ username = properties["edenusr"] as String? + username = properties["edenusr"] as String?
+ password = properties["edenpwd"] as String? + password = properties["edenpwd"] as String?
+ } + }
+ url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/") + url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/")
+ } + }
+ // Parchment end + // Parchment end
} }
} }
@@ -112,7 +133,7 @@ tasks.shadowJar { @@ -113,7 +133,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature // Needed for Paperclip's install to maven local feature
from(generatePom) { from(generatePom) {
@@ -72,7 +64,7 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
rename { "pom.xml" } rename { "pom.xml" }
} }
@@ -176,7 +197,7 @@ tasks.test { @@ -177,7 +197,7 @@ tasks.test {
fun TaskContainer.registerRunTask( fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -132,7 +124,7 @@ index 3dded5c491ace6b073a7bc3178976bd70f0b9393..2373f056cbe868491bafa02e3b711a63
public SystemReport fillSystemReport(SystemReport details) { public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c79b193ad822b8c246f24a87cd418892bc18ff5a..190d673c65aad82c044a4291a637af723e08267e 100644 index dd435909ad16a7f732fd0a2056f986dd9b24c0d5..a5301e96cd62d9d8e8c743ba8af97fb99b699af4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -145,7 +137,7 @@ index c79b193ad822b8c246f24a87cd418892bc18ff5a..190d673c65aad82c044a4291a637af72
private final String bukkitVersion = Versioning.getBukkitVersion(); private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c3c7b34ceb1b8f0ed042b29924c633fa7519dc30..31b56b031e57684d9f0849390badf9057fbf4ffa 100644 index ea7df53656766a8dc4ab5fe66de894301db634e1..6de638292a6126460c8b0e0a5d3ab6e4d28c2892 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main { @@ -269,7 +269,7 @@ public class Main {

8
patches/server/0002-Add-SoundEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add SoundEvent
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 6ecf60c69a27f8db1c245db15449bba581c3dbf5..07207bc7aa610da2151fceaeddcf00f4464fd41d 100644 index c2e0417ee15018ec31c4aa8eec3dff7a0d16aa9e..55929e0c397bc557de9d035c353f736f9d24d43f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -55,8 +55,8 @@ import net.minecraft.network.protocol.game.ClientboundExplodePacket; @@ -55,8 +55,8 @@ import net.minecraft.network.protocol.game.ClientboundExplodePacket;
@@ -19,7 +19,7 @@ index 6ecf60c69a27f8db1c245db15449bba581c3dbf5..07207bc7aa610da2151fceaeddcf00f4
import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.network.protocol.game.DebugPackets;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MCUtil; import net.minecraft.server.MCUtil;
@@ -1308,12 +1308,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -1269,12 +1269,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@Override @Override
public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) { public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -57,7 +57,7 @@ index 8e2bccc3a9ddb17a4978596056189eb776976338..26215724174178056b915fc4ce927aba
@Override @Override
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 65657c009f6d5a5d5740e80f912a5893333c7085..13a32945865a5c2143cdfdd16859a95dd8eb0014 100644 index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..9be83da618d2359951c602fa5dfcdd608270a23e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -60,7 +60,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket; @@ -60,7 +60,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
@@ -69,7 +69,7 @@ index 65657c009f6d5a5d5740e80f912a5893333c7085..13a32945865a5c2143cdfdd16859a95d
import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket; import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket; import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket; import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -959,7 +959,7 @@ public abstract class PlayerList { @@ -964,7 +964,7 @@ public abstract class PlayerList {
if (flag2 && !isLocAltered) { if (flag2 && !isLocAltered) {
BlockState data = worldserver1.getBlockState(blockposition); BlockState data = worldserver1.getBlockState(blockposition);
worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3); worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);