diff options
author | syeyoung <cyoung06@naver.com> | 2022-12-26 13:47:08 +0900 |
---|---|---|
committer | syeyoung <cyoung06@naver.com> | 2022-12-26 13:47:08 +0900 |
commit | 83665fb67d1a96b6b4cd5ae0bdeb179b7ebc2136 (patch) | |
tree | 01ae780a5059e5209826e196a860b13cb8b8d6f9 | |
parent | e4d75b0f5d953c7a62cf194308c4b304551705bd (diff) | |
download | Skyblock-Dungeons-Guide-83665fb67d1a96b6b4cd5ae0bdeb179b7ebc2136.tar.gz Skyblock-Dungeons-Guide-83665fb67d1a96b6b4cd5ae0bdeb179b7ebc2136.tar.bz2 Skyblock-Dungeons-Guide-83665fb67d1a96b6b4cd5ae0bdeb179b7ebc2136.zip |
- Fix build.gradle (so it really generates launch config stuff)
Signed-off-by: syeyoung <cyoung06@naver.com>
-rw-r--r-- | .vscode/launch.json | 26 | ||||
-rw-r--r-- | loader/build.gradle | 6 | ||||
-rw-r--r-- | mod/build.gradle | 6 | ||||
-rw-r--r-- | mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/rpc/RichPresenceManager.java | 7 |
4 files changed, 39 insertions, 6 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index 60ab5bbf..3e01bcab 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -26,6 +26,32 @@ "args": "\"nogui\"", "env": {}, "projectName": "" + }, + { + "type": "java", + "name": "Minecraft Client (:loader)", + "request": "launch", + "cwd": "${workspaceFolder}/loader/runtime", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/loader/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-XstartOnFirstThread\" \"-Ddevauth.enabled\u003dtrue\" \"-XstartOnFirstThread\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "", + "env": {}, + "projectName": "loader" + }, + { + "type": "java", + "name": "Minecraft Client (:mod)", + "request": "launch", + "cwd": "${workspaceFolder}/mod/runtime", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/mod/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-XstartOnFirstThread\" \"-Ddevauth.enabled\u003dtrue\" \"-XstartOnFirstThread\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "", + "env": {}, + "projectName": "mod" } ] }
\ No newline at end of file diff --git a/loader/build.gradle b/loader/build.gradle index f533b6aa..6619879c 100644 --- a/loader/build.gradle +++ b/loader/build.gradle @@ -26,7 +26,13 @@ loom { } } + runConfigs { + named("client") { + ideConfigGenerated(true) + } + } runs { + client { runDir = 'runtime' property('devauth.enabled','true') diff --git a/mod/build.gradle b/mod/build.gradle index 33d028be..466c88b7 100644 --- a/mod/build.gradle +++ b/mod/build.gradle @@ -25,10 +25,16 @@ loom { } } + runConfigs { + named("client") { + ideConfigGenerated(true) + } + } runs { client { runDir = 'runtime' property('devauth.enabled','true') + property('dg.loader', 'devenv') client() } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/rpc/RichPresenceManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/rpc/RichPresenceManager.java index 1ea17cfe..ff1d0ef2 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/rpc/RichPresenceManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/rpc/RichPresenceManager.java @@ -149,12 +149,7 @@ public class RichPresenceManager implements Runnable { if (pointerByReference.getValue() == Pointer.NULL) return -9998; iDiscordCore = new IDiscordCore(pointerByReference.getValue()); - iDiscordCore.SetLogHook.setLogHook(iDiscordCore, EDiscordLogLevel.DiscordLogLevel_Debug, Pointer.NULL, new IDiscordCore.LogHook() { - @Override - public void hook(Pointer hookData, EDiscordLogLevel level, String message) { - System.out.println(message+" - "+level+" - "+hookData); - } - }); + iDiscordCore.SetLogHook.setLogHook(iDiscordCore, EDiscordLogLevel.DiscordLogLevel_Debug, Pointer.NULL, (hookData, level, message) -> System.out.println(message+" - "+level+" - "+hookData)); activityManager = iDiscordCore.GetActivityManager.getActivityManager(iDiscordCore); relationshipManager = iDiscordCore.GetRelationshipManager.getRelationshipManager(iDiscordCore); |