Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
import net.minecraft.resources.ResourceKey;
Expand Down Expand Up @@ -104,6 +106,7 @@
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.entity.StructureBlockEntity;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
Expand All @@ -124,9 +127,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R2.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
Expand Down Expand Up @@ -156,6 +161,7 @@

import javax.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -188,6 +194,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
private final Field serverWorldsField;
private final Method getChunkFutureMethod;
private final Field chunkProviderExecutorField;
private final Constructor<?> blockEntityDataPacketConstructor;
private final Watchdog watchdog;

private static final RandomSource random = RandomSource.create();
Expand Down Expand Up @@ -219,6 +226,11 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
);
chunkProviderExecutorField.setAccessible(true);

blockEntityDataPacketConstructor = ClientboundBlockEntityDataPacket.class.getDeclaredConstructor(
BlockPos.class, BlockEntityType.class, net.minecraft.nbt.CompoundTag.class
);
blockEntityDataPacketConstructor.setAccessible(true);

new PaperweightDataConverters(CraftMagicNumbers.INSTANCE.getDataVersion(), this).buildUnoptimized();

Watchdog watchdog;
Expand Down Expand Up @@ -624,6 +636,25 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
try {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNativeLin(nbtData);

((CraftPlayer) player).getHandle().connection.send((Packet<?>)
blockEntityDataPacketConstructor.newInstance(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getTileEntity().getType(),
vanillaNBT
)
);
} catch (ReflectiveOperationException e) {
logger.log(Level.WARNING, "Failed to construct ClientboundBlockEntityDataPacket", e);
}
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
import net.minecraft.resources.ResourceKey;
Expand Down Expand Up @@ -104,6 +106,7 @@
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.entity.StructureBlockEntity;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
Expand All @@ -124,9 +127,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R3.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
Expand Down Expand Up @@ -156,6 +161,7 @@

import javax.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -188,6 +194,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
private final Field serverWorldsField;
private final Method getChunkFutureMethod;
private final Field chunkProviderExecutorField;
private final Constructor<?> blockEntityDataPacketConstructor;
private final Watchdog watchdog;

private static final RandomSource random = RandomSource.create();
Expand Down Expand Up @@ -219,6 +226,11 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
);
chunkProviderExecutorField.setAccessible(true);

blockEntityDataPacketConstructor = ClientboundBlockEntityDataPacket.class.getDeclaredConstructor(
BlockPos.class, BlockEntityType.class, net.minecraft.nbt.CompoundTag.class
);
blockEntityDataPacketConstructor.setAccessible(true);

new PaperweightDataConverters(CraftMagicNumbers.INSTANCE.getDataVersion(), this).buildUnoptimized();

Watchdog watchdog;
Expand Down Expand Up @@ -623,6 +635,25 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
try {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNativeLin(nbtData);

((CraftPlayer) player).getHandle().connection.send((Packet<?>)
blockEntityDataPacketConstructor.newInstance(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getTileEntity().getType(),
vanillaNBT
)
);
} catch (ReflectiveOperationException e) {
logger.log(Level.WARNING, "Failed to construct ClientboundBlockEntityDataPacket", e);
}
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -633,6 +635,19 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNativeLin(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getTileEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -613,6 +615,19 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNativeLin(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getTileEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -589,6 +591,19 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNative(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getBlockEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -563,6 +565,19 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNativeLin(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getTileEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -577,6 +579,18 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNative(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getBlockEntity().getType(),
vanillaNBT
));
}
@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -598,6 +600,19 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;

CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNative(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getBlockEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
Expand Down Expand Up @@ -596,6 +598,18 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileState tileState, LinCompoundTag nbtData) {
CraftBlockEntityState<?> craftState = (CraftBlockEntityState<?>) tileState;
CompoundTag vanillaNBT = (net.minecraft.nbt.CompoundTag) fromNative(nbtData);

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
craftState.getBlockEntity().getType(),
vanillaNBT
));
}

@Override
public void sendFakeOP(Player player) {
((CraftPlayer) player).getHandle().connection.send(new ClientboundEntityEventPacket(
Expand Down
Loading
Loading