CAD please learn OOP

QuestCraftPlusPlus · Sep 24, 2024 · 99b2e4b · 99b2e4b
1 parent cc83f67
commit 99b2e4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/pojlib/API.java b/src/main/java/pojlib/API.java
@@ -213,7 +213,7 @@ public static void login(Activity activity)
         }
 
         MinecraftAccount acc = MinecraftAccount.load(activity.getFilesDir() + "/accounts");
-        if(acc != null && (acc.expiresOn >= System.currentTimeMillis() || !hasWifi || !Msa.doesOwnGame)) {
+        if(acc != null && (acc.expiresOn >= System.currentTimeMillis() || !hasWifi || acc.isDemoMode)) {
             currentAcc = acc;
             API.profileImage = MinecraftAccount.getSkinFaceUrl(API.currentAcc);
             API.profileName = API.currentAcc.username;

diff --git a/src/main/java/pojlib/account/MinecraftAccount.java b/src/main/java/pojlib/account/MinecraftAccount.java
@@ -21,6 +21,7 @@ public class MinecraftAccount {
     public String accessToken;
     public String uuid;
     public String username;
+    public boolean isDemoMode = false;
     public long expiresOn;
     public final String userType = "msa";
 

diff --git a/src/main/java/pojlib/account/Msa.java b/src/main/java/pojlib/account/Msa.java
@@ -73,11 +73,13 @@ public MinecraftAccount performLogin(String msToken) throws MSAException {
                 acc.username = mcName;
                 acc.uuid = mcUuid;
                 acc.expiresOn = mcExpiresOn;
+                acc.isDemoMode = false;
             } else {
                 acc.accessToken = "0";
                 acc.username = "Player";
                 acc.uuid = "00000000-0000-0000-0000-000000000000";
                 acc.expiresOn = 0;
+                acc.isDemoMode = true;
             }
 
             return acc;

diff --git a/src/main/java/pojlib/util/json/MinecraftInstances.java b/src/main/java/pojlib/util/json/MinecraftInstances.java
@@ -59,7 +59,9 @@ public List<String> generateLaunchArgs(MinecraftAccount account) {
             List<String> allArgs = new ArrayList<>(Arrays.asList("-cp", classpath));
             allArgs.add(mainClass);
             allArgs.addAll(Arrays.asList(mcArgs));
-            if (!Msa.doesOwnGame) {allArgs.add("--demo");}
+            if (account.isDemoMode) {
+                allArgs.add("--demo");
+            }
 
             return allArgs;
         }