diff --git a/gradle.properties b/gradle.properties index 7096e10bf..12099eef7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 -paperRef=61a09c51023c53997c31ef24849a99262f7ddaf0 +paperRef=6de48dbdda78ec20398df3e81c9f22f0b76dee71 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index aec0a2b17..33c9e6e5f 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build Changes diff --git a/build.gradle.kts b/build.gradle.kts -index 1876481a830228fd15fcd2a4be5f2c28bd7e51fe..034b7e7d0d9eda61ca6f5a92c6e6acf406f0b587 100644 +index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..df6ee4c3158d9530d6d890d4ad617cc78df469b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -28,8 +28,8 @@ repositories { +@@ -29,8 +29,8 @@ repositories { } dependencies { @@ -19,7 +19,7 @@ index 1876481a830228fd15fcd2a4be5f2c28bd7e51fe..034b7e7d0d9eda61ca6f5a92c6e6acf4 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -80,7 +80,7 @@ tasks.jar { +@@ -82,7 +82,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +28,7 @@ index 1876481a830228fd15fcd2a4be5f2c28bd7e51fe..034b7e7d0d9eda61ca6f5a92c6e6acf4 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -205,7 +205,7 @@ tasks.test { +@@ -207,7 +207,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -38,23 +38,23 @@ index 1876481a830228fd15fcd2a4be5f2c28bd7e51fe..034b7e7d0d9eda61ca6f5a92c6e6acf4 workingDir = rootProject.layout.projectDirectory.dir( providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3dded5c491ace6b073a7bc3178976bd70f0b9393..450f7efbbeeb6de2b274a527aa90f49a984cab2a 100644 +index 1d7c26354eee1dff5e66b6234d408ed8f800415c..29e77a745705196f55495826cb38104637388e1f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1651,7 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! +- return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + return "Slice"; //Slice - Slice > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } 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 6d7f16fede01c19f638e1dcdae8b07b79cd86dc0..d868ec7c7d010e525f2a49bda89cd51c9a1c2e8a 100644 +index c1fc309411c277f7b7450686543a6a7a7fe2fdb1..46907276e5a9c66a1b1b0e3b85cf23c4067f2c86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -240,7 +240,7 @@ import javax.annotation.Nullable; // Paper +@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/patches/server/0002-Add-PlayerShieldDisableEvent.patch b/patches/server/0002-Add-PlayerShieldDisableEvent.patch index 587661d89..b64e1cfc2 100644 --- a/patches/server/0002-Add-PlayerShieldDisableEvent.patch +++ b/patches/server/0002-Add-PlayerShieldDisableEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerShieldDisableEvent diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index bada11542390b7575466f0e7062470665b8266c4..3879bf37a508675fb4c918516b3f27d5d978c4d1 100644 +index 8a864238e154e2131834d013652746b7e7a78c97..806975b124bf91ae560dc3a0289f3a298373546d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1583,6 +1583,7 @@ public abstract class Mob extends LivingEntity { +@@ -1588,6 +1588,7 @@ public abstract class Mob extends LivingEntity { float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F; if (this.random.nextFloat() < f) { @@ -17,10 +17,10 @@ index bada11542390b7575466f0e7062470665b8266c4..3879bf37a508675fb4c918516b3f27d5 this.level.broadcastEntityEvent(player, (byte) 30); } 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 d8780f06efc261a42389e466573a0bcf10c333f6..a5b7b798143b33c811928b9562f8cd11b484df60 100644 +index cea92f1dc663bf0648b2bd877d86ca380a517bc9..a1d1d8b5fbb5d7f8e980b4c116b8fec34f8878d5 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -931,7 +931,7 @@ public abstract class Player extends LivingEntity { +@@ -936,7 +936,7 @@ public abstract class Player extends LivingEntity { protected void blockUsingShield(LivingEntity attacker) { super.blockUsingShield(attacker); if (attacker.getMainHandItem().getItem() instanceof AxeItem) { @@ -29,7 +29,7 @@ index d8780f06efc261a42389e466573a0bcf10c333f6..a5b7b798143b33c811928b9562f8cd11 } } -@@ -1398,6 +1398,12 @@ public abstract class Player extends LivingEntity { +@@ -1403,6 +1403,12 @@ public abstract class Player extends LivingEntity { } public void disableShield(boolean sprinting) { @@ -42,7 +42,7 @@ index d8780f06efc261a42389e466573a0bcf10c333f6..a5b7b798143b33c811928b9562f8cd11 float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F; if (sprinting) { -@@ -1405,6 +1411,8 @@ public abstract class Player extends LivingEntity { +@@ -1410,6 +1416,8 @@ public abstract class Player extends LivingEntity { } if (this.random.nextFloat() < f) { diff --git a/patches/server/0004-Set-BlockData-without-light-update.patch b/patches/server/0004-Set-BlockData-without-light-update.patch index f465cc5f5..0e9aee6de 100644 --- a/patches/server/0004-Set-BlockData-without-light-update.patch +++ b/patches/server/0004-Set-BlockData-without-light-update.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Set BlockData without light update diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java -index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..726d63254bb9c81555e5264e6253d453d38c9601 100644 +index 21d1e0c9c471e9e556b5bd70166a769b46105c7a..d46dc12001bd46596c3bb2e24144bbe4d2d3a5e1 100644 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java -@@ -224,7 +224,7 @@ public class WorldGenRegion implements WorldGenLevel { +@@ -241,7 +241,7 @@ public class WorldGenRegion implements WorldGenLevel { Block.dropResources(iblockdata, this.level, pos, tileentity, breakingEntity, ItemStack.EMPTY); } @@ -17,7 +17,7 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..726d63254bb9c81555e5264e6253d453 } } -@@ -281,7 +281,7 @@ public class WorldGenRegion implements WorldGenLevel { +@@ -298,7 +298,7 @@ public class WorldGenRegion implements WorldGenLevel { } @Override @@ -27,10 +27,10 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..726d63254bb9c81555e5264e6253d453 return false; } else { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 474078b68f1bf22037495f42bae59b790fd8cb46..cf1164a86eae26244e5f1655fd1cb308f8eac5db 100644 +index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..a9315b7acec3c2ccaf879e0f1d45c062d8e201b1 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -433,12 +433,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -550,12 +550,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } @Override @@ -46,7 +46,7 @@ index 474078b68f1bf22037495f42bae59b790fd8cb46..cf1164a86eae26244e5f1655fd1cb308 // CraftBukkit start - tree generation if (this.captureTreeGeneration) { // Paper start -@@ -485,7 +485,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -602,7 +602,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } else { BlockState iblockdata2 = this.getBlockState(pos); @@ -55,7 +55,7 @@ index 474078b68f1bf22037495f42bae59b790fd8cb46..cf1164a86eae26244e5f1655fd1cb308 this.getProfiler().push("queueCheckLight"); this.getChunkSource().getLightEngine().checkBlock(pos); this.getProfiler().pop(); -@@ -632,7 +632,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -749,7 +749,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { Block.dropResources(iblockdata, this, pos, tileentity, breakingEntity, ItemStack.EMPTY); } @@ -99,10 +99,10 @@ index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..64cc26d146afba7c6ecb0d3052776837 } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index f20484b74197353adec0a3cd2c42f88aa9fdd4e6..7e8632f68cdb53f34608ea924071dcd57aa92727 100644 +index a53a9974a2358fa4b6a7216e4b849bd3ad5023ea..68fbf05b07ffe028993184261dbd1a61c3c45aa5 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -175,11 +175,20 @@ public class CraftBlock implements Block { +@@ -179,11 +179,20 @@ public class CraftBlock implements Block { @Override public void setBlockData(BlockData data, boolean applyPhysics) { @@ -124,20 +124,20 @@ index f20484b74197353adec0a3cd2c42f88aa9fdd4e6..7e8632f68cdb53f34608ea924071dcd5 net.minecraft.world.level.block.state.BlockState old = this.getNMS(); // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes -@@ -194,7 +203,7 @@ public class CraftBlock implements Block { +@@ -198,7 +207,7 @@ public class CraftBlock implements Block { if (applyPhysics) { return this.world.setBlock(position, blockData, 3); } else { - boolean success = this.world.setBlock(position, blockData, 2 | 16 | 1024); // NOTIFY | NO_OBSERVER | NO_PLACE (custom) + boolean success = this.world.setBlock(position, blockData, 2 | 16 | 1024, checkLight); // NOTIFY | NO_OBSERVER | NO_PLACE (custom) - if (success) { + if (success && this.world instanceof net.minecraft.world.level.Level) { this.world.getMinecraftWorld().sendBlockUpdated( position, diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java -index 08634e060b35d653c5677b7c1012cfda266bf002..869a5995e08dda5604fdc457a55a913fe0efe6e9 100644 +index 950d4381459d31d02acf55c4aef4f5e33367748b..0b09b06b3d9fe2cce5c6cbf70a4b84ff8edc2085 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java -@@ -222,7 +222,7 @@ public class DummyGeneratorAccess implements LevelAccessor { +@@ -231,7 +231,7 @@ public class DummyGeneratorAccess implements WorldGenLevel { } @Override diff --git a/patches/server/0005-Don-t-send-equipment-updates-if-only-durability-chan.patch b/patches/server/0005-Don-t-send-equipment-updates-if-only-durability-chan.patch index 1d88e1115..992adb7dd 100644 --- a/patches/server/0005-Don-t-send-equipment-updates-if-only-durability-chan.patch +++ b/patches/server/0005-Don-t-send-equipment-updates-if-only-durability-chan.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't send equipment updates if only durability changed diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6175360eb2b19c8197cc5b82a09030211afd838b..5f3274116d3c6f83f8215665e981c705d7655d72 100644 +index 1149a15486016ac101c5976b45b7d1c1109244ce..47b8e4f51fd63894926f41220f94fd8a65a57d7f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2995,7 +2995,7 @@ public abstract class LivingEntity extends Entity { +@@ -2996,7 +2996,7 @@ public abstract class LivingEntity extends Entity { ItemStack itemstack1 = this.getItemBySlot(enumitemslot); diff --git a/patches/server/0007-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0007-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch index 7cf0ef155..cf77090b4 100644 --- a/patches/server/0007-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch +++ b/patches/server/0007-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't send fire packets if player has Fire Resistance diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cdec0668ecbf9dea2551101cc3054dcc398d282a..31f8923c29a9be4468f873cf8d34da0b09270abf 100644 +index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..ea85fc39b77aece9c9544ec01348eafa233355d1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -686,7 +686,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -760,7 +760,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.checkOutOfWorld(); if (!this.level.isClientSide) { diff --git a/patches/server/0008-Track-Player-throughout-entire-block-destroy.patch b/patches/server/0008-Track-Player-throughout-entire-block-destroy.patch index d8394b87b..92bc0ff0c 100644 --- a/patches/server/0008-Track-Player-throughout-entire-block-destroy.patch +++ b/patches/server/0008-Track-Player-throughout-entire-block-destroy.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Track Player throughout entire block destroy diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 1c83fbc96a074c85a3e349e936ff1f3198596709..5857468333c17cf3056ad71490746afba4154452 100644 +index 12998d0e9ae0e148a155faa4468b0f78b8462cc9..b03eacbef3cf15b70ec012af0870975d3e8e8cba 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -409,6 +409,7 @@ public class ServerPlayerGameMode { +@@ -441,6 +441,7 @@ public class ServerPlayerGameMode { org.bukkit.block.BlockState state = bblock.getState(); level.captureDrops = new ArrayList<>(); // CraftBukkit end @@ -16,7 +16,7 @@ index 1c83fbc96a074c85a3e349e936ff1f3198596709..5857468333c17cf3056ad71490746afb block.playerWillDestroy((Level) this.level, pos, iblockdata, (Player) this.player); boolean flag = this.level.removeBlock(pos, false); -@@ -433,6 +434,7 @@ public class ServerPlayerGameMode { +@@ -465,6 +466,7 @@ public class ServerPlayerGameMode { // CraftBukkit start java.util.List itemsToDrop = level.captureDrops; // Paper - store current list level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff @@ -54,10 +54,10 @@ index 65a163d93a293e1e0a12a300d6335a700099cac2..b1b6072ffff0e1cc2e9e1a585ad882bc BlockState iblockdata2 = iblockdata1.hasProperty(BlockStateProperties.WATERLOGGED) && (Boolean) iblockdata1.getValue(BlockStateProperties.WATERLOGGED) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 1179c62695da4dcf02590c97d8da3c6fcdbee9ef..836ecd7c8db42634c5293caafce4624d3a10f465 100644 +index d87f8d106834678364f8720447d671de60c2454e..66b76aa6e97b7244a2abdf4a4591edfad3c2fe6c 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -869,6 +869,18 @@ public abstract class BlockBehaviour { +@@ -890,6 +890,18 @@ public abstract class BlockBehaviour { blockposition_mutableblockposition.setWithOffset((Vec3i) pos, enumdirection); BlockState iblockdata = world.getBlockState(blockposition_mutableblockposition); diff --git a/patches/server/0009-Add-BlockDestroyedByNeighborEvent.patch b/patches/server/0009-Add-BlockDestroyedByNeighborEvent.patch index cb2c471da..75ca1cf73 100644 --- a/patches/server/0009-Add-BlockDestroyedByNeighborEvent.patch +++ b/patches/server/0009-Add-BlockDestroyedByNeighborEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add BlockDestroyedByNeighborEvent diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index cf1164a86eae26244e5f1655fd1cb308f8eac5db..dfbe135d819bcc13d40942454803126bddfbf27d 100644 +index a9315b7acec3c2ccaf879e0f1d45c062d8e201b1..194dd5d6e34097fe78b4cce7e850352510dc804d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -608,6 +608,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -725,6 +725,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { if (iblockdata.isAir()) { return false; } else {