Fix some components

PaperMC · Nov 21, 2024 · 9b85c3b · 9b85c3b
1 parent 55475f0
commit 9b85c3b
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 116 deletions.
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
@@ -4691,10 +4691,10 @@ index 0000000000000000000000000000000000000000..197224e31175252d8438a8df585bbb65
 +}
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e85e544506b4c762503a1cb490e6c0f5b1d563f4
+index 0000000000000000000000000000000000000000..da6e73e78616ade91c5b3356256ef617dfb9c1d5
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,215 @@
 +package io.papermc.paper.util;
 +
 +import com.google.common.collect.Collections2;
@@ -4896,11 +4896,6 @@ index 0000000000000000000000000000000000000000..e85e544506b4c762503a1cb490e6c0f5
 +        return CraftNamespacedKey.fromMinecraft(key.location());
 +    }
 +
-+    public static Holder<SoundEvent> keyToSound(Key key) {
-+        ResourceLocation soundId = PaperAdventure.asVanilla(key);
-+        return BuiltInRegistries.SOUND_EVENT.wrapAsHolder(BuiltInRegistries.SOUND_EVENT.getOptional(soundId).orElse(SoundEvent.createVariableRangeEvent(soundId)));
-+    }
-+
 +    public static <A, M> List<A> transformUnmodifiable(final List<? extends M> nms, final Function<? super M, ? extends A> converter) {
 +        return Collections.unmodifiableList(Lists.transform(nms, converter::apply));
 +    }