Merge branch 'main' into swui-v2

buildSrc/src/steamwar.devserver.gradle

@@ -29,10 +29,6 @@ class DevServer extends DefaultTask {
     @Input
     boolean debug = false
 
-    @Input
-    @Optional
-    String worldName = null
-
     @Input
     String template = null
 
@@ -87,10 +83,13 @@ class DevServer extends DefaultTask {
                 }
             }
 
-            if (worldName == null) worldName = properties.get("worldName")
+            worldName = properties.get("worldName")
             host = properties.get("host")
             debugPort = new Random().nextInt(5001, 10000)
 
+            if (worldName == null) {
+                throw new GradleException("Please supply the 'worldName' in a 'steamwar.properties' files either in this project dir or any parent project!")
+            }
             if (host == null) {
                 throw new GradleException("Please supply the 'host' in a 'steamwar.properties' files either in this project dir or any parent project!")
             }
@@ -116,6 +115,9 @@ class DevServer extends DefaultTask {
     @Internal
     Boolean running = true
 
+    @Internal
+    String worldName = null
+
     class Finalizer extends DefaultTask {
 
         Finalizer() {