feat: integrate mapping reloads into the reload command

Author: RedxAx

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

@@ -83,6 +83,7 @@
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.network.netty.GeyserServer;
+import org.geysermc.geyser.pack.SkullResourcePackManager;
 import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.registry.Registries;
@@ -305,6 +306,10 @@ private void startInstance() {
         if (isReloading) {
             // If we're reloading, the default locale in the config might have changed.
             GeyserLocale.finalizeDefaultLocale(this);
+
+            Registries.load();
+            BlockRegistries.populate();
+            Registries.populate();
         } else {
             CodeOfConductManager.load();
         }
@@ -777,6 +782,11 @@ public void reloadGeyser() {
         this.eventBus.fire(new GeyserPreReloadEvent(this.extensionManager, this.eventBus));
 
         bootstrap.onGeyserDisable();
+
+        BlockRegistries.reset();
+        Registries.reset();
+        SkullResourcePackManager.SKULL_SKINS.clear();
+
         bootstrap.onGeyserEnable();
 
         isReloading = false;

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/BlockRegistries.java

@@ -148,4 +148,21 @@ public static void populate() {
         BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.INIT_BEDROCK);
         BlockRegistryPopulator.populate(BlockRegistryPopulator.Stage.POST_INIT);
     }
+
+    public static void reset() {
+        BLOCKS.clear();
+        JAVA_BLOCK_STATE_IDENTIFIER_TO_ID.clear();
+        NON_VANILLA_BLOCK_IDS.clear();
+        WATERLOGGED.clear();
+        INTERACTIVE.clear();
+        INTERACTIVE_MAY_BUILD.clear();
+        CUSTOM_BLOCKS.clear();
+        CUSTOM_BLOCK_STATE_OVERRIDES.clear();
+        NON_VANILLA_BLOCK_STATE_OVERRIDES.clear();
+        CUSTOM_BLOCK_ITEM_OVERRIDES.clear();
+        EXTENDED_COLLISION_BOXES.clear();
+        CUSTOM_SKULLS.clear();
+
+        COLLISIONS.clear();
+    }
 }

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/Registries.java

@@ -239,6 +239,14 @@ public static void load() {
         DANGEROUS_ENTITIES.load();
     }
 
+    public static void reset() {
+        loaded = false;
+
+        ITEMS.clear();
+        TAGS.clear();
+        POTION_MIXES.clear();
+    }
+
     public static void populate() {
         PacketRegistryPopulator.populate();
         DataComponentRegistryPopulator.populate();

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()));
+        }
+    }
 }