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

Update upstream

Browse Source
This commit is contained in:
Pugabyte
2021-07-07 15:28:49 -05:00
parent 7aaefe6994
commit 8c46400d86
6 changed files with 28 additions and 28 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
packageVersion = 1_17_R1
paperRef = cc063e1f09c116c9fc9786b40f7c36577a6a7264
paperRef = bb44da8420a5300c53e63843da8e7bb44cf45d2a

4
patches/api/0001-Build-changes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index e142072f31a41b25ac637970f79e71ab70c2f28c..3a2e308a5897cd99257ca9e4e836f4eced881246 100644
index 7ad3e5153718f6d4ce8293a9790bc3c1158aeb8e..14caef3d68aab390de482e9ea33a91641492279b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
@@ -29,6 +29,7 @@ dependencies {
api("org.ow2.asm:asm:9.0")
api("org.ow2.asm:asm-commons:9.0")
api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c4ec5a42e 100644
index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e44856654 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,7 @@ import java.nio.file.Files
@@ -27,7 +27,7 @@ index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -82,7 +83,7 @@ tasks.jar {
@@ -80,7 +81,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -36,7 +36,7 @@ index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -104,6 +105,26 @@ publishing {
@@ -102,6 +103,26 @@ publishing {
classifier = null
}
artifact(tasks.shadowJar)
@@ -63,7 +63,7 @@ index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c
}
}
@@ -114,7 +135,7 @@ tasks.shadowJar {
@@ -112,7 +133,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature
from(generatePom) {
@@ -72,7 +72,7 @@ index 39beb0331282b297f4f3857560d24ce6a616210d..b18b93e4f99005885f70f01d8a17487c
rename { "pom.xml" }
}
@@ -178,7 +199,7 @@ tasks.test {
@@ -176,7 +197,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -119,10 +119,10 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a24bab6095b85fe208bb0f467b267a9d0680c6fc..24f9cc4e117916d872a8410202cef771992a5c62 100644
index 3dded5c491ace6b073a7bc3178976bd70f0b9393..2373f056cbe868491bafa02e3b711a63f2e428aa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1651,7 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -130,9 +130,9 @@ index a24bab6095b85fe208bb0f467b267a9d0680c6fc..24f9cc4e117916d872a8410202cef771
+ return "Parchment"; //Parchment - Parchment > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
}
public SystemReport fillSystemReport(SystemReport systemreport) {
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
index 746b4d6ba5d2f0c38fd562e859d40697be361ef4..99e2e040157a333a63ff875ff2670e3134ac397c 100644
index c79b193ad822b8c246f24a87cd418892bc18ff5a..190d673c65aad82c044a4291a637af723e08267e 100644
--- a/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
@@ -145,7 +145,7 @@ index 746b4d6ba5d2f0c38fd562e859d40697be361ef4..99e2e040157a333a63ff875ff2670e31
private final String bukkitVersion = Versioning.getBukkitVersion();
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
index 32f82c60b680180b256edff127e5a6ded42fccf4..cf6ccc83b3c91722125f7f0cd84e18e6181679fe 100644
index c3c7b34ceb1b8f0ed042b29924c633fa7519dc30..31b56b031e57684d9f0849390badf9057fbf4ffa 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {

20
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
index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..fe1697874af3d64c0fb143b742375750047b8888 100644
index 6ecf60c69a27f8db1c245db15449bba581c3dbf5..07207bc7aa610da2151fceaeddcf00f4464fd41d 100644
--- a/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;
@@ -35,7 +35,7 @@ index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..fe1697874af3d64c0fb143b742375750
@Override
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a0acaac510aa2206a5c58f2b7aafdbc2bdf7a3dd..9e98937b653b0b95b9d0b171d6d5aec7e93992e6 100644
index 8e2bccc3a9ddb17a4978596056189eb776976338..26215724174178056b915fc4ce927abae8a2b8d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -67,7 +67,7 @@ import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
@@ -47,7 +47,7 @@ index a0acaac510aa2206a5c58f2b7aafdbc2bdf7a3dd..9e98937b653b0b95b9d0b171d6d5aec7
import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
import net.minecraft.resources.ResourceKey;
@@ -2141,7 +2141,7 @@ public class ServerPlayer extends Player {
@@ -2137,7 +2137,7 @@ public class ServerPlayer extends Player {
@Override
public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {
@@ -57,10 +57,10 @@ index a0acaac510aa2206a5c58f2b7aafdbc2bdf7a3dd..9e98937b653b0b95b9d0b171d6d5aec7
@Override
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index b46e64a386d256d30eac330c463c71396452563d..45c4ec17aad79e0b05e8b83b9c7c55ac8d550f19 100644
index 65657c009f6d5a5d5740e80f912a5893333c7085..13a32945865a5c2143cdfdd16859a95dd8eb0014 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -58,7 +58,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
@@ -60,7 +60,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
@@ -69,7 +69,7 @@ index b46e64a386d256d30eac330c463c71396452563d..45c4ec17aad79e0b05e8b83b9c7c55ac
import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -957,7 +957,7 @@ public abstract class PlayerList {
@@ -959,7 +959,7 @@ public abstract class PlayerList {
if (flag2 && !isLocAltered) {
BlockState data = worldserver1.getBlockState(blockposition);
worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);
@@ -79,7 +79,7 @@ index b46e64a386d256d30eac330c463c71396452563d..45c4ec17aad79e0b05e8b83b9c7c55ac
}
// Added from changeDimension
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 1bccd932851045c374e3092d33dc77fab680d0db..855a25c1a788039ac0d0ac340fd2b0e0064ce816 100644
index 19980b2d627eb3cacf8d0c3e6785ad2206910fbc..f1b7ff2b4e08bac81d742691003a3c4d7549e01b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -30,7 +30,7 @@ import net.minecraft.network.chat.MutableComponent;
@@ -91,7 +91,7 @@ index 1bccd932851045c374e3092d33dc77fab680d0db..855a25c1a788039ac0d0ac340fd2b0e0
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
@@ -1829,7 +1829,7 @@ public abstract class Player extends LivingEntity {
@@ -1825,7 +1825,7 @@ public abstract class Player extends LivingEntity {
private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
fromEntity.level.playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself
if (fromEntity instanceof ServerPlayer) {
@@ -123,10 +123,10 @@ index a79ba23ecf887ecbb6e095140f019ebb6fd0a6f7..5112edc5e68a386e9bb16ac0ec9d998e
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a59a449c0a7b76527f009031aee2d11d6b43cadf..0e6820b173bc01f5e314205fe1e593107beea45d 100644
index 9e08668ecf224dae91405da994cc7d346499a969..bfe1fa69aa1cea111421b1664e20128e0e8a96a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1835,4 +1835,77 @@ public class CraftEventFactory {
@@ -1836,4 +1836,77 @@ public class CraftEventFactory {
return event.callEvent();
}
// Paper end

4
patches/server/0008-Add-Player-setGameProfile.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 855a25c1a788039ac0d0ac340fd2b0e0064ce816..c3283f471ffde214b6d771a2df554697e57ba124 100644
index f1b7ff2b4e08bac81d742691003a3c4d7549e01b..297dc8baee595f16a8fcafc83964310e81edc2d0 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1448,6 +1448,12 @@ public abstract class Player extends LivingEntity {
@@ -1444,6 +1444,12 @@ public abstract class Player extends LivingEntity {
return this.gameProfile;
}

6
patches/server/0011-Add-BlockDropResourcesEvent.patch
View File

@@ -8,7 +8,7 @@ to easily get the items being dropped by any
block instead of only blocks broken by players.
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index 878cdfc49253e7916d038495f79fec7cce75aa50..18e93574d3634dc6e48ca224ec6b72c745f04a86 100644
index d6a3f3a2edae806b0ebf5bf5ac445116c0d64535..de47a0db1a2e439dbbbc7d5e34a38a05fe2ebeab 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -306,7 +306,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -48,10 +48,10 @@ index 878cdfc49253e7916d038495f79fec7cce75aa50..18e93574d3634dc6e48ca224ec6b72c7
});
state.spawnAfterBreak((ServerLevel) world, pos, stack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 5f2124a463eb4bd7d34091ed799d038926cfd763..5b03b806a1670de23f049cc219afda8afffaa92f 100644
index 06f49a860bc650ec422f706a35fe2970fd7389ba..fff7952928d830f01499566f2235aa76c7eac052 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1907,5 +1907,11 @@ public class CraftEventFactory {
@@ -1908,5 +1908,11 @@ public class CraftEventFactory {
final double posZ = pos.getZ();
playSoundEvent(event, packet -> playerList.broadcast(player, posX, posY, posZ, radius, world, packet));
}