Update deps

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'application'
 	id 'java'
-	id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+	id 'org.jetbrains.kotlin.jvm' version '1.4.0'
 }
 
 group 'com.tb24'
@@ -44,7 +44,7 @@ repositories {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
 	implementation 'com.google.code.gson:gson:2.8.6'
 //	implementation 'com.mojang:brigadier:1.0.17'
 	implementation 'com.squareup.okhttp3:okhttp:3.14.9'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/tb24/blenderumap/AssetUtils.kt

@@ -4,12 +4,12 @@ import me.fungames.jfortniteparse.ue4.assets.exports.UExport
 import me.fungames.jfortniteparse.ue4.assets.exports.UObject
 import me.fungames.jfortniteparse.ue4.assets.objects.FPropertyTag
 import me.fungames.jfortniteparse.ue4.objects.core.misc.FGuid
-import java.util.*
+import kotlin.math.max
 
 fun <T> getProp(properties: List<FPropertyTag>, name: String, clazz: Class<T>): T? {
 	for (prop in properties) {
 		if (name == prop.name.text) {
-			return prop.getTagTypeValue(clazz) as T?
+			return prop.getTagTypeValue(clazz)
 		}
 	}
 	return null
@@ -21,12 +21,12 @@ fun <T> getProps(properties: List<FPropertyTag>, name: String, clazz: Class<T>):
 	for (prop in properties) {
 		if (prop.name.text == name) {
 			collected.add(prop)
-			maxIndex = Math.max(maxIndex, prop.arrayIndex)
+			maxIndex = max(maxIndex, prop.arrayIndex)
 		}
 	}
 	val out = java.lang.reflect.Array.newInstance(clazz, maxIndex + 1) as Array<T?>
 	for (prop in collected) {
-		out[prop.arrayIndex] = prop.getTagTypeValue(clazz) as T?
+		out[prop.arrayIndex] = prop.getTagTypeValue(clazz)
 	}
 	return out
 }

src/main/java/com/tb24/blenderumap/FetchFortniteAesKey.java

@@ -23,6 +23,7 @@ public class FetchFortniteAesKey {
 	public static void main(String[] args) {
 		try {
 			Reader reader = new OkHttpClient().newCall(new Request.Builder().url("https://benbotfn.tk/api/v1/aes").build()).execute().body().charStream();
+			System.out.println("Fetched, writing...");
 			AesResponse response = GSON.fromJson(reader, AesResponse.class);
 			reader.close();
 			File configFile = new File("config.json");
@@ -50,6 +51,8 @@ public static void main(String[] args) {
 			FileWriter fileWriter = new FileWriter(configFile);
 			GSON.toJson(configTree, fileWriter);
 			fileWriter.close();
+			System.out.println("Done");
+			System.exit(0);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/main/java/com/tb24/blenderumap/JWPSerializer.kt

@@ -122,7 +122,7 @@ object JWPSerializer {
 					addProperty("string", h.text)
 					when (h) {
 						is FTextHistory.Base -> {
-							addProperty("namespace", h.nameSpace)
+							addProperty("namespace", h.namespace)
 							addProperty("key", h.key)
 						}
 						is FTextHistory.StringTableEntry -> {