Rename ModOptionsScreen

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

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.../cstav/genshinstrument/client/gui/screen/instrument/partial/AbstractInstrumentScreen.java b/.../cstav/genshinstrument/client/gui/screen/instrument/partial/AbstractInstrumentScreen.java
@@ -10,7 +10,7 @@
 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.gui.screen.options.instrument.partial.AbstractInstrumentOptionsScreen;
 import com.cstav.genshinstrument.client.keyMaps.InstrumentKeyMappings;
 import com.cstav.genshinstrument.client.midi.MidiController;
 import com.cstav.genshinstrument.event.MidiEvent.MidiEventArgs;
@@ -413,7 +413,7 @@ public static Optional<AbstractInstrumentScreen> getCurrentScreen(final Minecraf
         if (minecraft.screen instanceof AbstractInstrumentScreen)
             return Optional.of((AbstractInstrumentScreen)minecraft.screen);
 
-        if (minecraft.screen instanceof ModOptionsScreen instrumentOptionsScreen)
+        if (minecraft.screen instanceof AbstractInstrumentOptionsScreen instrumentOptionsScreen)
             if (instrumentOptionsScreen.isOverlay)
                 return Optional.of(instrumentOptionsScreen.instrumentScreen);
 

diff --git a/...om/cstav/genshinstrument/client/gui/screen/options/instrument/midi/MidiOptionsScreen.java b/...om/cstav/genshinstrument/client/gui/screen/options/instrument/midi/MidiOptionsScreen.java
@@ -3,7 +3,7 @@
 import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
 import com.cstav.genshinstrument.client.gui.screen.instrument.partial.AbstractInstrumentScreen;
-import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.ModOptionsScreen;
+import com.cstav.genshinstrument.client.gui.screen.options.instrument.partial.AbstractInstrumentOptionsScreen;
 import com.cstav.genshinstrument.client.midi.MidiController;
 
 import net.fabricmc.api.EnvType;
@@ -21,7 +21,7 @@
 import net.minecraft.util.Mth;
 
 @Environment(EnvType.CLIENT)
-public class MidiOptionsScreen extends ModOptionsScreen {
+public class MidiOptionsScreen extends AbstractInstrumentOptionsScreen {
     public static final int MIN_OCTAVE_SHIFT = -4, MAX_OCTAVE_SHIFT = 4;
 
     public MidiOptionsScreen(Component pTitle, Screen prevScreen, AbstractInstrumentScreen instrumentScreen) {

diff --git a/.../instrument/partial/ModOptionsScreen.java → ...tial/AbstractInstrumentOptionsScreen.java b/.../instrument/partial/ModOptionsScreen.java → ...tial/AbstractInstrumentOptionsScreen.java
@@ -17,24 +17,24 @@
 import net.minecraft.network.chat.Component;
 
 @Environment(EnvType.CLIENT)
-public class ModOptionsScreen extends Screen {
+public abstract class AbstractInstrumentOptionsScreen extends Screen {
 
     public final @Nullable AbstractInstrumentScreen instrumentScreen;
     public final Screen lastScreen;
 
     public final boolean isOverlay;
 
-    public ModOptionsScreen(Component pTitle, AbstractInstrumentScreen instrumentScreen, Screen lastScreen) {
+    public AbstractInstrumentOptionsScreen(Component pTitle, AbstractInstrumentScreen instrumentScreen, Screen lastScreen) {
         super(pTitle);
         this.instrumentScreen = instrumentScreen;
         this.lastScreen = lastScreen;
 
         this.isOverlay = instrumentScreen != null;
     }
-    public ModOptionsScreen(Component pTitle, AbstractInstrumentScreen instrumentScreen) {
+    public AbstractInstrumentOptionsScreen(Component pTitle, AbstractInstrumentScreen instrumentScreen) {
         this(pTitle, instrumentScreen, null);
     }
-    public ModOptionsScreen(Component pTitle, Screen lastScreen) {
+    public AbstractInstrumentOptionsScreen(Component pTitle, Screen lastScreen) {
         this(pTitle, null, lastScreen);
     }
 

diff --git a/...hinstrument/client/gui/screen/options/instrument/partial/BaseInstrumentOptionsScreen.java b/...hinstrument/client/gui/screen/options/instrument/partial/BaseInstrumentOptionsScreen.java
@@ -32,7 +32,7 @@
 import net.minecraft.util.Mth;
 
 @Environment(EnvType.CLIENT)
-public abstract class BaseInstrumentOptionsScreen extends ModOptionsScreen {
+public abstract class BaseInstrumentOptionsScreen extends AbstractInstrumentOptionsScreen {
     public static final MutableComponent MIDI_OPTIONS = Component.translatable("label.genshinstrument.midiOptions");
 
     private static final String SOUND_CHANNEL_KEY = "button.genshinstrument.audioChannels",