From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Tue, 21 Sep 2021 23:54:25 +0100 Subject: [PATCH] Client Visibility Settings diff --git a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java index 33ca4c2110673dee34b66c8d05ee83c4df828f2e..af31a3b9d0308e84c675e570ca7229a6171a0b7b 100644 --- a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +++ b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java @@ -31,7 +31,7 @@ public class ClientboundLevelChunkPacketData { private static final int TWO_MEGABYTES = 2097152; private final Map heightmaps; private final byte[] buffer; - private final List blockEntitiesData; + public final List blockEntitiesData; // Sakura - client visibility settings; private -> public; ATs for some reason don't work here // Paper start - Handle oversized block entities in chunks private final java.util.List> extraPackets = new java.util.ArrayList<>(); private static final int BLOCK_ENTITY_LIMIT = Integer.getInteger("Paper.excessiveTELimit", 750); @@ -153,7 +153,7 @@ public class ClientboundLevelChunkPacketData { return this.heightmaps; } - static class BlockEntityInfo { + public static class BlockEntityInfo { // Sakura - client visibility settings; package-protected -> public; ATs for some reason don't work here public static final StreamCodec STREAM_CODEC = StreamCodec.ofMember( ClientboundLevelChunkPacketData.BlockEntityInfo::write, ClientboundLevelChunkPacketData.BlockEntityInfo::new ); @@ -162,7 +162,7 @@ public class ClientboundLevelChunkPacketData { ); final int packedXZ; final int y; - final BlockEntityType type; + public final BlockEntityType type; // Sakura - client visibility settings; private -> public; ATs for some reason don't work here @Nullable final CompoundTag tag; diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java index 07f44bb61487671dd7df4524e7c65e101a1fc5b5..cf2b2794a2979d206ae9348498e4d8fadc16bc66 100644 --- a/net/minecraft/server/level/ChunkMap.java +++ b/net/minecraft/server/level/ChunkMap.java @@ -173,6 +173,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.handleLegacyStructureIndex(pos); } // Paper end - rewrite chunk system + private final it.unimi.dsi.fastutil.longs.Long2IntMap minimalEntities; // Sakura - client visibility settings; minimal tnt/sand public ChunkMap( ServerLevel level, @@ -235,6 +236,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider ); this.setServerViewDistance(serverViewDistance); this.worldGenContext = new WorldGenContext(level, generator, structureManager, this.lightEngine, null, this::setChunkUnsaved); // Paper - rewrite chunk system + // Sakura start - client visibility settings; minimal tnt/sand + this.minimalEntities = new it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap(); + this.minimalEntities.defaultReturnValue(Integer.MIN_VALUE); + // Sakura end - client visibility settings; minimal tnt/sand } private void setChunkUnsaved(ChunkPos chunkPos) { @@ -1024,6 +1029,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider tracker.serverEntity.sendChanges(); } } + + this.minimalEntities.clear(); // Sakura - client visibility settings; minimal tnt/sand } // Paper end - optimise entity tracker @@ -1263,6 +1270,32 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return !this.seenBy.isEmpty(); } // Paper end - optimise entity tracker + // Sakura start - client visibility settings; entity visibility + private boolean checkEntityVisibility(final ServerPlayer player) { + final Entity entity = this.entity; + final me.samsuik.sakura.player.visibility.VisibilitySettings settings = player.visibilitySettings; + if (!settings.playerModified() || !(entity.isPrimedTNT || entity.isFallingBlock)) { + return true; + } + + final me.samsuik.sakura.player.visibility.VisibilityType type = entity.isPrimedTNT + ? me.samsuik.sakura.player.visibility.VisibilityTypes.TNT + : me.samsuik.sakura.player.visibility.VisibilityTypes.SAND; + final me.samsuik.sakura.player.visibility.VisibilityState state = settings.get(type); + + if (state == me.samsuik.sakura.player.visibility.VisibilityState.MINIMAL) { + final long key = entity.blockPosition().asLong() ^ entity.getType().hashCode(); + final long visibleEntity = ChunkMap.this.minimalEntities.get(key); + if (visibleEntity != Integer.MIN_VALUE) { + return entity.getId() == visibleEntity; + } else { + ChunkMap.this.minimalEntities.put(key, entity.getId()); + } + } + + return state != me.samsuik.sakura.player.visibility.VisibilityState.OFF; + } + // Sakura end - client visibility settings; entity visibility public TrackedEntity(final Entity entity, final int range, final int updateInterval, final boolean trackDelta) { this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, updateInterval, trackDelta, this, this.seenBy); // Paper @@ -1347,6 +1380,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } flag = flag && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z); // Paper end - Configurable entity tracking range by Y + flag = flag && this.checkEntityVisibility(player); // Sakura start - client visibility settings; entity visibility // CraftBukkit start - respect vanish API if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits flag = false; diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java index 0a470f95e6c5399b92bf06f3c37fe31d9667acea..ca98972697fe2961402bea4cfb0cf86ea80a92f0 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -591,6 +591,22 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.playerTickingChunks.remove((LevelChunk)chunkHolder.getCurrentChunk()); } // Paper end - chunk tick iteration + // Sakura start - client visibility settings + public final LongSet explosionPositions = new it.unimi.dsi.fastutil.longs.LongOpenHashSet(); + + public final boolean checkExplosionVisibility(final Vec3 position, final ServerPlayer player) { + final me.samsuik.sakura.player.visibility.VisibilitySettings settings = player.visibilitySettings; + if (settings.isDisabled(me.samsuik.sakura.player.visibility.VisibilityTypes.EXPLOSIONS)) { + return false; + } else if (settings.isToggled(me.samsuik.sakura.player.visibility.VisibilityTypes.EXPLOSIONS)) { + final BlockPos blockPosition = BlockPos.containing(position); + final long encodedPosition = blockPosition.asLong(); + return this.explosionPositions.add(encodedPosition); + } + + return true; + } + // Sakura end - client visibility settings public ServerLevel( MinecraftServer server, @@ -699,6 +715,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler); // Paper end - rewrite chunk system this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit + this.levelTickScheduler.repeatingTask(this.explosionPositions::clear, 0); // Sakura - client visibility settings } // Paper start @@ -1938,7 +1955,20 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe for (ServerPlayer serverPlayer : this.players) { if (serverPlayer.distanceToSqr(vec3) < 4096.0) { Optional optional = Optional.ofNullable(serverExplosion.getHitPlayers().get(serverPlayer)); - serverPlayer.connection.send(new ClientboundExplodePacket(vec3, radius, i, optional, particleOptions, explosionSound, blockParticles)); + // Sakura start - client visibility settings; let players toggle explosion particles + ParticleOptions particle = particleOptions; + Vec3 position = vec3; + if (!this.checkExplosionVisibility(vec3, serverPlayer)) { + // todo: send knockback through PlayerPositionPacket + if (this.paperConfig().environment.disableExplosionKnockback) { + continue; + } else { + position = new Vec3(0.0, -1024.0, 0.0); + particle = net.minecraft.core.particles.ParticleTypes.SMOKE; + } + } + serverPlayer.connection.send(new ClientboundExplodePacket(position, radius, i, optional, particle, explosionSound, blockParticles)); + // Sakura end - client visibility settings; let players toggle explosion particles } } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java index ae5a2712796a1dd7ac3e3259d4111f01db31c219..3b2b22d709ec924a03134e0118541462a4d966d4 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -474,6 +474,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc return this.viewDistanceHolder; } // Paper end - rewrite chunk system + public final me.samsuik.sakura.player.visibility.PlayerVisibilitySettings visibilitySettings = new me.samsuik.sakura.player.visibility.PlayerVisibilitySettings(); // Sakura - client visibility settings public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) { super(level, gameProfile); diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java index c6db2c96db96453daaf49779f588f75f7c3d3d60..fd08d04c13a4064c658e0aad436b48831316129b 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -58,6 +58,60 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack public @Nullable String playerBrand; public final java.util.Set pluginMessagerChannels; // Paper end - retain certain values + // Sakura start - client visibility settings + private boolean filterExtraPackets(final Packet packet, final net.minecraft.server.level.ServerPlayer player) { + final me.samsuik.sakura.player.visibility.VisibilitySettings settings = player.visibilitySettings; + if (settings.isToggled(me.samsuik.sakura.player.visibility.VisibilityTypes.SPAWNERS)) { + if (packet instanceof net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket bedPacket) { + return bedPacket.getType() == net.minecraft.world.level.block.entity.BlockEntityType.MOB_SPAWNER; + } + } + + return false; + } + + private boolean filterOrModifyPacket(final Packet packet, final net.minecraft.server.level.ServerPlayer player) { + final me.samsuik.sakura.player.visibility.VisibilitySettings settings = player.visibilitySettings; + final java.util.List> extraPackets = packet.getExtraPackets(); + if (extraPackets != null) { + // block entity data is sent as an extra packet + extraPackets.removeIf(extraPacket -> this.filterExtraPackets(extraPacket, player)); + } + + if (settings.isToggled(me.samsuik.sakura.player.visibility.VisibilityTypes.SPAWNERS)) { + net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData chunkData = null; + if (packet instanceof net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket chunkPacket) { + chunkData = chunkPacket.getChunkData(); + } else if (packet instanceof net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData chunkPacket) { + chunkData = chunkPacket; + } + + if (chunkData != null) { + chunkData.blockEntitiesData.removeIf(blockEntityInfo -> blockEntityInfo.type == net.minecraft.world.level.block.entity.BlockEntityType.MOB_SPAWNER); + } + + if (packet instanceof net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket bedPacket && bedPacket.getType() == net.minecraft.world.level.block.entity.BlockEntityType.MOB_SPAWNER) { + return true; + } + } + + if (packet instanceof net.minecraft.network.protocol.game.ClientboundBlockEventPacket bePacket) { + if (settings.isToggled(me.samsuik.sakura.player.visibility.VisibilityTypes.PISTONS)) { + return bePacket.getBlock() instanceof net.minecraft.world.level.block.piston.PistonBaseBlock; + } + } + + return false; + } + + private net.minecraft.server.level.ServerPlayer getPlayer() { + if (this instanceof ServerGamePacketListenerImpl gamePacketListener) { + return gamePacketListener.getPlayer(); + } else { + return this.connection.getPlayer(); + } + } + // Sakura end - client visibility settings public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) { this.server = server; @@ -318,6 +372,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } else if (packet instanceof net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket defaultSpawnPositionPacket && this instanceof ServerGamePacketListenerImpl serverGamePacketListener) { serverGamePacketListener.player.compassTarget = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(defaultSpawnPositionPacket.respawnData().pos(), serverGamePacketListener.getPlayer().level()); } + // Sakura start - client visibility settings + final net.minecraft.server.level.ServerPlayer player = this.getPlayer(); + if (player != null && player.visibilitySettings.playerModified() && this.filterOrModifyPacket(packet, player)) { + return; + } + // Sakura end - client visibility settings // CraftBukkit end if (packet.isTerminal()) { this.close(); diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java index ef7d44ea1c1582bbf1d544819825778c414fe40d..2c1539826e14698d65a519e2474cbb3a41ed24fa 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3222,6 +3222,7 @@ public class ServerGamePacketListenerImpl event.setCancelled(cancelled); net.minecraft.world.inventory.AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224 + me.samsuik.sakura.player.gui.FeatureGui.clickEvent(event); // Sakura - client visibility settings this.cserver.getPluginManager().callEvent(event); if (this.player.containerMenu != oldContainer) { this.player.containerMenu.resumeRemoteUpdates(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java index 51f970f8e5fcb984e3a62e2322a794ba03325938..5f105b12ab407e6360e23a9aab2b502ced01c996 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -534,6 +534,10 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } // Paper end - optimise entity tracker public boolean pushedByFluid = true; // Sakura - entity pushed by fluid api + // Sakura start - client visibility settings + public boolean isPrimedTNT; + public boolean isFallingBlock; + // Sakura end - client visibility settings public Entity(EntityType type, Level level) { this.type = type; diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java index 8003dc1c4ecc9b69d92cf0441fe41e3ef8df49c2..85bebec21261e71b82a0b9c02e1c5edd8bd4cde6 100644 --- a/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -79,6 +79,7 @@ public class FallingBlockEntity extends Entity { super(type, level); this.dropItem = level.sakuraConfig().cannons.sand.dropItems; // Sakura - configure falling blocks dropping items this.heightParity = level.sakuraConfig().cannons.mechanics.fallingBlockParity; // Sakura - configure cannon mechanics + this.isFallingBlock = true; // Sakura - client visibility settings } public FallingBlockEntity(Level level, double x, double y, double z, BlockState state) { diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java index 18162042ee54e54bc4539a7a01a1fc88cc9b3f3a..71071899443fdb02beb0321f271430c732178e26 100644 --- a/net/minecraft/world/entity/item/PrimedTnt.java +++ b/net/minecraft/world/entity/item/PrimedTnt.java @@ -63,6 +63,7 @@ public class PrimedTnt extends Entity implements TraceableEntity { public PrimedTnt(EntityType type, Level level) { super(type, level); this.blocksBuilding = true; + this.isPrimedTNT = true; // Sakura - client visibility settings } public PrimedTnt(Level level, double x, double y, double z, @Nullable LivingEntity owner) {