README.md

@@ -1,5 +1,8 @@
 # BlenderUmap
-A Java tool to export Fortnite .umaps and a Python script to import it. More games will be supported as time goes on.
+A Java tool to export Fortnite .umaps and a Python script to import it.
+
+## Disclaimer
+This tool was made to fulfill my curiosity about exporting a Fortnite building into Blender back in May 2020, and I did not plan to support this for long term. Although I rarely release some updates to fix some breaking stuff with Fortnite (and/or incorporating enhancements on the underlying parser), **no support will be given when it's about small issues, failing to use the tool properly, or adding support for more games.** Take your time to read the stuff below, and thank you for your understanding.
 
 ## Usage
 * Before running the tool you need to have 64-bit Java installed. [Get it here. (choose 64-bit Offline)](https://www.java.com/en/download/manual.jsp)\
@@ -15,16 +18,26 @@ A Java tool to export Fortnite .umaps and a Python script to import it. More gam
 * Profit!
 
 ## config.json
-* **`PaksDirectory`: Path to the Paks folder.**
-* `UEVersion`: Unreal Engine version. Supports up to UE4.25.
+* **`PaksDirectory`: Path to the Paks folder.** Backslashes must be doubled like this: `\\`.
+* `UEVersion`: Unreal Engine version. Supports up to UE4.26.
 * **`EncryptionKeys`: List of AES keys to use for loading the paks**
   * `Guid`: Identify a pak by its encryption key GUID. Use `00000000000000000000000000000000` (32 0's) to refer to the main paks.
   * `FileName`: Alternatively, you can use this to identify a pak by its file name.
   * `Key`: The pak's encryption key, in either hex (starting with "0x") or base64.
-* `bReadMaterials`: Export materials. Materials are experimental! Not all imported materials will be perfect. **Min. 24GB of RAM recommended!**
-* `bRunUModel`: Run UModel within the exporting process to export meshes, materials, and textures.
-* `UModelAdditionalArgs`: Additional command line args when starting UModel.
+
+  Example for main paks:
+  ```json
+  {
+    "Guid": "00000000000000000000000000000000",
+    "Key": "0x36983D73A17CAF253F9D1A322A79D6DC53D8E81B661B7564343F41D4835275D5"
+  }
+  ```
 * `bDumpAssets`: Save assets as JSON format, useful for debugging.
+* `ObjectCacheSize`: Configure the object loader cache size to tune the performance, or set to 0 to disable. Defaults to 100.
+* `bReadMaterials`: Export materials. Materials are experimental! Not all imported materials will be perfect. **Min. 16GB of RAM recommended!**
+* `bExportToDDSWhenPossible`: Prefer PNG to DDS? Set this to `false` and textures will always be exported as PNG. **Warning: Export times will significantly increase when this is set to `false`!** Defaults to enabled.
+* `bExportBuildingFoundations`: You can turn off exporting sub-buildings in large POIs if you want to quickly port the base POI structures, by setting this to `false`. Defaults to enabled.
 * **`ExportPackage`: The .umap you want to export.** Accepts these path formats:
-  * /Game/Maps/MapName.umap
-  * GameName/Content/Maps/MapName.umap
+  * `/Game/Maps/MapName` (package path)
+  * `/Game/Maps/MapName.MapName` (object path)
+  * `GameName/Content/Maps/MapName.umap` (file path)

build.gradle

@@ -1,11 +1,12 @@
 plugins {
 	id 'application'
 	id 'java'
-	id 'org.jetbrains.kotlin.jvm' version '1.4.0'
+	id 'org.jetbrains.kotlin.jvm' version '1.5.20'
+	id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 group 'com.tb24'
-version '0.3.3'
+version '0.4.3'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -20,36 +21,26 @@ application {
 
 jar {
 	manifest {
-		attributes(
-				'Main-Class': javaMainClass
-		)
-	}
-
-	from {
-		configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-	} {
-		exclude 'META-INF/*.SF'
-		exclude 'META-INF/*.DSA'
-		exclude 'META-INF/*.RSA'
+		attributes 'Main-Class': javaMainClass
 	}
 }
 
 repositories {
 	google()
 	mavenCentral()
-	maven { url 'https://dl.bintray.com/fungamesleaks/mavenRepo' }
 	maven { url 'https://jitpack.io' }
 }
 
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
+	implementation 'androidx.collection:collection-ktx:1.1.0'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-	implementation 'com.google.code.gson:gson:2.8.6'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+	implementation 'com.google.code.gson:gson:2.8.7'
 	implementation 'com.squareup.okhttp3:okhttp:3.14.9'
-	implementation 'me.fungames:JFortniteParse:+' // :3.0.2'
-	implementation 'org.slf4j:slf4j-api:1.7.30'
-	testImplementation 'junit:junit:4.12'
+	implementation 'me.fungames:JFortniteParse:+'
+	implementation 'org.slf4j:slf4j-api:1.7.32'
+	testImplementation 'junit:junit:4.13.2'
 }
 
 compileKotlin {
@@ -59,3 +50,24 @@ compileKotlin {
 compileTestKotlin {
 	kotlinOptions.jvmTarget = '1.8'
 }
+
+shadowJar {
+	baseName = project.name
+	classifier = ''
+	archiveVersion = ''
+	exclude "**/*.kotlin_builtins"
+	exclude "**/*.kotlin_metadata"
+	exclude "**/*.kotlin_module"
+	exclude 'META-INF/maven/**'
+	exclude '**/DEPENDENCIES'
+	exclude '**/LGPL2.1'
+	exclude '**/LICENSE'
+	exclude '**/LICENSE.txt'
+	exclude '**/NOTICE'
+	exclude '**/NOTICE.txt'
+}
+
+tasks.withType(AbstractArchiveTask) {
+	preserveFileTimestamps = false
+	reproducibleFileOrder = true
+}

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1,5 +1 @@
-includeBuild('../JFortniteParse') {
-	dependencySubstitution {
-		substitute module('me.fungames:JFortniteParse') with project(':')
-	}
-}
+includeBuild('../JFortniteParse')

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

@@ -1,22 +1,27 @@
 package com.tb24.blenderumap
 
-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 me.fungames.jfortniteparse.ue4.assets.objects.IPropertyHolder
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
 import kotlin.math.max
 
-fun <T> getProp(properties: List<FPropertyTag>, name: String, clazz: Class<T>): T? {
+fun <T> IPropertyHolder.getProp(name: String, type: Type): T? {
 	for (prop in properties) {
 		if (name == prop.name.text) {
-			return prop.getTagTypeValue(clazz)
+			val clazz = (if (type is ParameterizedType) type.rawType else type) as Class<T>
+			return prop.getTagTypeValue(clazz, type)
 		}
 	}
 	return null
 }
 
-fun <T> getProps(properties: List<FPropertyTag>, name: String, clazz: Class<T>): Array<T?> {
-	val collected: MutableList<FPropertyTag> = ArrayList()
+inline fun <T> IPropertyHolder.getProp(name: String, clazz: Class<T>): T? = getProp(name, clazz as Type)
+inline fun <reified T> IPropertyHolder.getProp(name: String): T? = getProp(name, T::class.java as Type)
+
+fun <T> IPropertyHolder.getProps(name: String, clazz: Class<T>): Array<T?> {
+	val collected = mutableListOf<FPropertyTag>()
 	var maxIndex = -1
 	for (prop in properties) {
 		if (prop.name.text == name) {
@@ -31,9 +36,17 @@ fun <T> getProps(properties: List<FPropertyTag>, name: String, clazz: Class<T>):
 	return out
 }
 
-fun <T> UExport.getProp(name: String, clazz: Class<T>) = (this as UObject).getProp(name, clazz)
-fun <T> UObject.getProp(name: String, clazz: Class<T>) = getProp(properties, name, clazz)
-inline fun <reified T> UExport.get(name: String): T? = getProp(name, T::class.java)
-inline fun <reified T> UObject.get(name: String): T? = getProp(name, T::class.java)
+inline fun <reified T> IPropertyHolder.getProps(name: String) = getProps(name, T::class.java)
 
-fun FGuid?.asString() = if (this == null) null else "%08x%08x%08x%08x".format(part1.toInt(), part2.toInt(), part3.toInt(), part4.toInt())
+inline fun <reified T> UObject.getOrNullTraversing(name: String): T? {
+	var current = this
+	while (true) {
+		val value = current.getOrNull<T>(name)
+		if (value != null) {
+			//if (current != this) LOGGER.debug("{}.getOrNullTraversing(\"{}\") found value in {}", this.name, name, current.getPathName())
+			return value
+		}
+		current = current.template?.value ?: break
+	}
+	return null
+}

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

@@ -0,0 +1,18 @@
+package com.tb24.blenderumap;
+
+import me.fungames.jfortniteparse.ue4.versions.Ue4Version;
+
+import java.util.Collections;
+import java.util.List;
+
+public class Config {
+    public String PaksDirectory = "C:\\Program Files\\Epic Games\\Fortnite\\FortniteGame\\Content\\Paks";
+    public Ue4Version UEVersion = Ue4Version.GAME_UE4_LATEST;
+    public List<MyFileProvider.EncryptionKey> EncryptionKeys = Collections.emptyList();
+    public boolean bDumpAssets = false;
+    public int ObjectCacheSize = 100;
+    public boolean bReadMaterials = true;
+    public boolean bExportToDDSWhenPossible = true;
+    public boolean bExportBuildingFoundations = true;
+    public String ExportPackage;
+}