feat: reloadmappings Command.

Author: RedxAx

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

@@ -54,6 +54,7 @@
 import org.geysermc.geyser.command.defaults.PingCommand;
 import org.geysermc.geyser.command.defaults.QuickActionsCommand;
 import org.geysermc.geyser.command.defaults.ReloadCommand;
+import org.geysermc.geyser.command.defaults.ReloadMappingsCommand;
 import org.geysermc.geyser.command.defaults.SettingsCommand;
 import org.geysermc.geyser.command.defaults.StatisticsCommand;
 import org.geysermc.geyser.command.defaults.StopCommand;
@@ -159,6 +160,7 @@ public CommandRegistry(GeyserImpl geyser, CommandManager<GeyserCommandSource> cl
 
         registerBuiltInCommand(new ListCommand(geyser, "list", "geyser.commands.list.desc", "geyser.command.list"));
         registerBuiltInCommand(new ReloadCommand(geyser, "reload", "geyser.commands.reload.desc", "geyser.command.reload"));
+        registerBuiltInCommand(new ReloadMappingsCommand(geyser, "reloadmappings", "geyser.commands.reloadmappings.desc", "geyser.command.reloadmappings"));
         registerBuiltInCommand(new OffhandCommand("offhand", "geyser.commands.offhand.desc", "geyser.command.offhand"));
         registerBuiltInCommand(new DumpCommand(geyser, "dump", "geyser.commands.dump.desc", "geyser.command.dump"));
         registerBuiltInCommand(new VersionCommand(geyser, "version", "geyser.commands.version.desc", "geyser.command.version"));

core/src/main/java/org/geysermc/geyser/command/defaults/ReloadMappingsCommand.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019-2025 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.command.defaults;
+
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.util.TriState;
+import org.geysermc.geyser.command.GeyserCommand;
+import org.geysermc.geyser.command.GeyserCommandSource;
+import org.geysermc.geyser.pack.SkullResourcePackManager;
+import org.geysermc.geyser.registry.BlockRegistries;
+import org.geysermc.geyser.registry.Registries;
+import org.geysermc.geyser.registry.populator.BlockRegistryPopulator;
+import org.geysermc.geyser.registry.populator.CustomBlockRegistryPopulator;
+import org.geysermc.geyser.registry.populator.CustomSkullRegistryPopulator;
+import org.geysermc.geyser.registry.populator.ItemRegistryPopulator;
+import org.geysermc.geyser.registry.populator.TagRegistryPopulator;
+import org.geysermc.geyser.text.GeyserLocale;
+import org.incendo.cloud.context.CommandContext;
+
+import java.util.concurrent.TimeUnit;
+
+public class ReloadMappingsCommand extends GeyserCommand {
+
+    private final GeyserImpl geyser;
+
+    public ReloadMappingsCommand(GeyserImpl geyser, String name, String description, String permission) {
+        super(name, description, permission, TriState.NOT_SET);
+        this.geyser = geyser;
+    }
+
+    @Override
+    public void execute(CommandContext<GeyserCommandSource> context) {
+        GeyserCommandSource source = context.sender();
+        source.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.reloadmappings.message", source.locale()));
+
+        geyser.getSessionManager().disconnectAll("geyser.commands.reloadmappings.kick");
+
+        geyser.getScheduledThread().schedule(() -> {
+            reloadMappings();
+            source.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.reloadmappings.success", source.locale()));
+        }, 10, TimeUnit.MILLISECONDS);
+    }
+
+    static void reloadMappings() {
+        BlockRegistries.BLOCKS.clear();
+        BlockRegistries.JAVA_BLOCK_STATE_IDENTIFIER_TO_ID.clear();
+        BlockRegistries.NON_VANILLA_BLOCK_IDS.clear();
+        BlockRegistries.WATERLOGGED.clear();
+        BlockRegistries.INTERACTIVE.clear();
+        BlockRegistries.INTERACTIVE_MAY_BUILD.clear();
+        BlockRegistries.CUSTOM_BLOCKS.clear();
+        BlockRegistries.CUSTOM_BLOCK_STATE_OVERRIDES.clear();
+        BlockRegistries.NON_VANILLA_BLOCK_STATE_OVERRIDES.clear();
+        BlockRegistries.CUSTOM_BLOCK_ITEM_OVERRIDES.clear();
+        BlockRegistries.EXTENDED_COLLISION_BOXES.clear();
+        BlockRegistries.CUSTOM_SKULLS.clear();
+
+        Registries.ITEMS.clear();
+        Registries.TAGS.clear();
+
+        SkullResourcePackManager.SKULL_SKINS.clear();
+
+        CustomSkullRegistryPopulator.populate();
+        BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.PRE_INIT);
+        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.DEFINITION);
+        BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.INIT_JAVA);
+        BlockRegistries.COLLISIONS.load();
+        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.NON_VANILLA_REGISTRATION);
+        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.VANILLA_REGISTRATION);
+        CustomBlockRegistryPopulator.populate(CustomBlockRegistryPopulator.Stage.CUSTOM_REGISTRATION);
+        BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.INIT_BEDROCK);
+        BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.POST_INIT);
+        ItemRegistryPopulator.populate();
+        TagRegistryPopulator.populate();
+
+        Registries.POTION_MIXES.load();
+    }
+}

