fix excs/sigs dev

SpaceWalkerRS · SpaceWalkerRS · commit 47424307287d · 2026-01-10T18:38:41.000+01:00
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/MakeBaseExceptionsTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/MakeBaseExceptionsTask.java
@@ -20,7 +20,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		GameJarsCache gameJars = files.getGlobalCache().getGameJarsCache();
 		BuildFiles buildFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getBuildFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			extractExceptions(
 				gameJars.getMergedJar(minecraftVersion),
 				buildFiles.getBaseMergedExceptionsFile(minecraftVersion)
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/MakeBaseSignaturesTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/MakeBaseSignaturesTask.java
@@ -20,7 +20,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		GameJarsCache gameJars = files.getGlobalCache().getGameJarsCache();
 		BuildFiles buildFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getBuildFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			extractSignatures(
 				gameJars.getMergedJar(minecraftVersion),
 				buildFiles.getBaseMergedSignaturesFile(minecraftVersion)
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/MakeGeneratedExceptionsTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/MakeGeneratedExceptionsTask.java
@@ -27,7 +27,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			File jar = buildFiles.getGeneratedMergedJar(minecraftVersion);
 			File excs = buildFiles.getGeneratedMergedExceptionsFile(minecraftVersion);
 			File nests = nestsCache.getMergedNestsFile(minecraftVersion, nestsBuilds);
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/MakeGeneratedSignaturesTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/MakeGeneratedSignaturesTask.java
@@ -27,7 +27,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			File jar = buildFiles.getGeneratedMergedJar(minecraftVersion);
 			File sigs = buildFiles.getGeneratedMergedSignaturesFile(minecraftVersion);
 			File nests = nestsCache.getMergedNestsFile(minecraftVersion, nestsBuilds);
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/MapGeneratedJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/MapGeneratedJarsTask.java
@@ -22,7 +22,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		SourceMappings mappings = files.getExceptionsAndSignaturesDevelopmentFiles().getSourceMappings();
 		BuildFiles buildFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getBuildFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(MapJar.class, parameters -> {
 				parameters.getOverwrite().set(true);
 				parameters.getInput().set(buildFiles.getNamedGeneratedMergedJar(minecraftVersion));
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/SaveExceptionsTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/SaveExceptionsTask.java
@@ -32,7 +32,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		ExceptionsAndSignaturesDevelopmentFiles excsAndSigs = files.getExceptionsAndSignaturesDevelopmentFiles();
 		BuildFiles buildFiles = excsAndSigs.getBuildFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			saveExceptions(
 				buildFiles.getBaseMergedExceptionsFile(minecraftVersion),
 				buildFiles.getGeneratedMergedExceptionsFile(minecraftVersion),
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/SaveSignaturesTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/SaveSignaturesTask.java
@@ -35,7 +35,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		ExceptionsAndSignaturesDevelopmentFiles excsAndSigs = files.getExceptionsAndSignaturesDevelopmentFiles();
 		BuildFiles buildFiles = excsAndSigs.getBuildFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			saveSignatures(
 				buildFiles.getBaseMergedSignaturesFile(minecraftVersion),
 				buildFiles.getGeneratedMergedSignaturesFile(minecraftVersion),
diff --git a/src/main/java/net/ornithemc/keratin/api/task/generation/SplitGeneratedJarTask.java b/src/main/java/net/ornithemc/keratin/api/task/generation/SplitGeneratedJarTask.java
@@ -17,7 +17,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildFiles buildFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getBuildFiles();
 
-		if (!minecraftVersion.hasSharedObfuscation() && minecraftVersion.canBeMerged()) {
+		if (minecraftVersion.canBeMergedAsMapped()) {
 			workQueue.submit(SplitJar.class, parameters -> {
 				parameters.getClient().set(buildFiles.getNamedGeneratedClientJar(minecraftVersion));
 				parameters.getServer().set(buildFiles.getNamedGeneratedServerJar(minecraftVersion));
diff --git a/src/main/java/net/ornithemc/keratin/api/task/processing/Nester.java b/src/main/java/net/ornithemc/keratin/api/task/processing/Nester.java
@@ -55,7 +55,7 @@ static void _nestJar(File input, File output, File nests) throws IOException {
 				File tmp = output;
 
 				while (tmp.exists()) {
-					tmp = new File(tmp.getParentFile(), tmp.getName() + ".tmp");
+					tmp = new File(tmp.getParentFile(), ".tmp." + tmp.getName());
 				}
 
 				Files.copy(input, tmp);
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupExceptionsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupExceptionsTask.java
@@ -22,6 +22,7 @@
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.ExceptionsAndSignaturesDevelopmentFiles;
+import net.ornithemc.keratin.files.ExceptionsAndSignaturesDevelopmentFiles.SetupFiles;
 import net.ornithemc.keratin.files.KeratinFiles;
 import net.ornithemc.keratin.matching.Matches;
 import net.ornithemc.keratin.matching.MatchesUtil;
@@ -36,23 +37,24 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		KeratinGradleExtension keratin = getExtension();
 		KeratinFiles files = keratin.getFiles();
 
-		ExceptionsAndSignaturesDevelopmentFiles excsAndSigs = files.getExceptionsAndSignaturesDevelopmentFiles();
+		ExceptionsAndSignaturesDevelopmentFiles excsFiles = files.getExceptionsAndSignaturesDevelopmentFiles();
+		SetupFiles setupExcsFiles = excsFiles.getSetupFiles();
 
 		MinecraftVersion fromMinecraftVersion = getFromMinecraftVersion().isPresent()
 			? MinecraftVersion.parse(keratin, getFromMinecraftVersion().get())
 			: null;
 
 		if (minecraftVersion.hasSharedObfuscation()) {
-			File excs = excsAndSigs.getMergedExceptionsFile(minecraftVersion);
-			File setup = excsAndSigs.getMergedExceptionsFile(minecraftVersion);
+			File excs = excsFiles.getMergedExceptionsFile(minecraftVersion);
+			File setup = setupExcsFiles.getMergedExceptionsFile(minecraftVersion);
 
 			if (excs.exists()) {
 				Files.copy(excs, setup);
 			} else {
 				if (fromMinecraftVersion == null) {
 					setup.createNewFile();
 				} else if (fromMinecraftVersion.hasSharedObfuscation()) {
-					File fromExcs = excsAndSigs.getMergedExceptionsFile(fromMinecraftVersion);
+					File fromExcs = excsFiles.getMergedExceptionsFile(fromMinecraftVersion);
 
 					updateExceptions(
 						fromMinecraftVersion.id(),
@@ -68,8 +70,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 			}
 		} else {
 			if (minecraftVersion.hasClient()) {
-				File excs = excsAndSigs.getClientExceptionsFile(minecraftVersion);
-				File setup = excsAndSigs.getClientExceptionsFile(minecraftVersion);
+				File excs = excsFiles.getClientExceptionsFile(minecraftVersion);
+				File setup = setupExcsFiles.getClientExceptionsFile(minecraftVersion);
 
 				if (excs.exists()) {
 					Files.copy(excs, setup);
@@ -79,7 +81,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					} else if (fromMinecraftVersion.hasSharedObfuscation()) {
 						throw new RuntimeException("cannot update from <1.3 version to >=1.3 version!");
 					} else if (fromMinecraftVersion.hasClient()) {
-						File fromExcs = excsAndSigs.getClientExceptionsFile(fromMinecraftVersion);
+						File fromExcs = excsFiles.getClientExceptionsFile(fromMinecraftVersion);
 
 						updateExceptions(
 							fromMinecraftVersion.client().id(),
@@ -95,8 +97,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 				}
 			}
 			if (minecraftVersion.hasServer()) {
-				File excs = excsAndSigs.getServerExceptionsFile(minecraftVersion);
-				File setup = excsAndSigs.getServerExceptionsFile(minecraftVersion);
+				File excs = excsFiles.getServerExceptionsFile(minecraftVersion);
+				File setup = setupExcsFiles.getServerExceptionsFile(minecraftVersion);
 
 				if (excs.exists()) {
 					Files.copy(excs, setup);
@@ -106,7 +108,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					} else if (fromMinecraftVersion.hasSharedObfuscation()) {
 						throw new RuntimeException("cannot update from <1.3 version to >=1.3 version!");
 					} else if (fromMinecraftVersion.hasServer()) {
-						File fromExcs = excsAndSigs.getServerExceptionsFile(fromMinecraftVersion);
+						File fromExcs = excsFiles.getServerExceptionsFile(fromMinecraftVersion);
 
 						updateExceptions(
 							fromMinecraftVersion.server().id(),
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupJarsTask.java
@@ -25,7 +25,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(NestJar.class, parameters -> {
 				parameters.getInputJar().set(gameJars.getMergedJar(minecraftVersion));
 				parameters.getOutputJar().set(setupJars.getMergedJar(minecraftVersion));
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupMappingsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupMappingsTask.java
@@ -42,7 +42,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			int mappingsBuild = keratin.getNamedMappingsBuild(minecraftVersion.id());
 
 			workQueue.submit(MakeSetupMappings.class, parameters -> {
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupSignaturesTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSetupSignaturesTask.java
@@ -23,6 +23,7 @@
 import net.ornithemc.keratin.api.MinecraftVersion;
 import net.ornithemc.keratin.api.task.MinecraftTask;
 import net.ornithemc.keratin.files.ExceptionsAndSignaturesDevelopmentFiles;
+import net.ornithemc.keratin.files.ExceptionsAndSignaturesDevelopmentFiles.SetupFiles;
 import net.ornithemc.keratin.files.KeratinFiles;
 import net.ornithemc.keratin.matching.Matches;
 import net.ornithemc.keratin.matching.MatchesUtil;
@@ -37,23 +38,24 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		KeratinGradleExtension keratin = getExtension();
 		KeratinFiles files = keratin.getFiles();
 
-		ExceptionsAndSignaturesDevelopmentFiles excsAndSigs = files.getExceptionsAndSignaturesDevelopmentFiles();
+		ExceptionsAndSignaturesDevelopmentFiles sigsFiles = files.getExceptionsAndSignaturesDevelopmentFiles();
+		SetupFiles setupSigsFiles = sigsFiles.getSetupFiles();
 
 		MinecraftVersion fromMinecraftVersion = getFromMinecraftVersion().isPresent()
 			? MinecraftVersion.parse(keratin, getFromMinecraftVersion().get())
 			: null;
 
 		if (minecraftVersion.hasSharedObfuscation()) {
-			File sigs = excsAndSigs.getMergedSignaturesFile(minecraftVersion);
-			File setup = excsAndSigs.getMergedSignaturesFile(minecraftVersion);
+			File sigs = sigsFiles.getMergedSignaturesFile(minecraftVersion);
+			File setup = setupSigsFiles.getMergedSignaturesFile(minecraftVersion);
 
 			if (sigs.exists()) {
 				Files.copy(sigs, setup);
 			} else {
 				if (fromMinecraftVersion == null) {
 					setup.createNewFile();
 				} else if (fromMinecraftVersion.hasSharedObfuscation()) {
-					File fromSigs = excsAndSigs.getMergedSignaturesFile(fromMinecraftVersion);
+					File fromSigs = sigsFiles.getMergedSignaturesFile(fromMinecraftVersion);
 
 					updateSignatures(
 						fromMinecraftVersion.id(),
@@ -69,8 +71,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 			}
 		} else {
 			if (minecraftVersion.hasClient()) {
-				File sigs = excsAndSigs.getClientSignaturesFile(minecraftVersion);
-				File setup = excsAndSigs.getClientSignaturesFile(minecraftVersion);
+				File sigs = sigsFiles.getClientSignaturesFile(minecraftVersion);
+				File setup = setupSigsFiles.getClientSignaturesFile(minecraftVersion);
 
 				if (sigs.exists()) {
 					Files.copy(sigs, setup);
@@ -80,7 +82,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					} else if (fromMinecraftVersion.hasSharedObfuscation()) {
 						throw new RuntimeException("cannot update from <1.3 version to >=1.3 version!");
 					} else if (fromMinecraftVersion.hasClient()) {
-						File fromSigs = excsAndSigs.getClientSignaturesFile(fromMinecraftVersion);
+						File fromSigs = sigsFiles.getClientSignaturesFile(fromMinecraftVersion);
 
 						updateSignatures(
 							fromMinecraftVersion.client().id(),
@@ -96,8 +98,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 				}
 			}
 			if (minecraftVersion.hasServer()) {
-				File sigs = excsAndSigs.getServerSignaturesFile(minecraftVersion);
-				File setup = excsAndSigs.getServerSignaturesFile(minecraftVersion);
+				File sigs = sigsFiles.getServerSignaturesFile(minecraftVersion);
+				File setup = setupSigsFiles.getServerSignaturesFile(minecraftVersion);
 
 				if (sigs.exists()) {
 					Files.copy(sigs, setup);
@@ -107,7 +109,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					} else if (fromMinecraftVersion.hasSharedObfuscation()) {
 						throw new RuntimeException("cannot update from <1.3 version to >=1.3 version!");
 					} else if (fromMinecraftVersion.hasServer()) {
-						File fromSigs = excsAndSigs.getServerSignaturesFile(fromMinecraftVersion);
+						File fromSigs = sigsFiles.getServerSignaturesFile(fromMinecraftVersion);
 
 						updateSignatures(
 							fromMinecraftVersion.server().id(),
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSourceJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSourceJarsTask.java
@@ -44,7 +44,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 
 		BuildNumbers nestsBuilds = keratin.getNestsBuilds(minecraftVersion);
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(MakeSourceJar.class, parameters -> {
 				parameters.getInput().set(gameJars.getMergedJar(minecraftVersion));
 				parameters.getOutput().set(sourceJars.getMergedJar(minecraftVersion));
@@ -104,8 +104,8 @@ public void execute() {
 			File signatures = getParameters().getSignatures().get();
 			File nests = getParameters().getNests().getOrNull();
 
-			File tmp1 = new File(output.getParentFile(), ".tmp1.jar");
-			File tmp2 = new File(output.getParentFile(), ".tmp2.jar");
+			File tmp1 = new File(output.getParentFile(), ".tmp1." + output.getName());
+			File tmp2 = new File(output.getParentFile(), ".tmp2." + output.getName());
 
 			try {
 				File jarIn = input;
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSourceMappingsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MakeSourceMappingsTask.java
@@ -23,7 +23,7 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		SetupFiles setupFiles = excsAndSigs.getSetupFiles();
 		SourceMappings sourceMappings = excsAndSigs.getSourceMappings();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(PatchMappings.class, parameters -> {
 				parameters.getIntermediaryMappings().set(setupFiles.getMergedIntermediaryMappingsFile(minecraftVersion));
 				parameters.getNamedMappings().set(setupFiles.getMergedNamedMappingsFile(minecraftVersion));
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MapSetupJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MapSetupJarsTask.java
@@ -22,15 +22,15 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		SetupJars setupJars = files.getExceptionsAndSignaturesDevelopmentFiles().getSetupJars();
 		SetupFiles setupFiles = files.getExceptionsAndSignaturesDevelopmentFiles().getSetupFiles();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(MapJar.class, parameters -> {
 				parameters.getOverwrite().set(true);
 				parameters.getInput().set(setupJars.getMergedJar(minecraftVersion));
 				parameters.getOutput().set(setupJars.getIntermediaryMergedJar(minecraftVersion));
 				parameters.getMappings().set(setupFiles.getMergedIntermediaryMappingsFile(minecraftVersion));
 				parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-				parameters.getSourceNamespace().set("official");
-				parameters.getTargetNamespace().set("intermediary");
+				parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+				parameters.getTargetNamespace().set(Mapper.INTERMEDIARY);
 			});
 		} else {
 			if (minecraftVersion.hasClient()) {
@@ -40,8 +40,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					parameters.getOutput().set(setupJars.getIntermediaryClientJar(minecraftVersion));
 					parameters.getMappings().set(setupFiles.getClientIntermediaryMappingsFile(minecraftVersion));
 					parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-					parameters.getSourceNamespace().set("official");
-					parameters.getTargetNamespace().set("intermediary");
+					parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+					parameters.getTargetNamespace().set(Mapper.INTERMEDIARY);
 				});
 			}
 			if (minecraftVersion.hasServer()) {
@@ -51,8 +51,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					parameters.getOutput().set(setupJars.getIntermediaryServerJar(minecraftVersion));
 					parameters.getMappings().set(setupFiles.getServerIntermediaryMappingsFile(minecraftVersion));
 					parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-					parameters.getSourceNamespace().set("official");
-					parameters.getTargetNamespace().set("intermediary");
+					parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+					parameters.getTargetNamespace().set(Mapper.INTERMEDIARY);
 				});
 			}
 		}
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MapSourceJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MapSourceJarsTask.java
@@ -22,15 +22,15 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 		SourceJars sourceJars = files.getExceptionsAndSignaturesDevelopmentFiles().getSourceJars();
 		SourceMappings mappings = files.getExceptionsAndSignaturesDevelopmentFiles().getSourceMappings();
 
-		if (minecraftVersion.hasSharedObfuscation()) {
+		if (minecraftVersion.canBeMergedAsObfuscated()) {
 			workQueue.submit(MapJar.class, parameters -> {
 				parameters.getOverwrite().set(true);
 				parameters.getInput().set(sourceJars.getMergedJar(minecraftVersion));
 				parameters.getOutput().set(sourceJars.getNamedMergedJar(minecraftVersion));
 				parameters.getMappings().set(mappings.getMergedMappingsFile(minecraftVersion));
 				parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-				parameters.getSourceNamespace().set("official");
-				parameters.getTargetNamespace().set("named");
+				parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+				parameters.getTargetNamespace().set(Mapper.NAMED);
 			});
 		} else {
 			if (minecraftVersion.hasClient()) {
@@ -40,8 +40,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					parameters.getOutput().set(sourceJars.getNamedClientJar(minecraftVersion));
 					parameters.getMappings().set(mappings.getClientMappingsFile(minecraftVersion));
 					parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-					parameters.getSourceNamespace().set("official");
-					parameters.getTargetNamespace().set("named");
+					parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+					parameters.getTargetNamespace().set(Mapper.NAMED);
 				});
 			}
 			if (minecraftVersion.hasServer()) {
@@ -51,8 +51,8 @@ public void run(WorkQueue workQueue, MinecraftVersion minecraftVersion) throws E
 					parameters.getOutput().set(sourceJars.getNamedServerJar(minecraftVersion));
 					parameters.getMappings().set(mappings.getServerMappingsFile(minecraftVersion));
 					parameters.getLibraries().set(libraries.getLibraries(minecraftVersion));
-					parameters.getSourceNamespace().set("official");
-					parameters.getTargetNamespace().set("named");
+					parameters.getSourceNamespace().set(Mapper.OFFICIAL);
+					parameters.getTargetNamespace().set(Mapper.NAMED);
 				});
 			}
 		}
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MappingsFiller.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MappingsFiller.java
diff --git a/src/main/java/net/ornithemc/keratin/api/task/setup/MergeSourceJarsTask.java b/src/main/java/net/ornithemc/keratin/api/task/setup/MergeSourceJarsTask.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static void _nestJar(File input, File output, File nests) throws IOException {`
`55`	`55`	`File tmp = output;`
`56`	`56`
`57`	`57`	`while (tmp.exists()) {`
`58`		`- tmp = new File(tmp.getParentFile(), tmp.getName() + ".tmp");`
	`58`	`+ tmp = new File(tmp.getParentFile(), ".tmp." + tmp.getName());`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`Files.copy(input, tmp);`