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 @@ -33,6 +33,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -82,6 +83,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -126,6 +128,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -657,6 +660,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -670,6 +674,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(Identifier.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -33,6 +33,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -127,6 +129,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -637,6 +640,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -650,6 +654,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(ResourceLocation.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -33,6 +33,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -127,6 +129,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -635,6 +638,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -648,6 +652,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(ResourceLocation.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -33,6 +33,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -127,6 +129,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -657,6 +660,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -670,6 +674,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(ResourceLocation.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -33,6 +33,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -126,6 +128,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -656,6 +659,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -669,6 +673,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(ResourceLocation.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -32,6 +32,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -126,6 +128,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -674,6 +677,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -687,6 +691,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(Identifier.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

@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 @@ -32,6 +32,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
Expand Down Expand Up @@ -83,6 +84,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.ByteArrayTag;
import net.minecraft.nbt.ByteTag;
Expand Down Expand Up @@ -126,6 +128,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.chunk.ChunkAccess;
Expand Down Expand Up @@ -679,6 +682,7 @@ yield new EnumProperty(state.getName(),
return properties;
}

@SuppressWarnings("deprecation") // -Werror
@Override
public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) {
var structureBlock = new StructureBlockEntity(
Expand All @@ -692,6 +696,21 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData)
));
}

@Override
public void sendFakeNBT(Player player, BlockVector3 pos, TileEntityBlock tileEntityBlock, LinCompoundTag nbtData) {
BlockEntityType<?> nativeBlockEntityType = BuiltInRegistries.BLOCK_ENTITY_TYPE
.getValue(Identifier.parse(tileEntityBlock.getNbtId()));
if (nativeBlockEntityType == null) {
return;
}

((CraftPlayer) player).getHandle().connection.send(new ClientboundBlockEntityDataPacket(
new BlockPos(pos.x(), pos.y(), pos.z()),
nativeBlockEntityType,
(net.minecraft.nbt.CompoundTag) fromNative(nbtData)
));
}

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