update logger

Author: Ecdcaeb

build.gradle

@@ -46,16 +46,17 @@ dependencies {
     //noinspection GradlePackageUpdate
     implementation 'com.miglayout:miglayout-swing:11.4.2'
     implementation 'com.github.bobbylight:RSyntaxTextArea:3.5.2'
-    implementation 'org.ow2.asm:asm-tree:9.7.1'
-    implementation 'org.ow2.asm:asm-util:9.7.1'
-    implementation 'org.ow2.asm:asm-commons:9.7.1'
+    implementation 'org.ow2.asm:asm-tree:9.8'
+    implementation 'org.ow2.asm:asm-util:9.8'
+    implementation 'org.ow2.asm:asm-commons:9.8'
     implementation 'org.benf:cfr:0.152'
     implementation 'com.github.mstrobel.procyon:procyon-decompiler:v0.6.0'
-    implementation 'org.vineflower:vineflower:1.10.1'
+    implementation 'org.vineflower:vineflower:1.11.1'
     implementation 'org.javassist:javassist:3.30.2-GA'
     implementation 'com.google.code.gson:gson:2.11.0'
-    implementation 'org.tinylog:tinylog:1.3.6'
-    implementation 'com.github.FabricMC:mapping-io:597f0722d6'
+    implementation 'org.tinylog:tinylog-api:2.7.0'
+    implementation 'org.tinylog:tinylog-impl:2.7.0'
+    implementation 'net.fabricmc:mapping-io:0.7.1'
     implementation 'zone.rong:imaginebreaker:2.1'
 }
 

src/main/java/cn/enaium/joe/Main.java

@@ -20,11 +20,10 @@
 import cn.enaium.joe.util.*;
 import cn.enaium.joe.util.classes.ClassNode;
 import cn.enaium.joe.util.reflection.ReflectionHelper;
-import org.pmw.tinylog.Configurator;
-import org.pmw.tinylog.Logger;
-import org.pmw.tinylog.writers.ConsoleWriter;
-import org.pmw.tinylog.writers.FileWriter;
+import org.tinylog.Logger;
+import org.tinylog.writers.ConsoleWriter;
 
+import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
@@ -69,7 +68,6 @@ private static void agent(Instrumentation inst) throws IOException {
     }
 
     private static void launch() {
-        Configurator.currentConfig().writer(new ConsoleWriter(), "[{date: HH:mm:ss.SSS}] {level} > {message}").addWriter(new FileWriter("latest.log"), "[{date: HH:mm:ss.SSS}] {level} > {message}").activate();
         System.setOut(new TinyLogPrintStream(System.out, STDOUT));
         System.setErr(new TinyLogPrintStream(System.err, STDERR));
 

src/main/java/cn/enaium/joe/gui/panel/file/FileDropTarget.java

@@ -16,7 +16,8 @@
 
 package cn.enaium.joe.gui.panel.file;
 
-import org.pmw.tinylog.Logger;
+
+import org.tinylog.Logger;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;

src/main/java/cn/enaium/joe/gui/panel/file/tree/CenterPanel.java

@@ -67,7 +67,7 @@ public CenterPane(){
                         } else {
                             MappingFormat mappingFormat = MappingParser.isAnyMatched(name);
                             if (mappingFormat != null) {
-                                JavaOctetEditor.getInstance().TASKS.submit(new RemappingTask(file, MappingFormat.SRG));
+                                JavaOctetEditor.getInstance().TASKS.submit(new RemappingTask(file, MappingFormat.SRG_FILE));
                             }
                         }
                     }

src/main/java/cn/enaium/joe/service/decompiler/ProcyonDecompiler.java

@@ -30,7 +30,7 @@
 import com.strobel.decompiler.DecompilerSettings;
 import com.strobel.decompiler.PlainTextOutput;
 import com.strobel.decompiler.languages.java.JavaFormattingOptions;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.StringWriter;
 import java.util.HashMap;

src/main/java/cn/enaium/joe/service/decompiler/VineFlowerDecompiler.java

@@ -25,7 +25,7 @@
 import org.jetbrains.java.decompiler.main.extern.IContextSource;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

src/main/java/cn/enaium/joe/util/LangUtil.java

@@ -19,7 +19,7 @@
 import cn.enaium.joe.util.config.util.CachedConfigValue;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/cn/enaium/joe/util/LoggerConfigurationLoader.java

@@ -0,0 +1,16 @@
+package cn.enaium.joe.util;
+
+import org.tinylog.configuration.ConfigurationLoader;
+
+import java.util.Properties;
+
+public class LoggerConfigurationLoader implements ConfigurationLoader {
+    @Override
+    public Properties load() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("writer", "file");
+        properties.setProperty("writer.file", "lastest.log");
+        properties.setProperty("exception", "strip: jdk.internal");
+        return properties;
+    }
+}

src/main/java/cn/enaium/joe/util/MessageUtil.java

@@ -19,7 +19,7 @@
 import cn.enaium.joe.dialog.OptionDialog;
 import cn.enaium.joe.gui.panel.BorderPanel;
 import cn.enaium.joe.gui.panel.confirm.ConfirmPanel;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/cn/enaium/joe/util/TinyLogPrintStream.java

@@ -16,7 +16,7 @@
 
 package cn.enaium.joe.util;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.OutputStream;
 import java.io.PrintStream;