Merge remote-tracking branch 'origin/master'

# Conflicts: # update
liplum · May 29, 2022 · 5ad7102 · 5ad7102
2 parents 6218044 + 87b9915
commit 5ad7102
Show file tree

Hide file tree

Showing 14 changed files with 282 additions and 171 deletions.
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
@@ -134,6 +134,7 @@ cyber-io.speed-increase.range={0}% to {1}%
 control.cyber-io.yes=Yes
 control.cyber-io.no=No
 control.cyber-io.ok=OK
+control.cyber-io.enable=Enable {0}
 control.cyber-io.validate=Validate
 control.cyber-io.update-mod.success=CyberIO {0} updated successfully. Please restart the game to reload CyberIO.
 control.cyber-io.update-mod.failed=Failed to update CyberIO because {0}.
@@ -175,6 +176,10 @@ setting.cyber-io-github-mirror.cancel-tooltip=Desert the input.
 setting.cyber-io-check-update.button=Check Update
 setting.cyber-io-check-update.already-latest=Current Cyber IO is already latest.
 setting.cyber-io-check-update.not-support=Check update doesn't support.
+setting.cyber-io-advanced-function.title=Advanced Functions
+# Advanced Function
+advanced.cyber-io.map-cleaner=Map Cleaner
+advanced.cyber-io.map-cleaner.description=Enable Map Cleaner, you will find a special button named "Map Cleaner" in the settings menu while you are playing in a local map. Hit the button, then it will clear all contents from Cyber IO in that map.
 # UI
 ui.cyber-io.mouse-position.tile=Tile:{0},{1}
 ui.cyber-io.mouse-position.build=Build:{0},{1}

diff --git a/buildSrc/src/net/liplum/gradle/DownloadTask.kt b/buildSrc/src/net/liplum/gradle/DownloadTask.kt
@@ -27,6 +27,7 @@ abstract class DownloadTask : DefaultTask() {
         val targetFile = targetFile.get()
         val sourceUrl = sourceUrl.get()
         if (!targetFile.exists() || overwrite.getOrElse(false)) {
+            targetFile.parentFile?.mkdirs()
             if (tip.isPresent) logger.lifecycle(tip.get())
             logger.lifecycle("Downloading file from $sourceUrl into ${targetFile.path}, please wait for a while.")
             ant.call {

diff --git a/main/src/net/liplum/GameH.kt b/main/src/net/liplum/GameH.kt
@@ -136,6 +136,10 @@ val OnlyServer = Condition {
     val net = Vars.net
     net.server() || !net.active()
 }
+val OnlyLocal = Condition{
+    val net = Vars.net
+    !net.server() && !net.active()
+}
 val OnlyDebug = Condition {
     CioMod.DebugMode
 }
@@ -160,6 +164,25 @@ inline fun ServerOnly(func: () -> Unit): Boolean {
     return false
 }
 
+/**
+ * Runs codes only on Logical Server
+ */
+inline fun OnlyLocal(func: () -> Unit): Boolean {
+    val net = Vars.net
+    if (!net.server() && !net.active()) {
+        func()
+    }
+    return false
+}
+
+inline fun <reified T> T.OnlyLocalOn(func: T.() -> Unit): T {
+    val net = Vars.net
+    if (!net.server() && !net.active()) {
+        func()
+    }
+    return this
+}
+
 inline fun <reified T> T.ServerOnlyOn(func: T.() -> Unit): T {
     val net = Vars.net
     if (net.server() || !net.active()) {

diff --git a/main/src/net/liplum/R.java b/main/src/net/liplum/R.java
@@ -139,6 +139,7 @@ public static final class Ctrl {
                 Yes = Gen("yes"),
                 No = Gen("no"),
                 OK = Gen("ok"),
+                Enable = Gen("enable"),
                 Validate = Gen("validate"),
                 UpdateModSuccess = Gen("update-mod.success"),
                 UpdateModFailed = Gen("update-mod.failed");
@@ -150,6 +151,17 @@ public static String Gen(String content) {
         }
     }
 
+    public static final class Advanced {
+        public static final String
+                MapCleaner = Gen("map-cleaner");
+
+        @NotNull
+        @Contract(pure = true)
+        public static String Gen(String content) {
+            return "advanced." + Meta.ModID + "." + content;
+        }
+    }
+
     public static final class C {
         public static final Color RedAlert = Color.valueOf("#e53935");
         public static final Color RedAlertDark = Color.valueOf("#d50000");
@@ -303,6 +315,7 @@ public static final class CMD {
         public static final String
                 ResetConfig = "cio-reset-config",
                 ReloadConfig = "cio-reload-config",
-                CheckUpdate = "cio-check-update";
+                CheckUpdate = "cio-check-update",
+                ClearCyberIOConetnt = "cio-clean-map";
     }
 }
diff --git a/main/src/net/liplum/Var.kt b/main/src/net/liplum/Var.kt
@@ -0,0 +1,5 @@
+package net.liplum
+
+object Var {
+    var EnableMapCleaner = false
+}