Merge remote-tracking branch 'origin/develop' into develop

TheFruxz · Dec 7, 2021 · 2779f49 · 2779f49
2 parents c17f570 + 0f3890b
commit 2779f49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/JET-JVM/src/main/kotlin/de/jet/jvm/extension/Developer.kt b/JET-JVM/src/main/kotlin/de/jet/jvm/extension/Developer.kt
@@ -67,9 +67,12 @@ fun empty() { }
 /**
  * Returns the [this]<[T]> modified with the [process] if [modifyIf] is true,
  */
-fun <T> T?.applyIfNull(process: (T?) -> Unit) = isNull.switchResult(this.apply(process), this)
 
-fun <T> T?.applyIfNotNull(process: (T) -> Unit) = isNotNull.switchResult(this.forceCast<T>().apply(process), this)
+fun <T> T?.applyIfNull(process: (T?) -> Unit) = modifyIf(isNull, process)
+
+fun <T> T?.applyIfNotNull(process: (T) -> Unit) = modifyIf(isNotNull) {
+	process(this!!)
+}
 
 fun <T> T?.ifNull(process: () -> Unit) = if (isNull) process() else empty()
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 allprojects {
 
     group = "de.jet"
-    version = "1.0-BETA-8.1"
+    version = "1.0-BETA-8.1b"
 
     repositories {
         mavenCentral()