Permissions class for general perms, GeyserImpl is responsible for the subscription

bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeUpdateListener.java

@@ -29,8 +29,8 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.platform.bungeecord.command.BungeeCommandSource;
 import org.geysermc.geyser.util.VersionCheckUtils;
 
@@ -40,7 +40,7 @@ public final class GeyserBungeeUpdateListener implements Listener {
     public void onPlayerJoin(final PostLoginEvent event) {
         if (GeyserImpl.getInstance().getConfig().isNotifyOnNewBedrockUpdate()) {
             final ProxiedPlayer player = event.getPlayer();
-            if (player.hasPermission(Constants.UPDATE_PERMISSION)) {
+            if (player.hasPermission(Permissions.CHECK_UPDATE)) {
                 VersionCheckUtils.checkForGeyserUpdate(() -> new BungeeCommandSource(player));
             }
         }

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModUpdateListener.java

@@ -26,14 +26,14 @@
 package org.geysermc.geyser.platform.mod;
 
 import net.minecraft.world.entity.player.Player;
-import org.geysermc.geyser.Constants;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.platform.mod.command.ModCommandSource;
 import org.geysermc.geyser.util.VersionCheckUtils;
 
 public final class GeyserModUpdateListener {
     public static void onPlayReady(Player player) {
         ModCommandSource source = new ModCommandSource(player.createCommandSourceStack());
-        if (source.hasPermission(Constants.UPDATE_PERMISSION)) {
+        if (source.hasPermission(Permissions.CHECK_UPDATE)) {
             VersionCheckUtils.checkForGeyserUpdate(() -> source);
         }
     }

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotUpdateListener.java

@@ -29,8 +29,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.platform.spigot.command.SpigotCommandSource;
 import org.geysermc.geyser.util.VersionCheckUtils;
 
@@ -40,7 +40,7 @@ public final class GeyserSpigotUpdateListener implements Listener {
     public void onPlayerJoin(final PlayerJoinEvent event) {
         if (GeyserImpl.getInstance().getConfig().isNotifyOnNewBedrockUpdate()) {
             final Player player = event.getPlayer();
-            if (player.hasPermission(Constants.UPDATE_PERMISSION)) {
+            if (player.hasPermission(Permissions.CHECK_UPDATE)) {
                 VersionCheckUtils.checkForGeyserUpdate(() -> new SpigotCommandSource(player));
             }
         }

bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java

@@ -70,6 +70,7 @@ import java.util.stream.Collectors;
 
 public class GeyserStandaloneBootstrap implements GeyserBootstrap {
 
+    private StandaloneCloudCommandManager cloud;
     private CommandRegistry commandRegistry;
     private GeyserStandaloneConfiguration geyserConfig;
     private final GeyserStandaloneLogger geyserLogger = new GeyserStandaloneLogger();
@@ -223,15 +224,22 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap {
 
         geyser = GeyserImpl.load(PlatformType.STANDALONE, this);
 
-        if (!geyser.isReloading()) {
+        boolean reloading = geyser.isReloading();
-            // fire GeyserDefineCommandsEvent after PreInitEvent, before PostInitEvent, for consistency with other bootstraps
+        if (!reloading) {
-            StandaloneCloudCommandManager cloud = new StandaloneCloudCommandManager(geyser);
+            // Currently there would be no significant benefit of re-initializing commands. Also, we would have to unsubscribe CommandRegistry.
+            // Fire GeyserDefineCommandsEvent after PreInitEvent, before PostInitEvent, for consistency with other bootstraps.
+            cloud = new StandaloneCloudCommandManager(geyser);
             commandRegistry = new CommandRegistry(geyser, cloud);
-            cloud.fireRegisterPermissionsEvent(); // event must be fired after CommandRegistry has subscribed its listener
         }
 
         GeyserImpl.start();
 
+        if (!reloading) {
+            // Event must be fired after CommandRegistry has subscribed its listener.
+            // Also, the subscription for the Permissions class is created when Geyser is initialized.
+            cloud.fireRegisterPermissionsEvent();
+        }
+
         if (gui != null) {
             gui.enableCommands(geyser.getScheduledThread(), commandRegistry);
         }

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityUpdateListener.java

@@ -28,8 +28,8 @@ package org.geysermc.geyser.platform.velocity;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.proxy.Player;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.platform.velocity.command.VelocityCommandSource;
 import org.geysermc.geyser.util.VersionCheckUtils;
 
@@ -39,7 +39,7 @@ public final class GeyserVelocityUpdateListener {
     public void onPlayerJoin(PostLoginEvent event) {
         if (GeyserImpl.getInstance().getConfig().isNotifyOnNewBedrockUpdate()) {
             final Player player = event.getPlayer();
-            if (player.hasPermission(Constants.UPDATE_PERMISSION)) {
+            if (player.hasPermission(Permissions.CHECK_UPDATE)) {
                 VersionCheckUtils.checkForGeyserUpdate(() -> new VelocityCommandSource(player));
             }
         }

core/src/main/java/org/geysermc/geyser/Constants.java

@@ -35,11 +35,7 @@ public final class Constants {
     public static final String NEWS_PROJECT_NAME = "geyser";
 
     public static final String FLOODGATE_DOWNLOAD_LOCATION = "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/";
-
     public static final String GEYSER_DOWNLOAD_LOCATION = "https://geysermc.org/download";
-    public static final String UPDATE_PERMISSION = "geyser.update";
-    public static final String SERVER_SETTINGS_PERMISSION = "geyser.settings.server";
-    public static final String SETTINGS_GAMERULES_PERMISSION = "geyser.settings.gamerules";
 
     static final String SAVED_REFRESH_TOKEN_FILE = "saved-refresh-tokens.json";
 

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -104,7 +104,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @Getter
-public class GeyserImpl implements GeyserApi {
+public class GeyserImpl implements GeyserApi, EventRegistrar {
     public static final ObjectMapper JSON_MAPPER = new ObjectMapper()
             .enable(JsonParser.Feature.IGNORE_UNDEFINED)
             .enable(JsonParser.Feature.ALLOW_COMMENTS)
@@ -233,6 +233,9 @@ public class GeyserImpl implements GeyserApi {
             CompletableFuture.runAsync(AssetUtils::downloadAndRunClientJarTasks);
         });
 
+        // Register our general permissions when possible
+        eventBus.subscribe(this, GeyserRegisterPermissionsEvent.class, Permissions::register);
+
         startInstance();
 
         GeyserConfiguration config = bootstrap.getGeyserConfig();

core/src/main/java/org/geysermc/geyser/Permissions.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser;
+
+import org.geysermc.geyser.api.event.lifecycle.GeyserRegisterPermissionsEvent;
+import org.geysermc.geyser.api.util.TriState;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Permissions related to Geyser
+ */
+public final class Permissions {
+
+    private static final Map<String, TriState> PERMISSIONS = new HashMap<>();
+
+    public static final String CHECK_UPDATE = register("geyser.update");
+    public static final String SERVER_SETTINGS = register("geyser.settings.server");
+    public static final String SETTINGS_GAMERULES = register("geyser.settings.gamerules");
+
+    private Permissions() {
+        //no
+    }
+
+    private static String register(String permission) {
+        return register(permission, TriState.NOT_SET);
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private static String register(String permission, TriState permissionDefault) {
+        PERMISSIONS.put(permission, permissionDefault);
+        return permission;
+    }
+
+    public static void register(GeyserRegisterPermissionsEvent event) {
+        for (Map.Entry<String, TriState> permission : PERMISSIONS.entrySet()) {
+            event.register(permission.getKey(), permission.getValue());
+        }
+    }
+}

core/src/main/java/org/geysermc/geyser/command/CommandRegistry.java

@@ -27,7 +27,6 @@ package org.geysermc.geyser.command;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.command.Command;
 import org.geysermc.geyser.api.event.EventRegistrar;
@@ -238,11 +237,6 @@ public class CommandRegistry implements EventRegistrar {
         for (Map.Entry<String, TriState> permission : permissionDefaults.entrySet()) {
             event.register(permission.getKey(), permission.getValue());
         }
-
-        // Register other various Geyser permissions
-        event.register(Constants.UPDATE_PERMISSION, TriState.NOT_SET);
-        event.register(Constants.SERVER_SETTINGS_PERMISSION, TriState.NOT_SET);
-        event.register(Constants.SETTINGS_GAMERULES_PERMISSION, TriState.NOT_SET);
     }
 
     public boolean hasPermission(GeyserCommandSource source, String permission) {

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetDefaultGameTypeTranslator.java

@@ -27,7 +27,7 @@ package org.geysermc.geyser.translator.protocol.bedrock.entity.player;
 
 import org.cloudburstmc.protocol.bedrock.packet.SetDefaultGameTypePacket;
 import org.cloudburstmc.protocol.bedrock.packet.SetPlayerGameTypePacket;
-import org.geysermc.geyser.Constants;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -42,7 +42,7 @@ public class BedrockSetDefaultGameTypeTranslator extends PacketTranslator<SetDef
      */
     @Override
     public void translate(GeyserSession session, SetDefaultGameTypePacket packet) {
-        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Constants.SERVER_SETTINGS_PERMISSION)) {
+        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Permissions.SERVER_SETTINGS)) {
             session.getGeyser().getWorldManager().setDefaultGameMode(session, GameMode.byId(packet.getGamemode()));
         }
         // Stop the client from updating their own Gamemode without telling the server

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetDifficultyTranslator.java

@@ -25,9 +25,9 @@
 
 package org.geysermc.geyser.translator.protocol.bedrock.entity.player;
 
+import org.geysermc.geyser.Permissions;
 import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 import org.cloudburstmc.protocol.bedrock.packet.SetDifficultyPacket;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -40,7 +40,7 @@ public class BedrockSetDifficultyTranslator extends PacketTranslator<SetDifficul
      */
     @Override
     public void translate(GeyserSession session, SetDifficultyPacket packet) {
-        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Constants.SERVER_SETTINGS_PERMISSION)) {
+        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Permissions.SERVER_SETTINGS)) {
             if (packet.getDifficulty() != session.getWorldCache().getDifficulty().ordinal()) {
                 session.getGeyser().getWorldManager().setDifficulty(session, Difficulty.from(packet.getDifficulty()));
             }

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java

@@ -26,7 +26,7 @@
 package org.geysermc.geyser.translator.protocol.bedrock.entity.player;
 
 import org.cloudburstmc.protocol.bedrock.packet.SetPlayerGameTypePacket;
-import org.geysermc.geyser.Constants;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -46,7 +46,7 @@ public class BedrockSetPlayerGameTypeTranslator extends PacketTranslator<SetPlay
     @Override
     public void translate(GeyserSession session, SetPlayerGameTypePacket packet) {
         // yes, if you are OP
-        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Constants.SERVER_SETTINGS_PERMISSION)) {
+        if (session.getOpPermissionLevel() >= 2 && session.hasPermission(Permissions.SERVER_SETTINGS)) {
             if (packet.getGamemode() != session.getGameMode().ordinal()) {
                 // Bedrock has more Gamemodes than Java, leading to cases 5 (for "default") and 6 (for "spectator") being sent
                 // https://github.com/CloudburstMC/Protocol/blob/3.0/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/GameType.java

core/src/main/java/org/geysermc/geyser/util/SettingsUtils.java

@@ -27,8 +27,8 @@ package org.geysermc.geyser.util;
 
 import org.geysermc.cumulus.component.DropdownComponent;
 import org.geysermc.cumulus.form.CustomForm;
-import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.Permissions;
 import org.geysermc.geyser.level.GameRule;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.session.GeyserSession;
@@ -80,7 +80,7 @@ public class SettingsUtils {
             }
         }
 
-        boolean showGamerules = session.getOpPermissionLevel() >= 2 || session.hasPermission(Constants.SETTINGS_GAMERULES_PERMISSION);
+        boolean showGamerules = session.getOpPermissionLevel() >= 2 || session.hasPermission(Permissions.SETTINGS_GAMERULES);
         if (showGamerules) {
             builder.label("geyser.settings.title.game_rules")
                     .translator(MinecraftLocale::getLocaleString); // we need translate gamerules next