diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index 4edc2ceeb..f717720ea 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -9,9 +9,9 @@ import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; @@ -25,9 +25,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) public class MixinMinecraft { - // will always show the auto updater if true - boolean debugAlwaysShowUpdater = false; + /** + * Can be enabled for testing the auto updater UI.
+ * will always show the auto updater if set to true. + */ + @Unique + private static final boolean DEBUG_ALWAYS_SHOW_UPDATER = false; + + #if MC_VER < MC_1_20_2 #if MC_VER == MC_1_20_1 @Redirect( @@ -44,13 +50,13 @@ public class MixinMinecraft public void onOpenScreen(Minecraft instance, Screen guiScreen) { #endif - if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !debugAlwaysShowUpdater) // Don't do anything if the user doesn't want it + if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !DEBUG_ALWAYS_SHOW_UPDATER) // Don't do anything if the user doesn't want it { instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened return; } - if (SelfUpdater.onStart() || debugAlwaysShowUpdater) + if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER) { instance.setScreen(new UpdateModScreen( new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons @@ -72,10 +78,13 @@ public class MixinMinecraft private void buildInitialScreens(Runnable runnable) { if ( - Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() // Don't do anything if the user doesn't want it - && SelfUpdater.onStart() - || debugAlwaysShowUpdater - ) + DEBUG_ALWAYS_SHOW_UPDATER || + ( + // Don't do anything if the user doesn't want it + Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() + && SelfUpdater.onStart() + ) + ) { runnable = () -> { Minecraft.getInstance().setScreen(new UpdateModScreen(