diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/screen/music/MusicScreen.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/screen/music/MusicScreen.java index 5db68c6..4ff49ba 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/screen/music/MusicScreen.java +++ b/projects/kitten-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; private final WidgetContainer albumArt; private final WidgetContainer songInfo; + private final WidgetContainer pauseButton; private final PlayingSong song; MusicDisplayMode(WidgetContainer progressBar, WidgetContainer 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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/MusicControlsImpl.java similarity index 97% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/MusicControlsImpl.java index dea2243..da6817c 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/MusicPolling.java similarity index 98% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/MusicPolling.java index 577ba0a..646ac70 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/PolledSong.java similarity index 95% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/PolledSong.java index 7d77970..1e841d4 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/SoundEventsUtils.java similarity index 90% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/SoundEventsUtils.java index b0226c1..2a04a38 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/ChannelMixin.java similarity index 95% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/ChannelMixin.java index d44ef19..09316d5 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MinecraftMixin.java similarity index 89% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MinecraftMixin.java index 32c4a13..9af23b6 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/SoundEngineMixin.java similarity index 88% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java rename to projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/SoundEngineMixin.java index eeecb01..9b0994c 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/MusicControlsImpl.java similarity index 97% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/MusicControlsImpl.java index ee255a0..0275dcc 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicControlsImpl.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/MusicPolling.java similarity index 98% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/MusicPolling.java index 560953b..c6a0c48 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/MusicPolling.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/PolledSong.java similarity index 95% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/PolledSong.java index 7d77970..1e841d4 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/PolledSong.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/SoundEventsUtils.java similarity index 90% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/SoundEventsUtils.java index b0226c1..2a04a38 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/SoundEventsUtils.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/ChannelMixin.java similarity index 95% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/ChannelMixin.java index d44ef19..09316d5 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/ChannelMixin.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_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/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MinecraftMixin.java similarity index 89% rename from projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MinecraftMixin.java index 32c4a13..9af23b6 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_star/impl/mixin/MinecraftMixin.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_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/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/SoundEngineMixin.java similarity index 88% rename from projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java rename to projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/SoundEngineMixin.java index eeecb01..9b0994c 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_star/impl/mixin/SoundEngineMixin.java +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_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 {