APWorld Update Stuff

Author: Yuta12342

source/archipelago/APEntryState.hx

@@ -474,12 +474,23 @@ class APEntryState extends MusicBeatState
 		return {status: "unsupported", message: "System not supported."};
 	}
 
-	public static function checkAndAlertAPWorld():Void
+	public static function checkAndAlertAPWorld():Bool
 	{
 		var result = checkAPWorld();
 		if (result.status == "outdated") {
 			Application.current.window.alert(result.message + "\nPlease update it in the AP Menu.", "APWorld Update Recommended");
 		}
+		else if (result.status == "missing") {
+			Application.current.window.alert(result.message + "\nPlease install it in the AP Menu.", "APWorld Missing");
+		}
+		else if (result.status == "error") {
+			Application.current.window.alert(result.message, "APWorld Error");
+		}
+		else if (result.status == "unsupported") {
+			Application.current.window.alert(result.message + "\nYou cannot use AP on this System.", "Unsupported Error");
+		}
+
+		return result.status == "exact";
 	}
 
 	public static function installAPWorld():Void

source/states/FirstCheckState.hx

@@ -114,7 +114,7 @@ class FirstCheckState extends MusicBeatState
 						trace('versions arent matching!');
 						MusicBeatState.switchState(new states.OutdatedState());
 					}
-					else FlxG.switchState(new states.SplashScreen());
+					else FlxG.switchState(new APCheckState());
 				}
 
 				http.onError = function(error)
@@ -137,7 +137,41 @@ class FirstCheckState extends MusicBeatState
 				updateRibbon.alpha = 1;
 			});
 
-			archipelago.APEntryState.checkAndAlertAPWorld();
+
+			}
+		else
+		{
+			FlxG.switchState(new states.SplashScreen());
+		}
+	}
+}
+
+class APCheckState extends MusicBeatState
+{
+	override public function create()
+	{
+		super.create();
+		if (!archipelago.APEntryState.checkAndAlertAPWorld())
+		{
+			var update = new haxe.ui.containers.dialogs.MessageBox();
+			update.title = "Archipelago World";
+			update.text = "Would you like to install the version of the APWorld for this version of Mixtape Engine?";
+			update.buttons = haxe.ui.containers.dialogs.Dialog.DialogButton.YES | haxe.ui.containers.dialogs.Dialog.DialogButton.NO;
+			
+			update.onDialogClosed = function(event:haxe.ui.containers.dialogs.Dialog.DialogEvent)
+			{
+				if (event.button == haxe.ui.containers.dialogs.Dialog.DialogButton.YES)
+				{
+					archipelago.APEntryState.installAPWorld();
+					FlxG.switchState(new states.SplashScreen());
+				}
+				else
+				{
+					FlxG.switchState(new states.SplashScreen());
+				}
+			};
+			
+			update.show();
 		}
 		else
 		{

source/states/OutdatedState.hx

@@ -51,12 +51,12 @@ class OutdatedState extends MusicBeatState
 				FlxG.sound.play(Paths.sound('cancelMenu'));
 				FlxTween.tween(warnText, {alpha: 0}, 1, {
 					onComplete: function (twn:FlxTween) {
-						MusicBeatState.switchState(new What());
+						MusicBeatState.switchState(new states.FirstCheckState.APCheckState());
 					}
 				});
 			}
 		}
-		else MusicBeatState.switchState(new What());
+		else MusicBeatState.switchState(new states.FirstCheckState.APCheckState());
 		super.update(elapsed);
 	}
 }

source/states/PlayState.hx

@@ -2046,6 +2046,8 @@ class PlayState extends MusicBeatState
 
 	private function generateSong():Void
 	{
+
+		
 		// FlxG.log.add(ChartParser.parse());
 		songSpeed = PlayState.SONG.speed;
 		songSpeedType = ClientPrefs.getGameplaySetting('scrolltype');