Paper/patches/api/0189-Add-Player-Client-Options-API.patch

251 lines
8.8 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2021-11-27 09:11:43 +01:00
From: MiniDigger <admin@benndorf.dev>
2021-06-11 14:02:28 +02:00
Date: Mon, 20 Jan 2020 21:38:34 +0100
Subject: [PATCH] Add Player Client Options API
diff --git a/src/main/java/com/destroystokyo/paper/ClientOption.java b/src/main/java/com/destroystokyo/paper/ClientOption.java
new file mode 100644
index 0000000000000000000000000000000000000000..f89bfeba29e6988db849957a508ca97ff5322242
2021-06-11 14:02:28 +02:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ClientOption.java
@@ -0,0 +1,52 @@
2021-06-11 14:02:28 +02:00
+package com.destroystokyo.paper;
+
+import net.kyori.adventure.translation.Translatable;
+import net.kyori.adventure.util.Index;
2021-06-11 14:02:28 +02:00
+import org.jetbrains.annotations.NotNull;
+
+import org.bukkit.inventory.MainHand;
+
+public final class ClientOption<T> {
+
+ public static final ClientOption<SkinParts> SKIN_PARTS = new ClientOption<>(SkinParts.class);
+ public static final ClientOption<Boolean> CHAT_COLORS_ENABLED = new ClientOption<>(Boolean.class);
+ public static final ClientOption<ChatVisibility> CHAT_VISIBILITY = new ClientOption<>(ChatVisibility.class);
+ public static final ClientOption<String> LOCALE = new ClientOption<>(String.class);
+ public static final ClientOption<MainHand> MAIN_HAND = new ClientOption<>(MainHand.class);
+ public static final ClientOption<Integer> VIEW_DISTANCE = new ClientOption<>(Integer.class);
+ public static final ClientOption<Boolean> ALLOW_SERVER_LISTINGS = new ClientOption<>(Boolean.class);
+ public static final ClientOption<Boolean> TEXT_FILTERING_ENABLED = new ClientOption<>(Boolean.class);
2021-06-11 14:02:28 +02:00
+
+ private final Class<T> type;
+
+ private ClientOption(@NotNull Class<T> type) {
+ this.type = type;
+ }
+
+ @NotNull
+ public Class<T> getType() {
+ return type;
+ }
+
+ public enum ChatVisibility implements Translatable {
+ FULL("full"),
+ SYSTEM("system"),
+ HIDDEN("hidden"),
+ UNKNOWN("unknown");
+
+ public static Index<String, ChatVisibility> NAMES = Index.create(ChatVisibility.class, chatVisibility -> chatVisibility.name);
+ private final String name;
+
+ ChatVisibility(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public @NotNull String translationKey() {
+ if (this == UNKNOWN) {
+ throw new UnsupportedOperationException(this.name + " doesn't have a translation key");
+ }
+ return "options.chat.visibility." + this.name;
+ }
2021-06-11 14:02:28 +02:00
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/SkinParts.java b/src/main/java/com/destroystokyo/paper/SkinParts.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a0c39405d4fbed457787e3c6ded4cc6591bc8c2
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/SkinParts.java
@@ -0,0 +1,20 @@
+package com.destroystokyo.paper;
+
+public interface SkinParts {
+
+ boolean hasCapeEnabled();
+
+ boolean hasJacketEnabled();
+
+ boolean hasLeftSleeveEnabled();
+
+ boolean hasRightSleeveEnabled();
+
+ boolean hasLeftPantsEnabled();
+
+ boolean hasRightPantsEnabled();
+
+ boolean hasHatsEnabled();
+
+ int getRaw();
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
new file mode 100644
2024-02-01 10:15:57 +01:00
index 0000000000000000000000000000000000000000..1757055d821d9ec7c728aa6c1b52fa6aea591ae5
2021-06-11 14:02:28 +02:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
2024-02-01 10:15:57 +01:00
@@ -0,0 +1,136 @@
2021-06-11 14:02:28 +02:00
+package com.destroystokyo.paper.event.player;
+
+import com.destroystokyo.paper.ClientOption;
+import com.destroystokyo.paper.ClientOption.ChatVisibility;
+import com.destroystokyo.paper.SkinParts;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.MainHand;
2024-02-01 10:15:57 +01:00
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
2021-06-11 14:02:28 +02:00
+
+/**
+ * Called when the player changes their client settings
2021-06-11 14:02:28 +02:00
+ */
+public class PlayerClientOptionsChangeEvent extends PlayerEvent {
+
2024-02-01 10:15:57 +01:00
+ private static final HandlerList HANDLER_LIST = new HandlerList();
2021-06-11 14:02:28 +02:00
+
+ private final String locale;
+ private final int viewDistance;
+ private final ChatVisibility chatVisibility;
+ private final boolean chatColors;
+ private final SkinParts skinparts;
+ private final MainHand mainHand;
+ private final boolean allowsServerListings;
+ private final boolean textFilteringEnabled;
2021-06-11 14:02:28 +02:00
+
+ @Deprecated
2021-06-11 14:02:28 +02:00
+ public PlayerClientOptionsChangeEvent(@NotNull Player player, @NotNull String locale, int viewDistance, @NotNull ChatVisibility chatVisibility, boolean chatColors, @NotNull SkinParts skinParts, @NotNull MainHand mainHand) {
+ super(player);
+ this.locale = locale;
+ this.viewDistance = viewDistance;
+ this.chatVisibility = chatVisibility;
+ this.chatColors = chatColors;
+ this.skinparts = skinParts;
+ this.mainHand = mainHand;
+ this.allowsServerListings = false;
+ this.textFilteringEnabled = false;
+ }
+
2024-02-01 10:15:57 +01:00
+ @ApiStatus.Internal
+ public PlayerClientOptionsChangeEvent(@NotNull Player player, @NotNull Map<ClientOption<?>, ?> options) {
+ super(player);
+
+ this.locale = (String) options.get(ClientOption.LOCALE);
+ this.viewDistance = (int) options.get(ClientOption.VIEW_DISTANCE);
+ this.chatVisibility = (ChatVisibility) options.get(ClientOption.CHAT_VISIBILITY);
+ this.chatColors = (boolean) options.get(ClientOption.CHAT_COLORS_ENABLED);
+ this.skinparts = (SkinParts) options.get(ClientOption.SKIN_PARTS);
+ this.mainHand = (MainHand) options.get(ClientOption.MAIN_HAND);
+ this.allowsServerListings = (boolean) options.get(ClientOption.ALLOW_SERVER_LISTINGS);
+ this.textFilteringEnabled = (boolean) options.get(ClientOption.TEXT_FILTERING_ENABLED);
2021-06-11 14:02:28 +02:00
+ }
+
+ @NotNull
+ public String getLocale() {
2024-02-01 10:15:57 +01:00
+ return this.locale;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasLocaleChanged() {
2024-02-01 10:15:57 +01:00
+ return !this.locale.equals(this.player.getClientOption(ClientOption.LOCALE));
2021-06-11 14:02:28 +02:00
+ }
+
+ public int getViewDistance() {
2024-02-01 10:15:57 +01:00
+ return this.viewDistance;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasViewDistanceChanged() {
2024-02-01 10:15:57 +01:00
+ return this.viewDistance != this.player.getClientOption(ClientOption.VIEW_DISTANCE);
2021-06-11 14:02:28 +02:00
+ }
+
+ @NotNull
+ public ChatVisibility getChatVisibility() {
2024-02-01 10:15:57 +01:00
+ return this.chatVisibility;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasChatVisibilityChanged() {
2024-02-01 10:15:57 +01:00
+ return this.chatVisibility != this.player.getClientOption(ClientOption.CHAT_VISIBILITY);
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasChatColorsEnabled() {
2024-02-01 10:15:57 +01:00
+ return this.chatColors;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasChatColorsEnabledChanged() {
2024-02-01 10:15:57 +01:00
+ return this.chatColors != this.player.getClientOption(ClientOption.CHAT_COLORS_ENABLED);
2021-06-11 14:02:28 +02:00
+ }
+
+ @NotNull
+ public SkinParts getSkinParts() {
2024-02-01 10:15:57 +01:00
+ return this.skinparts;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasSkinPartsChanged() {
2024-02-01 10:15:57 +01:00
+ return this.skinparts.getRaw() != this.player.getClientOption(ClientOption.SKIN_PARTS).getRaw();
2021-06-11 14:02:28 +02:00
+ }
+
+ @NotNull
+ public MainHand getMainHand() {
2024-02-01 10:15:57 +01:00
+ return this.mainHand;
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean hasMainHandChanged() {
2024-02-01 10:15:57 +01:00
+ return this.mainHand != this.player.getClientOption(ClientOption.MAIN_HAND);
2021-06-11 14:02:28 +02:00
+ }
+
+ public boolean allowsServerListings() {
2024-02-01 10:15:57 +01:00
+ return this.allowsServerListings;
+ }
+
+ public boolean hasAllowServerListingsChanged() {
2024-02-01 10:15:57 +01:00
+ return this.allowsServerListings != this.player.getClientOption(ClientOption.ALLOW_SERVER_LISTINGS);
+ }
+
+ public boolean hasTextFilteringEnabled() {
2024-02-01 10:15:57 +01:00
+ return this.textFilteringEnabled;
+ }
+
+ public boolean hasTextFilteringChanged() {
2024-02-01 10:15:57 +01:00
+ return this.textFilteringEnabled != this.player.getClientOption(ClientOption.TEXT_FILTERING_ENABLED);
+ }
+
2021-06-11 14:02:28 +02:00
+ @Override
+ @NotNull
+ public HandlerList getHandlers() {
2024-02-01 10:15:57 +01:00
+ return HANDLER_LIST;
2021-06-11 14:02:28 +02:00
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
2024-02-01 10:15:57 +01:00
+ return HANDLER_LIST;
2021-06-11 14:02:28 +02:00
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
2024-04-23 19:02:08 +02:00
index 33547e9e3f8f7c906a5d91b75eb62327cc1f2a3a..7429666fd1af4f4a924cf93572df5b826782af05 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2024-04-23 19:02:08 +02:00
@@ -3282,6 +3282,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2021-06-11 14:02:28 +02:00
void resetCooldown();
// Paper end - attack cooldown API
+ // Paper start - client option API
2021-06-11 14:02:28 +02:00
+ /**
+ * @return the client option value of the player
+ */
+ <T> @NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption<T> option);
+ // Paper end - client option API
+
2021-06-11 14:02:28 +02:00
// Spigot start
public class Spigot extends Entity.Spigot {