Skip to content

Commit

Permalink
Fix BenBot domain
Browse files Browse the repository at this point in the history
  • Loading branch information
@Amrsatrio
Amrsatrio committed Jul 6, 2021
1 parent 0f23285 commit 5659ba7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 39 deletions.
26 changes: 8 additions & 18 deletions src/main/java/com/tb24/blenderumap/FetchFortniteAesKey.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
package com.tb24.blenderumap;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.*;
import kotlin.io.FilesKt;
import me.fungames.jfortniteparse.util.DataTypeConverterKt;
import okhttp3.OkHttpClient;
import okhttp3.Request;

import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.*;
import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;

import kotlin.io.FilesKt;
import me.fungames.jfortniteparse.util.DataTypeConverterKt;
import okhttp3.OkHttpClient;
import okhttp3.Request;

public class FetchFortniteAesKey {
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
private static final OkHttpClient okHttpClient = new OkHttpClient();
Expand All @@ -41,7 +31,7 @@ public static void main(String[] args) {

private static void updateEncryptionKeys() throws IOException {
System.out.println("Fetching encryption keys...");
Reader reader = okHttpClient.newCall(new Request.Builder().url("https://benbotfn.tk/api/v1/aes").build()).execute().body().charStream();
Reader reader = okHttpClient.newCall(new Request.Builder().url("https://benbot.app/api/v1/aes").build()).execute().body().charStream();
System.out.println("Updating config...");
AesResponse response = GSON.fromJson(reader, AesResponse.class);
reader.close();
Expand Down Expand Up @@ -70,7 +60,7 @@ private static void updateEncryptionKeys() throws IOException {

private static void updateMappings() throws IOException, GeneralSecurityException {
System.out.println("Fetching available mappings...");
Reader reader = okHttpClient.newCall(new Request.Builder().url("https://benbotfn.tk/api/v1/mappings").build()).execute().body().charStream();
Reader reader = okHttpClient.newCall(new Request.Builder().url("https://benbot.app/api/v1/mappings").build()).execute().body().charStream();
FileEntry[] response = GSON.fromJson(reader, FileEntry[].class);
FileEntry chosen = null;
for (FileEntry entry : response) {
Expand Down
41 changes: 20 additions & 21 deletions src/main/java/com/tb24/blenderumap/JWPSerializer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import com.google.gson.*
import me.fungames.jfortniteparse.ue4.assets.IoPackage
import me.fungames.jfortniteparse.ue4.assets.PakPackage
import me.fungames.jfortniteparse.ue4.assets.UProperty
import me.fungames.jfortniteparse.ue4.assets.exports.ECurveTableMode
import me.fungames.jfortniteparse.ue4.assets.exports.UCurveTable
import me.fungames.jfortniteparse.ue4.assets.exports.UDataTable
import me.fungames.jfortniteparse.ue4.assets.exports.UObject
Expand All @@ -27,26 +26,25 @@ import me.fungames.jfortniteparse.util.printHexBinary
import java.lang.reflect.Type
import java.math.BigInteger
import java.util.*
import kotlin.jvm.JvmField as F

/**
* Provides John Wick Parse JSON data structure for JFortniteParse objects.
* @author amrsatrio
*/
object JWPSerializer {
@JvmField
var sUseNonstandardFormat = false

@JvmField
val GSON: Gson = GsonBuilder()
@F var sUseNonstandardFormat = false
@F var sSerializePathName = false
@F val GSON: Gson = GsonBuilder()
.disableHtmlEscaping()
//.setPrettyPrinting()
.serializeNulls()
.setFieldNamingStrategy {
it.getAnnotation(UProperty::class.java)?.name
?: separateCamelCase(it.name, "_").toLowerCase(Locale.ENGLISH)
?: separateCamelCase(it.name, "_").toLowerCase(Locale.ROOT)
}
.registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
.registerTypeAdapter(UByte::class.java, JsonSerializer<UByte> { src, typeOfSrc, context -> JsonPrimitive(src.toString()) })
.registerTypeAdapter(UByte::class.java, JsonSerializer<UByte> { src, typeOfSrc, context -> JsonPrimitive(src.toShort()) })
.registerTypeAdapter(UShort::class.java, JsonSerializer<UShort> { src, typeOfSrc, context -> JsonPrimitive(src.toInt()) })
.registerTypeAdapter(UInt::class.java, JsonSerializer<UInt> { src, typeOfSrc, context -> JsonPrimitive(src.toLong()) })
.registerTypeAdapter(ULong::class.java, JsonSerializer<ULong> { src, typeOfSrc, context -> JsonPrimitive(BigInteger(src.toString())) })
Expand Down Expand Up @@ -88,7 +86,7 @@ object JWPSerializer {
.registerTypeAdapter(FPackageIndex::class.java, JsonSerializer<FPackageIndex> { src, typeOfSrc, context ->
if (src.isImport()) {
val pkg = src.owner
JsonArray().apply {
val arr = JsonArray().apply {
if (pkg is PakPackage) {
var current = pkg.run { src.getResource() }
while (current != null) {
Expand All @@ -102,11 +100,9 @@ object JWPSerializer {
add(current.getName().text)
current = current.getOuter()
}
if (initial is IoPackage.ResolvedExportObject) {
add(initial.pkg.name)
}
}
}
if (arr.size() > 0) arr else null
} else {
JsonObject().apply {
addProperty("export", src.index)
Expand All @@ -118,14 +114,17 @@ object JWPSerializer {
})
.registerTypeAdapter(UScriptMap::class.java, JsonSerializer<UScriptMap> { src, typeOfSrc, context ->
JsonArray().apply {
for ((k, v) in src.mapData) {
for ((k, v) in src.entries) {
add(JsonObject().apply {
add("key", context.serialize(k))
add("value", context.serialize(v))
})
}
}
})
.registerTypeAdapter(UScriptSet::class.java, JsonSerializer<UScriptSet> { src, typeOfSrc, context ->
JsonArray().apply { src.elements.forEach { add(context.serialize(it)) } }
})
.registerTypeHierarchyAdapter(FSoftObjectPath::class.java, JsonSerializer<FSoftObjectPath> { src, typeOfSrc, context ->
JsonObject().apply {
addProperty("asset_path_name", src.assetPathName.text)
Expand Down Expand Up @@ -170,11 +169,11 @@ object JWPSerializer {
add(JsonArray(2).apply {
add(context.serialize(k))
add(JsonObject().apply {
addProperty("export_type", when (src.curveTableMode) {
ECurveTableMode.Empty -> "Empty"
ECurveTableMode.SimpleCurves -> "SimpleCurveKey"
ECurveTableMode.RichCurves -> "RichCurveKey"
}) // this is actually wrong but we're serializing it anyways to keep compatibility
/*addProperty("export_type", when (src.curveTableMode) {
ECurveTableMode.Empty -> "Empty"
ECurveTableMode.SimpleCurves -> "SimpleCurveKey"
ECurveTableMode.RichCurves -> "RichCurveKey"
})*/ // this is actually wrong but we're serializing it anyways to keep compatibility
context.serialize(v).asJsonObject.entrySet().forEach {
add(it.key, it.value)
}
Expand All @@ -192,7 +191,7 @@ object JWPSerializer {
val obj = JsonObject()
//if (sUseNonstandardFormat && src.export != null) obj.addProperty("object_name", src.export!!.objectName.text)
obj.addProperty("export_type", src.exportType)
obj.addProperty("path_name", src.getPathName(src.owner))
if (sSerializePathName) obj.addProperty("path_name", src.getPathName(src.owner))

if (src !is UDataTable || sUseNonstandardFormat)
serializeProperties(obj, src.properties, context)
Expand All @@ -202,15 +201,15 @@ object JWPSerializer {
obj.add("rows", JsonObject().apply {
for ((key, value) in src.rows) {
add(key.text, JsonObject().apply {
addProperty("export_type", "RowStruct")
//addProperty("export_type", "RowStruct")
serializeProperties(this, value.properties, context)
})
}
})
} else {
for ((key, value) in src.rows) {
obj.add(key.text, JsonObject().apply {
addProperty("export_type", "RowStruct")
//addProperty("export_type", "RowStruct")
serializeProperties(this, value.properties, context)
})
}
Expand Down
1 change: 1 addition & 0 deletions umap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def import_material(ob: bpy.types.Object,
for node in tree.nodes:
tree.nodes.remove(node)

m.use_backface_culling = True
m.blend_method = "OPAQUE"

def group(sub_tex_idx, location):
Expand Down

0 comments on commit 5659ba7

Please sign in to comment.