improve API restart timeouts

- Fix a bug on 1.8.9

Author: moehreag

1.8.9/src/main/java/io/github/axolotlclient/mixin/ControlsOptionsScreenMixin.java

@@ -22,6 +22,8 @@
 
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.KeystrokeHud;
 import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import org.spongepowered.asm.mixin.Mixin;
@@ -34,8 +36,8 @@ public abstract class ControlsOptionsScreenMixin {
 
 	@Inject(method = "buttonClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;openScreen(Lnet/minecraft/client/gui/screen/Screen;)V"))
 	public void axolotlclient$updateKeystroke(ButtonWidget button, CallbackInfo ci) {
-		/*TODO KeystrokeHud hud = (KeystrokeHud) HudManager.getInstance().get(KeystrokeHud.ID);
+		KeystrokeHud hud = (KeystrokeHud) HudManager.getInstance().get(KeystrokeHud.ID);
 		if (hud.isEnabled())
-			hud.setKeystrokes();*/
+			hud.setKeystrokes();
 	}
 }

common/src/main/java/io/github/axolotlclient/api/API.java

@@ -71,6 +71,7 @@ public class API {
 	private AccountSettings settings;
 	private HttpClient client;
 	private CompletableFuture<?> restartingFuture;
+	private int nextRestartSecs;
 	private Future<?> statusUpdateFuture;
 	private final ScheduledExecutorService statusUpdateExecutor;
 	private static final List<BiContainer<Runnable, ListenerType>> afterStartupListeners = new ArrayList<>();
@@ -122,11 +123,11 @@ private CompletableFuture<?> authenticate() {
 		try {
 			if (!GlobalDataRequest.get(true).get(1, TimeUnit.MINUTES).success()) {
 				logger.warn("Not trying to start API as it couldn't be reached!");
-				return scheduleRestart(false);
+				return scheduleRestart();
 			}
 		} catch (InterruptedException | ExecutionException | TimeoutException e) {
 			logger.warn("Not trying to start API as it couldn't be reached within the timeout of 1 minute!");
-			return scheduleRestart(false);
+			return scheduleRestart();
 		}
 
 		logDetailed("Authenticating with Mojang...");
@@ -364,20 +365,22 @@ public void onClose(int statusCode, String reason) {
 			1014
 		};
 		if (Arrays.stream(error_codes).anyMatch(i -> i == statusCode) && apiOptions.enabled.get()) {
-			scheduleRestart(true);
+			scheduleRestart();
 		}
 	}
 
-	private CompletableFuture<?> scheduleRestart(boolean immediate) {
+	private CompletableFuture<?> scheduleRestart() {
 		if (restartingFuture != null) {
 			restartingFuture.cancel(true);
+			nextRestartSecs = Math.min(nextRestartSecs*2, 60);
+		} else {
+			nextRestartSecs = 2;
 		}
-		logger.info("Trying restart in " + (immediate ? "10 seconds" : "5 minutes."));
+		logger.info("Trying restart in " + nextRestartSecs + "seconds.");
 		restartingFuture = CompletableFuture.supplyAsync(() -> {
 			logDetailed("Restarting API session...");
 			return startup(account).join();
-		}, immediate ? CompletableFuture.delayedExecutor(10, TimeUnit.SECONDS, ThreadExecuter.service()) :
-			CompletableFuture.delayedExecutor(5, TimeUnit.MINUTES, ThreadExecuter.service()));
+		}, CompletableFuture.delayedExecutor(nextRestartSecs, TimeUnit.SECONDS, ThreadExecuter.service()));
 		return restartingFuture;
 	}