add client setting for cooldown type, refactor show-coordinates #2193

Konicai · 2021-05-04T00:45:25Z

This allows the user to choose what kind of cooldown they want to see (title, action bar, or false) through a dropdown. Similarly to the show coordinate option, they aren't shown the option if it is disabled globally through the geyser config (at least that is the only setter of DEFAULT_SHOW_COOLDOWN currently).

This was was done in a new PreferencesCache in the session. I threw the show coordinates code in there as well since it seemed more appropriate. Also turned the allowShowCoordinates boolean into a @Getter field so that the form constructor is a bit nicer.

~~Relies on GeyserMC/languages#69~~

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

…ting # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

- note, i accidentally removed the line that set it null on close when I merged master into this branch

Konicai · 2021-05-04T01:02:30Z

Should have pushed at once to avoid the extra builds... whoops.

Also I think I just borked my languages submodule?

I'll replace the dropdown text with the proper locale getter once we think this is good to go

Konicai · 2021-05-04T04:48:16Z

Also I forgot to mention, CooldownUtils.getByName returns TITLE instead of DISABLED when the given string has no match, to line up with the javadoc.

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

Camotoy · 2021-05-05T19:58:37Z

connector/src/main/java/org/geysermc/connector/network/session/cache/PreferencesCache.java

+import org.geysermc.connector.utils.CooldownUtils;
+
+@Getter
+public class PreferencesCache {


I think this name should be changed, but I'm not sure to what. I'm going to have a PR after OptionalPack is merged that allows a plugin to change if a client can Bedrock godbridge or not, so the boolean for that might as well be stuck here. Open to suggestions.

If it would stop all connected geyser players from god-bridging, why would the boolean be stored in every session instance?

Do you mean the PR would allow plugins to change an allowGodbridging value that geyser uses to prevent god-bridging, or it would allow an extension plugin to do the work of preventing god-bridging?

If it would stop all connected geyser players from god-bridging, why would the boolean be stored in every session instance?

We can't do that because of GeyserConnect, or if server owners only wanted to block per-world for example. The plugin would be separate and use plugin messages to communicate to Geyser.

Konicai · 2021-05-10T01:03:49Z

Tested successfully on bungeecord (For the button text, the key names are shown instead of their values since the translation strings haven't been added to the languages submodule yet)

Camotoy

Do you think that, if the Geyser instance disables the cooldown type, that should prevent Geyser from doing so as well? Knowing now that Java Edition has a toggle for it is making me think that's unnecessary - though right now we also allow the blocking of coordinates.

Camotoy · 2021-05-13T15:32:54Z

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -1226,7 +1228,7 @@ public void sendDownstreamPacket(Packet packet) {
    public void setReducedDebugInfo(boolean value) {
        reducedDebugInfo = value;
        // Set the showCoordinates data. This is done because updateShowCoordinates() uses this gamerule as a variable.
-        getWorldCache().updateShowCoordinates();
+        getPreferencesCache().updateShowCoordinates();


This doesn't need to be the Lombok call, and can just be preferencesCache.updateShowCoordinates()

connector/src/main/java/org/geysermc/connector/utils/CooldownUtils.java

Camotoy · 2021-05-15T01:24:53Z

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

+            }
+
+            if (CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED) {
+                CooldownUtils.CooldownType cooldownType = CooldownUtils.CooldownType.values()[settingsResponse.getDropdownResponses().get(offset).getElementID()];


Use CooldownType.VALUES here. values() is a function that allocates a new array (which we don't need when we have one.

thanks, I wasn't sure if there was a significant difference

Should the same apply to the gamemode and difficulty stuff below this?

I do not believe those have a VALUES static field.

the gamerule enum is ours, but the VALUES static field is private. the difficulty enum is mcprotocollibs and doesn't have one.

not sure if this is going out of the scope of this pr

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

Camotoy · 2021-05-15T02:36:30Z

connector/src/main/java/org/geysermc/connector/utils/CooldownUtils.java

@@ -149,7 +158,7 @@ public static CooldownType getByName(String name) {
                    return type;
                }
            }
-            return DISABLED;
+            return TITLE;


We shouldn't do this because legacy configs that have their cooldown settings set to false will break.

add client setting for cooldown type, refactor show-coordinates

5d5aa47

Konicai mentioned this pull request May 4, 2021

new translation strings for attack cooldown dropdown GeyserMC/languages#69

Closed

Camotoy reviewed May 4, 2021

View reviewed changes

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java Outdated Show resolved Hide resolved

Camotoy reviewed May 4, 2021

View reviewed changes

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java Outdated Show resolved Hide resolved

Camotoy reviewed May 4, 2021

View reviewed changes

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java Outdated Show resolved Hide resolved

Konicai added 3 commits May 3, 2021 20:52

Merge remote-tracking branch 'upstream/master' into cooldown-user-set…

5dd4fa9

…ting # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

prepare for future scoreboard PR

ba040cc

- note, i accidentally removed the line that set it null on close when I merged master into this branch

fix do not equals syntax

8767aac

Camotoy reviewed May 4, 2021

View reviewed changes

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java Show resolved Hide resolved

Use Collections.emptyList() instead of new ArrayList<>()

93e7cde

Camotoy reviewed May 5, 2021

View reviewed changes

use translation strings, loop through enum instead, fix lists

ae47870

Konicai added 2 commits May 13, 2021 12:14

use java edition locale strings

0723f2e

Merge branch 'master' into cooldown-user-setting

185d268

Camotoy reviewed May 15, 2021

View reviewed changes

small improvements

9d8292a

Camotoy reviewed May 15, 2021

View reviewed changes

Konicai and others added 3 commits May 14, 2021 22:40

don't break legacy configs with cooldown false

31f963d

forgot to change javadoc

4e9b1bc

Reset languages submodule

14ad6e6

Camotoy approved these changes May 15, 2021

View reviewed changes

Camotoy merged commit 3e3b8fa into GeyserMC:master May 15, 2021

Konicai deleted the cooldown-user-setting branch May 24, 2021 02:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add client setting for cooldown type, refactor show-coordinates #2193

add client setting for cooldown type, refactor show-coordinates #2193

Konicai commented May 4, 2021 •

edited

Loading

Konicai commented May 4, 2021 •

edited

Loading

Konicai commented May 4, 2021

Camotoy May 5, 2021

Konicai May 6, 2021

Camotoy May 6, 2021

Konicai commented May 10, 2021

Camotoy left a comment

Camotoy May 13, 2021

Camotoy May 15, 2021

Konicai May 15, 2021

Konicai May 15, 2021

Camotoy May 15, 2021

Konicai May 15, 2021

Camotoy May 15, 2021

add client setting for cooldown type, refactor show-coordinates #2193

add client setting for cooldown type, refactor show-coordinates #2193

Conversation

Konicai commented May 4, 2021 • edited Loading

Konicai commented May 4, 2021 • edited Loading

Konicai commented May 4, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Konicai commented May 10, 2021

Camotoy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Konicai commented May 4, 2021 •

edited

Loading

Konicai commented May 4, 2021 •

edited

Loading