Remove Registries.RECORDS

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

@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.registry;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.geysermc.geyser.registry.loader.RegistryLoader;
-
-import java.util.function.Supplier;
-
-/**
- * A mapped registry with an integer as the key. This class is designed to minimize the need for boxing/unboxing keys.
- *
- * @param <V> the value
- */
-public class IntMappedRegistry<V> extends AbstractMappedRegistry<Integer, V, Int2ObjectMap<V>> {
-    protected <I> IntMappedRegistry(I input, RegistryLoader<I, Int2ObjectMap<V>> registryLoader) {
-        super(input, registryLoader);
-    }
-
-    /**
-     * Returns the value registered by the given integer.
-     *
-     * @param i the integer
-     * @return the value registered by the given integer.
-     */
-    public V get(int i) {
-        return this.mappings.get(i);
-    }
-
-    @Nullable
-    @Override
-    @Deprecated
-    public V get(Integer key) {
-        return super.get(key);
-    }
-
-    /**
-     * Returns the value registered by the given key or the default value
-     * specified if null.
-     *
-     * @param i the key
-     * @param defaultValue the default value
-     * @return the value registered by the given key or the default value
-     *         specified if null.
-     */
-    public V getOrDefault(int i, V defaultValue) {
-        return this.mappings.getOrDefault(i, defaultValue);
-    }
-
-    @Override
-    @Deprecated
-    public V getOrDefault(Integer key, V defaultValue) {
-        return super.getOrDefault(key, defaultValue);
-    }
-
-    /**
-     * Registers a new value into this registry with the given key.
-     *
-     * @param i the key
-     * @param value the value
-     * @return a new value into this registry with the given key.
-     */
-    public V register(int i, V value) {
-        return this.mappings.put(i, value);
-    }
-
-    @Override
-    @Deprecated
-    public V register(Integer key, V value) {
-        return super.register(key, value);
-    }
-
-    /**
-     * Creates a new integer mapped registry with the given {@link RegistryLoader}. The
-     * input type is not specified here, meaning the loader return type is either
-     * predefined, or the registry is populated at a later point.
-     *
-     * @param registryLoader the registry loader
-     * @param <I> the input
-     * @param <V> the map value
-     * @return a new registry with the given RegistryLoader
-     */
-    public static <I, V> IntMappedRegistry<V> create(RegistryLoader<I, Int2ObjectMap<V>> registryLoader) {
-        return new IntMappedRegistry<>(null, registryLoader);
-    }
-
-    /**
-     * Creates a new integer mapped registry with the given {@link RegistryLoader} and input.
-     *
-     * @param registryLoader the registry loader
-     * @param <I> the input
-     * @param <V> the map value
-     * @return a new registry with the given RegistryLoader supplier
-     */
-    public static <I, V> IntMappedRegistry<V> create(I input, Supplier<RegistryLoader<I, Int2ObjectMap<V>>> registryLoader) {
-        return new IntMappedRegistry<>(input, registryLoader.get());
-    }
-}

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

@@ -149,12 +149,6 @@ public final class Registries {
      */
     public static final VersionedRegistry<Int2ObjectMap<GeyserRecipe>> RECIPES = VersionedRegistry.create(RegistryLoaders.empty(Int2ObjectOpenHashMap::new));
 
-    /**
-     * A mapped registry holding the available records, with the ID of the record being the key, and the {@link org.cloudburstmc.protocol.bedrock.data.SoundEvent}
-     * as the value.
-     */
-    public static final IntMappedRegistry<org.cloudburstmc.protocol.bedrock.data.SoundEvent> RECORDS = IntMappedRegistry.create(RegistryLoaders.empty(Int2ObjectOpenHashMap::new));
-
     /**
      * A mapped registry holding {@link ResourcePack}'s with the pack uuid as keys.
      */

core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

@@ -41,7 +41,6 @@ import org.cloudburstmc.nbt.NbtType;
 import org.cloudburstmc.nbt.NbtUtils;
 import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.codec.v685.Bedrock_v685;
-import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
 import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
@@ -458,10 +457,6 @@ public class ItemRegistryPopulator {
 
                 if (javaItem.javaIdentifier().contains("bucket") && !javaItem.javaIdentifier().contains("milk")) {
                     buckets.add(definition);
-                } else if (javaItem.javaIdentifier().startsWith("minecraft:music_disc_")) {
-                    // The Java record level event uses the item ID as the "key" to play the record
-                    Registries.RECORDS.register(javaItem.javaId(), SoundEvent.valueOf("RECORD_" +
-                            mapping.getBedrockIdentifier().replace("minecraft:music_disc_", "").toUpperCase(Locale.ENGLISH)));
                 }
 
                 mappings.add(mapping);