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
|
2022-10-27 01:09:03 +02:00
|
|
|
index 0000000000000000000000000000000000000000..f89bfeba29e6988db849957a508ca97ff5322242
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/ClientOption.java
|
2022-10-27 01:09:03 +02:00
|
|
|
@@ -0,0 +1,52 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper;
|
|
|
|
+
|
2021-08-14 06:11:12 +02:00
|
|
|
+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);
|
2022-10-27 01:09:03 +02:00
|
|
|
+ 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;
|
|
|
|
+ }
|
|
|
|
+
|
2021-08-14 06:11:12 +02:00
|
|
|
+ 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
|
2022-10-27 01:09:03 +02:00
|
|
|
index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f525d3b057d
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
|
2022-10-27 01:09:03 +02:00
|
|
|
@@ -0,0 +1,134 @@
|
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;
|
2022-10-27 01:09:03 +02:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+
|
|
|
|
+import java.util.Map;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
2022-10-27 01:09:03 +02:00
|
|
|
+ * Called when the player changes their client settings
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
|
|
|
+public class PlayerClientOptionsChangeEvent extends PlayerEvent {
|
|
|
|
+
|
|
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
|
|
+
|
|
|
|
+ private final String locale;
|
|
|
|
+ private final int viewDistance;
|
|
|
|
+ private final ChatVisibility chatVisibility;
|
|
|
|
+ private final boolean chatColors;
|
|
|
|
+ private final SkinParts skinparts;
|
|
|
|
+ private final MainHand mainHand;
|
2022-10-27 01:09:03 +02:00
|
|
|
+ private final boolean allowsServerListings;
|
|
|
|
+ private final boolean textFilteringEnabled;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-10-27 01:09:03 +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;
|
2022-10-27 01:09:03 +02:00
|
|
|
+ this.allowsServerListings = false;
|
|
|
|
+ this.textFilteringEnabled = false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ 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() {
|
|
|
|
+ return locale;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasLocaleChanged() {
|
|
|
|
+ return !locale.equals(player.getClientOption(ClientOption.LOCALE));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public int getViewDistance() {
|
|
|
|
+ return viewDistance;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasViewDistanceChanged() {
|
|
|
|
+ return viewDistance != player.getClientOption(ClientOption.VIEW_DISTANCE);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public ChatVisibility getChatVisibility() {
|
|
|
|
+ return chatVisibility;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasChatVisibilityChanged() {
|
|
|
|
+ return chatVisibility != player.getClientOption(ClientOption.CHAT_VISIBILITY);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasChatColorsEnabled() {
|
|
|
|
+ return chatColors;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasChatColorsEnabledChanged() {
|
|
|
|
+ return chatColors != player.getClientOption(ClientOption.CHAT_COLORS_ENABLED);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public SkinParts getSkinParts() {
|
|
|
|
+ return skinparts;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasSkinPartsChanged() {
|
|
|
|
+ return skinparts.getRaw() != player.getClientOption(ClientOption.SKIN_PARTS).getRaw();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public MainHand getMainHand() {
|
|
|
|
+ return mainHand;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasMainHandChanged() {
|
|
|
|
+ return mainHand != player.getClientOption(ClientOption.MAIN_HAND);
|
|
|
|
+ }
|
|
|
|
+
|
2022-10-27 01:09:03 +02:00
|
|
|
+ public boolean allowsServerListings() {
|
|
|
|
+ return allowsServerListings;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasAllowServerListingsChanged() {
|
|
|
|
+ return allowsServerListings != player.getClientOption(ClientOption.ALLOW_SERVER_LISTINGS);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasTextFilteringEnabled() {
|
|
|
|
+ return textFilteringEnabled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean hasTextFilteringChanged() {
|
|
|
|
+ return textFilteringEnabled != player.getClientOption(ClientOption.TEXT_FILTERING_ENABLED);
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Override
|
|
|
|
+ @NotNull
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
index 5e7fec90713e580801c1e98bccf4adc5e16b9c71..25b86021224e53f5ff10ca21f19cce85e4073c4c 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
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -3073,6 +3073,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2021-06-11 14:02:28 +02:00
|
|
|
void resetCooldown();
|
2023-12-09 00:13:02 +01:00
|
|
|
// 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
|
|
|
|
+ */
|
2023-12-09 00:13:02 +01:00
|
|
|
+ <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
|
2023-12-09 00:13:02 +01:00
|
|
|
public class Spigot extends Entity.Spigot {
|
|
|
|
|