diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index 0af31a6a1..446af8432 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -147,17 +147,15 @@ public class UpdateModScreen extends DhScreen this.renderBackground(matrices, mouseX, mouseY, delta); // Render background #endif + // TODO: add the tooltips for the buttons + super.render(matrices, mouseX, mouseY, delta); // Render the buttons + // TODO: Add tooltips // Render the text's DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF); DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), this.width / 2, this.height / 2 - 20, 0x52FD52); - - // TODO: add the tooltips for the buttons - super.render(matrices, mouseX, mouseY, delta); // Render the buttons - - // TODO: Add tooltips } @Override 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 f4bf969a6..711179411 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 @@ -25,6 +25,9 @@ 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; + #if MC_VER < MC_1_20_2 #if MC_VER == MC_1_20_1 @Redirect( @@ -41,13 +44,13 @@ public class MixinMinecraft public void onOpenScreen(Minecraft instance, Screen guiScreen) { #endif - if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it + if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !debugAlwaysShowUpdater) // 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()) + if (SelfUpdater.onStart() | debugAlwaysShowUpdater) { instance.setScreen(new UpdateModScreen( new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons @@ -71,6 +74,7 @@ public class MixinMinecraft if ( Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() // Don't do anything if the user doesn't want it && SelfUpdater.onStart() + || debugAlwaysShowUpdater ) { runnable = () -> {