Improve auto updater logging and fix potential issues with updating
This commit is contained in:
+1
-1
Submodule coreSubProjects updated: a49d74763a...54cbead4eb
+5
-3
@@ -95,14 +95,16 @@ public abstract class MixinMinecraft
|
|||||||
)
|
)
|
||||||
private void buildInitialScreens(Runnable runnable)
|
private void buildInitialScreens(Runnable runnable)
|
||||||
{
|
{
|
||||||
|
boolean showUpdater = SelfUpdater.onStart(); // always needs to be called, otherwise auto update setup won't be completed
|
||||||
|
|
||||||
// TODO merge logic for forge, neo, and fabric
|
// TODO merge logic for forge, neo, and fabric
|
||||||
if (
|
if (
|
||||||
DEBUG_ALWAYS_SHOW_UPDATER ||
|
|
||||||
(
|
(
|
||||||
// Don't do anything if the user doesn't want it
|
// Don't do anything if the user doesn't want it
|
||||||
Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()
|
showUpdater
|
||||||
&& SelfUpdater.onStart()
|
&& Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()
|
||||||
)
|
)
|
||||||
|
|| DEBUG_ALWAYS_SHOW_UPDATER
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
runnable = () ->
|
runnable = () ->
|
||||||
|
|||||||
+4
-2
@@ -76,10 +76,12 @@ public class MixinMinecraft
|
|||||||
)
|
)
|
||||||
private void buildInitialScreens(Runnable runnable)
|
private void buildInitialScreens(Runnable runnable)
|
||||||
{
|
{
|
||||||
|
boolean showUpdater = SelfUpdater.onStart(); // always needs to be called, otherwise auto update setup won't be completed
|
||||||
|
|
||||||
// TODO merge logic for forge, neo, and fabric
|
// TODO merge logic for forge, neo, and fabric
|
||||||
if (
|
if (
|
||||||
Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() // Don't do anything if the user doesn't want it
|
showUpdater
|
||||||
&& SelfUpdater.onStart()
|
&& Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() // Don't do anything if the user doesn't want it
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
runnable = () ->
|
runnable = () ->
|
||||||
|
|||||||
+5
-42
@@ -40,45 +40,6 @@ public class MixinMinecraft
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// commented out due to a bug with Manifold and having nested preprocessors
|
|
||||||
// and since neoforge doesn't work for anything before MC 1.20.6 anyway it doesn't need to be included
|
|
||||||
|
|
||||||
//#if MC_VER < MC_1_20_2
|
|
||||||
//#if MC_VER == MC_1_20_1
|
|
||||||
//@Redirect(
|
|
||||||
// method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V",
|
|
||||||
// at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
|
|
||||||
//)
|
|
||||||
//public void onOpenScreen(Minecraft instance, Screen guiScreen)
|
|
||||||
//{
|
|
||||||
//#else
|
|
||||||
//@Redirect(
|
|
||||||
// method = "<init>(Lnet/minecraft/client/main/GameConfig;)V",
|
|
||||||
// at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
|
|
||||||
//)
|
|
||||||
//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
|
|
||||||
// {
|
|
||||||
// instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (SelfUpdater.onStart())
|
|
||||||
// {
|
|
||||||
// instance.setScreen(new UpdateModScreen(
|
|
||||||
// new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
|
|
||||||
// (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
|
|
||||||
// ));
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
#if MC_VER >= MC_1_20_2
|
#if MC_VER >= MC_1_20_2
|
||||||
@Redirect(
|
@Redirect(
|
||||||
method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/Minecraft$GameLoadCookie;)V",
|
method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/Minecraft$GameLoadCookie;)V",
|
||||||
@@ -86,14 +47,16 @@ public class MixinMinecraft
|
|||||||
)
|
)
|
||||||
private void buildInitialScreens(Runnable runnable)
|
private void buildInitialScreens(Runnable runnable)
|
||||||
{
|
{
|
||||||
|
boolean showUpdater = SelfUpdater.onStart(); // always needs to be called, otherwise auto update setup won't be completed
|
||||||
|
|
||||||
// TODO merge logic for forge, neo, and fabric
|
// TODO merge logic for forge, neo, and fabric
|
||||||
if (
|
if (
|
||||||
DEBUG_ALWAYS_SHOW_UPDATER ||
|
|
||||||
(
|
(
|
||||||
// Don't do anything if the user doesn't want it
|
// Don't do anything if the user doesn't want it
|
||||||
Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()
|
showUpdater
|
||||||
&& SelfUpdater.onStart()
|
&& Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()
|
||||||
)
|
)
|
||||||
|
|| DEBUG_ALWAYS_SHOW_UPDATER
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
runnable = () ->
|
runnable = () ->
|
||||||
|
|||||||
Reference in New Issue
Block a user