core/src/main/java/org/geysermc/geyser/registry/ArrayRegistry.java

@@ -28,6 +28,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.registry.loader.RegistryLoader;
 
+import java.util.Arrays;
 import java.util.function.Supplier;
 
 /**
@@ -148,4 +149,9 @@ public static <I, M> ArrayRegistry<M> create(RegistryLoader<I, M[]> registryLoad
     public static <I, M> ArrayRegistry<M> create(I input, RegistryLoader<I, M[]> registryLoader) {
         return new ArrayRegistry<>(input, registryLoader);
     }
+
+    @Override
+    public void clear() {
+        Arrays.fill(this.mappings, null);
+    }
 }

core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java

@@ -123,6 +123,14 @@ public boolean loaded() {
         return this.loaded;
     }
 
+    @Override
+    public void clear() {
+        if (!this.loaded) {
+            return;
+        }
+        this.backingRegistry.clear();
+    }
+
     /**
      * A registry initializer.
      *

core/src/main/java/org/geysermc/geyser/registry/IRegistry.java

@@ -57,4 +57,12 @@ interface IRegistry<M> {
      * @param consumer the consumer
      */
     void register(Consumer<M> consumer);
+
+    /**
+     * Clears The Underlying Mappings.
+     * Throws {@link UnsupportedOperationException} When The Registry Doesn't Support It.
+     */
+    default void clear() {
+        throw new UnsupportedOperationException("Registry does not support clear.");
+    }
 }

core/src/main/java/org/geysermc/geyser/registry/Registry.java

@@ -25,6 +25,9 @@
 
 package org.geysermc.geyser.registry;
 
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Map;
 import java.util.function.Consumer;
 import org.geysermc.geyser.registry.loader.RegistryLoader;
 
@@ -110,4 +113,20 @@ public void set(M mappings) {
     public void register(Consumer<M> consumer) {
         consumer.accept(this.mappings);
     }
+
+    /**
+     * Clears The Mappings.
+     */
+    @Override
+    public void clear() {
+        if (this.mappings instanceof Collection) {
+            ((Collection<?>) this.mappings).clear();
+        } else if (this.mappings instanceof Map) {
+            ((Map<?, ?>) this.mappings).clear();
+        } else if (this.mappings instanceof BitSet) {
+            ((BitSet) this.mappings).clear();
+        } else {
+            throw new UnsupportedOperationException("Cannot clear registry of type " + (this.mappings == null ? "null" : this.mappings.getClass().getName()));
+        }
+    }
 }