fix merge

unimined · Jul 27, 2024 · d34ec5e · d34ec5e
1 parent c898b43
commit d34ec5e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.../wagyourtail/unimined/internal/minecraft/patch/fabric/LegacyFabricMinecraftTransformer.kt b/.../wagyourtail/unimined/internal/minecraft/patch/fabric/LegacyFabricMinecraftTransformer.kt
@@ -21,7 +21,9 @@ open class LegacyFabricMinecraftTransformer(
         }
     }
 
-    override var prodNamespace: Namespace by FinalizeOnRead(LazyMutable { provider.mappings.checkedNs("legacyIntermediary") })
+    override var prodNamespace: Namespace by FinalizeOnRead(LazyMutable {
+        provider.mappings.checkedNs("legacyIntermediary")
+    })
 
     override fun loader(dep: Any, action: Dependency.() -> Unit) {
         fabric.dependencies.add(

diff --git a/...n/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/AbstractReIndevTransformer.kt b/...n/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/AbstractReIndevTransformer.kt
@@ -13,7 +13,7 @@ abstract class AbstractReIndevTransformer(
     providerName: String
 ) : AbstractMinecraftTransformer(project, provider, providerName) {
 
-    override var canCombine: Boolean = SemVerUtils.matches(provider.version.replace("_", "."), ">2.9")
+    override var canCombine: Boolean = SemVerUtils.matches(provider.version.replace("_", ""), ">2.9")
 
     init {
         addMavens()

diff --git a/...yz/wagyourtail/unimined/internal/minecraft/patch/reindev/NoTransformReIndevTransformer.kt b/...yz/wagyourtail/unimined/internal/minecraft/patch/reindev/NoTransformReIndevTransformer.kt
@@ -1,12 +1,11 @@
 package xyz.wagyourtail.unimined.internal.minecraft.patch.reindev
 
 import org.gradle.api.Project
-import xyz.wagyourtail.unimined.api.mapping.MappingNamespaceTree
-import xyz.wagyourtail.unimined.api.minecraft.EnvType
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.AbstractMinecraftTransformer
+import xyz.wagyourtail.unimined.mapping.Namespace
 import xyz.wagyourtail.unimined.util.*
 import java.net.URI
 import java.nio.file.Path
@@ -20,6 +19,8 @@ class NoTransformReIndevTransformer(project: Project, provider: ReIndevProvider)
     "ReIndev-none"
 ) {
 
-    override var prodNamespace: MappingNamespaceTree.Namespace = provider.mappings.OFFICIAL
+    override val prodNamespace: Namespace by lazy {
+        provider.mappings.checkedNs("official")
+    }
 
 }
diff --git a/...aft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevDownloader.kt b/...aft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevDownloader.kt
@@ -1,11 +1,12 @@
 package xyz.wagyourtail.unimined.internal.minecraft.patch.reindev
 
 import org.gradle.api.Project
-import xyz.wagyourtail.unimined.api.minecraft.EnvType
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.resolver.MinecraftDownloader
+import xyz.wagyourtail.unimined.mapping.EnvType
+import xyz.wagyourtail.unimined.mapping.Namespace
 import xyz.wagyourtail.unimined.util.FinalizeOnRead
 import xyz.wagyourtail.unimined.util.LazyMutable
 import xyz.wagyourtail.unimined.util.cachingDownload
@@ -50,8 +51,7 @@ class ReIndevDownloader(project: Project, provider: MinecraftProvider) : Minecra
             EnvType.CLIENT,
             version,
             listOf(),
-            provider.mappings.OFFICIAL,
-            provider.mappings.OFFICIAL,
+            Namespace("official"),
             null,
             "jar",
             clientPath
@@ -75,8 +75,7 @@ class ReIndevDownloader(project: Project, provider: MinecraftProvider) : Minecra
             EnvType.SERVER,
             version,
             listOf(),
-            provider.mappings.OFFICIAL,
-            provider.mappings.OFFICIAL,
+            Namespace("official"),
             null,
             "jar",
             serverPath

diff --git a/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevProvider.kt b/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevProvider.kt
@@ -34,8 +34,7 @@ class ReIndevProvider(project: Project, sourceSet: SourceSet) : MinecraftProvide
             }
         }
 
-        mappings.devNamespace = mappings.OFFICIAL
-        mappings.devFallbackNamespace = mappings.OFFICIAL
+        mappings.devNamespace = mappings.checkedNs("official")
     }
 
     override val mergedOfficialMinecraftFile: File? by lazy {