Skip to content

Commit

Permalink
Player helper cleanup (#2503)
Browse files Browse the repository at this point in the history 
* Initial update/cleanup

* Minor cleanups

* Make `setBossBarTitle` abstract

* Use `ServerPlayer#serverLevel`

* `climbable` -> `climbableBlocks`
  • Loading branch information
@tal5
tal5 committed Jul 12, 2023
1 parent f2ac786 commit 78a8d1f
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 61 deletions.
38 changes: 10 additions & 28 deletions plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/PlayerHelper.java
View file
Expand Up @@ -20,17 +20,11 @@ public abstract class PlayerHelper {

public abstract void stopSound(Player player, String sound, SoundCategory category); // TODO: remove the category param once 1.19 is the minimum version

public FakeEntity sendEntitySpawn(List<PlayerTag> players, DenizenEntityType entityType, LocationTag location, ArrayList<Mechanism> mechanisms, int customId, UUID customUUID, boolean autoTrack) {
throw new UnsupportedOperationException();
}
public abstract FakeEntity sendEntitySpawn(List<PlayerTag> players, DenizenEntityType entityType, LocationTag location, ArrayList<Mechanism> mechanisms, int customId, UUID customUUID, boolean autoTrack);

public void deTrackEntity(Player player, Entity entity) {
throw new UnsupportedOperationException();
}
public abstract void deTrackEntity(Player player, Entity entity);

public void sendEntityDestroy(Player player, Entity entity) {
throw new UnsupportedOperationException();
}
public abstract void sendEntityDestroy(Player player, Entity entity);

public abstract int getFlyKickCooldown(Player player);

Expand Down Expand Up @@ -67,35 +61,23 @@ public enum SkinLayer {
RIGHT_PANTS(5),
RIGHT_SLEEVE(3);

public int flag;
public final int flag;

SkinLayer(int offset) {
this.flag = 1 << offset;
}
}
public byte getSkinLayers(Player player) {
throw new UnsupportedOperationException();
}
public abstract byte getSkinLayers(Player player);

public void setSkinLayers(Player player, byte flags) {
throw new UnsupportedOperationException();
}
public abstract void setSkinLayers(Player player, byte flags);

public void setBossBarTitle(BossBar bar, String title) {
bar.setTitle(title);
}
public abstract void setBossBarTitle(BossBar bar, String title);

public boolean getSpawnForced(Player player) {
throw new UnsupportedOperationException();
}
public abstract boolean getSpawnForced(Player player);

public void setSpawnForced(Player player, boolean forced) {
throw new UnsupportedOperationException();
}
public abstract void setSpawnForced(Player player, boolean forced);

public long getLastActionTime(Player player) {
throw new UnsupportedOperationException();
}
public abstract long getLastActionTime(Player player);

public enum ProfileEditMode { ADD, UPDATE_DISPLAY, UPDATE_LATENCY, UPDATE_GAME_MODE, UPDATE_LISTED }

Expand Down
48 changes: 15 additions & 33 deletions v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/helpers/PlayerHelperImpl.java
View file
Expand Up @@ -78,18 +78,7 @@ public class PlayerHelperImpl extends PlayerHelper {
public static final Field VEHICLE_FLY_TICKS = ReflectionHelper.getFields(ServerGamePacketListenerImpl.class).get(ReflectionMappingsInfo.ServerGamePacketListenerImpl_aboveGroundVehicleTickCount, int.class);
public static final MethodHandle PLAYER_RESPAWNFORCED_SETTER = ReflectionHelper.getFinalSetter(ServerPlayer.class, ReflectionMappingsInfo.ServerPlayer_respawnForced, boolean.class);

public static final EntityDataAccessor<Byte> ENTITY_HUMAN_SKINLAYERS_DATAWATCHER;

static {
EntityDataAccessor<Byte> skinlayers = null;
try {
skinlayers = (EntityDataAccessor<Byte>) ReflectionHelper.getFields(net.minecraft.world.entity.player.Player.class).get(ReflectionMappingsInfo.Player_DATA_PLAYER_MODE_CUSTOMISATION).get(null);
}
catch (Throwable ex) {
ex.printStackTrace();
}
ENTITY_HUMAN_SKINLAYERS_DATAWATCHER = skinlayers;
}
public static final EntityDataAccessor<Byte> PLAYER_DATA_ACCESSOR_SKINLAYERS = ReflectionHelper.getFieldValue(net.minecraft.world.entity.player.Player.class, ReflectionMappingsInfo.Player_DATA_PLAYER_MODE_CUSTOMISATION, null);

@Override
public void stopSound(Player player, String sound, SoundCategory category) {
Expand All @@ -99,8 +88,7 @@ public void stopSound(Player player, String sound, SoundCategory category) {
@Override
public void deTrackEntity(Player player, Entity entity) {
ServerPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
ServerLevel world = (ServerLevel) nmsPlayer.level();
ChunkMap.TrackedEntity tracker = world.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
ChunkMap.TrackedEntity tracker = nmsPlayer.serverLevel().getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
if (tracker == null) {
if (NMSHandler.debugPackets) {
DenizenNetworkManagerImpl.doPacketOutput("Failed to de-track entity " + entity.getEntityId() + " for " + player.getName() + ": tracker null");
Expand All @@ -111,10 +99,7 @@ public void deTrackEntity(Player player, Entity entity) {
tracker.removePlayer(nmsPlayer);
}

public static class TrackerData {
public PlayerTag player;
public ServerEntity tracker;
}
public record TrackerData(PlayerTag player, ServerEntity tracker) {}

@Override
public FakeEntity sendEntitySpawn(List<PlayerTag> players, DenizenEntityType entityType, LocationTag location, ArrayList<Mechanism> mechanisms, int customId, UUID customUUID, boolean autoTrack) {
Expand Down Expand Up @@ -181,9 +166,7 @@ else if (mechanism.matches("skin_blob")) {
ServerGamePacketListenerImpl conn = nmsPlayer.connection;
final ServerEntity tracker = new ServerEntity(world.getHandle(), nmsEntity, 1, true, conn::send, Collections.singleton(nmsPlayer.connection));
tracker.addPairing(nmsPlayer);
final TrackerData data = new TrackerData();
data.player = player;
data.tracker = tracker;
final TrackerData data = new TrackerData(player, tracker);
trackers.add(data);
if (autoTrack) {
new BukkitRunnable() {
Expand Down Expand Up @@ -237,8 +220,8 @@ public void sendEntityDestroy(Player player, Entity entity) {
@Override
public int getFlyKickCooldown(Player player) {
ServerGamePacketListenerImpl conn = ((CraftPlayer) player).getHandle().connection;
if (conn instanceof AbstractListenerPlayInImpl) {
conn = ((AbstractListenerPlayInImpl) conn).oldListener;
if (conn instanceof AbstractListenerPlayInImpl denizenListener) {
conn = denizenListener.oldListener;
}
try {
return Math.max(80 - Math.max(FLY_TICKS.getInt(conn), VEHICLE_FLY_TICKS.getInt(conn)), 0);
Expand All @@ -253,8 +236,8 @@ public int getFlyKickCooldown(Player player) {
public void setFlyKickCooldown(Player player, int ticks) {
ticks = 80 - ticks;
ServerGamePacketListenerImpl conn = ((CraftPlayer) player).getHandle().connection;
if (conn instanceof AbstractListenerPlayInImpl) {
conn = ((AbstractListenerPlayInImpl) conn).oldListener;
if (conn instanceof AbstractListenerPlayInImpl denizenListener) {
conn = denizenListener.oldListener;
}
try {
FLY_TICKS.setInt(conn, ticks);
Expand Down Expand Up @@ -305,8 +288,7 @@ public void setTemporaryOp(Player player, boolean op) {
GameProfile profile = ((CraftPlayer) player).getProfile();
ServerOpList opList = server.getPlayerList().getOps();
if (op) {
int permLevel = server.getOperatorUserPermissionLevel();
opList.add(new ServerOpListEntry(profile, permLevel, opList.canBypassPlayerLimit(profile)));
opList.add(new ServerOpListEntry(profile, server.getOperatorUserPermissionLevel(), opList.canBypassPlayerLimit(profile)));
}
else {
opList.remove(profile);
Expand Down Expand Up @@ -357,12 +339,12 @@ public String getPlayerBrand(Player player) {

@Override
public byte getSkinLayers(Player player) {
return ((CraftPlayer) player).getHandle().getEntityData().get(ENTITY_HUMAN_SKINLAYERS_DATAWATCHER);
return ((CraftPlayer) player).getHandle().getEntityData().get(PLAYER_DATA_ACCESSOR_SKINLAYERS);
}

@Override
public void setSkinLayers(Player player, byte flags) {
((CraftPlayer) player).getHandle().getEntityData().set(ENTITY_HUMAN_SKINLAYERS_DATAWATCHER, flags);
((CraftPlayer) player).getHandle().getEntityData().set(PLAYER_DATA_ACCESSOR_SKINLAYERS, flags);
}

@Override
Expand Down Expand Up @@ -421,10 +403,10 @@ public void sendPlayerInfoRemovePacket(Player player, UUID id) {
public void sendClimbableMaterials(Player player, List<Material> materials) {
Map<ResourceKey<? extends Registry<?>>, TagNetworkSerialization.NetworkPayload> packetInput = TagNetworkSerialization.serializeTagsToNetwork(((CraftServer) Bukkit.getServer()).getServer().registries());
Map<ResourceLocation, IntList> tags = ReflectionHelper.getFieldValue(TagNetworkSerialization.NetworkPayload.class, ReflectionMappingsInfo.TagNetworkSerializationNetworkPayload_tags, packetInput.get(BuiltInRegistries.BLOCK.key()));
IntList intList = tags.get(BlockTags.CLIMBABLE.location());
intList.clear();
IntList climbableBlocks = tags.get(BlockTags.CLIMBABLE.location());
climbableBlocks.clear();
for (Material material : materials) {
intList.add(BuiltInRegistries.BLOCK.getId(CraftMagicNumbers.getBlock(material)));
climbableBlocks.add(BuiltInRegistries.BLOCK.getId(CraftMagicNumbers.getBlock(material)));
}
PacketHelperImpl.send(player, new ClientboundUpdateTagsPacket(packetInput));
}
Expand All @@ -443,7 +425,7 @@ public void refreshPlayer(Player player) {
nmsWorld.isFlat(),
ClientboundRespawnPacket.KEEP_ALL_DATA,
nmsPlayer.getLastDeathLocation(),
nmsPlayer.portalCooldown));
nmsPlayer.getPortalCooldown()));
nmsPlayer.connection.teleport(player.getLocation());
if (nmsPlayer.isPassenger()) {
nmsPlayer.connection.send(new ClientboundSetPassengersPacket(nmsPlayer.getVehicle()));
Expand Down

0 comments on commit 78a8d1f

Please sign in to comment.