Add MusicDistortEntity support

chrislo27 · Apr 10, 2019 · 610e0e7 · 610e0e7
1 parent 7e5f63a
commit 610e0e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/gui/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/gui/RSDE.kt b/gui/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/gui/RSDE.kt
@@ -42,7 +42,7 @@ class RSDE : Application() {
             mkdirs()
         }
         @Suppress("MayBeConstant")
-        val SFX_DB_BRANCH = "master"
+        val SFX_DB_BRANCH = "prototype"
         const val GITHUB = "https://github.com/chrislo27/RSDE"
         const val RHRE_GITHUB = "https://github.com/chrislo27/RhythmHeavenRemixEditor"
         val rhreSfxRoot: File = rhreRoot.resolve("sfx/$SFX_DB_BRANCH/")

diff --git a/gui/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/gui/editor/Editor.kt b/gui/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/gui/editor/Editor.kt
@@ -2,6 +2,7 @@ package io.github.chrislo27.rhre3.sfxdb.gui.editor
 
 import io.github.chrislo27.rhre3.sfxdb.Parser
 import io.github.chrislo27.rhre3.sfxdb.adt.*
+import io.github.chrislo27.rhre3.sfxdb.gui.RSDE
 import io.github.chrislo27.rhre3.sfxdb.gui.editor.panes.*
 import io.github.chrislo27.rhre3.sfxdb.gui.registry.GameRegistry
 import io.github.chrislo27.rhre3.sfxdb.gui.scene.EditorPane
@@ -98,8 +99,11 @@ class Editor(val folder: File, val editorPane: EditorPane) {
             is Equidistant -> EquidistantObjPane(this, struct)
             is RandomCue -> RandomCueObjPane(this, struct)
             is CuePointer -> null
-            is SubtitleEntity, is ShakeEntity, is EndRemixEntity, is TextureEntity -> null
-            else -> throw IllegalStateException("JsonStruct ${struct::class.java.name} is not supported for editing. Please tell the developer!")
+            is SubtitleEntity, is ShakeEntity, is EndRemixEntity, is TextureEntity, is PlayalongEntity, is TapeMeasure, is MusicDistortEntity -> null
+            else -> {
+                RSDE.LOGGER.warn("JsonStruct ${struct::class.java.name} is not supported for editing, implicitly returning null")
+                null
+            }
         }
     }
 

diff --git a/main/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/validation/Transformers.kt b/main/src/main/kotlin/io/github/chrislo27/rhre3/sfxdb/validation/Transformers.kt
@@ -182,6 +182,10 @@ object Transformers {
                 Parser.buildStruct(this, node, printProperties)
                 this to getNonSuccess(this)
             }
+            "musicDistortEntity" -> MusicDistortEntityObject().run {
+                Parser.buildStruct(this, node, printProperties)
+                this to getNonSuccess(this)
+            }
             else -> return@transformer Result.Failure(node, type, "Type of datamodel is not valid or not implemented")
         }
         if (datamodel.second.isNotEmpty())