Remove unnecessary KitTunes- prefixes

subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/KitTunes.java

@@ -13,7 +13,7 @@
 import net.pixaurora.kit_tunes.impl.config.ConfigManager;
 import net.pixaurora.kit_tunes.impl.config.ScrobblerCache;
 import net.pixaurora.kit_tunes.impl.resource.ResourcePathImpl;
-import net.pixaurora.kit_tunes.impl.service.KitTunesMinecraftUICompat;
+import net.pixaurora.kit_tunes.impl.service.MinecraftUICompat;
 import net.pixaurora.kit_tunes.impl.service.ServiceLoading;
 
 public class KitTunes {
@@ -22,8 +22,7 @@ public class KitTunes {
     public static final ConfigManager<ScrobblerCache> SCROBBLER_CACHE = new ConfigManager<>(
             Constants.SCROBBLER_CACHE_PATH, ScrobblerCache.class, () -> new ScrobblerCache(List.of()));
 
-    public static final KitTunesMinecraftUICompat UI_LAYER = ServiceLoading
-            .loadJustOneOrThrow(KitTunesMinecraftUICompat.class);
+    public static final MinecraftUICompat UI_LAYER = ServiceLoading.loadJustOneOrThrow(MinecraftUICompat.class);
 
     public static final List<MusicEventListener> MUSIC_LISTENERS = ServiceLoading.loadAll(MusicEventListener.class);
 

subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/listener/NotificationSendingMusicListener.java

@@ -3,13 +3,13 @@
 import net.pixaurora.kit_tunes.api.event.TrackEndEvent;
 import net.pixaurora.kit_tunes.api.event.TrackStartEvent;
 import net.pixaurora.kit_tunes.api.listener.MusicEventListener;
-import net.pixaurora.kit_tunes.impl.service.KitTunesMinecraftUICompat;
+import net.pixaurora.kit_tunes.impl.service.MinecraftUICompat;
 
 public class NotificationSendingMusicListener implements MusicEventListener {
     @Override
     public void onTrackStart(TrackStartEvent event) {
         if (event.track().isPresent()) {
-            KitTunesMinecraftUICompat.sendNowPlayingNotification(event.track().get());
+            MinecraftUICompat.sendNowPlayingNotification(event.track().get());
         }
     }
 

subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/service/KitTunesMinecraftUICompat.java → subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/service/MinecraftUICompat.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 KitTunesMinecraftUICompat extends SoundPlayer, TextProcessor {
+public interface MinecraftUICompat extends SoundPlayer, TextProcessor {
     public static void sendNowPlayingNotification(Track track) {
         KitTunes.UI_LAYER.sendToast(Toast.fromData(new MeowPlayingToast(track)));
     }

subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/ui/MinecraftClient.java

@@ -1,14 +1,14 @@
 package net.pixaurora.kit_tunes.impl.ui;
 
 import net.pixaurora.kit_tunes.impl.KitTunes;
-import net.pixaurora.kit_tunes.impl.service.KitTunesMinecraftUICompat;
+import net.pixaurora.kit_tunes.impl.service.MinecraftUICompat;
 import net.pixaurora.kit_tunes.impl.ui.math.Size;
 import net.pixaurora.kit_tunes.impl.ui.screen.Screen;
 import net.pixaurora.kit_tunes.impl.ui.sound.Sound;
 import net.pixaurora.kit_tunes.impl.ui.text.Component;
 
 public interface MinecraftClient {
-    private static KitTunesMinecraftUICompat impl() {
+    private static MinecraftUICompat impl() {
         return KitTunes.UI_LAYER;
     }
 

subprojects/core/src/main/java/net/pixaurora/kit_tunes/impl/ui/display/WrappedGuiDisplay.java

@@ -30,11 +30,11 @@ public void drawGuiTextureSubsection(ResourcePath path, Size size, Point pos, Si
 
     @Override
     public void drawText(Component text, Color color, Point pos, boolean shadowed) {
-        this.drawText(text, color, pos, shadowed);
+        this.parent.drawText(text, color, pos, shadowed);
     }
 
     @Override
     public void drawTextBox(TextBox box) {
-        this.drawTextBox(box);
+        this.parent.drawTextBox(box);
     }
 }

subprojects/sound_events/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/MusicPolling.java

@@ -23,8 +23,8 @@ public class MusicPolling implements SoundEventListener {
     public void onPlaySound(SoundInstance sound, WeighedSoundEvents soundSet, float range) {
         SoundSource source = sound.getSource();
         if (source == SoundSource.MUSIC || source == SoundSource.RECORDS) {
-            PolledListeningProgress progress = EventHandling.handleTrackStart(
-                    KitTunesSoundEventsUtils.minecraftTypeToInternalType(sound.getSound().getLocation()));
+            PolledListeningProgress progress = EventHandling
+                    .handleTrackStart(SoundEventsUtils.minecraftTypeToInternalType(sound.getSound().getLocation()));
 
             TRACKS_TO_POLL.add(Pair.of(sound, progress));
         }

subprojects/sound_events/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/KitTunesSoundEventsUtils.java → subprojects/sound_events/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/SoundEventsUtils.java

@@ -4,7 +4,7 @@
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;
 import net.pixaurora.kit_tunes.impl.resource.ResourcePathImpl;
 
-public class KitTunesSoundEventsUtils {
+public class SoundEventsUtils {
     public static ResourcePath minecraftTypeToInternalType(ResourceLocation identifier) {
         return new ResourcePathImpl(identifier.getNamespace(), identifier.getPath());
     }

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/FakeComponent.java

@@ -16,6 +16,6 @@ public MutableComponent gameVer() {
 
     @Override
     public Component concat(Component component) {
-        return new FakeComponent(this.parent.copy().append(KitTunesUIImpl.internalToMinecraftType(component)));
+        return new FakeComponent(this.parent.copy().append(UICompatImpl.internalToMinecraftType(component)));
     }
 }

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/KitTunesUIImpl.java → subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/UICompatImpl.java

@@ -8,20 +8,20 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesScreenImpl;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesToastImpl;
+import net.pixaurora.kit_tunes.impl.gui.ScreenImpl;
+import net.pixaurora.kit_tunes.impl.gui.ToastImpl;
 import net.pixaurora.kit_tunes.impl.gui.MinecraftScreen;
 import net.pixaurora.kit_tunes.impl.gui.widget.TextBoxImpl;
 import net.pixaurora.kit_tunes.impl.resource.ResourcePathUtils;
-import net.pixaurora.kit_tunes.impl.service.KitTunesMinecraftUICompat;
+import net.pixaurora.kit_tunes.impl.service.MinecraftUICompat;
 import net.pixaurora.kit_tunes.impl.ui.math.Point;
 import net.pixaurora.kit_tunes.impl.ui.screen.Screen;
 import net.pixaurora.kit_tunes.impl.ui.sound.Sound;
 import net.pixaurora.kit_tunes.impl.ui.text.Color;
 import net.pixaurora.kit_tunes.impl.ui.text.Component;
 import net.pixaurora.kit_tunes.impl.ui.widget.text.TextBox;
 
-public class KitTunesUIImpl implements KitTunesMinecraftUICompat {
+public class UICompatImpl implements MinecraftUICompat {
     private final Minecraft client = Minecraft.getInstance();
 
     public static ResourceLocation internalToMinecraftType(ResourcePath path) {
@@ -44,7 +44,7 @@ public static MutableComponent internalToMinecraftType(Component component) {
 
     @Override
     public void sendToast(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
-        this.client.getToasts().addToast(new KitTunesToastImpl(toast));
+        this.client.getToasts().addToast(new ToastImpl(toast));
     }
 
     @Override
@@ -93,7 +93,7 @@ public void setScreen(Screen screen) {
         if (screen instanceof MinecraftScreen) {
             mcScreen = ((MinecraftScreen) screen).parent();
         } else {
-            mcScreen = new KitTunesScreenImpl(screen);
+            mcScreen = new ScreenImpl(screen);
         }
         this.client.setScreen(mcScreen);
     }
@@ -105,7 +105,7 @@ public void confirmURL(String url) {
 
     @Override
     public TextBox createTextbox(List<Component> lines, Color color, int maxLineLength, Point pos) {
-        List<FormattedCharSequence> text = lines.stream().map(KitTunesUIImpl::internalToMinecraftType)
+        List<FormattedCharSequence> text = lines.stream().map(UICompatImpl::internalToMinecraftType)
                 .flatMap(line -> this.client.font.split(line, maxLineLength).stream()).toList();
 
         return new TextBoxImpl(text, color, pos);

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/compat/ModMenuIntegration.java

@@ -7,13 +7,13 @@
 
 import net.minecraft.client.gui.screens.Screen;
 import net.pixaurora.kit_tunes.impl.Constants;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesScreenImpl;
+import net.pixaurora.kit_tunes.impl.gui.ScreenImpl;
 import net.pixaurora.kit_tunes.impl.gui.MinecraftScreen;
 import net.pixaurora.kit_tunes.impl.ui.screen.KitTunesHomeScreen;
 
 public class ModMenuIntegration implements ModMenuApi {
-    public KitTunesScreenImpl modHomeScreen(Screen parent) {
-        return new KitTunesScreenImpl(new KitTunesHomeScreen(new MinecraftScreen(parent)));
+    public ScreenImpl modHomeScreen(Screen parent) {
+        return new ScreenImpl(new KitTunesHomeScreen(new MinecraftScreen(parent)));
     }
 
     @Override

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/gui/ConversionCacheImpl.java

@@ -2,19 +2,19 @@
 
 import net.minecraft.resources.ResourceLocation;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;
-import net.pixaurora.kit_tunes.impl.KitTunesUIImpl;
+import net.pixaurora.kit_tunes.impl.UICompatImpl;
 import net.pixaurora.kit_tunes.impl.ui.ConversionCache;
 
 public class ConversionCacheImpl extends ConversionCache<ResourceLocation, net.minecraft.network.chat.Component> {
     @Override
     protected ResourceLocation resourceToMinecraftType(ResourcePath path) {
-        return KitTunesUIImpl.internalToMinecraftType(path);
+        return UICompatImpl.internalToMinecraftType(path);
     }
 
     @Override
     protected net.minecraft.network.chat.Component componentToMinecraftType(
             net.pixaurora.kit_tunes.impl.ui.text.Component component) {
-        return KitTunesUIImpl.internalToMinecraftType(component);
+        return UICompatImpl.internalToMinecraftType(component);
     }
 
 }

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/gui/KitTunesScreenImpl.java → subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/gui/ScreenImpl.java

@@ -7,12 +7,12 @@
 import net.pixaurora.kit_tunes.impl.ui.math.Size;
 import net.pixaurora.kit_tunes.impl.ui.screen.Screen;
 
-public class KitTunesScreenImpl extends net.minecraft.client.gui.screens.Screen {
+public class ScreenImpl extends net.minecraft.client.gui.screens.Screen {
     private final Screen screen;
 
     private final ConversionCacheImpl conversions;
 
-    public KitTunesScreenImpl(Screen screen) {
+    public ScreenImpl(Screen screen) {
         super(Component.empty());
 
         this.screen = screen;

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/gui/KitTunesToastImpl.java → subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/gui/ToastImpl.java

@@ -4,7 +4,7 @@
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 
-public class KitTunesToastImpl implements Toast {
+public class ToastImpl implements Toast {
     private final net.pixaurora.kit_tunes.impl.ui.toast.Toast toast;
     private final long millisecondsShown;
 
@@ -13,7 +13,7 @@ public class KitTunesToastImpl implements Toast {
     private boolean hasRendered;
     private long firstRenderedTime;
 
-    public KitTunesToastImpl(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
+    public ToastImpl(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
         this.toast = toast;
         this.millisecondsShown = toast.timeShown().toMillis();
         this.conversions = new ConversionCacheImpl();

subprojects/ui/r1.20.4/src/main/resources/META-INF/services/net.pixaurora.kit_tunes.impl.service.MinecraftUICompat

@@ -0,0 +1 @@
+net.pixaurora.kit_tunes.impl.UICompatImpl

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/FakeComponent.java

@@ -16,6 +16,6 @@ public MutableComponent gameVer() {
 
     @Override
     public Component concat(Component component) {
-        return new FakeComponent(this.parent.copy().append(KitTunesUIImpl.internalToMinecraftType(component)));
+        return new FakeComponent(this.parent.copy().append(UICompatImpl.internalToMinecraftType(component)));
     }
 }

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/KitTunesUIImpl.java → subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/UICompatImpl.java

@@ -8,20 +8,20 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesScreenImpl;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesToastImpl;
+import net.pixaurora.kit_tunes.impl.gui.ScreenImpl;
+import net.pixaurora.kit_tunes.impl.gui.ToastImpl;
 import net.pixaurora.kit_tunes.impl.gui.MinecraftScreen;
 import net.pixaurora.kit_tunes.impl.gui.widget.TextBoxImpl;
 import net.pixaurora.kit_tunes.impl.resource.ResourcePathUtils;
-import net.pixaurora.kit_tunes.impl.service.KitTunesMinecraftUICompat;
+import net.pixaurora.kit_tunes.impl.service.MinecraftUICompat;
 import net.pixaurora.kit_tunes.impl.ui.math.Point;
 import net.pixaurora.kit_tunes.impl.ui.screen.Screen;
 import net.pixaurora.kit_tunes.impl.ui.sound.Sound;
 import net.pixaurora.kit_tunes.impl.ui.text.Color;
 import net.pixaurora.kit_tunes.impl.ui.text.Component;
 import net.pixaurora.kit_tunes.impl.ui.widget.text.TextBox;
 
-public class KitTunesUIImpl implements KitTunesMinecraftUICompat {
+public class UICompatImpl implements MinecraftUICompat {
     private final Minecraft client = Minecraft.getInstance();
 
     public static ResourceLocation internalToMinecraftType(ResourcePath path) {
@@ -44,7 +44,7 @@ public static MutableComponent internalToMinecraftType(Component component) {
 
     @Override
     public void sendToast(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
-        this.client.getToasts().addToast(new KitTunesToastImpl(toast));
+        this.client.getToasts().addToast(new ToastImpl(toast));
     }
 
     @Override
@@ -93,7 +93,7 @@ public void setScreen(Screen screen) {
         if (screen instanceof MinecraftScreen) {
             mcScreen = ((MinecraftScreen) screen).parent();
         } else {
-            mcScreen = new KitTunesScreenImpl(screen);
+            mcScreen = new ScreenImpl(screen);
         }
         this.client.setScreen(mcScreen);
     }
@@ -105,7 +105,7 @@ public void confirmURL(String url) {
 
     @Override
     public TextBox createTextbox(List<Component> lines, Color color, int maxLineLength, Point pos) {
-        List<FormattedCharSequence> text = lines.stream().map(KitTunesUIImpl::internalToMinecraftType)
+        List<FormattedCharSequence> text = lines.stream().map(UICompatImpl::internalToMinecraftType)
                 .flatMap(line -> this.client.font.split(line, maxLineLength).stream()).toList();
 
         return new TextBoxImpl(text, color, pos);

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/compat/ModMenuIntegration.java

@@ -7,13 +7,13 @@
 
 import net.minecraft.client.gui.screens.Screen;
 import net.pixaurora.kit_tunes.impl.Constants;
-import net.pixaurora.kit_tunes.impl.gui.KitTunesScreenImpl;
+import net.pixaurora.kit_tunes.impl.gui.ScreenImpl;
 import net.pixaurora.kit_tunes.impl.gui.MinecraftScreen;
 import net.pixaurora.kit_tunes.impl.ui.screen.KitTunesHomeScreen;
 
 public class ModMenuIntegration implements ModMenuApi {
-    public KitTunesScreenImpl modHomeScreen(Screen parent) {
-        return new KitTunesScreenImpl(new KitTunesHomeScreen(new MinecraftScreen(parent)));
+    public ScreenImpl modHomeScreen(Screen parent) {
+        return new ScreenImpl(new KitTunesHomeScreen(new MinecraftScreen(parent)));
     }
 
     @Override

subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/gui/ConversionCacheImpl.java

@@ -2,19 +2,19 @@
 
 import net.minecraft.resources.ResourceLocation;
 import net.pixaurora.kit_tunes.api.resource.ResourcePath;
-import net.pixaurora.kit_tunes.impl.KitTunesUIImpl;
+import net.pixaurora.kit_tunes.impl.UICompatImpl;
 import net.pixaurora.kit_tunes.impl.ui.ConversionCache;
 
 public class ConversionCacheImpl extends ConversionCache<ResourceLocation, net.minecraft.network.chat.Component> {
     @Override
     protected ResourceLocation resourceToMinecraftType(ResourcePath path) {
-        return KitTunesUIImpl.internalToMinecraftType(path);
+        return UICompatImpl.internalToMinecraftType(path);
     }
 
     @Override
     protected net.minecraft.network.chat.Component componentToMinecraftType(
             net.pixaurora.kit_tunes.impl.ui.text.Component component) {
-        return KitTunesUIImpl.internalToMinecraftType(component);
+        return UICompatImpl.internalToMinecraftType(component);
     }
 
 }

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/gui/KitTunesScreenImpl.java → subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/gui/ScreenImpl.java

@@ -7,12 +7,12 @@
 import net.pixaurora.kit_tunes.impl.ui.math.Size;
 import net.pixaurora.kit_tunes.impl.ui.screen.Screen;
 
-public class KitTunesScreenImpl extends net.minecraft.client.gui.screens.Screen {
+public class ScreenImpl extends net.minecraft.client.gui.screens.Screen {
     private final Screen screen;
 
     private final ConversionCacheImpl conversions;
 
-    public KitTunesScreenImpl(Screen screen) {
+    public ScreenImpl(Screen screen) {
         super(Component.empty());
 
         this.screen = screen;

subprojects/ui/r1.20.4/src/main/java/net/pixaurora/kit_tunes/impl/gui/KitTunesToastImpl.java → subprojects/ui/r1.21.0/src/main/java/net/pixaurora/kit_tunes/impl/gui/ToastImpl.java

@@ -4,7 +4,7 @@
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 
-public class KitTunesToastImpl implements Toast {
+public class ToastImpl implements Toast {
     private final net.pixaurora.kit_tunes.impl.ui.toast.Toast toast;
     private final long millisecondsShown;
 
@@ -13,7 +13,7 @@ public class KitTunesToastImpl implements Toast {
     private boolean hasRendered;
     private long firstRenderedTime;
 
-    public KitTunesToastImpl(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
+    public ToastImpl(net.pixaurora.kit_tunes.impl.ui.toast.Toast toast) {
         this.toast = toast;
         this.millisecondsShown = toast.timeShown().toMillis();
         this.conversions = new ConversionCacheImpl();

subprojects/ui/r1.21.0/src/main/resources/META-INF/services/net.pixaurora.kit_tunes.impl.service.MinecraftUICompat

@@ -0,0 +1 @@
+net.pixaurora.kit_tunes.impl.UICompatImpl