diff --git a/build.gradle.kts b/build.gradle.kts index d5cc2df..ebe1e86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -132,10 +132,10 @@ allprojects { // This includes either project-specific license or a default one if (file("$projectDir/LICENSE").exists()) { textFrom("$projectDir/LICENSE") - rename { s -> "${project.name.toUpperCase()}_LICENSE" } + rename { "${project.name.toUpperCase()}_LICENSE" } } else { textFrom("$rootDir/LICENSE") - rename { s -> "${rootProject.name.toUpperCase()}_LICENSE" } + rename { "${rootProject.name.toUpperCase()}_LICENSE" } } } } diff --git a/core/src/main/java/me/nov/threadtear/ThreadtearCore.java b/core/src/main/java/me/nov/threadtear/ThreadtearCore.java index 6f81675..21a1ccc 100644 --- a/core/src/main/java/me/nov/threadtear/ThreadtearCore.java +++ b/core/src/main/java/me/nov/threadtear/ThreadtearCore.java @@ -15,13 +15,16 @@ import java.util.stream.Collectors; public class ThreadtearCore { + + // removed due to being unused + /* public static void configureEnvironment() throws Exception { System.setProperty("file.encoding", "UTF-8"); Field charset = Charset.class.getDeclaredField("defaultCharset"); charset.setAccessible(true); charset.set(null, null); } - +*/ public static void configureLoggers() { LogWrapper.logger.addLogger(LoggerFactory.getLogger("logfile")); LogWrapper.logger.addLogger(LoggerFactory.getLogger("form")); diff --git a/gradle.properties b/gradle.properties index 04c0ca1..e2692bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ com.github.autostyle.version = 3.1 commons-io.version = 2.6 commons-configuration2.version = 2.7 commons-beanutils.version = 1.9.4 -darklaf.version = 2.6.1 -darklaf.extensions.version = 0.3.4 +darklaf.version = 3.0.2 +darklaf.extensions.version = 0.4.1 asm.version = 9.1 cfr.version = -SNAPSHOT rsyntaxtextarea.version = 3.1.1 diff --git a/gui/src/main/java/me/nov/threadtear/Threadtear.java b/gui/src/main/java/me/nov/threadtear/Threadtear.java index d6b7d76..287b2db 100644 --- a/gui/src/main/java/me/nov/threadtear/Threadtear.java +++ b/gui/src/main/java/me/nov/threadtear/Threadtear.java @@ -48,7 +48,7 @@ public static Threadtear getInstance() { public static void main(String[] args) throws Exception { LookAndFeel.init(); LookAndFeel.setLookAndFeel(); - ThreadtearCore.configureEnvironment(); + // ThreadtearCore.configureEnvironment(); ThreadtearCore.configureLoggers(); configureGUILoggers(); getInstance().setVisible(true); diff --git a/gui/src/main/java/me/nov/threadtear/swing/SwingUtils.java b/gui/src/main/java/me/nov/threadtear/swing/SwingUtils.java index 8611666..f9c672d 100644 --- a/gui/src/main/java/me/nov/threadtear/swing/SwingUtils.java +++ b/gui/src/main/java/me/nov/threadtear/swing/SwingUtils.java @@ -2,7 +2,7 @@ import com.github.weisj.darklaf.components.OverlayScrollPane; import com.github.weisj.darklaf.components.border.DarkBorders; -import com.github.weisj.darklaf.icons.IconLoader; +import com.github.weisj.darklaf.properties.icons.IconLoader; import com.github.weisj.darklaf.ui.button.DarkButtonUI; import me.nov.threadtear.Threadtear; import me.nov.threadtear.swing.textarea.DecompilerTextArea; diff --git a/gui/src/main/java/me/nov/threadtear/swing/laf/LookAndFeel.java b/gui/src/main/java/me/nov/threadtear/swing/laf/LookAndFeel.java index d81697b..0c293cb 100644 --- a/gui/src/main/java/me/nov/threadtear/swing/laf/LookAndFeel.java +++ b/gui/src/main/java/me/nov/threadtear/swing/laf/LookAndFeel.java @@ -1,15 +1,16 @@ package me.nov.threadtear.swing.laf; import java.awt.Color; +import java.util.logging.Level; import javax.swing.plaf.ColorUIResource; import com.github.weisj.darklaf.LafManager; import com.github.weisj.darklaf.theme.*; -import com.github.weisj.darklaf.theme.info.ColorToneRule; -import com.github.weisj.darklaf.theme.info.ContrastRule; import com.github.weisj.darklaf.theme.info.DefaultThemeProvider; -import com.github.weisj.darklaf.theme.info.PreferredThemeStyle; +import com.github.weisj.darklaf.theme.spec.ColorToneRule; +import com.github.weisj.darklaf.theme.spec.ContrastRule; +import com.github.weisj.darklaf.theme.spec.PreferredThemeStyle; public class LookAndFeel { @@ -28,7 +29,7 @@ public static void init() { } public static void setLookAndFeel() { - LafManager.enableLogging(true); + LafManager.setLogLevel(Level.INFO); LafManager.registerDefaultsAdjustmentTask((t, d) -> { if (Theme.isDark(t)) { Object p = d.get("backgroundContainer");