Basic test for dungeon items

6 files changed, 174 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemStackTypeAdapter.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemStackTypeAdapter.kt
new file mode 100644
index 000000000..38002990f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemStackTypeAdapter.kt
@@ -0,0 +1,29 @@
+package at.hannibal2.skyhanni.utils
+
+import com.google.gson.Gson
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
+
+object ItemStackTypeAdapterFactory : TypeAdapterFactory {
+    override fun <T : Any> create(gson: Gson?, type: TypeToken<T>): TypeAdapter<T>? {
+        if (type.rawType == ItemStack::class.java) {
+            val nbtCompoundTypeAdapter = gson!!.getAdapter(NBTTagCompound::class.java)
+            return object : TypeAdapter<ItemStack>() {
+                override fun write(out: JsonWriter, value: ItemStack) {
+                    nbtCompoundTypeAdapter.write(out, value.serializeNBT())
+                }
+
+                override fun read(reader: JsonReader): ItemStack {
+                    return ItemStack.loadItemStackFromNBT(nbtCompoundTypeAdapter.read(reader))
+                }
+            } as TypeAdapter<T>
+        }
+        return null
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 3df9e4673..5b9328682 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -122,7 +122,7 @@ object ItemUtils {
     fun ItemStack.getInternalName_new() = NEUInternalName.from(getInternalName())
 
         fun ItemStack.getInternalName(): String {
-        if (name == "§fWisp's Ice-Flavored Water I Splash Potion") {
+        if (tagCompound?.getCompoundTag("display")?.getString("Name") == "§fWisp's Ice-Flavored Water I Splash Potion") {
             return "WISP_POTION"
         }
         return NEUItems.getInternalName(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt
new file mode 100644
index 000000000..94a162c98
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt
@@ -0,0 +1,11 @@
+package at.hannibal2.skyhanni.utils
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import java.io.Reader
+import kotlin.reflect.jvm.javaType
+import kotlin.reflect.typeOf
+
+inline fun <reified T : Any> Gson.fromJson(string: String): T = this.fromJson(string, typeOf<T>().javaType)
+inline fun <reified T : Any> Gson.fromJson(jsonElement: JsonElement): T = this.fromJson(jsonElement, typeOf<T>().javaType)
+inline fun <reified T : Any> Gson.fromJson(reader: Reader): T = this.fromJson(reader, typeOf<T>().javaType)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt b/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt
new file mode 100644
index 000000000..d2f608ffa
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt
@@ -0,0 +1,109 @@
+package at.hannibal2.skyhanni.utils
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
+import kotlin.reflect.*
+import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.isSubtypeOf
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.primaryConstructor
+import com.google.gson.internal.`$Gson$Types` as InternalGsonTypes
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+annotation class KSerializable
+
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+annotation class ExtraData
+
+
+class KotlinTypeAdapterFactory : TypeAdapterFactory {
+
+    internal data class ParameterInfo(
+        val param: KParameter,
+        val adapter: TypeAdapter<Any?>,
+        val name: String,
+        val field: KProperty1<Any, Any?>
+    )
+
+    @OptIn(ExperimentalStdlibApi::class)
+    override fun <T : Any> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T>? {
+        val kotlinClass = type.rawType.kotlin as KClass<T>
+        if (kotlinClass.findAnnotation<KSerializable>() == null) return null
+        if (!kotlinClass.isData) return null
+        val primaryConstructor = kotlinClass.primaryConstructor ?: return null
+        val params = primaryConstructor.parameters.filter { it.findAnnotation<ExtraData>() == null }
+        val extraDataParam = primaryConstructor.parameters
+            .find { it.findAnnotation<ExtraData>() != null && typeOf<MutableMap<String, JsonElement>>().isSubtypeOf(it.type) }
+            ?.let { param ->
+                param to kotlinClass.memberProperties.find { it.name == param.name && it.returnType.isSubtypeOf(typeOf<Map<String, JsonElement>>()) } as KProperty1<Any, Map<String, JsonElement>>
+            }
+        val parameterInfos = params.map { param ->
+            ParameterInfo(
+                param,
+                gson.getAdapter(
+                    TypeToken.get(InternalGsonTypes.resolve(type.type, type.rawType, param.type.javaType))
+                ) as TypeAdapter<Any?>,
+                param.findAnnotation<SerializedName>()?.value ?: param.name!!,
+                kotlinClass.memberProperties.find { it.name == param.name }!! as KProperty1<Any, Any?>
+            )
+        }.associateBy { it.name }
+        val jsonElementAdapter = gson.getAdapter(JsonElement::class.java)
+
+        return object : TypeAdapter<T>() {
+            override fun write(out: JsonWriter, value: T?) {
+                if (value == null) {
+                    out.nullValue()
+                    return
+                }
+                out.beginObject()
+                parameterInfos.forEach { (name, paramInfo) ->
+                    out.name(name)
+                    paramInfo.adapter.write(out, paramInfo.field.get(value))
+                }
+                if (extraDataParam != null) {
+                    val extraData = extraDataParam.second.get(value)
+                    extraData.forEach { (extraName, extraValue) ->
+                        out.name(extraName)
+                        jsonElementAdapter.write(out, extraValue)
+                    }
+                }
+                out.endObject()
+            }
+
+            override fun read(reader: JsonReader): T? {
+                if (reader.peek() == JsonToken.NULL) {
+                    reader.nextNull()
+                    return null
+                }
+                reader.beginObject()
+                val args = mutableMapOf<KParameter, Any?>()
+                val extraData = mutableMapOf<String, JsonElement>()
+                while (reader.peek() != JsonToken.END_OBJECT) {
+                    val name = reader.nextName()
+                    val paramData = parameterInfos[name]
+                    if (paramData == null) {
+                        extraData[name] = jsonElementAdapter.read(reader)
+                        continue
+                    }
+                    val value = paramData.adapter.read(reader)
+                    args[paramData.param] = value
+                }
+                reader.endObject()
+                if (extraDataParam != null) {
+                    args[extraDataParam.first] = extraData
+                }
+                return primaryConstructor.callBy(args)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NBTTypeAdapter.kt b/src/main/java/at/hannibal2/skyhanni/utils/NBTTypeAdapter.kt
new file mode 100644
index 000000000..607fdfc2c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NBTTypeAdapter.kt
@@ -0,0 +1,23 @@
+package at.hannibal2.skyhanni.utils
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import net.minecraft.nbt.CompressedStreamTools
+import net.minecraft.nbt.NBTTagCompound
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.util.*
+
+object NBTTypeAdapter : TypeAdapter<NBTTagCompound>() {
+    override fun write(out: JsonWriter, value: NBTTagCompound) {
+        val baos = ByteArrayOutputStream()
+        CompressedStreamTools.writeCompressed(value, baos)
+        out.value(Base64.getEncoder().encode(baos.toByteArray()).decodeToString())
+    }
+
+    override fun read(reader: JsonReader): NBTTagCompound {
+        val bais = ByteArrayInputStream(Base64.getDecoder().decode(reader.nextString()))
+        return CompressedStreamTools.readCompressed(bais)
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index af0f26bcc..f44893c2a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -154,7 +154,7 @@ object SkyBlockItemModifierUtils {
     // TODO untested
     fun ItemStack.hasBookOfStats() = getAttributeBoolean("stats_book")
 
-    fun ItemStack.hasArtOfPiece() = getAttributeBoolean("artOfPeaceApplied")
+    fun ItemStack.hasArtOfPeace() = getAttributeBoolean("artOfPeaceApplied")
 
     fun ItemStack.getLivingMetalProgress() = getAttributeInt("lm_evo")