mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-22 08:19:26 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2ef589c okaaay let's go PaperMC/Paper@d0028b7 you saw nothing PaperMC/Paper@e080b20 Bundles are no longer experimental (thanks lynx) PaperMC/Paper@d280061 First batch of server patches PaperMC/Paper@3585434 first 100! PaperMC/Paper@6b27267 oops PaperMC/Paper@152e82c Some work PaperMC/Paper@9e92fed More work? PaperMC/Paper@f1649d7 Work it PaperMC/Paper@9d63c81 Work work work PaperMC/Paper@dc5af48 Breakpoint before projectile mess PaperMC/Paper@7c04a31 Update projectile launch to 1.21.2 PaperMC/Paper@a400929 242 PaperMC/Paper@8851d25 Fluid Flowing ifLoaded patch PaperMC/Paper@f677393 Skip Improve-exact-choice-recipe-ingredients for now PaperMC/Paper@5e262c1 298 PaperMC/Paper@aa37f72 Patches PaperMC/Paper@af125d2 Patch PaperMC/Paper@6bfc6db Patch PaperMC/Paper@09b625e 400 PaperMC/Paper@1f8b537 440 PaperMC/Paper@f5177aa Some more work PaperMC/Paper@2810f50 503 PaperMC/Paper@0bb4d1d 553 PaperMC/Paper@4db2503 Work work work work PaperMC/Paper@cbf6416 A bunch of patches PaperMC/Paper@6456b5d A bunch more 637 PaperMC/Paper@cb79de8 moooore PaperMC/Paper@1dc1425 MOOOOORE PaperMC/Paper@d52e2d2 MOOOOOOOORE PaperMC/Paper@4baf9ab MOOOOOOOOOOORE PaperMC/Paper@dd87f9f fix gruesome copyright violation PaperMC/Paper@5a6011c MOOOOOOOOOOOOOORE PaperMC/Paper@5d19e2b good luck americans PaperMC/Paper@457d035 Patches, patches, patches PaperMC/Paper@80de05f Patch me this, patch me that PaperMC/Paper@26f7b4c Patch PaperMC/Paper@89bf081 Patch PaperMC/Paper@7d4cce9 Patch PaperMC/Paper@b237528 Readd wrongly removed diff PaperMC/Paper@fc05430 963 PaperMC/Paper@9047541 Upstream update PaperMC/Paper@d67e55d Checkpoint PaperMC/Paper@fe142cd Anti Xray PaperMC/Paper@35e01d7 Update work 989 PaperMC/Paper@7616ebc 1000 PaperMC/Paper@6a31574 1020 PaperMC/Paper@227caac Wrong attempt at Tag lifecycle PaperMC/Paper@afbb0d8 1037 PaperMC/Paper@b06e0b0 Work on compile errors PaperMC/Paper@9c83387 Compile issues 1 PaperMC/Paper@0f011a3 Some more compile issues PaperMC/Paper@6fb86bb Compiler issues v2 PaperMC/Paper@918ca96 Compiler issues v3 PaperMC/Paper@bb124f4 Compiler issues v4 PaperMC/Paper@0a8fd78 Compiler issue v5 PaperMC/Paper@e19f484 Test compile fixes PaperMC/Paper@3518974 fix some issues PaperMC/Paper@6df21e6 Start Moonrise update PaperMC/Paper@47258a7 Move common diffs to MCUtils PaperMC/Paper@ecf4d97 Begin fixing issues PaperMC/Paper@8e569ba Merge patches PaperMC/Paper@3b31621 Implement config hooks in PaperHooks PaperMC/Paper@e9c58f5 Implement chunk tick iteration optimisations PaperMC/Paper@2a95ad1 Implement explosion optimisations PaperMC/Paper@16d2c9d Implement Starlight PaperMC/Paper@3d7b570 Implement chunk system PaperMC/Paper@1d341df Fix some compile errors from patches PaperMC/Paper@6daedd7 Prepare rebase PaperMC/Paper@75e3409 Complete rebase, start review PaperMC/Paper@f1a11a6 Finish mixin diff review PaperMC/Paper@a911f4a Prepare rebase PaperMC/Paper@35ef293 Finish rebase PaperMC/Paper@9ecf77e Fix compile issues PaperMC/Paper@62e3bcd Review patch-to-patch diff PaperMC/Paper@b711764 Rebase fixups PaperMC/Paper@2e76d3f Specify mainCapabilityAttribute for paper-api PaperMC/Paper@e4efb59 fix compile issues PaperMC/Paper@683ce20 Fix Anti-Xray using wrong data in chunk deserialize PaperMC/Paper@e92607c Fix MSPT command PaperMC/Paper@dcd81a8 Fix crafting (and server icon) PaperMC/Paper@61136fe Add max minecarft speed gamerule config PaperMC/Paper@ba1ee87 Revert "Add max minecarft speed gamerule config" PaperMC/Paper@cf03bed Add startup flag to disable gamerule limits PaperMC/Paper@be2edea Fix boats/minecarts not dropping when destroyed PaperMC/Paper@b14d336 Apply watchdoge patches PaperMC/Paper@2946dbb Update WorldServer#serverlevelData mapping PaperMC/Paper@98af0e0 update generator PaperMC/Paper@20507b4 Apply more patches PaperMC/Paper@7162ff0 fix item meta PaperMC/Paper@7d67d3f fix DamageTypeTags init PaperMC/Paper@0971875 re-add improve perf of mass crafts PaperMC/Paper@bcf52fe Delete some old patches PaperMC/Paper@348c855 Readd last API patch (with TODO) PaperMC/Paper@b630564 More patches PaperMC/Paper@3cb16c9 Add back per player mob spawning PaperMC/Paper@fe7b741 Another one PaperMC/Paper@12ed021 Update material tags and entity effect PaperMC/Paper@02bca1e Remove timings impl PaperMC/Paper@4d87302 Fix NPE and StackOverflowError for dispensers PaperMC/Paper@f8f230a Remove unnecessary AT PaperMC/Paper@29bf7be Fix unused parameter in PlayerList#remove PaperMC/Paper@9e35192 Execute spark tasks during tick sleep (#11525) PaperMC/Paper@e35f199 Use declaration order for state holder property iteration PaperMC/Paper@6288adb Remove leftover missed timings calls (#11527) PaperMC/Paper@99b1bf9 Use new ClientboundPlayerRotationPacket for setting player rotation PaperMC/Paper@40211a0 Update Gradle wrapper to 8.10.2 PaperMC/Paper@49eae0d remove some leftovers PaperMC/Paper@d576cfc cleanup bugfix patch PaperMC/Paper@1196ab5 Avoid issues with certain tasks not processing during sleep (#11526) PaperMC/Paper@fe2f3d4 Fix portal exit resulting in bad teleport transition PaperMC/Paper@9f1fa0b Fix item gravity on inactive items, remove dumb active skipping PaperMC/Paper@1a1d0cf Use target pitch in teleport (generally the same thing) PaperMC/Paper@8ba3073 fix "is_freezing" damage type tag PaperMC/Paper@1523212 don't resend effects when PlayerItemConsumeEvent is cancelled PaperMC/Paper@1330880 Add Friction API to minecarts PaperMC/Paper@580a610 Allow using old ender pearl behavior & apply ender pearl exploit patch (#11524) PaperMC/Paper@40a960d Rebuild patches
231 lines
7.3 KiB
Diff
231 lines
7.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <kfian294ma4@gmail.com>
|
|
Date: Tue, 21 Sep 2021 23:55:45 +0100
|
|
Subject: [PATCH] Visibility API
|
|
|
|
|
|
diff --git a/src/main/java/me/samsuik/sakura/player/visibility/Visibility.java b/src/main/java/me/samsuik/sakura/player/visibility/Visibility.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..3df11f07ce533b8b911ec423be850374fcc8a7c1
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/player/visibility/Visibility.java
|
|
@@ -0,0 +1,198 @@
|
|
+package me.samsuik.sakura.player.visibility;
|
|
+
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
+import net.kyori.adventure.text.format.TextColor;
|
|
+import org.bukkit.Material;
|
|
+
|
|
+import java.util.EnumSet;
|
|
+import java.util.Locale;
|
|
+
|
|
+public class Visibility {
|
|
+
|
|
+ private final EnumSet<Setting> settings = EnumSet.noneOf(Setting.class);
|
|
+
|
|
+ /**
|
|
+ * Checks if the provided setting has been modified.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ * @return the setting has been modified
|
|
+ */
|
|
+ public boolean isToggled(Setting setting) {
|
|
+ return settings.contains(setting);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if the provided setting is enabled.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ * @return the setting is enabled
|
|
+ */
|
|
+ public boolean isEnabled(Setting setting) {
|
|
+ return setting.defaultValue != isToggled(setting);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if the provided setting is disabled.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ * @return the setting is disabled
|
|
+ */
|
|
+ public boolean isDisabled(Setting setting) {
|
|
+ return !isEnabled(setting);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Toggles the provided settings state.
|
|
+ * [ true -> false, false -> true ]
|
|
+ * NOTE: the default value can vary.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ */
|
|
+ public void toggle(Setting setting) {
|
|
+ if (!settings.remove(setting)) {
|
|
+ settings.add(setting);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Toggles the provided settings state if it matches the modified state.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ * @param modified fun
|
|
+ */
|
|
+ public void toggle(Setting setting, boolean modified) {
|
|
+ if (isToggled(setting) == modified) {
|
|
+ toggle(setting);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the provided settings state.
|
|
+ *
|
|
+ * @param setting provided
|
|
+ * @param enable whether to enable this setting
|
|
+ */
|
|
+ public void set(Setting setting, boolean enable) {
|
|
+ if (isEnabled(setting) && !enable || isDisabled(setting) && enable) {
|
|
+ toggle(setting);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Toggles all settings based on the logic below.
|
|
+ * IF: settings are untouched or have been modified
|
|
+ * THEN: disable all settings
|
|
+ * IF: all settings are disabled
|
|
+ * THEN: enable all settings
|
|
+ */
|
|
+ public void toggleAll() {
|
|
+ boolean toggled = true; // true == all toggled
|
|
+
|
|
+ // If something is enabled set state to true
|
|
+ for (Setting setting : Setting.values()) {
|
|
+ toggled &= isToggled(setting);
|
|
+ }
|
|
+
|
|
+ // apply the opposite of the state so that it toggles
|
|
+ for (Setting setting : Setting.values()) {
|
|
+ toggle(setting, toggled);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Whether the settings have been modified.
|
|
+ * This is exposed to allow for quick return optimisations.
|
|
+ *
|
|
+ * @return settings have been modified
|
|
+ */
|
|
+ public boolean isModified() {
|
|
+ return !settings.isEmpty();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Current visibility settings state.
|
|
+ *
|
|
+ * @return state
|
|
+ */
|
|
+ public State getState() {
|
|
+ if (this.settings.isEmpty()) {
|
|
+ return State.ENABLED;
|
|
+ } else if (this.settings.size() != Setting.values().length) {
|
|
+ return State.MODIFIED;
|
|
+ } else {
|
|
+ return State.DISABLED;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public enum Setting {
|
|
+ TNT_VISIBILITY("TNT Visibility", Material.TNT, NamedTextColor.RED, true),
|
|
+ SAND_VISIBILITY("Sand Visibility", Material.SAND, NamedTextColor.YELLOW, true),
|
|
+ MINIMAL("Minimal TNT/Sand", Material.NETHER_BRICK_SLAB, NamedTextColor.GOLD, false),
|
|
+ EXPLOSIONS("Explosion Particles", Material.COBWEB, NamedTextColor.WHITE, true),
|
|
+ ENCHANTMENT_GLINT("Enchantment Glint", Material.ENCHANTED_BOOK, NamedTextColor.DARK_PURPLE, true),
|
|
+ SPAWNERS("Spawner Visibility", Material.SPAWNER, NamedTextColor.DARK_GRAY, true),
|
|
+ REDSTONE("Redstone Animations", Material.REDSTONE, NamedTextColor.DARK_RED, true),
|
|
+ PISTONS("Piston Animations", Material.PISTON, NamedTextColor.GOLD, true);
|
|
+
|
|
+ private final String friendlyName;
|
|
+ private final Material material;
|
|
+ private final TextColor colour;
|
|
+ private final boolean defaultValue;
|
|
+
|
|
+ Setting(String friendlyName, Material material, TextColor color, boolean defaultValue) {
|
|
+ this.friendlyName = friendlyName;
|
|
+ this.material = material;
|
|
+ this.colour = color;
|
|
+ this.defaultValue = defaultValue;
|
|
+ }
|
|
+
|
|
+ public boolean getDefault() {
|
|
+ return this.defaultValue;
|
|
+ }
|
|
+
|
|
+ public String friendlyName() {
|
|
+ return this.friendlyName;
|
|
+ }
|
|
+
|
|
+ public Material material() {
|
|
+ return this.material;
|
|
+ }
|
|
+
|
|
+ public TextColor colour() {
|
|
+ return this.colour;
|
|
+ }
|
|
+
|
|
+ public String basicName() {
|
|
+ return this.name().replace("_", "").toLowerCase(Locale.ROOT);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public enum State {
|
|
+ ENABLED("Enabled", Material.GREEN_STAINED_GLASS_PANE, NamedTextColor.GREEN),
|
|
+ MODIFIED("Modified", Material.MAGENTA_STAINED_GLASS_PANE, NamedTextColor.LIGHT_PURPLE),
|
|
+ DISABLED("Disabled", Material.RED_STAINED_GLASS_PANE, NamedTextColor.RED);
|
|
+
|
|
+ private final String title;
|
|
+ private final Material material;
|
|
+ private final TextColor colour;
|
|
+
|
|
+ State(String name, Material material, TextColor colour) {
|
|
+ this.title = name;
|
|
+ this.material = material;
|
|
+ this.colour = colour;
|
|
+ }
|
|
+
|
|
+ public String title() {
|
|
+ return this.title;
|
|
+ }
|
|
+
|
|
+ public Material material() {
|
|
+ return material;
|
|
+ }
|
|
+
|
|
+ public TextColor colour() {
|
|
+ return colour;
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 95f0b3186e313c7fbd5c8531d52b82a69e525f94..a1d6e58d466b94d65c830a7e50b9a5eae76138aa 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -60,6 +60,15 @@ import org.jetbrains.annotations.Nullable;
|
|
*/
|
|
public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient { // Paper
|
|
|
|
+ // Sakura start
|
|
+ /**
|
|
+ * Visibility API for FPS settings.
|
|
+ *
|
|
+ * @return visibility api
|
|
+ */
|
|
+ me.samsuik.sakura.player.visibility.Visibility getVisibility();
|
|
+ // Sakura end
|
|
+
|
|
// Paper start
|
|
@Override
|
|
default net.kyori.adventure.identity.@NotNull Identity identity() {
|