Perform package renames

StavWasPlayZ · Aug 29, 2023 · baf8cf4 · baf8cf4
1 parent f03a29b
commit baf8cf4
Show file tree

Hide file tree

Showing 47 changed files with 129 additions and 126 deletions.
diff --git a/src/main/java/com/cstav/genshinstrument/client/ClientInitiator.java b/src/main/java/com/cstav/genshinstrument/client/ClientInitiator.java
@@ -4,11 +4,11 @@
 
 import com.cstav.genshinstrument.GInstrumentMod;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.drum.AratakisGreatAndGloriousDrumScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.floralzither.FloralZitherScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.vintagelyre.VintageLyreScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.windsonglyre.WindsongLyreScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.drum.AratakisGreatAndGloriousDrumScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.floralzither.FloralZitherScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.vintagelyre.VintageLyreScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.windsonglyre.WindsongLyreScreen;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.event.ClientEvents;
 import com.cstav.genshinstrument.event.ResourcesLoadedEvent;

diff --git a/src/main/java/com/cstav/genshinstrument/client/ModMenuImp.java b/src/main/java/com/cstav/genshinstrument/client/ModMenuImp.java
@@ -1,6 +1,6 @@
 package com.cstav.genshinstrument.client;
 
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.GridInstrumentOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.GridInstrumentOptionsScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 

diff --git a/src/main/java/com/cstav/genshinstrument/client/config/ModClientConfigs.java b/src/main/java/com/cstav/genshinstrument/client/config/ModClientConfigs.java
@@ -4,8 +4,8 @@
 import com.cstav.genshinstrument.client.config.enumType.ZitherSoundType;
 import com.cstav.genshinstrument.client.config.enumType.label.DrumNoteLabel;
 import com.cstav.genshinstrument.client.config.enumType.label.NoteGridLabel;
-import com.cstav.genshinstrument.client.gui.screens.instrument.drum.DominentDrumType;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.midi.MidiOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.drum.DominentDrumType;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.midi.MidiOptionsScreen;
 import com.cstav.genshinstrument.sound.NoteSound;
 
 import net.fabricmc.api.EnvType;

diff --git a/src/main/java/com/cstav/genshinstrument/client/config/enumType/label/DrumNoteLabel.java b/src/main/java/com/cstav/genshinstrument/client/config/enumType/label/DrumNoteLabel.java
@@ -1,9 +1,9 @@
 package com.cstav.genshinstrument.client.config.enumType.label;
 
-import com.cstav.genshinstrument.client.gui.screens.instrument.drum.DrumNoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.INoteLabel;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
+import com.cstav.genshinstrument.client.gui.screen.instrument.drum.DrumNoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.INoteLabel;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.NoteLabelSupplier;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings.DrumKeys;
 import com.cstav.genshinstrument.util.LabelUtil;
 

diff --git a/src/main/java/com/cstav/genshinstrument/client/config/enumType/label/NoteGridLabel.java b/src/main/java/com/cstav/genshinstrument/client/config/enumType/label/NoteGridLabel.java
@@ -1,10 +1,10 @@
 package com.cstav.genshinstrument.client.config.enumType.label;
 
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.INoteLabel;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid.NoteGridButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.INoteLabel;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.NoteLabelSupplier;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid.NoteGridButton;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.util.LabelUtil;
 import com.mojang.blaze3d.platform.InputConstants.Key;

diff --git a/...eens/instrument/GenshinConsentScreen.java → ...reen/instrument/GenshinConsentScreen.java b/...eens/instrument/GenshinConsentScreen.java → ...reen/instrument/GenshinConsentScreen.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument;
+package com.cstav.genshinstrument.client.gui.screen.instrument;
 
 import java.awt.Color;
 import java.util.List;

diff --git a/...m/AratakisGreatAndGloriousDrumScreen.java → ...m/AratakisGreatAndGloriousDrumScreen.java b/...m/AratakisGreatAndGloriousDrumScreen.java → ...m/AratakisGreatAndGloriousDrumScreen.java
@@ -1,15 +1,15 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.drum;
+package com.cstav.genshinstrument.client.gui.screen.instrument.drum;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.cstav.genshinstrument.GInstrumentMod;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.BaseInstrumentOptionsScreen;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.DrumOptionsScren;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.DrumOptionsScren;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.BaseInstrumentOptionsScreen;
 import com.mojang.blaze3d.platform.InputConstants.Key;
 
 import net.fabricmc.api.EnvType;

