Adjust logger names to match the correct hierarchy

Update Actions versions

Author: XiaoPangxie732

.github/workflows/maven.yml

@@ -21,9 +21,9 @@ jobs:
       packages: write
       contents: write
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6
     - name: Set up JDK
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: temurin
@@ -39,7 +39,7 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
     - name: Upload target
       if: success()
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v6
       with:
         name: MinecraftDecompiler
         path: modules/cli/target/MinecraftDecompiler.jar

.github/workflows/pr.yml

@@ -6,9 +6,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: temurin
@@ -22,7 +22,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
       - name: Upload target
         if: success()
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v6
         with:
           name: MinecraftDecompiler
           path: modules/cli/target/MinecraftDecompiler.jar

modules/api/src/main/java/cn/maxpixel/mcdecompiler/api/MinecraftDecompiler.java

@@ -176,7 +176,7 @@ else try (Stream<Path> s = FileUtil.iterateFiles(jarFs.getPath(""))) {
     }
 
     public static final class OptionBuilder {
-        private static final Logger LOGGER = LogManager.getLogger("Option Builder");
+        private static final Logger LOGGER = LogManager.getLogger();
         private String version;
         private SideType type;
         private boolean includeOthers = true;

modules/app-common/src/main/java/cn/maxpixel/mcdecompiler/common/app/util/AppUtils.java

@@ -42,7 +42,7 @@ public static String file2Native(@NotNull String fileName) {
     }
 
     public static void waitFor(Process pro) {
-        Logger logger = LogManager.getLogger("Process PID: " + pro.pid());
+        Logger logger = LogManager.getLogger("cn.maxpixel.mcdecompiler.Process PID: " + pro.pid());
         try (BufferedReader in = pro.inputReader();
              BufferedReader err = pro.errorReader()) {
             Thread inT = new Thread(() -> {

modules/app-common/src/main/java/cn/maxpixel/mcdecompiler/common/app/util/DownloadingUtil.java

@@ -60,7 +60,7 @@ public class DownloadingUtil {
 
     public static final HttpClient HTTP_CLIENT = HttpClient.newBuilder()
             .proxy(new ProxySelector() {
-                private static final Logger LOGGER = LogManager.getLogger("Proxy");
+                private static final Logger LOGGER = LogManager.getLogger("cn.maxpixel.mcdecompiler.DownloadingUtil.Proxy");
                 private static final List<Proxy> PROXY_LIST = List.of(INTERNAL_PROXY);
                 @Override
                 public List<Proxy> select(URI uri) {

modules/cli/src/main/java/cn/maxpixel/mcdecompiler/MinecraftDecompilerCommandLine.java

@@ -49,7 +49,7 @@ public class MinecraftDecompilerCommandLine {
         System.setProperty("org.openjdk.java.util.stream.tripwire", Boolean.toString(Constants.IS_DEV));
     }
     private static final Object2ObjectOpenHashMap<Option, OptionSpec<?>> OPTION_MAP = new Object2ObjectOpenHashMap<>();
-    private static final Logger LOGGER = LogManager.getLogger("CommandLine");
+    private static final Logger LOGGER = LogManager.getLogger();
 
     public static void main(String[] args) throws Throwable {
         if (Constants.IS_DEV) LOGGER.info("MCD Begin");// Used to measure time

modules/cli/src/main/resources/logging.json

@@ -1,7 +1,7 @@
 {
   "loggers": {
-    "root": {
-      "level": "INFO"
+    "cn.maxpixel.mcdecompiler": {
+      "formatter": "[%time%] [%name%/%source_method%] [%level%] %msg%\n"
     }
   }
 }

modules/decompiler/src/main/java/cn/maxpixel/mcdecompiler/decompiler/Decompilers.java

@@ -37,7 +37,7 @@
 
 public class Decompilers {
     private static final Manifest MANIFEST = JarUtil.getManifest(Decompilers.class);
-    private static final Logger LOGGER = LogManager.getLogger("Decompiler Manager");
+    private static final Logger LOGGER = LogManager.getLogger();
     private static final Object2ObjectOpenHashMap<String, IDecompiler> DECOMPILERS = new Object2ObjectOpenHashMap<>();
     static {
         for (IDecompiler d : ServiceLoader.load(IDecompiler.class)) {

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/component/Owned.java

@@ -24,7 +24,7 @@
 
 import java.util.Objects;
 
-public class Owned<T extends Mapping> implements Component {
+public class Owned<T extends Mapping> implements Component {// TODO: Remove this and directly use ClassMapping as the component
     public ClassMapping<T> owner;
 
     public Owned() {}