fix: remove META-INF/services files added by kotlin-reflect

Mesagisto · Jan 15, 2023 · 7f68af2 · 7f68af2
1 parent 7a7ce9d
commit 7f68af2
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 33 deletions.
diff --git a/fabric-1_16/build.gradle.kts b/fabric-1_16/build.gradle.kts
@@ -25,6 +25,8 @@ pkg {
   excludePath("META-INF/proguard/*")
   excludePath("META-INF/maven/*")
   excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
+  excludePath("META-INF/services/java.security*")
   excludePath("org/slf4j/*")
   excludePath("org/jetbrains/annotations/*")
   excludePath("org/intellij/lang/annotations/*")

diff --git a/fabric-1_17/build.gradle.kts b/fabric-1_17/build.gradle.kts
@@ -25,6 +25,7 @@ pkg {
   excludePath("META-INF/proguard/*")
   excludePath("META-INF/maven/*")
   excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
   excludePath("org/slf4j/*")
   excludePath("org/jetbrains/annotations/*")
   excludePath("org/intellij/lang/annotations/*")

diff --git a/fabric-1_18/build.gradle.kts b/fabric-1_18/build.gradle.kts
@@ -25,6 +25,7 @@ pkg {
   excludePath("META-INF/proguard/*")
   excludePath("META-INF/maven/*")
   excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
   excludePath("org/slf4j/*")
   excludePath("org/jetbrains/annotations/*")
   excludePath("org/intellij/lang/annotations/*")

diff --git a/fabric-1_19/build.gradle.kts b/fabric-1_19/build.gradle.kts
@@ -31,6 +31,7 @@ pkg {
   excludePath("META-INF/proguard/*")
   excludePath("META-INF/maven/*")
   excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
   excludePath("org/slf4j/*")
   excludePath("org/jetbrains/annotations/*")
   excludePath("org/intellij/lang/annotations/*")

diff --git a/forge-1_16/build.gradle.kts b/forge-1_16/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
   id("io.itsusinn.pkg")
 }
 architectury {
-  minecraft = "1.18.2"
+  minecraft = "1.16.5"
   platformSetupLoomIde()
   forge()
 }
@@ -22,22 +22,24 @@ repositories {
 }
 pkg {
   excludePath("META-INF/*.kotlin_module")
-  excludePathStartWith("META-INF/versions")
-  excludePathStartWith("META-INF/proguard")
-  excludePathStartWith("META-INF/maven")
-  excludePathStartWith("org/slf4j")
-  excludePathStartWith("kotlinx/coroutines/flow")
+  excludePath("META-INF/versions/*")
+  excludePath("META-INF/proguard/*")
+  excludePath("META-INF/maven/*")
+  excludePath("META-INF/com.android.tools/*")
+  excludePath("org/slf4j/*")
+  excludePath("org/jetbrains/annotations/*")
+  excludePath("org/intellij/lang/annotations/*")
+  excludePath("kotlin/*")
+  excludePath("kotlinx/*")
   listOf("asn1", "jcajce", "jce", "pqc", "x509", "math", "i18n", "iana", "internal").forEach {
-    excludePathStartWith("org/bouncycastle/$it")
+    excludePath("org/bouncycastle/$it/*")
   }
   val task = tasks.remapJar.get()
   task.dependsOn("pkg")
   shadowJar {
     task.inputFile.set(this.archiveFile)
   }
-  relocateKotlinStdlib()
-  relocateKotlinxLib()
-  kotlinRelocate("org.yaml.snakeyaml", "$group.relocate.org.yaml.snakeyaml")
+  kotlinRelocate("org.yaml.snakeyaml", "relocate.org.yaml.snakeyaml")
 }
 
 loom {
@@ -46,16 +48,13 @@ loom {
 
 dependencies {
   val loom = project.extensions.getByName<LoomGradleExtensionAPI>("loom")
-  minecraft("com.mojang:minecraft:1.18.2")
+  minecraft("com.mojang:minecraft:1.16.5")
   mappings(loom.officialMojangMappings())
 
-  forge("net.minecraftforge:forge:1.18.2-40.0.12")
+  forge("net.minecraftforge:forge:1.16.5-36.2.34")
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
 
   pkgIn(project(":common"))
-  pkgIn("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-  pkgIn("io.nats:jnats:2.15.3")
-  pkgIn("org.mesagisto:mesagisto-client:1.5.2")
 }
 
 java {
@@ -68,7 +67,6 @@ tasks {
       jvmTarget = "1.8"
       freeCompilerArgs = listOf("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn")
     }
-    sourceCompatibility = "1.8"
   }
   processResources {
     inputs.property("version", project.version)

diff --git a/forge-1_16/src/main/java/org/meowcat/mesagisto/forge/ModAdapter.kt b/forge-1_16/src/main/java/org/meowcat/mesagisto/forge/ModAdapter.kt
@@ -2,8 +2,8 @@ package org.meowcat.mesagisto.forge
 
 import net.minecraft.server.MinecraftServer
 import net.minecraftforge.common.MinecraftForge
-import net.minecraftforge.event.server.ServerStartingEvent
-import net.minecraftforge.event.server.ServerStoppingEvent
+import net.minecraftforge.event.world.WorldEvent
+import net.minecraftforge.fml.server.ServerLifecycleHooks
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
 import org.meowcat.mesagisto.forge.impl.ChatImpl
@@ -13,22 +13,23 @@ val logger: Logger = LogManager.getLogger("mesagisto")
 
 @net.minecraftforge.fml.common.Mod("mesagisto")
 class ModAdapter {
-  private lateinit var server: MinecraftServer
+  private val server: MinecraftServer by lazy { ServerLifecycleHooks.getCurrentServer() }
   init {
     MinecraftForge.EVENT_BUS.addListener(ChatImpl::deliverChatEvent)
     MinecraftForge.EVENT_BUS.addListener(this::onServerStart)
     MinecraftForge.EVENT_BUS.addListener(this::onServerStop)
   }
   private fun onServerStart(
-    event: ServerStartingEvent
+    event: WorldEvent.Load
   ) {
-    server = event.server
-    ChatImpl.server = event.server
+    server
+    ChatImpl.server
     ModEntry.onEnable()
   }
+
   private fun onServerStop(
-    event: ServerStoppingEvent
+    event: WorldEvent.Unload
   ) {
-    ModEntry.onDisable()
+    // ModEntry.onDisable()
   }
 }
diff --git a/forge-1_16/src/main/java/org/meowcat/mesagisto/forge/impl/ChatImpl.kt b/forge-1_16/src/main/java/org/meowcat/mesagisto/forge/impl/ChatImpl.kt
@@ -4,19 +4,20 @@ import net.minecraft.network.chat.ChatType
 import net.minecraft.network.chat.TextComponent
 import net.minecraft.server.MinecraftServer
 import net.minecraftforge.event.ServerChatEvent
+import net.minecraftforge.fml.server.ServerLifecycleHooks
 import org.mesagisto.mcmod.api.ChatHandler
 import org.mesagisto.mcmod.api.IChat
 import java.util.*
 
 class IChatImpl : IChat by ChatImpl
 
 object ChatImpl : IChat {
-  lateinit var server: MinecraftServer
+  val server: MinecraftServer by lazy { ServerLifecycleHooks.getCurrentServer() }
   private val handlers: MutableList<ChatHandler> = arrayListOf()
 
   fun deliverChatEvent(event: ServerChatEvent) {
     handlers.forEach {
-      it.hande(event.player.name.string, event.message)
+      it.handle(event.player.name.string, event.message)
     }
   }
   override fun broadcastMessage(message: String) {

diff --git a/forge-1_18/build.gradle.kts b/forge-1_18/build.gradle.kts
@@ -26,6 +26,7 @@ pkg {
   excludePath("META-INF/proguard/*")
   excludePath("META-INF/maven/*")
   excludePath("META-INF/com.android.tools/*")
+  excludePath("META-INF/services/kotlin.reflect*")
   excludePath("org/slf4j/*")
   excludePath("org/jetbrains/annotations/*")
   excludePath("org/intellij/lang/annotations/*")

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1 @@
 org.gradle.jvmargs=-Xmx2G
-
-loader_version=0.12.2
-fabric_api_version=0.29.3+1.16
-
-mod_version = 1.1.2
-maven_group = org.meowcat
-archives_base_name = fabric-message-source