diff --git a/...ens/instrument/drum/DominentDrumType.java → ...een/instrument/drum/DominentDrumType.java b/...ens/instrument/drum/DominentDrumType.java → ...een/instrument/drum/DominentDrumType.java
@@ -1,6 +1,6 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.drum;
+package com.cstav.genshinstrument.client.gui.screen.instrument.drum;
 
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.midi.DrumMidiOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.midi.DrumMidiOptionsScreen;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...reens/instrument/drum/DrumButtonType.java → ...creen/instrument/drum/DrumButtonType.java b/...reens/instrument/drum/DrumButtonType.java → ...creen/instrument/drum/DrumButtonType.java
@@ -1,6 +1,6 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.drum;
+package com.cstav.genshinstrument.client.gui.screen.instrument.drum;
 
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.INoteLabel;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.INoteLabel;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings.DrumKeys;
 import com.cstav.genshinstrument.sound.ModSounds;

diff --git a/...reens/instrument/drum/DrumNoteButton.java → ...creen/instrument/drum/DrumNoteButton.java b/...reens/instrument/drum/DrumNoteButton.java → ...creen/instrument/drum/DrumNoteButton.java
@@ -1,8 +1,8 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.drum;
+package com.cstav.genshinstrument.client.gui.screen.instrument.drum;
 
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButtonRenderer;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButtonRenderer;
 import com.cstav.genshinstrument.networking.buttonidentifier.DrumNoteIdentifier;
 
 import net.fabricmc.api.EnvType;

diff --git a/...ment/floralzither/FloralZitherScreen.java → ...ment/floralzither/FloralZitherScreen.java b/...ment/floralzither/FloralZitherScreen.java → ...ment/floralzither/FloralZitherScreen.java
@@ -1,10 +1,10 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.floralzither;
+package com.cstav.genshinstrument.client.gui.screen.instrument.floralzither;
 
 import com.cstav.genshinstrument.GInstrumentMod;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid.AbstractGridInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.BaseInstrumentOptionsScreen;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.FloralZitherOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid.AbstractGridInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.FloralZitherOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.BaseInstrumentOptionsScreen;
 import com.cstav.genshinstrument.sound.NoteSound;
 
 import net.fabricmc.api.EnvType;

diff --git a/...ent/partial/AbstractInstrumentScreen.java → ...ent/partial/AbstractInstrumentScreen.java b/...ent/partial/AbstractInstrumentScreen.java → ...ent/partial/AbstractInstrumentScreen.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial;
 
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -7,10 +7,10 @@
 
 import com.cstav.genshinstrument.GInstrumentMod;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.GenshinConsentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.BaseInstrumentOptionsScreen;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.ModOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.GenshinConsentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.BaseInstrumentOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.ModOptionsScreen;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.client.midi.MidiController;
 import com.cstav.genshinstrument.event.MidiEvent.MidiEventArgs;

diff --git a/...rument/partial/InstrumentThemeLoader.java → ...rument/partial/InstrumentThemeLoader.java b/...rument/partial/InstrumentThemeLoader.java → ...rument/partial/InstrumentThemeLoader.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial;
 
 import java.awt.Color;
 import java.util.ArrayList;

diff --git a/...s/instrument/partial/note/NoteButton.java → ...n/instrument/partial/note/NoteButton.java b/...s/instrument/partial/note/NoteButton.java → ...n/instrument/partial/note/NoteButton.java
@@ -1,11 +1,11 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note;
 
 import java.awt.Point;
 
 import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.NoteLabelSupplier;
 import com.cstav.genshinstrument.networking.ModPacketHandler;
 import com.cstav.genshinstrument.networking.buttonidentifier.DefaultNoteButtonIdentifier;
 import com.cstav.genshinstrument.networking.buttonidentifier.NoteButtonIdentifier;

diff --git a/...ment/partial/note/NoteButtonRenderer.java → ...ment/partial/note/NoteButtonRenderer.java b/...ment/partial/note/NoteButtonRenderer.java → ...ment/partial/note/NoteButtonRenderer.java
@@ -1,12 +1,12 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note;
 
 import java.util.ArrayList;
 
 import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation.NoteAnimationController;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.animation.NoteAnimationController;
 import com.cstav.genshinstrument.util.CommonUtil;
 import com.mojang.blaze3d.systems.RenderSystem;
 

