diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/MinecraftClient.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/MinecraftClient.java index 7922cfd9..f950ea68 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/MinecraftClient.java +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/MinecraftClient.java @@ -9,10 +9,10 @@ import net.pixaurora.kitten_cube.impl.ui.sound.Sound; import net.pixaurora.kitten_heart.impl.KitTunes; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; public final class MinecraftClient { - private static MinecraftUICompat impl() { + private static UICompat impl() { return KitTunes.UI_LAYER; } diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java index d738f6bd..15f17436 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java @@ -18,7 +18,8 @@ import net.pixaurora.kitten_heart.impl.music.metadata.MusicMetadata; import net.pixaurora.kitten_heart.impl.music.metadata.MusicMetadataLoader; import net.pixaurora.kitten_heart.impl.resource.ResourcePathImpl; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; +import net.pixaurora.kitten_heart.impl.service.MusicCompat; import net.pixaurora.kitten_heart.impl.service.ServiceLoading; import net.pixaurora.catculator.impl.Catculator; @@ -40,7 +41,9 @@ public class KitTunes { public static ConfigManager SCROBBLER_CACHE; public static ConfigManager LISTEN_HISTORY; - public static final MinecraftUICompat UI_LAYER = ServiceLoading.loadJustOneOrThrow(MinecraftUICompat.class); + public static final UICompat UI_LAYER = ServiceLoading.loadJustOneOrThrow(UICompat.class); + + public static final MusicCompat MUSIC_LAYER = ServiceLoading.loadJustOneOrThrow(MusicCompat.class); public static final List MUSIC_LISTENERS = ServiceLoading.loadAll(MusicEventListener.class); diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MusicCompat.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MusicCompat.java new file mode 100644 index 00000000..f557c1d2 --- /dev/null +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MusicCompat.java @@ -0,0 +1,5 @@ +package net.pixaurora.kitten_heart.impl.service; + +public interface MusicCompat { + long millisToNextSong(); +} diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MinecraftUICompat.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java similarity index 93% rename from projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MinecraftUICompat.java rename to projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java index f98580a4..ced9058c 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/MinecraftUICompat.java +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java @@ -14,7 +14,7 @@ * The version-specific implementation for pieces of the UI that are organized * in the core of the mod. */ -public interface MinecraftUICompat extends SoundPlayer, TextProcessor { +public interface UICompat extends SoundPlayer, TextProcessor { public void sendToast(Toast toast); public Component translatable(String key); 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 ab5e9069..83a913c8 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 @@ -26,9 +26,11 @@ import net.pixaurora.kitten_heart.impl.ui.screen.KitTunesScreenTemplate; import net.pixaurora.kitten_heart.impl.ui.widget.PauseButton; import net.pixaurora.kitten_heart.impl.ui.widget.Timer; +import net.pixaurora.kitten_heart.impl.ui.widget.progress.MusicCooldownProgress; import net.pixaurora.kitten_heart.impl.ui.widget.progress.ProgressBar; import net.pixaurora.kitten_heart.impl.ui.widget.progress.ProgressBarTileSet; import net.pixaurora.kitten_heart.impl.ui.widget.progress.ProgressBarTileSets; +import net.pixaurora.kitten_heart.impl.ui.widget.progress.ProgressProvider; import static net.pixaurora.kitten_heart.impl.music.metadata.MusicMetadata.asComponent; @@ -89,18 +91,8 @@ private static ProgressBarTileSet tileSet(ResourcePath texturePath) { Point.ZERO, Size.of(4, 4), Point.of(4, 0), Size.of(4, 4), Point.of(8, 0), Size.of(4, 4)); } - private static interface DisplayMode { - boolean isActive(); - - void cleanup(); - } - public DisplayMode createMusicDisplay(PlayingSong song) { - WidgetContainer progressBar = this - .addWidget(new ProgressBar(song, PLAYING_SONG_TILE_SET)) - .align(Alignment.CENTER_BOTTOM) - .at(Point.of(0, -24)) - .anchor(WidgetAnchor.TOP_MIDDLE); + WidgetContainer progressBar = this.configProgressBar(song, PLAYING_SONG_TILE_SET); WidgetContainer timer = this.addWidget(new Timer(song)) .align(progressBar.relativeTo(WidgetAnchor.BOTTOM_MIDDLE)) @@ -155,40 +147,58 @@ public DisplayMode createMusicDisplay(PlayingSong song) { } public DisplayMode createWaitingDisplay() { - return new WaitingDisplayMode(); + ProgressProvider progress = new MusicCooldownProgress(); + + WidgetContainer progressBar = this.configProgressBar(progress, PLAYING_SONG_TILE_SET); + + return new WaitingDisplayMode(Arrays.asList(progressBar)); } - private class MusicDisplayMode implements DisplayMode { - private final PlayingSong song; + private WidgetContainer configProgressBar(ProgressProvider progress, ProgressBarTileSets tileSets) { + return this.addWidget(new ProgressBar(progress, tileSets)) + .align(Alignment.CENTER_BOTTOM) + .at(Point.of(0, -24)) + .anchor(WidgetAnchor.TOP_MIDDLE); + } + + private abstract class DisplayMode { private final List> widgets; - MusicDisplayMode(PlayingSong song, List> widgets) { - this.song = song; + public DisplayMode(List> widgets) { this.widgets = widgets; } - @Override - public boolean isActive() { - return EventHandling.isTracking(song.progress()); - } + abstract boolean isActive(); - @Override - public void cleanup() { + void cleanup() { for (WidgetContainer widget : this.widgets) { MusicScreen.this.removeWidget(widget); } } } - private class WaitingDisplayMode implements DisplayMode { + private class MusicDisplayMode extends DisplayMode { + private final PlayingSong song; + + MusicDisplayMode(PlayingSong song, List> widgets) { + super(widgets); + this.song = song; + } + @Override public boolean isActive() { - return !EventHandling.isTrackingAnything(); + return EventHandling.isTracking(song.progress()); } + } - @Override - public void cleanup() { + private class WaitingDisplayMode extends DisplayMode { + WaitingDisplayMode(List> widgets) { + super(widgets); + } + @Override + public boolean isActive() { + return !EventHandling.isTrackingAnything(); } } } diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/widget/progress/MusicCooldownProgress.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/widget/progress/MusicCooldownProgress.java new file mode 100644 index 00000000..2a3e5aa4 --- /dev/null +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/ui/widget/progress/MusicCooldownProgress.java @@ -0,0 +1,29 @@ +package net.pixaurora.kitten_heart.impl.ui.widget.progress; + +import java.time.Duration; + +import net.pixaurora.kitten_heart.impl.KitTunes; + +public class MusicCooldownProgress implements ProgressProvider { + private final long startingCooldown; + + public MusicCooldownProgress() { + this.startingCooldown = KitTunes.MUSIC_LAYER.millisToNextSong(); + } + + @Override + public double percentComplete() { + return (double) KitTunes.MUSIC_LAYER.millisToNextSong() / this.startingCooldown; + } + + @Override + public Duration playedDuration() { + return Duration.ofMillis(KitTunes.MUSIC_LAYER.millisToNextSong()); + } + + @Override + public Duration totalDuration() { + return Duration.ofMillis(startingCooldown); + } + +} diff --git a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java new file mode 100644 index 00000000..aba93f4a --- /dev/null +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java @@ -0,0 +1,12 @@ +package net.pixaurora.kitten_sounds.impl.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.sounds.MusicManager; + +@Mixin(MusicManager.class) +public interface MusicManagerAccessor { + @Accessor + public int getNextSongDelay(); +} diff --git a/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java new file mode 100644 index 00000000..05c22f9d --- /dev/null +++ b/projects/kitten-sounds/r1.17.0/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java @@ -0,0 +1,17 @@ +package net.pixaurora.kitten_sounds.impl.service; + +import net.minecraft.client.Minecraft; +import net.pixaurora.kitten_heart.impl.service.MusicCompat; +import net.pixaurora.kitten_sounds.impl.mixin.MusicManagerAccessor; + +public class MusicCompatImpl implements MusicCompat { + private static final long MILLIS_PER_TICK = 50; + + private final Minecraft client = Minecraft.getInstance(); + + @Override + public long millisToNextSong() { + long nextSongDelay = ((MusicManagerAccessor) this.client.getMusicManager()).getNextSongDelay(); + return MILLIS_PER_TICK * nextSongDelay; + } +} diff --git a/projects/kitten-sounds/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat b/projects/kitten-sounds/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat new file mode 100644 index 00000000..31ece07f --- /dev/null +++ b/projects/kitten-sounds/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat @@ -0,0 +1 @@ +net.pixaurora.kitten_sounds.impl.service.MusicCompatImpl diff --git a/projects/kitten-sounds/r1.17.0/src/main/resources/kitten_sounds.mixins.json b/projects/kitten-sounds/r1.17.0/src/main/resources/kitten_sounds.mixins.json index bb8e3b6c..86574d81 100644 --- a/projects/kitten-sounds/r1.17.0/src/main/resources/kitten_sounds.mixins.json +++ b/projects/kitten-sounds/r1.17.0/src/main/resources/kitten_sounds.mixins.json @@ -7,6 +7,7 @@ "client": [ "ChannelMixin", "MinecraftMixin", + "MusicManagerAccessor", "SoundEngineMixin" ], "injectors": { diff --git a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java new file mode 100644 index 00000000..aba93f4a --- /dev/null +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/mixin/MusicManagerAccessor.java @@ -0,0 +1,12 @@ +package net.pixaurora.kitten_sounds.impl.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.sounds.MusicManager; + +@Mixin(MusicManager.class) +public interface MusicManagerAccessor { + @Accessor + public int getNextSongDelay(); +} diff --git a/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java new file mode 100644 index 00000000..05c22f9d --- /dev/null +++ b/projects/kitten-sounds/r1.20.3/src/main/java/net/pixaurora/kitten_sounds/impl/service/MusicCompatImpl.java @@ -0,0 +1,17 @@ +package net.pixaurora.kitten_sounds.impl.service; + +import net.minecraft.client.Minecraft; +import net.pixaurora.kitten_heart.impl.service.MusicCompat; +import net.pixaurora.kitten_sounds.impl.mixin.MusicManagerAccessor; + +public class MusicCompatImpl implements MusicCompat { + private static final long MILLIS_PER_TICK = 50; + + private final Minecraft client = Minecraft.getInstance(); + + @Override + public long millisToNextSong() { + long nextSongDelay = ((MusicManagerAccessor) this.client.getMusicManager()).getNextSongDelay(); + return MILLIS_PER_TICK * nextSongDelay; + } +} diff --git a/projects/kitten-sounds/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat b/projects/kitten-sounds/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat new file mode 100644 index 00000000..31ece07f --- /dev/null +++ b/projects/kitten-sounds/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MusicCompat @@ -0,0 +1 @@ +net.pixaurora.kitten_sounds.impl.service.MusicCompatImpl diff --git a/projects/kitten-sounds/r1.20.3/src/main/resources/kitten_sounds.mixins.json b/projects/kitten-sounds/r1.20.3/src/main/resources/kitten_sounds.mixins.json index db186747..dd1b6350 100644 --- a/projects/kitten-sounds/r1.20.3/src/main/resources/kitten_sounds.mixins.json +++ b/projects/kitten-sounds/r1.20.3/src/main/resources/kitten_sounds.mixins.json @@ -7,6 +7,7 @@ "client": [ "ChannelMixin", "MinecraftMixin", + "MusicManagerAccessor", "SoundEngineMixin" ], "injectors": { diff --git a/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index c3e47534..cb209656 100644 --- a/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -20,7 +20,7 @@ import net.pixaurora.kitten_cube.impl.ui.sound.Sound; import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -28,7 +28,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.17.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 6a79d5e9..c1d4b713 100644 --- a/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.sound.Sound; import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.19.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.19.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.19.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.19.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 6a79d5e9..c1d4b713 100644 --- a/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.sound.Sound; import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.19.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.19.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.19.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.19.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 6a79d5e9..c1d4b713 100644 --- a/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.sound.Sound; import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.19.4/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.19.4/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.19.4/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.19.4/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 049870fc..a967138c 100644 --- a/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.ResourcePathUtils; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.20.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.20.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.20.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.20.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 9c81d3d8..afa8aa35 100644 --- a/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.ResourcePathUtils; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.20.3/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 5eae172f..a82349a0 100644 --- a/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.ResourcePathUtils; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.21.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.21.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.21.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.21.0/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat diff --git a/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index 06f8389b..5bd92735 100644 --- a/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -18,7 +18,7 @@ import net.pixaurora.kitten_cube.impl.ui.widget.text.TextBox; import net.pixaurora.kitten_heart.impl.resource.ResourcePathUtils; import net.pixaurora.kitten_heart.impl.resource.temp.FileAccess; -import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat; +import net.pixaurora.kitten_heart.impl.service.UICompat; import net.pixaurora.kitten_square.impl.FakeComponent; import net.pixaurora.kitten_square.impl.SoundUtil; import net.pixaurora.kitten_square.impl.ui.screen.MinecraftScreen; @@ -26,7 +26,7 @@ import net.pixaurora.kitten_square.impl.ui.toast.ToastImpl; import net.pixaurora.kitten_square.impl.ui.widget.TextBoxImpl; -public class UICompatImpl implements MinecraftUICompat { +public class UICompatImpl implements UICompat { private final Minecraft client = Minecraft.getInstance(); public static ResourceLocation internalToMinecraftType(ResourcePath path) { diff --git a/projects/kitten-square/r1.21.2/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat b/projects/kitten-square/r1.21.2/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat similarity index 100% rename from projects/kitten-square/r1.21.2/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.MinecraftUICompat rename to projects/kitten-square/r1.21.2/src/main/resources/META-INF/services/net.pixaurora.kitten_heart.impl.service.UICompat