From 95318b26ac4411be4689490b1325043e718ea746 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:06:35 +0200 Subject: [PATCH] code inspection fixes --- .../lib/config/IConfigElementProxy.java | 1 + .../lib/dependencies/DependencyLoader.java | 13 ++++++++++--- .../com/falsepattern/lib/mixin/IMixinPlugin.java | 4 ++-- .../com/falsepattern/lib/mixin/ITargetedMod.java | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/falsepattern/lib/config/IConfigElementProxy.java b/src/main/java/com/falsepattern/lib/config/IConfigElementProxy.java index e8ba829..ea6020c 100644 --- a/src/main/java/com/falsepattern/lib/config/IConfigElementProxy.java +++ b/src/main/java/com/falsepattern/lib/config/IConfigElementProxy.java @@ -21,6 +21,7 @@ public class IConfigElementProxy implements IConfigElement { return proxied.isProperty(); } + @SuppressWarnings("rawtypes") @Override public Class getConfigEntryClass() { return proxied.getConfigEntryClass(); diff --git a/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java b/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java index 27299e1..b916f3c 100644 --- a/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java +++ b/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java @@ -9,6 +9,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.nio.file.Files; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -94,7 +95,10 @@ public class DependencyLoader { val jarName = groupId + "-" + mavenJarName; val libDir = new File(modsDir, "falsepattern"); if (!libDir.exists()) { - libDir.mkdirs(); + if (!libDir.mkdirs()) { + FalsePatternLib.getLog().fatal("Failed to create directory {}", libDir); + throw new RuntimeException("Failed to create directory " + libDir); + } } val file = new File(libDir, jarName); if (file.exists()) { @@ -115,7 +119,10 @@ public class DependencyLoader { artifactId, preferredVersion, (suffix != null) ? ":" + suffix : ""); - file.delete(); + if (!file.delete()) { + FalsePatternLib.getLog().fatal("Failed to delete file {}", file); + throw new RuntimeException("Failed to delete file " + file); + } } } for (var repo : mavenRepositories) { @@ -190,7 +197,7 @@ public class DependencyLoader { var bytesRead = 0; - val fileOutput = new BufferedOutputStream(new FileOutputStream(target)); + val fileOutput = new BufferedOutputStream(Files.newOutputStream(target.toPath())); byte[] smallBuffer = new byte[4096]; while ((bytesRead = is.read(smallBuffer)) >= 0) { fileOutput.write(smallBuffer, 0, bytesRead); diff --git a/src/main/java/com/falsepattern/lib/mixin/IMixinPlugin.java b/src/main/java/com/falsepattern/lib/mixin/IMixinPlugin.java index 961f077..7ba4459 100644 --- a/src/main/java/com/falsepattern/lib/mixin/IMixinPlugin.java +++ b/src/main/java/com/falsepattern/lib/mixin/IMixinPlugin.java @@ -102,8 +102,8 @@ public interface IMixinPlugin extends IMixinConfigPlugin { IMixin[] getMixinEnumValues(); static File findJarOf(final ITargetedMod mod) { - try { - return walk(MODS_DIRECTORY_PATH).filter(mod::isMatchingJar).map(Path::toFile).findFirst().orElse(null); + try (val stream = walk(MODS_DIRECTORY_PATH)) { + return stream.filter(mod::isMatchingJar).map(Path::toFile).findFirst().orElse(null); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java b/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java index ea788fa..73cd814 100644 --- a/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java +++ b/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java @@ -10,6 +10,7 @@ public interface ITargetedMod { boolean isLoadInDevelopment(); + @SuppressWarnings("UnstableApiUsage") default boolean isMatchingJar(Path path) { String pathString = path.toString(); String nameLowerCase = Files.getNameWithoutExtension(pathString).toLowerCase();