Minor cleanups to #336

QuiltMC · Jul 28, 2023 · 14c9197 · 14c9197
1 parent bd1630f
commit 14c9197
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/src/main/java/org/quiltmc/loader/impl/transformer/TransformCache.java b/src/main/java/org/quiltmc/loader/impl/transformer/TransformCache.java
@@ -41,7 +41,6 @@
 import org.quiltmc.loader.api.QuiltLoader;
 import org.quiltmc.loader.api.plugin.solver.ModLoadOption;
 import org.quiltmc.loader.api.plugin.solver.ModSolveResult;
-import org.quiltmc.loader.impl.QuiltLoaderImpl;
 import org.quiltmc.loader.impl.discovery.ModResolutionException;
 import org.quiltmc.loader.impl.discovery.RuntimeModRemapper;
 import org.quiltmc.loader.impl.filesystem.PartiallyWrittenIOException;
@@ -51,7 +50,6 @@
 import org.quiltmc.loader.impl.filesystem.QuiltZipPath;
 import org.quiltmc.loader.impl.util.FilePreloadHelper;
 import org.quiltmc.loader.impl.util.FileSystemUtil;
-import org.quiltmc.loader.impl.util.FileUtil;
 import org.quiltmc.loader.impl.util.HashUtil;
 import org.quiltmc.loader.impl.util.QuiltLoaderInternal;
 import org.quiltmc.loader.impl.util.QuiltLoaderInternalType;
@@ -148,8 +146,7 @@ private static QuiltZipPath checkTransformCache(Path transformCacheFolder, Map<S
 			QuiltZipPath inner = fs.getRoot();
 			if (!FasterFiles.isRegularFile(inner.resolve(FILE_TRANSFORM_COMPLETE))) {
 				Log.info(LogCategory.CACHE, "Not reusing previous transform cache since it's incomplete!");
-				// delete the previous transform cache to prevent FileAlreadyExistsException later
-				try { Files.deleteIfExists(cacheFile); } catch(IOException ignored) {}
+				erasePreviousTransformCache(transformCacheFolder, cacheFile, null);
 				return null;
 			}
 			Path optionFile = inner.resolve("options.txt");
@@ -387,16 +384,6 @@ private boolean couldBeJavaElement(String name, boolean ignoreClassSuffix) {
 		});
 	}
 
-	static final class ClassData {
-		final ModLoadOption mod;
-		final byte[] classBytes;
-
-		ClassData(ModLoadOption mod, byte[] classBytes) {
-			this.mod = mod;
-			this.classBytes = classBytes;
-		}
-	}
-
 	@FunctionalInterface
 	interface ClassConsumer {
 		byte[] run(ModLoadOption mod, Path file) throws IOException;