From 96c80a654952014db0b550299538bbe9440d7b94 Mon Sep 17 00:00:00 2001 From: Nikita Savyolov Date: Mon, 11 Oct 2021 22:49:05 +0300 Subject: [PATCH] fix: play sounds using Identifier rather than SoundEvent https://github.com/SquidDev-CC/CC-Tweaked/commit/6dd33f7099aea3315f213e44e61ba054b2607fdb --- src/main/java/dan200/computercraft/client/SoundManager.java | 6 +++--- .../shared/network/client/SpeakerPlayClientMessage.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/SoundManager.java b/src/main/java/dan200/computercraft/client/SoundManager.java index d3c67ab5e..fe452eb7d 100644 --- a/src/main/java/dan200/computercraft/client/SoundManager.java +++ b/src/main/java/dan200/computercraft/client/SoundManager.java @@ -10,7 +10,7 @@ import net.minecraft.client.sound.AbstractSoundInstance; import net.minecraft.client.sound.SoundInstance; import net.minecraft.client.sound.TickableSoundInstance; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import java.util.HashMap; @@ -21,7 +21,7 @@ public class SoundManager { private static final Map sounds = new HashMap<>(); - public static void playSound( UUID source, Vec3d position, SoundEvent event, float volume, float pitch ) + public static void playSound( UUID source, Vec3d position, Identifier event, float volume, float pitch ) { var soundManager = MinecraftClient.getInstance().getSoundManager(); @@ -54,7 +54,7 @@ public class SoundManager private static class MoveableSound extends AbstractSoundInstance implements TickableSoundInstance { - protected MoveableSound( SoundEvent sound, Vec3d position, float volume, float pitch ) + protected MoveableSound( Identifier sound, Vec3d position, float volume, float pitch ) { super( sound, SoundCategory.RECORDS ); setPosition( position ); diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java index 97e8d3b69..a913d1ea9 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java @@ -11,7 +11,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.PacketByteBuf; -import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; @@ -67,7 +66,6 @@ public class SpeakerPlayClientMessage implements NetworkMessage @Environment( EnvType.CLIENT ) public void handle( PacketContext context ) { - SoundEvent sound = new SoundEvent( this.sound ); SoundManager.playSound( source, pos, sound, volume, pitch ); } }