feat: add dungeon map detection (#4)

* feat: add dungeon map detection

* feat: add colours, and remove node overwriting

* feat: add room matching stuff and room middle section

* feat: switch to sha256 for hashing since the array had problems

* feat: a lot of room stuff

* feat: add room rotations and more rooms

* style: use sealed classes and objects for CatacombNodeType

* requested chagnes

* git attributes

* git attributes v2

---------

Co-authored-by: Empa <itsempa@users.noreply.github.com>

Author: meowora

.gitattributes

@@ -0,0 +1,2 @@
+src/repo/rooms/** linguist-generated
+src/main/kotlin/me/owdding/mortem/Mortem.kt ident

build.gradle.kts

@@ -1,6 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude
 import org.gradle.kotlin.dsl.modImplementation
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -12,6 +11,7 @@ plugins {
     kotlin("jvm") version "2.2.20"
     alias(libs.plugins.ksp)
     `versioned-catalogues`
+    alias(libs.plugins.meowdding.resources)
 }
 
 repositories {
@@ -86,6 +86,14 @@ loom {
     }
 }
 
+compactingResources {
+    basePath = "repo"
+    pathDirectory = "../../src"
+
+    configureTask(tasks.named<AbstractCopyTask>("processResources").get())
+    compactToArray("rooms")
+}
+
 ksp {
     arg("meowdding.project_name", "mortem")
     arg("meowdding.package", "me.owdding.mortem.generated")

buildSrc/build.gradle.kts

@@ -8,6 +8,5 @@ repositories {
 }
 
 dependencies {
-    implementation(libs.meowdding.resources)
     implementation(libs.gson)
 }

gradle/libs.versions.toml

@@ -8,12 +8,12 @@ repo-lib = "3.0.2"
 devauth = "1.2.1"
 
 ksp = "2.2.10-2.0.2"
+meowdding-resources = "1.0.17"
 
 rconfigkt = "3.5.15"
 
 gson = "2.12.1"
 
-meowdding-resources = "1.0.15"
 meowdding-ktmodules = "1.0.5"
 meowdding-ktcodecs = "1.1.0"
 meowdding-lib = "3.0.13"
@@ -39,4 +39,5 @@ meowdding-lib = { module = "me.owdding.meowdding-lib:meowdding-lib", version.ref
 meowdding-remote-repo = { module = "me.owdding.repo:remote-repo", version.ref = "meowdding-remote-repo" }
 
 [plugins]
+meowdding-resources = { id = "me.owdding.resources", version.ref = "meowdding-resources" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

settings.gradle.kts

@@ -3,6 +3,7 @@ pluginManagement {
         maven("https://maven.kikugie.dev/snapshots")
         maven("https://maven.fabricmc.net/")
         gradlePluginPortal()
+        maven("https://maven.teamresourceful.com/repository/maven-public/")
     }
 }
 

src/main/java/me/owdding/mortem/mixins/ClientboundSectionBlocksUpdatePacketAccessor.java

@@ -0,0 +1,14 @@
+package me.owdding.mortem.mixins;
+
+import net.minecraft.core.SectionPos;
+import net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ClientboundSectionBlocksUpdatePacket.class)
+public interface ClientboundSectionBlocksUpdatePacketAccessor {
+
+    @Accessor("sectionPos")
+    SectionPos mortem$sectionPos();
+
+}

src/main/kotlin/me/owdding/mortem/Mortem.kt

@@ -11,6 +11,7 @@ import tech.thatgravyboat.skyblockapi.api.SkyBlockAPI
 
 @Module
 object Mortem : ClientModInitializer, MeowddingLogger by MeowddingLogger.autoResolve() {
+    const val gitRef = $$"$Id$"
 
     val SELF = FabricLoader.getInstance().getModContainer("mortem").get()
     val MOD_ID: String = SELF.metadata.id

src/main/kotlin/me/owdding/mortem/core/Instance.kt

@@ -0,0 +1,11 @@
+package me.owdding.mortem.core
+
+interface Instance {
+    val instance: InstanceType
+}
+
+enum class InstanceType {
+    CATACOMBS,
+    KUUDRA,
+    ;
+}

src/main/kotlin/me/owdding/mortem/core/catacombs/Catacomb.kt

@@ -0,0 +1,117 @@
+package me.owdding.mortem.core.catacombs
+
+import me.owdding.ktcodecs.FieldName
+import me.owdding.ktcodecs.GenerateCodec
+import me.owdding.mortem.core.Instance
+import me.owdding.mortem.core.InstanceType
+import me.owdding.mortem.core.catacombs.nodes.CatacombNodeType
+import me.owdding.mortem.core.catacombs.nodes.CatacombsNode
+import me.owdding.mortem.utils.Utils
+import me.owdding.mortem.utils.Utils.unsafeCast
+import net.minecraft.core.Direction
+import org.joml.Vector2i
+import org.joml.minus
+import org.joml.plus
+import tech.thatgravyboat.skyblockapi.api.area.dungeon.DungeonFloor
+import tech.thatgravyboat.skyblockapi.utils.extentions.filterValuesNotNull
+import java.util.concurrent.ConcurrentHashMap
+
+data class Catacomb(
+    val floor: DungeonFloor,
+) : Instance {
+    var size: CatacombSize = CatacombSize.forFloor(floor)
+
+    var mapTopLeft: Vector2i? = null
+    var mapRoomSize: Int = 0
+        set(value) {
+            mapRoomAndDoorSize = value + DOOR_WIDTH
+            field = value
+        }
+    var mapRoomAndDoorSize: Int = 0
+
+    val grid: MutableMap<Vector2i, CatacombsNode<*>> = ConcurrentHashMap()
+
+    fun <T : CatacombsNode<T>> getOrCreateNode(position: Vector2i, type: CatacombNodeType<T>) : T = grid.getOrPut(position, type.constructor).unsafeCast()
+
+    inline fun <reified T : CatacombsNode<T>> getNeighbours(position: Vector2i): Map<Vector2i, T> = buildList {
+        add(position + Utils.vectorOneZero)
+        add(position + Utils.vectorZeroOne)
+        add(position - Utils.vectorOneZero)
+        add(position - Utils.vectorZeroOne)
+    }.associateWith { grid[it] as? T }.filterValuesNotNull()
+
+    override val instance: InstanceType get() = InstanceType.CATACOMBS
+}
+
+fun interface CatacombsColorProvider {
+    fun getColor(): Int
+}
+
+enum class CatacombRoomType(val provider: CatacombsColorProvider) : CatacombsColorProvider by provider {
+    NORMAL({ 0xAb6b00 }),
+    TRAP({ 0xFF7F0F }),
+    FAIRY({ 0xF080FF }),
+    PUZZLE({ 0xe050F0 }),
+    MINIBOSS({ 0xFFFF00 }),
+    BLOOD({ 0xFF0000 }),
+    START({ 0x00FF00 }),
+    UNKNOWN({ 0xababab }),
+    DEFAULT({ 0x000000 }),
+    ;
+
+    companion object {
+        fun getByColor(color: CatacombMapColor): CatacombRoomType? = when (color) {
+            CatacombMapColor.COMPLETE -> START
+            CatacombMapColor.UNKNOWN -> UNKNOWN
+            CatacombMapColor.FAILED -> BLOOD
+            CatacombMapColor.PUZZLE -> PUZZLE
+            CatacombMapColor.TRAP -> TRAP
+            CatacombMapColor.MINIBOSS -> MINIBOSS
+            CatacombMapColor.FAIRY -> FAIRY
+            CatacombMapColor.NORMAL -> NORMAL
+            else -> null
+        }
+    }
+
+}
+
+enum class CatacombDoorType(val provider: CatacombsColorProvider) : CatacombsColorProvider by provider {
+    WITHER({ 0x4f4f4f }),
+    BLOOD({ 0xFF0000 }),
+    NORMAL({ 0xab6b00 }),
+    TRAP({ 0xff7f0f }),
+    MINIBOSS({ 0xFFFF00 }),
+    PUZZLE({ 0xe060f0 }),
+    FAIRY({ 0xf080ff }),
+    DEFAULT({ 0x000000 }),
+;
+
+    companion object {
+        fun getByColor(color: CatacombMapColor): CatacombDoorType? = when (color) {
+            CatacombMapColor.FAILED -> BLOOD
+            CatacombMapColor.NORMAL -> NORMAL
+            CatacombMapColor.WITHER -> WITHER
+            CatacombMapColor.FAIRY -> FAIRY
+            CatacombMapColor.PUZZLE -> PUZZLE
+            CatacombMapColor.TRAP -> TRAP
+            CatacombMapColor.MINIBOSS -> MINIBOSS
+            CatacombMapColor.UNKNOWN -> DEFAULT
+            else -> null
+        }
+    }
+}
+
+@GenerateCodec
+data class StoredCatacombRoom(
+    var name: String,
+    var id: String,
+    var secrets: Int,
+    @FieldName("center") val centerHash: String,
+    @FieldName("directions") val directionalHashes: Map<String, Direction>,
+) {
+    var shouldSerialize = false
+
+    fun markChange() {
+        shouldSerialize = true
+    }
+}

src/main/kotlin/me/owdding/mortem/core/catacombs/CatacombConstants.kt

@@ -0,0 +1,3 @@
+package me.owdding.mortem.core.catacombs
+
+const val DOOR_WIDTH: Int = 4