Merge branch 'main' into develop

unimined · Jul 31, 2024 · d6dc005 · d6dc005
2 parents 03961d4 + f17c854
commit d6dc005
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt
@@ -118,10 +118,14 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey: Str
 
     override fun calamus(key: String, action: MappingEntry.() -> Unit) {
         unimined.ornitheMaven()
-        val environment = when (envType) {
-            EnvType.CLIENT -> "-client"
-            EnvType.SERVER -> "-server"
-            EnvType.JOINED -> ""
+        val environment = if (minecraft.minecraftData.mcVersionCompare(minecraft.version, "1.3") < 0) {
+            when (envType) {
+                EnvType.CLIENT -> "-client"
+                EnvType.SERVER -> "-server"
+                else -> throw IllegalStateException("Cannot use calamus with side COMBINED")
+            }
+        } else {
+            ""
         }
         addDependency(key, MappingEntry(
             contentOf(ornitheGenRevisionTransform(