hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Delete existing sources jar when re-running jar processors. Fixes #560

Browse source
This commit is contained in:
modmuss50 2022-01-05 09:58:19 +00:00
parent 240a23f52d
commit 6fd3d5d021
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/ProcessedNamedMinecraftProvider.java
View file

@ -76,6 +76,7 @@ public abstract class ProcessedNamedMinecraftProvider<M extends MinecraftProvide
for (Path inputJar : inputJars) { for (Path inputJar : inputJars) {
final Path outputJar = getProcessedPath(inputJar); final Path outputJar = getProcessedPath(inputJar);
deleteSimilarJars(outputJar);
Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING); Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
jarProcessorManager.process(outputJar.toFile()); jarProcessorManager.process(outputJar.toFile());
@ -87,6 +88,15 @@ public abstract class ProcessedNamedMinecraftProvider<M extends MinecraftProvide
} }
} }
private void deleteSimilarJars(Path jar) throws IOException {
Files.deleteIfExists(jar);
for (Path path : Files.list(jar.getParent()).filter(Files::isRegularFile)
.filter(path -> path.getFileName().startsWith(jar.getFileName().toString().replace(".jar", ""))).toList()) {
Files.deleteIfExists(path);
}
}
@Override @Override
protected String getName(String name) { protected String getName(String name) {
return "%s%s-%s".formatted(projectMappedName, name, getTargetNamespace().toString()); return "%s%s-%s".formatted(projectMappedName, name, getTargetNamespace().toString());