diff --git a/src/main/java/com/cstav/genshinstrument/client/gui/screen/instrument/partial/AbstractInstrumentScreen.java b/src/main/java/com/cstav/genshinstrument/client/gui/screen/instrument/partial/AbstractInstrumentScreen.java index f2216f0..7a154cb 100644 --- a/src/main/java/com/cstav/genshinstrument/client/gui/screen/instrument/partial/AbstractInstrumentScreen.java +++ b/src/main/java/com/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 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/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/midi/MidiOptionsScreen.java b/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/midi/MidiOptionsScreen.java index 23a4111..8b14934 100644 --- a/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/midi/MidiOptionsScreen.java +++ b/src/main/java/com/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/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/ModOptionsScreen.java b/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/AbstractInstrumentOptionsScreen.java similarity index 91% rename from src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/ModOptionsScreen.java rename to src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/AbstractInstrumentOptionsScreen.java index b240c57..0c9ab4b 100644 --- a/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/ModOptionsScreen.java +++ b/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/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/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/BaseInstrumentOptionsScreen.java b/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/BaseInstrumentOptionsScreen.java index 7d25e46..fefcd34 100644 --- a/src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/BaseInstrumentOptionsScreen.java +++ b/src/main/java/com/cstav/genshinstrument/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",