Fixes

QuestCraftPlusPlus · Sep 23, 2024 · 1a2e00b · 1a2e00b
1 parent f132da8
commit 1a2e00b
Show file tree

Hide file tree

Showing 10 changed files with 239 additions and 50 deletions.
diff --git a/Assets/Plugins/Android/Pojlib-release.aar b/Assets/Plugins/Android/Pojlib-release.aar
diff --git a/Assets/Plugins/Android/Pojlib-release.aar.meta b/Assets/Plugins/Android/Pojlib-release.aar.meta
diff --git a/Assets/Plugins/Android/launcherTemplate.gradle b/Assets/Plugins/Android/launcherTemplate.gradle
@@ -1,7 +1,14 @@
 apply plugin: 'com.android.application'
 
+repositories {
+    maven {
+       url = uri("https://jitpack.io")
+    }
+}
+
 dependencies {
     implementation project(':unityLibrary')
+    implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
     }
 
 android {

diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
@@ -6,7 +6,7 @@ dependencies {
 	implementation("com.google.guava:guava:31.0.1-jre")
 	implementation("commons-io:commons-io:2.11.0")
 	implementation("commons-codec:commons-codec:1.15")
-	implementation("com.microsoft.azure:msal4j:1.13.9")
+	implementation("com.microsoft.azure:msal4j:1.17.0")
 **DEPS**}
 
 android {

diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
@@ -14376,7 +14376,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: V5.0.0
+  m_text: 'v5.1.0 RC3
+
+'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: f35adae8958437040b0fbd16e87d120a, type: 2}
   m_sharedMaterial: {fileID: -3046671735200912922, guid: f35adae8958437040b0fbd16e87d120a,

diff --git a/Assets/Scripts/APIParser.cs b/Assets/Scripts/APIParser.cs
@@ -43,14 +43,14 @@ public class MetaInfo
     public List<FileInfo> files { get; set; }
     public List<string> loaders { get; set; }
     public List<Deps> dependencies { get; set; }
+    public string version_number { get; set; }
     public string id { get; set; }
 }
 
 [Serializable]
 
 public class Deps
 {
-    public string version_id;
     public string project_id;
     public string file_name;
     public string dependency_type;

diff --git a/Assets/Scripts/JNIStorage.cs b/Assets/Scripts/JNIStorage.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
+using UnityEngine.CrashReportHandler;
 
 public class JNIStorage : MonoBehaviour
 {
@@ -20,6 +21,7 @@ public class JNIStorage : MonoBehaviour
 
     private void Start()
     {
+		CrashReportHandler.enableCaptureExceptions = false;
         instance = this;
 
         // If the user has not granted Microphone permission, don't try to start the clip.

diff --git a/Assets/Scripts/ModManager.cs b/Assets/Scripts/ModManager.cs
@@ -366,7 +366,7 @@ private void DownloadDependenciesAndAddMod(MetaParser mp, MetaInfo metaInfo, str
                     foreach (var depFile in validDepFiles)
                     {
                         PojlibInstance currInst = JNIStorage.GetInstance(InstanceButton.currInstName);
-                        JNIStorage.apiClass.CallStatic("addExtraProject", JNIStorage.instancesObj, currInst.raw, slug, currentInstanceVer, depFile.url, mp.project_type);
+                        JNIStorage.apiClass.CallStatic("addExtraProject", JNIStorage.instancesObj, currInst.raw, slug, depInfo.version_number, depFile.url, mp.project_type);
                         Debug.Log($"Downloading Dep with file url {depFile.url}");
                         break;
                     }
@@ -375,7 +375,7 @@ private void DownloadDependenciesAndAddMod(MetaParser mp, MetaInfo metaInfo, str
         }
 
         PojlibInstance inst = JNIStorage.GetInstance(InstanceButton.currInstName);
-        JNIStorage.apiClass.CallStatic("addExtraProject", JNIStorage.instancesObj, inst.raw, mp.slug, currentInstanceVer, modUrl, mp.project_type);
+        JNIStorage.apiClass.CallStatic("addExtraProject", JNIStorage.instancesObj, inst.raw, mp.slug, metaInfo.version_number, modUrl, mp.project_type);
         UpdateUIAfterModAddition(mp.slug);
     }