replace property getter method with a smaller and more helpful implem…

…entation and squish icons more because why not
rhysdh540 · Apr 27, 2024 · bfe7dc6 · bfe7dc6
1 parent c02ca76
commit bfe7dc6
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 33 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -2,9 +2,7 @@ plugins {
 	id("com.github.gmazzo.buildconfig")
 }
 
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 buildConfig {
 	className("ZumeConstants")

diff --git a/api/src/main/resources/icon.png b/api/src/main/resources/icon.png
diff --git a/archaic/build.gradle.kts b/archaic/build.gradle.kts
@@ -1,8 +1,6 @@
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	version("archaic_minecraft_version"())

diff --git a/icon_padded.png b/icon_padded.png
diff --git a/icon_padded_large.png b/icon_padded_large.png
diff --git a/legacy/build.gradle.kts b/legacy/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	version("legacy_minecraft_version"())

diff --git a/lexforge/build.gradle.kts b/lexforge/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	combineWith(project(":api").sourceSets.main.get())

diff --git a/lexforge16/build.gradle.kts b/lexforge16/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	combineWith(project(":api").sourceSets.main.get())

diff --git a/lexforge18/build.gradle.kts b/lexforge18/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	combineWith(project(":api").sourceSets.main.get())

diff --git a/modern/build.gradle.kts b/modern/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	version("modern_minecraft_version"())

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -1,6 +1,4 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	version("neoforge_minecraft_version"())

diff --git a/primitive/build.gradle.kts b/primitive/build.gradle.kts
@@ -1,8 +1,6 @@
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	side("client")

diff --git a/stubs/build.gradle.kts b/stubs/build.gradle.kts
@@ -1,3 +1 @@
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
diff --git a/vintage/build.gradle.kts b/vintage/build.gradle.kts
@@ -1,8 +1,6 @@
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 
-operator fun String.invoke(): String {
-	return (rootProject.properties[this] as String?)!!
-}
+operator fun String.invoke(): String = rootProject.properties[this] as? String ?: error("Property $this not found")
 
 unimined.minecraft {
 	version("vintage_minecraft_version"())