upgrade kotlin to 1.8.0. upgrade mindustry to v141.3.

liplum · Jan 26, 2023 · 62dcefa · 62dcefa
1 parent 2dee569
commit 62dcefa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -43,18 +43,18 @@ allprojects {
 }
 mindustry {
     dependency {
-        mindustry mirror "v139"
-        arc on "v139"
+        mindustry mirror "v141.2"
+        arc on "v141.3"
     }
     client {
         /*mindustry from Foo(
             version = "v8.0.0",
             release = "erekir-client.jar"
         )*/
-        mindustry official "v139"
+        mindustry official "v141.3"
     }
     server {
-        mindustry official "v139"
+        mindustry official "v141.3"
     }
 }
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -2,7 +2,7 @@ import io.github.liplum.mindustry.importMindustry
 
 plugins {
     kotlin("jvm")
-    id("com.google.devtools.ksp") version "1.7.20-1.0.7"
+    id("com.google.devtools.ksp") version "1.8.0-1.0.8"
     `maven-publish`
     id("io.github.liplum.mgpp")
 }

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     `maven-publish`
-    id("com.google.devtools.ksp") version "1.7.20-1.0.7"
+    id("com.google.devtools.ksp") version "1.8.0-1.0.8"
     id("io.github.liplum.mgpp")
 }
 val PlumyVersion: String by project

diff --git a/main/src/net/liplum/registry/CioOverwrite.kt b/main/src/net/liplum/registry/CioOverwrite.kt
@@ -52,7 +52,6 @@ object CioOverwrite {
             (Blocks.payloadLoader as PayloadLoader).maxBlockSize = blockSize.toInt()
             (Blocks.payloadRouter as PayloadRouter).payloadLimit = blockSize
             (Blocks.payloadUnloader as PayloadUnloader).maxBlockSize = blockSize.toInt()
-            (Blocks.payloadPropulsionTower as PayloadMassDriver).maxPayloadSize = blockSize
             (Blocks.payloadMassDriver as PayloadMassDriver).maxPayloadSize = blockSize
             (Blocks.reinforcedPayloadConveyor as PayloadConveyor).payloadLimit = blockSize
             (Blocks.reinforcedPayloadRouter as PayloadConveyor).payloadLimit = blockSize

diff --git a/processor/src/net/liplum/processor/dp/DpProcessor.kt b/processor/src/net/liplum/processor/dp/DpProcessor.kt
@@ -75,6 +75,9 @@ class DpProcessor(
         symbols.forEach { it.accept(Visitor(), Unit) }
         try {
             val functions = graph.resolveAllInOrder()
+            for (func in functions) {
+                logger.info("[DpProcessor] ${func.id}.")
+            }
             val qualifiers = functions.mapNotNull {
                 val split = it.id.split(".")
                 when (split.size) {

diff --git a/processor/src/net/liplum/processor/events/SubscriptionProcessor.kt b/processor/src/net/liplum/processor/events/SubscriptionProcessor.kt
@@ -99,7 +99,7 @@ class SubscriptionProcessor(
                     event2Subscribers[EventType(eventName)] += EventSubscriber(
                         curFuncFullName, OnlySpec(only), isZeroArg = function.parameters.isEmpty()
                     )
-                    logger.info("Function ${function.qualifiedName?.asString()} subscribes Event ${eventName.simpleName()}")
+                    logger.info("[SubscriptionProcessor] Function ${function.qualifiedName?.asString()} subscribes Event ${eventName.simpleName()}")
                 }
             }
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
     }
 
     plugins {
-        kotlin("jvm") version "1.7.10"
+        kotlin("jvm") version "1.8.0"
     }
 }
 include(