fix: sound preview not working, add variant support

Author: RedVortexDev

src/main/java/dev/dfonline/codeclient/dev/PreviewSoundChest.java

@@ -4,39 +4,60 @@
 import dev.dfonline.codeclient.Feature;
 import dev.dfonline.codeclient.config.KeyBinds;
 import dev.dfonline.codeclient.dev.overlay.ChestPeeker;
-import dev.dfonline.codeclient.hypercube.item.Sound;
+import dev.dfonline.codeclient.hypercube.actiondump.Sound;
 import dev.dfonline.codeclient.hypercube.item.VarItem;
 import dev.dfonline.codeclient.hypercube.item.VarItems;
 import dev.dfonline.codeclient.location.Dev;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.random.Random;
 
-import java.util.Optional;
+import java.util.List;
 
 public class PreviewSoundChest extends Feature {
 
+    @SuppressWarnings("deprecation")
+    private static final Random threadSafeRandom = Random.createThreadSafe();
+
     @Override
     public void tick() {
         if (KeyBinds.previewSounds.wasPressed() && CodeClient.MC.world != null && CodeClient.location instanceof Dev) {
             if (CodeClient.MC.player == null) return;
-            ChestPeeker.pick(items -> {
-                for (ItemStack item : items) {
-                    VarItem varItem = VarItems.parse(item);
-                    if (!(varItem instanceof Sound sound)) continue;
-                    Optional<dev.dfonline.codeclient.hypercube.actiondump.Sound> adSound = sound.getSoundId();
-                    if (adSound.isEmpty()) continue;
-                    try {
-                        CodeClient.MC.player.playSound(
-                                (SoundEvent) SoundEvents.class.getDeclaredField(adSound.get().sound).get(null),
-                                (float) sound.getVolume(),
-                                (float) sound.getPitch()
-                        );
-                    } catch (Exception ignored) {
-
-                    }
-                }
+            ChestPeeker.pick(PreviewSoundChest::previewSounds);
+        }
+    }
+
+    public static void previewSounds(List<ItemStack> items) {
+        ClientPlayerEntity player = CodeClient.MC.player;
+        if (player == null || CodeClient.MC.world == null) return;
+
+        for (ItemStack item : items) {
+            VarItem varItem = VarItems.parse(item);
+            if (!(varItem instanceof dev.dfonline.codeclient.hypercube.item.Sound sound)) continue;
+
+            sound.getSoundId().ifPresent(adSound -> {
+                Sound.Variant variant = adSound.getVariantFromName(sound.getVariant());
+                Identifier id = Identifier.ofVanilla(adSound.soundId);
+                SoundEvent event = SoundEvent.of(id);
+
+                CodeClient.MC.world.playSound(
+                        player,
+                        player.getX(),
+                        player.getY(),
+                        player.getZ(),
+                        event,
+                        SoundCategory.MASTER,
+                        (float) sound.getVolume(),
+                        (float) sound.getPitch(),
+                        // I would copy-paste this entire method call for either variant or non-variant
+                        // to preserve the original random, but this is way cleaner.
+                        variant != null ? variant.seed() : threadSafeRandom.nextLong()
+                );
             });
         }
     }
+
 }

src/main/java/dev/dfonline/codeclient/hypercube/actiondump/Sound.java

@@ -7,6 +7,8 @@
 
 public class Sound extends VarItem implements Searchable {
     public String sound;
+    public String soundId;
+    public Variant[] variants;
 
     @Override
     public List<String> getTerms() {
@@ -20,4 +22,19 @@ public ItemStack getItem() {
         data.addProperty("vol", 2);
         return super.getItem("snd", data);
     }
+
+    public record Variant(String id, String name, long seed) {
+    }
+
+    public Variant getVariantFromName(String id) {
+        if (variants == null) {
+            return null;
+        }
+        for (Variant variant : variants) {
+            if (variant.id.equals(id)) {
+                return variant;
+            }
+        }
+        return null;
+    }
 }

src/main/java/dev/dfonline/codeclient/hypercube/item/Sound.java

@@ -13,12 +13,14 @@
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
 import java.util.*;
 
 public class Sound extends VarItem {
     private String sound;
     private double pitch;
     private double volume;
+    private String variant;
 
     public static final Map<String, Double> Notes;
     public static final Map<Double, String> Pitches;
@@ -83,6 +85,9 @@ public Sound(JsonObject var) {
         this.sound = data.get("sound").getAsString();
         this.pitch = data.get("pitch").getAsDouble();
         this.volume = data.get("vol").getAsDouble();
+        if (data.has("variant")) {
+            this.variant = data.get("variant").getAsString();
+        }
     }
 
     public Sound() {
@@ -100,10 +105,9 @@ public String getSound() {
     public Optional<dev.dfonline.codeclient.hypercube.actiondump.Sound> getSoundId() {
         try {
             return Arrays.stream(ActionDump.getActionDump().sounds).filter(sound -> Objects.equals(sound.icon.getCleanName(), this.sound)).findFirst();
-        } catch (Exception ignored) {
-
+        } catch (IOException ignored) {
+            return Optional.empty();
         }
-        return Optional.empty();
     }
 
     public void setSound(String sound) {
@@ -141,6 +145,10 @@ public void setVolume(double volume) {
         this.data.addProperty("vol", volume);
     }
 
+    public String getVariant() {
+        return variant;
+    }
+
     @Override
     public ItemStack toStack() {
         ItemStack stack = super.toStack();