add warning to loot tables if rolls are empty

12rcu · May 7, 2024 · ead80e0 · ead80e0
1 parent b716f89
commit ead80e0
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 0 deletions.
diff --git a/src/main/kotlin/com/lop/devtools/monstera/addon/entity/behaviour/BehaviourEntityImpl.kt b/src/main/kotlin/com/lop/devtools/monstera/addon/entity/behaviour/BehaviourEntityImpl.kt
@@ -254,6 +254,7 @@ open class BehaviourEntity(val unsafeParent: Entity): OverwriteComponents(unsafe
      *
      * @return a valid table that can be used in the loot table component
      */
+    @Deprecated("Use in component table() call", ReplaceWith("table()"))
     fun generateLootTable(data: BehLootTables.() -> Unit): String {
         unsafeLootTable.apply(data)
         return unsafeParent.addon.config.paths.lootTableEntity.toString() + "/${unsafeParent.name}"
@@ -295,6 +296,7 @@ open class BehaviourEntity(val unsafeParent: Entity): OverwriteComponents(unsafe
         }
 
         if(!unsafeLootTable.isEmpty()) {
+            unsafeLootTable.debug(unsafeParent.name)
             BehLootTables.Entity(unsafeLootTable).build(unsafeParent.name)
         }
     }

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/blocks/components/BlockComponents.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/blocks/components/BlockComponents.kt
@@ -161,6 +161,7 @@ class BlockComponents : MonsteraRawFile() {
      */
     fun table(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Block(lootTables).build(tableName)
         target.fold({
             loot = BehLootTables.resolveRelative(it)

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Barter.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Barter.kt
@@ -15,6 +15,7 @@ class Barter : MonsteraRawFile() {
 
     fun table(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Entity(lootTables).build(tableName)
         target.fold({
             barterTable = resolveRelative(it)

diff --git a/...n/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/BehRandomSearchAndDig.kt b/...n/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/BehRandomSearchAndDig.kt
@@ -69,6 +69,7 @@ class BehRandomSearchAndDig : MonsteraRawFile() {
      */
     fun itemTable(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Entity(lootTables).build(tableName)
         target.fold({
             itemTable = BehLootTables.resolveRelative(it)

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/BehSneeze.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/BehSneeze.kt
@@ -65,6 +65,7 @@ class BehSneeze : MonsteraRawFile() {
      */
     fun lootTable(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Entity(lootTables).build(tableName)
         target.fold({
             lootTable = BehLootTables.resolveRelative(it)

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Equipment.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Equipment.kt
@@ -24,6 +24,7 @@ class Equipment : MonsteraRawFile() {
      */
     fun table(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Entity(lootTables).build(tableName)
         target.fold({
             table = BehLootTables.resolveRelative(it)

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Loot.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/entitiy/components/scraped/Loot.kt
@@ -20,6 +20,7 @@ class Loot : MonsteraRawFile() {
      */
     fun table(tableName: String, data: BehLootTables.() -> Unit) {
         val lootTables = BehLootTables().apply(data)
+        lootTables.debug(tableName)
         val target = BehLootTables.Entity(lootTables).build(tableName)
         target.fold({
             table = BehLootTables.resolveRelative(it)

diff --git a/src/main/kotlin/com/lop/devtools/monstera/files/beh/tables/loot/BehLootTables.kt b/src/main/kotlin/com/lop/devtools/monstera/files/beh/tables/loot/BehLootTables.kt
@@ -64,6 +64,15 @@ class BehLootTables: MonsteraRawFile() {
      */
     fun isEmpty() = poolsData.isNullOrEmpty()
 
+    /**
+     * debug print infos and warnings
+     */
+    fun debug(idInfo: String) {
+        poolsData?.firstOrNull { it.rollsData == null }?.run {
+            logger.warn("($idInfo) rolls not set - handled as implicit 0")
+        }
+    }
+
     @SerializedName("pools")
     @Expose
     @JsonAdapter(MonsteraListFileTypeAdapter::class)