Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-23 19:16:14 +01:00
Code Issues Projects Releases Wiki Activity

add sound converter for versions greater 1.16.4 (#1027)

Browse Source
This commit is contained in:
Jan Lindner 2021-01-03 05:55:23 +01:00 committed by GitHub
parent 0d50905754
commit aa555f792e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java
View File

@ -953,9 +953,59 @@ public class BukkitConverters {
private static MethodAccessor getSoundEffect = null;
private static FieldAccessor soundKey = null;
private static MethodAccessor getSoundEffectByKey = null;
private static MethodAccessor getSoundEffectBySound = null;
private static MethodAccessor getSoundByEffect = null;
private static Map<String, Sound> soundIndex = null;
public static EquivalentConverter<Sound> getSoundConverter() {
// Try to create sound converter for new versions greater 1.16.4
try {
if (getSoundEffectByKey == null || getSoundEffectBySound == null || getSoundByEffect == null) {
Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);
getSoundEffectByKey = Accessors.getMethodAccessor(fuzzy.getMethodByParameters(
"getSoundEffect",
MinecraftReflection.getSoundEffectClass(),
new Class<?>[]{String.class}
));
getSoundEffectBySound = Accessors.getMethodAccessor(fuzzy.getMethodByParameters(
"getSoundEffect",
MinecraftReflection.getSoundEffectClass(),
new Class<?>[]{Sound.class}
));
getSoundByEffect = Accessors.getMethodAccessor(fuzzy.getMethodByParameters(
"getBukkit",
Sound.class,
new Class<?>[]{MinecraftReflection.getSoundEffectClass()}
));
}
return ignoreNull(new EquivalentConverter<Sound>() {
@Override
public Class<Sound> getSpecificType() {
return Sound.class;
}
@Override
public Object getGeneric(Sound specific) {
return getSoundEffectBySound.invoke(null, specific);
}
@Override
public Sound getSpecific(Object generic) {
return (Sound) getSoundByEffect.invoke(null, generic);
}
});
} catch (Exception e) {
}
// Fall back to sound converter from legacy versions before 1.16.4
if (getSound == null || getSoundEffect == null) {
Class<?> craftSound = MinecraftReflection.getCraftSoundClass();
FuzzyReflection fuzzy = FuzzyReflection.fromClass(craftSound, true);