From a453cc833f52cf1ccd52288edb73c6f0fbc0c7cc Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Thu, 14 Dec 2023 18:11:17 +0100
Subject: Add support for jar merging

---
 archenemyexample/build.gradle.kts                 | 18 ++++++++++++++----
 archenemyexample/src/fabricMain/kotlin/doStuff.kt |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'archenemyexample')

diff --git a/archenemyexample/build.gradle.kts b/archenemyexample/build.gradle.kts
index fae9a49..7ae9646 100644
--- a/archenemyexample/build.gradle.kts
+++ b/archenemyexample/build.gradle.kts
@@ -9,7 +9,8 @@ repositories {
     mavenCentral()
     maven("https://maven.fabricmc.net")
 }
-val minecraft = mojang.minecraft("1.20.2", MCSide.CLIENT) as ModuleDependency
+val minecraftClient = mojang.minecraft("1.20.2", MCSide.CLIENT) as ModuleDependency
+val minecraftServer = mojang.minecraft("1.20.2", MCSide.CLIENT) as ModuleDependency
 val officialMappings = mojang.officialMappings(
     "1.20.2", MCSide.CLIENT
 )
@@ -30,7 +31,7 @@ kotlin {
             this.dependencies {
                 implementation(
                     mojang.mapJar(
-                        minecraft,
+                        minecraftClient,
                         officialMappings,
                         "official",
                         "named"
@@ -44,12 +45,21 @@ kotlin {
         compilations.named("main").get().run {
             defaultSourceSet.dependsOn(allJvm)
             this.dependencies {
-                val thingy = mojang.mapJar(
-                    minecraft,
+                val intermediaryClient = mojang.mapJar(
+                    minecraftClient,
                     intermediaryMappings,
                     "official",
                     "intermediary"
                 )
+                val intermediaryServer = mojang.mapJar(
+                    minecraftServer,
+                    intermediaryMappings,
+                    "official",
+                    "intermediary"
+                )
+                val thingy = mojang.mergeJar(
+                    intermediaryClient, intermediaryServer
+                )
                 implementation(
                     mojang.mapJar(
                         thingy as ModuleDependency,
diff --git a/archenemyexample/src/fabricMain/kotlin/doStuff.kt b/archenemyexample/src/fabricMain/kotlin/doStuff.kt
index d88a17e..fc163c2 100644
--- a/archenemyexample/src/fabricMain/kotlin/doStuff.kt
+++ b/archenemyexample/src/fabricMain/kotlin/doStuff.kt
@@ -1,5 +1,7 @@
 import net.minecraft.client.MinecraftClient
+import net.minecraft.server.dedicated.DedicatedServer
 
 actual fun doStuff(args: Int) {
     val client = MinecraftClient.getInstance()
+    val dedicated: DedicatedServer = TODO()
 }
\ No newline at end of file
-- 
cgit