diff --git a/...instrument/partial/note/NoteNotation.java → ...instrument/partial/note/NoteNotation.java b/...instrument/partial/note/NoteNotation.java → ...instrument/partial/note/NoteNotation.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note;
 
 /**
  * Marks the accidental notation of a {@link NoteButton}

diff --git a/...ens/instrument/partial/note/NoteRing.java → ...een/instrument/partial/note/NoteRing.java b/...ens/instrument/partial/note/NoteRing.java → ...een/instrument/partial/note/NoteRing.java
@@ -1,11 +1,11 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note;
 
 import java.awt.Point;
 
 import com.cstav.genshinstrument.client.ClientUtil;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation.RingAnimationController;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.animation.RingAnimationController;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...te/animation/NoteAnimationController.java → ...te/animation/NoteAnimationController.java b/...te/animation/NoteAnimationController.java → ...te/animation/NoteAnimationController.java
@@ -1,7 +1,7 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.animation;
 
 import com.cstav.genshinstrument.client.AnimationController;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...te/animation/RingAnimationController.java → ...te/animation/RingAnimationController.java b/...te/animation/RingAnimationController.java → ...te/animation/RingAnimationController.java
@@ -1,7 +1,7 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.animation;
 
 import com.cstav.genshinstrument.client.AnimationController;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteRing;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteRing;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...rument/partial/note/label/INoteLabel.java → ...rument/partial/note/label/INoteLabel.java b/...rument/partial/note/label/INoteLabel.java → ...rument/partial/note/label/INoteLabel.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label;
 
 
 import net.minecraft.network.chat.Component;

diff --git a/...partial/note/label/NoteLabelSupplier.java → ...partial/note/label/NoteLabelSupplier.java b/...partial/note/label/NoteLabelSupplier.java → ...partial/note/label/NoteLabelSupplier.java
@@ -1,6 +1,6 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label;
 
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

diff --git a/...otegrid/AbstractGridInstrumentScreen.java → ...otegrid/AbstractGridInstrumentScreen.java b/...otegrid/AbstractGridInstrumentScreen.java → ...otegrid/AbstractGridInstrumentScreen.java
@@ -1,4 +1,4 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid;
 
 import java.awt.Color;
 import java.util.Map;
@@ -7,11 +7,11 @@
 
 import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.BaseInstrumentOptionsScreen;
-import com.cstav.genshinstrument.client.gui.screens.options.instrument.GridInstrumentOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.label.NoteLabelSupplier;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.GridInstrumentOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.BaseInstrumentOptionsScreen;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.networking.buttonidentifier.NoteButtonIdentifier;
 import com.cstav.genshinstrument.networking.buttonidentifier.NoteGridButtonIdentifier;

diff --git a/...instrument/partial/notegrid/NoteGrid.java → ...instrument/partial/notegrid/NoteGrid.java b/...instrument/partial/notegrid/NoteGrid.java → ...instrument/partial/notegrid/NoteGrid.java
@@ -1,9 +1,9 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
 import com.cstav.genshinstrument.sound.NoteSound;
 import com.mojang.blaze3d.platform.InputConstants.Key;
 

diff --git a/...ment/partial/notegrid/NoteGridButton.java → ...ment/partial/notegrid/NoteGridButton.java b/...ment/partial/notegrid/NoteGridButton.java → ...ment/partial/notegrid/NoteGridButton.java
@@ -1,8 +1,8 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid;
+package com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid;
 
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButton;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteButtonRenderer;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteButtonRenderer;
 import com.cstav.genshinstrument.networking.buttonidentifier.NoteGridButtonIdentifier;
 import com.cstav.genshinstrument.sound.NoteSound;
 import com.cstav.genshinstrument.util.LabelUtil;

diff --git a/...ent/test/banjo/BanjoInstrumentScreen.java → ...ent/test/banjo/BanjoInstrumentScreen.java b/...ent/test/banjo/BanjoInstrumentScreen.java → ...ent/test/banjo/BanjoInstrumentScreen.java
@@ -1,3 +1,4 @@
+package com.cstav.genshinstrument.client.gui.screen.instrument.test.banjo;
 // package com.cstav.genshinstrument.client.gui.screens.instrument.test.banjo;
 
 // import com.cstav.genshinstrument.GInstrumentMod;

diff --git a/...rument/vintagelyre/VintageLyreScreen.java → ...rument/vintagelyre/VintageLyreScreen.java b/...rument/vintagelyre/VintageLyreScreen.java → ...rument/vintagelyre/VintageLyreScreen.java
@@ -1,8 +1,8 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.vintagelyre;
+package com.cstav.genshinstrument.client.gui.screen.instrument.vintagelyre;
 
 import com.cstav.genshinstrument.GInstrumentMod;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.InstrumentThemeLoader;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid.AbstractGridInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.InstrumentThemeLoader;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid.AbstractGridInstrumentScreen;
 import com.cstav.genshinstrument.sound.ModSounds;
 import com.cstav.genshinstrument.sound.NoteSound;
 

diff --git a/...rument/vintagelyre/VintageNoteButton.java → ...rument/vintagelyre/VintageNoteButton.java b/...rument/vintagelyre/VintageNoteButton.java → ...rument/vintagelyre/VintageNoteButton.java
@@ -1,9 +1,9 @@
-package com.cstav.genshinstrument.client.gui.screens.instrument.vintagelyre;
+package com.cstav.genshinstrument.client.gui.screen.instrument.vintagelyre;
 
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteNotation;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid.AbstractGridInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screens.instrument.partial.notegrid.NoteGridButton;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.note.NoteNotation;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid.AbstractGridInstrumentScreen;
+import com.cstav.genshinstrument.client.gui.screen.instrument.partial.notegrid.NoteGridButton;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;