Clean up sounds stuff

Pixaurora · Oct 29, 2024 · 404c02e · 404c02e
1 parent 961a47e
commit 404c02e
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 18 deletions.
diff --git a/...tten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/screen/music/MusicScreen.java b/...tten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/screen/music/MusicScreen.java
@@ -151,6 +151,7 @@ private class MusicDisplayMode implements DisplayMode {
         private final WidgetContainer<Timer> timer;
         private final WidgetContainer<StaticTexture> albumArt;
         private final WidgetContainer<PushableTextLines> songInfo;
+        private final WidgetContainer<RectangularButton> pauseButton;
         private final PlayingSong song;
 
         MusicDisplayMode(WidgetContainer<ProgressBar> progressBar, WidgetContainer<Timer> timer,
@@ -160,6 +161,7 @@ private class MusicDisplayMode implements DisplayMode {
             this.timer = timer;
             this.albumArt = albumArt;
             this.songInfo = songInfo;
+            this.pauseButton = pauseButton;
             this.song = song;
         }
 
@@ -174,6 +176,7 @@ public void cleanup() {
             MusicScreen.this.removeWidget(this.timer);
             MusicScreen.this.removeWidget(this.albumArt);
             MusicScreen.this.removeWidget(this.songInfo);
+            MusicScreen.this.removeWidget(this.pauseButton);
         }
     }
 

diff --git a/...a/kitten_star/impl/MusicControlsImpl.java → ...kitten_sounds/impl/MusicControlsImpl.java b/...a/kitten_star/impl/MusicControlsImpl.java → ...kitten_sounds/impl/MusicControlsImpl.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

diff --git a/...aurora/kitten_star/impl/MusicPolling.java → ...rora/kitten_sounds/impl/MusicPolling.java b/...aurora/kitten_star/impl/MusicPolling.java → ...rora/kitten_sounds/impl/MusicPolling.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ixaurora/kitten_star/impl/PolledSong.java → ...aurora/kitten_sounds/impl/PolledSong.java b/...ixaurora/kitten_star/impl/PolledSong.java → ...aurora/kitten_sounds/impl/PolledSong.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import net.pixaurora.kitten_heart.impl.music.progress.PolledListeningProgress;
 

diff --git a/...ra/kitten_star/impl/SoundEventsUtils.java → .../kitten_sounds/impl/SoundEventsUtils.java b/...ra/kitten_star/impl/SoundEventsUtils.java → .../kitten_sounds/impl/SoundEventsUtils.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import net.minecraft.resources.ResourceLocation;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;

diff --git a/.../kitten_star/impl/mixin/ChannelMixin.java → ...itten_sounds/impl/mixin/ChannelMixin.java b/.../kitten_star/impl/mixin/ChannelMixin.java → ...itten_sounds/impl/mixin/ChannelMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import org.lwjgl.openal.AL10;
 import org.lwjgl.openal.AL11;

diff --git a/...itten_star/impl/mixin/MinecraftMixin.java → ...ten_sounds/impl/mixin/MinecraftMixin.java b/...itten_star/impl/mixin/MinecraftMixin.java → ...ten_sounds/impl/mixin/MinecraftMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -7,7 +7,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.pixaurora.kitten_heart.impl.KitTunes;
-import net.pixaurora.kitten_star.impl.MusicPolling;
+import net.pixaurora.kitten_sounds.impl.MusicPolling;
 
 @Mixin(Minecraft.class)
 public class MinecraftMixin {

diff --git a/...ten_star/impl/mixin/SoundEngineMixin.java → ...n_sounds/impl/mixin/SoundEngineMixin.java b/...ten_star/impl/mixin/SoundEngineMixin.java → ...n_sounds/impl/mixin/SoundEngineMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import java.util.Map;
 
@@ -12,7 +12,7 @@
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
-import net.pixaurora.kitten_star.impl.MusicPolling;
+import net.pixaurora.kitten_sounds.impl.MusicPolling;
 
 @Mixin(SoundEngine.class)
 public class SoundEngineMixin {

diff --git a/...a/kitten_star/impl/MusicControlsImpl.java → ...kitten_sounds/impl/MusicControlsImpl.java b/...a/kitten_star/impl/MusicControlsImpl.java → ...kitten_sounds/impl/MusicControlsImpl.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

diff --git a/...aurora/kitten_star/impl/MusicPolling.java → ...rora/kitten_sounds/impl/MusicPolling.java b/...aurora/kitten_star/impl/MusicPolling.java → ...rora/kitten_sounds/impl/MusicPolling.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ixaurora/kitten_star/impl/PolledSong.java → ...aurora/kitten_sounds/impl/PolledSong.java b/...ixaurora/kitten_star/impl/PolledSong.java → ...aurora/kitten_sounds/impl/PolledSong.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import net.pixaurora.kitten_heart.impl.music.progress.PolledListeningProgress;
 

diff --git a/...ra/kitten_star/impl/SoundEventsUtils.java → .../kitten_sounds/impl/SoundEventsUtils.java b/...ra/kitten_star/impl/SoundEventsUtils.java → .../kitten_sounds/impl/SoundEventsUtils.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl;
+package net.pixaurora.kitten_sounds.impl;
 
 import net.minecraft.resources.ResourceLocation;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;

diff --git a/.../kitten_star/impl/mixin/ChannelMixin.java → ...itten_sounds/impl/mixin/ChannelMixin.java b/.../kitten_star/impl/mixin/ChannelMixin.java → ...itten_sounds/impl/mixin/ChannelMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import org.lwjgl.openal.AL10;
 import org.lwjgl.openal.AL11;

diff --git a/...itten_star/impl/mixin/MinecraftMixin.java → ...ten_sounds/impl/mixin/MinecraftMixin.java b/...itten_star/impl/mixin/MinecraftMixin.java → ...ten_sounds/impl/mixin/MinecraftMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -7,7 +7,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.pixaurora.kitten_heart.impl.KitTunes;
-import net.pixaurora.kitten_star.impl.MusicPolling;
+import net.pixaurora.kitten_sounds.impl.MusicPolling;
 
 @Mixin(Minecraft.class)
 public class MinecraftMixin {

diff --git a/...ten_star/impl/mixin/SoundEngineMixin.java → ...n_sounds/impl/mixin/SoundEngineMixin.java b/...ten_star/impl/mixin/SoundEngineMixin.java → ...n_sounds/impl/mixin/SoundEngineMixin.java
@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_star.impl.mixin;
+package net.pixaurora.kitten_sounds.impl.mixin;
 
 import java.util.Map;
 
@@ -12,7 +12,7 @@
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
-import net.pixaurora.kitten_star.impl.MusicPolling;
+import net.pixaurora.kitten_sounds.impl.MusicPolling;
 
 @Mixin(SoundEngine.class)
 public class SoundEngineMixin {