SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remap CraftBukkit to Mojang+Yarn Mappings

Browse Source 
By: Initial Source <noreply+automated@papermc.io>
This commit is contained in:
CraftBukkit/Spigot
2024-12-11 22:26:55 +01:00
parent a265d64138
commit 30e4583dbe
1780 changed files with 44628 additions and 41274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
paper-server/patches/sources/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java.patch Normal file
View File

@@ -0,0 +1,31 @@
--- a/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
+++ b/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
@@ -9,6 +9,10 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.RedStoneWireBlock;
import net.minecraft.world.level.block.state.BlockState;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockRedstoneEvent;
+// CraftBukkit end
public class DefaultRedstoneWireEvaluator extends RedstoneWireEvaluator {
@@ -20,7 +24,16 @@
public void updatePowerStrength(Level world, BlockPos pos, BlockState state, @Nullable Orientation orientation, boolean blockAdded) {
int i = this.calculateTargetStrength(world, pos);
- if ((Integer) state.getValue(RedStoneWireBlock.POWER) != i) {
+ // CraftBukkit start
+ int oldPower = state.getValue(RedStoneWireBlock.POWER);
+ if (oldPower != i) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, pos), oldPower, i);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ i = event.getNewCurrent();
+ }
+ if (oldPower != i) {
+ // CraftBukkit end
if (world.getBlockState(pos) == state) {
world.setBlock(pos, (BlockState) state.setValue(RedStoneWireBlock.POWER, i), 2);
}

32
paper-server/patches/sources/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.patch
View File

@@ -1,32 +0,0 @@
--- a/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
+++ b/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
@@ -10,6 +10,11 @@
import net.minecraft.world.level.block.BlockRedstoneWire;
import net.minecraft.world.level.block.state.IBlockData;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockRedstoneEvent;
+// CraftBukkit end
+
public class DefaultRedstoneWireEvaluator extends RedstoneWireEvaluator {
public DefaultRedstoneWireEvaluator(BlockRedstoneWire blockredstonewire) {
@@ -20,7 +25,16 @@
public void updatePowerStrength(World world, BlockPosition blockposition, IBlockData iblockdata, @Nullable Orientation orientation, boolean flag) {
int i = this.calculateTargetStrength(world, blockposition);
- if ((Integer) iblockdata.getValue(BlockRedstoneWire.POWER) != i) {
+ // CraftBukkit start
+ int oldPower = iblockdata.getValue(BlockRedstoneWire.POWER);
+ if (oldPower != i) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition), oldPower, i);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ i = event.getNewCurrent();
+ }
+ if (oldPower != i) {
+ // CraftBukkit end
if (world.getBlockState(blockposition) == iblockdata) {
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneWire.POWER, i), 2);
}

23
paper-server/patches/sources/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.patch → paper-server/patches/sources/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java.patch
View File

@@ -1,24 +1,23 @@
--- a/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
+++ b/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
@@ -17,6 +17,11 @@
import net.minecraft.world.level.block.state.properties.BlockPropertyRedstoneSide;
import net.minecraft.world.level.block.state.properties.BlockStateEnum;
@@ -16,6 +16,10 @@
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.block.state.properties.RedstoneSide;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockRedstoneEvent;
+// CraftBukkit end
+
public class ExperimentalRedstoneWireEvaluator extends RedstoneWireEvaluator {
private final Deque<BlockPosition> wiresToTurnOff = new ArrayDeque();
@@ -41,7 +46,16 @@
int j = unpackPower(i);
IBlockData iblockdata1 = world.getBlockState(blockposition1);
@@ -41,7 +45,16 @@
int j = ExperimentalRedstoneWireEvaluator.unpackPower(i);
BlockState iblockdata1 = world.getBlockState(blockposition1);
- if (iblockdata1.is((Block) this.wireBlock) && !((Integer) iblockdata1.getValue(BlockRedstoneWire.POWER)).equals(j)) {
- if (iblockdata1.is((Block) this.wireBlock) && !((Integer) iblockdata1.getValue(RedStoneWireBlock.POWER)).equals(j)) {
+ // CraftBukkit start
+ int oldPower = iblockdata.getValue(BlockRedstoneWire.POWER);
+ int oldPower = state.getValue(RedStoneWireBlock.POWER);
+ if (oldPower != j) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition1), oldPower, j);
+ world.getCraftServer().getPluginManager().callEvent(event);
@@ -29,4 +28,4 @@
+ // CraftBukkit end
int k = 2;
if (!flag || !flag1) {
if (!blockAdded || !flag1) {

24
paper-server/patches/sources/net/minecraft/world/level/redstone/NeighborUpdater.patch → paper-server/patches/sources/net/minecraft/world/level/redstone/NeighborUpdater.java.patch
View File

@@ -1,11 +1,15 @@
--- a/net/minecraft/world/level/redstone/NeighborUpdater.java
+++ b/net/minecraft/world/level/redstone/NeighborUpdater.java
@@ -13,6 +13,13 @@
@@ -8,11 +8,17 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.IBlockData;
+// CraftBukkit start
+import net.minecraft.server.level.WorldServer;
import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
@@ -14,21 +18,21 @@
public interface NeighborUpdater {
@@ -50,6 +57,17 @@
@@ -50,6 +56,17 @@
static void executeUpdate(World world, IBlockData iblockdata, BlockPosition blockposition, Block block, @Nullable Orientation orientation, boolean flag) {
static void executeUpdate(Level world, BlockState state, BlockPos pos, Block sourceBlock, @Nullable Orientation orientation, boolean notify) {
try {
+ // CraftBukkit start
+ CraftWorld cworld = ((WorldServer) world).getWorld();
+ CraftWorld cworld = ((ServerLevel) world).getWorld();
+ if (cworld != null) {
+ BlockPhysicsEvent event = new BlockPhysicsEvent(CraftBlock.at(world, blockposition), CraftBlockData.fromData(iblockdata));
+ ((WorldServer) world).getCraftServer().getPluginManager().callEvent(event);
+ BlockPhysicsEvent event = new BlockPhysicsEvent(CraftBlock.at(world, pos), CraftBlockData.fromData(state));
+ ((ServerLevel) world).getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+ }
+ // CraftBukkit end
iblockdata.handleNeighborChanged(world, blockposition, block, orientation, flag);
state.handleNeighborChanged(world, pos, sourceBlock, orientation, notify);
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception while updating neighbours");