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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c2e2281 Initial 1.18 update
PaperMC/Paper@12efc3f Fixes
PaperMC/Paper@60af9b0 moar fixes
PaperMC/Paper@19f9520 1.18.2 compiles successfuly now
PaperMC/Paper@f4eb08a Readd 'Fix entity type tags suggestions in selectors'
PaperMC/Paper@706c98a Update Datafixer
PaperMC/Paper@02e2402 Update README
PaperMC/Paper@c984991 Fix mc dev fix by removing it
PaperMC/Paper@490517d fixed flat bedrock patch
PaperMC/Paper@9da236f re-add config for stronghold seed patch
PaperMC/Paper@9a73213 Adventure 4.10.0
PaperMC/Paper@37436ac Move comment up
PaperMC/Paper@c6fc144 Fix unload stall
PaperMC/Paper@fbe43d6 clean up patch changes
PaperMC/Paper@3526f22 move patch relying on TraceUtil to after its creation
PaperMC/Paper@fd74326 update reobf-mappings-patch.tiny
PaperMC/Paper@5071d50 clean up view distance api diff
PaperMC/Paper@cc45a35 move decompile fixes to start of git history
PaperMC/Paper@146ac7b address failing mob goals test
PaperMC/Paper@b9037a5 fix issue resulting from kenny's apatch addiction
PaperMC/Paper@126ca73 Add TODO for leaf
PaperMC/Paper@ab8a139 Configure javadoc overview and doc-files copying
PaperMC/Paper@0859f59 1_18_R2
PaperMC/Paper@14add2b Updated Upstream (CraftBukkit)
PaperMC/Paper@178802a Fix various 1.18.2 update issues (#7523)
PaperMC/Paper@b1afebb Force close world loading screen on join (#7529)
PaperMC/Paper@d3caeeb Fix early registry access in xray patch
PaperMC/Paper@c6ea84c Drop unneeded desync patch
PaperMC/Paper@12d89fe Revert chunk postprocessing back to 1.18.1 logic
PaperMC/Paper@90788a5 clean up prepareTickingChunk diff
PaperMC/Paper@d33cdcf Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@753bf2c Update paperweight to 1.3.5
PaperMC/Paper@15b6b3d Add StructuresLocateEvent as replacement for StructureLocateEvent (#7524)
PaperMC/Paper@c09365a Fix deadlock on watchdog crash (#7535)
PaperMC/Paper@719daa8 Updated Upstream (CraftBukkit)
PaperMC/Paper@b9f26bb Add printPaperVersion task
PaperMC/Paper@63aa4d3 Clarify exception messages for invalid view distances (#7510)
PaperMC/Paper@0ee6dda Add javadoc linking for adventure-text-minimessage (#7538)
PaperMC/Paper@b6616c8 Fix falling block spawn methods
PaperMC/Paper@6d47843 replace bungeecord-chat dependency with deprecated version (#7539)
PaperMC/Paper@42a9c37 Move Adventure patch up
This commit is contained in:
lexikiq
2022-03-04 18:40:31 -05:00
parent cad9362f3d
commit 9b316cd4b3
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
version = 1.18.2-R0.1-SNAPSHOT version = 1.18.2-R0.1-SNAPSHOT
mcVersion = 1.18.2 mcVersion = 1.18.2
paperRef = 0859f594698246d3999ea9829393bc90cf783088 paperRef = 6d4784392d765fb6d82a4d57869925852543f7e3
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

4
patches/api/0006-Add-UnsafeValues-canPlaceItemOn.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index f59030893eba2bf653207b040a5f54fdf7b7b50f..02c78e80a0e30aaeebc441fde9b27e3563011a0f 100644 index b39d1474210da1974d7e95f10daaf496a9330442..107f356026397f1a6ef8580c7f239a02bf8105fe 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java --- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -225,4 +225,17 @@ public interface UnsafeValues { @@ -238,4 +238,17 @@ public interface UnsafeValues {
*/ */
boolean isCollidable(@org.jetbrains.annotations.NotNull Material material); boolean isCollidable(@org.jetbrains.annotations.NotNull Material material);
// Paper end // Paper end

4
patches/api/0007-Expose-NMS-ordinals.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose NMS ordinals
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 02c78e80a0e30aaeebc441fde9b27e3563011a0f..4a105b3e48eabb17dd701cd7287c7054311a365b 100644 index 107f356026397f1a6ef8580c7f239a02bf8105fe..12b9d9fff1313aa27a8178456934b88df76580d6 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java --- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -237,5 +237,12 @@ public interface UnsafeValues { @@ -250,5 +250,12 @@ public interface UnsafeValues {
* @return if the item can be placed * @return if the item can be placed
*/ */
java.util.concurrent.CompletableFuture<Boolean> canPlaceItemOn(@org.jetbrains.annotations.NotNull ItemStack item, @org.jetbrains.annotations.Nullable gg.projecteden.parchment.OptionalHumanEntity player, @org.jetbrains.annotations.NotNull org.bukkit.block.Block block, @org.jetbrains.annotations.NotNull org.bukkit.block.BlockFace face); java.util.concurrent.CompletableFuture<Boolean> canPlaceItemOn(@org.jetbrains.annotations.NotNull ItemStack item, @org.jetbrains.annotations.Nullable gg.projecteden.parchment.OptionalHumanEntity player, @org.jetbrains.annotations.NotNull org.bukkit.block.Block block, @org.jetbrains.annotations.NotNull org.bukkit.block.BlockFace face);

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

@@ -104,10 +104,10 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286d
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..780a88c7fcab402f1908ee1959f907e52d998a2e 100644 index 07c382f30ed3736ed15b5b71f48dc4a1de958242..6994038e8371a7d506d5f4c5abdf3b441f329231 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate @DontObfuscate
public String getServerModName() { public String getServerModName() {
@@ -117,7 +117,7 @@ index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..780a88c7fcab402f1908ee1959f907e5
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 5a6290e5d7b82dbc069d159ea53292e4dbc94d03..3336f223f9f0c6207471de15326f40d2ddc1dae2 100644 index 7343bd96a4a15f4abc081e565175db8df930a470..22619586b0d821123ed7bfb14744cfb27567522c 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
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

6
patches/server/0003-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 8e87aca16879d7dd1dc0bd17d3215fca40b547cd..8013aa65752e15217b5ae99e012fb745205b9853 100644 index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..1f0624e96f17fd16658dc244aaf15d56da8243ab 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
@@ -1510,12 +1510,12 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -1510,12 +1510,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -37,10 +37,10 @@ index e74c13e7aaa144fcd07036de70e80bebf0be698a..397d2c48c57a58c32b96c712d1c9682a
@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 f5852341161b0d632e22af9b3e625ca1e786bd63..e3783298e50d8b75a00f7ad7ca1e7a7b8209e6d9 100644 index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..85d6690bf0a96654a4fb596a8e5d8e1afc01bbc5 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
@@ -967,7 +967,7 @@ public abstract class PlayerList { @@ -974,7 +974,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);

4
patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 4be7b18b4e794734439d1e8bec4304d88328c91e..5d287d4cb1c9302479d8d2dd92939b4832991a92 100644 index 41e7ca100073052b99c82fa6a82f8168e0135499..30a4ceccf2ac0244f91b64cc4864e186211c9042 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -587,6 +587,55 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -601,6 +601,55 @@ public final class CraftMagicNumbers implements UnsafeValues {
} }
// Paper end // Paper end

4
patches/server/0007-Expose-EntityType-Ordinals.patch
View File

@@ -51,10 +51,10 @@ index 79abd84696ef099f6b12ddeaa6e398f18c53316a..13e277c9ff27a52fbf7041c36d7c5ff6
return Registry.ENTITY_TYPE.getKey(type); return Registry.ENTITY_TYPE.getKey(type);
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 6fa8fdfeec2af4a669e60c5a238c81f90f19c546..b3c6cf1c6bd37815ef144965b8af7825b15e08e0 100644 index 30a4ceccf2ac0244f91b64cc4864e186211c9042..d71c9ed269e321cfec20c2a5223fd7741fc24702 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -634,6 +634,18 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -648,6 +648,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
final net.minecraft.world.item.context.BlockPlaceContext ctx = context; final net.minecraft.world.item.context.BlockPlaceContext ctx = context;
return future.completeAsync(() -> blockItem.canPlace(ctx, blockState), net.minecraft.server.MCUtil.MAIN_EXECUTOR); return future.completeAsync(() -> blockItem.canPlace(ctx, blockState), net.minecraft.server.MCUtil.MAIN_EXECUTOR);
} }

4
patches/server/0012-Add-Furnace-Recipe-API.patch
View File

@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a3ddeb9862bc87294c215dc906cd8cca8f699b62..2e9efad46a1b395040a7dff6f80382ea9a2ae980 100644 index 028663b86970b8a1ae3e5275429516ee00ef0a04..f3b65b3fa80f2cbc5986b6dfd56b6346bae83b36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2316,4 +2316,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -2328,4 +2328,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return this.adventure$pointers; return this.adventure$pointers;
} }
// Paper end // Paper end