Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2024-09-26 03:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix all sounds not working

Browse Source
This commit is contained in:
libraryaddict 2023-01-29 20:33:30 +13:00
parent 04fbe0dc39
commit 8395d19e17
9 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nms/v1_17_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_17/ReflectionManager.java
View File

@ -394,11 +394,6 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return new SynchedEntityData.DataItem<>((EntityDataAccessor<T>) wrappedDataWatcherObject.getHandle(), metaItem);
}
@Deprecated
public SoundEvent createSoundEffect(String minecraftKey) {
return new SoundEvent(new ResourceLocation(minecraftKey));
}
@Override
public ResourceLocation createMinecraftKey(String name) {
return new ResourceLocation(name);

5
nms/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_1/ReflectionManager.java
View File

@ -394,11 +394,6 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return new SynchedEntityData.DataItem<>((EntityDataAccessor<T>) wrappedDataWatcherObject.getHandle(), metaItem);
}
@Deprecated
public SoundEvent createSoundEffect(String minecraftKey) {
return new SoundEvent(new ResourceLocation(minecraftKey));
}
@Override
public ResourceLocation createMinecraftKey(String name) {
return new ResourceLocation(name);

5
nms/v1_18_R2/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_2/ReflectionManager.java
View File

@ -395,11 +395,6 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return new SynchedEntityData.DataItem<>((EntityDataAccessor<T>) wrappedDataWatcherObject.getHandle(), metaItem);
}
@Deprecated
public SoundEvent createSoundEffect(String minecraftKey) {
return new SoundEvent(new ResourceLocation(minecraftKey));
}
@Override
public ResourceLocation createMinecraftKey(String name) {
return new ResourceLocation(name);

5
nms/v1_19_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_19_R1/ReflectionManager.java
View File

@ -401,11 +401,6 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return new SynchedEntityData.DataItem<>((EntityDataAccessor<T>) wrappedDataWatcherObject.getHandle(), metaItem);
}
@Deprecated
public SoundEvent createSoundEffect(String minecraftKey) {
return new SoundEvent(new ResourceLocation(minecraftKey));
}
@Override
public ResourceLocation createMinecraftKey(String name) {
return new ResourceLocation(name);

9
nms/v1_19_R2/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_19_R2/ReflectionManager.java
View File

@ -216,8 +216,8 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return CraftItemStack.asCraftCopy(bukkitItem);
}
public SoundEvent getCraftSound(Sound sound) {
return CraftSound.getSoundEffect(sound);
public Holder<SoundEvent> getCraftSound(Sound sound) {
return BuiltInRegistries.SOUND_EVENT.wrapAsHolder(CraftSound.getSoundEffect(sound));
}
public ServerEntity getEntityTrackerEntry(Entity target) throws Exception {
@ -451,9 +451,8 @@ public class ReflectionManager implements ReflectionManagerAbstract {
return new SynchedEntityData.DataItem<>((EntityDataAccessor<T>) wrappedDataWatcherObject.getHandle(), metaItem);
}
@Deprecated
public SoundEvent createSoundEffect(String minecraftKey) {
throw new UnsupportedOperationException("createSoundEffect has been deprecated with nnew changes");
public Holder<SoundEvent> createSoundEvent(String minecraftKey) {
return BuiltInRegistries.SOUND_EVENT.wrapAsHolder(SoundEvent.createVariableRangeEvent(createMinecraftKey(minecraftKey)));
}
@Override

9
plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@ -337,18 +337,9 @@ public class FlagWatcher {
}
watch = new WatcherValue(index, value);
if (watch == null) {
continue;
}
} else {
watch = new WatcherValue(index, watch.getValue());
if (watch == null) {
continue;
}
if (id == MetaIndex.ENTITY_META.getIndex()) {
doSneakCheck((Byte) watch.getValue());
}

11
plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
View File

@ -1792,10 +1792,9 @@ public class ReflectionManager {
return null;
}
@Deprecated
public static Object createSoundEffect(String minecraftKey) {
if (nmsReflection != null) {
return nmsReflection.createSoundEffect(minecraftKey);
return nmsReflection.createSoundEvent(minecraftKey);
}
try {
@ -1807,6 +1806,14 @@ public class ReflectionManager {
return null;
}
public static Object createSoundEvent(String name) {
if (nmsReflection != null) {
return nmsReflection.createSoundEvent(name);
}
return createMinecraftKey(name);
}
public static Object createMinecraftKey(String name) {
if (nmsReflection != null) {
return nmsReflection.createMinecraftKey(name);

4
plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundGroup.java
View File

@ -47,8 +47,8 @@ public class SoundGroup {
if (sound instanceof Sound) {
sound = ReflectionManager.getCraftSound((Sound) sound);
} else if (sound instanceof String) {
sound = ReflectionManager.createMinecraftKey((String) sound);
} else if (!sound.getClass().getSimpleName().equals("SoundEffect")) {
sound = ReflectionManager.createSoundEvent((String) sound);
} else if (!sound.getClass().getSimpleName().equals("SoundEffect") && !sound.getClass().getSimpleName().equals("Holder")) {
throw new IllegalArgumentException("Unexpected " + sound.getClass());
}

5
shared/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManagerAbstract.java
View File

@ -116,8 +116,9 @@ public interface ReflectionManagerAbstract {
<T> Object createDataWatcherItem(WrappedDataWatcher.WrappedDataWatcherObject wrappedDataWatcherObject, T metaItem);
@Deprecated
Object createSoundEffect(String minecraftKey);
default Object createSoundEvent(String minecraftKey) {
return createMinecraftKey(minecraftKey);
}
Object createMinecraftKey(String name);