diff options
| author | syeyoung <cyoung06@naver.com> | 2023-01-14 17:38:53 +0900 |
|---|---|---|
| committer | syeyoung <cyoung06@naver.com> | 2023-01-14 17:38:53 +0900 |
| commit | 2643c79f7d42df92c62bf30814ee5a5db1f27dc9 (patch) | |
| tree | 446a41ef237f0640f4992d31d4a2d678435d6a61 /loader | |
| parent | 47888d08ecd161b7c4208d281cbbcb4cf1d0fde8 (diff) | |
| parent | ba4ce4e30d5778d0ad00c163823dc5abb8b78b76 (diff) | |
| download | Skyblock-Dungeons-Guide-2643c79f7d42df92c62bf30814ee5a5db1f27dc9.tar.gz Skyblock-Dungeons-Guide-2643c79f7d42df92c62bf30814ee5a5db1f27dc9.tar.bz2 Skyblock-Dungeons-Guide-2643c79f7d42df92c62bf30814ee5a5db1f27dc9.zip | |
Merge remote-tracking branch 'origin/dg4.0' into dg4.0
# Conflicts:
# gradle.properties
# mod/build.gradle
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/build.gradle | 10 | ||||
| -rw-r--r-- | loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/loader/build.gradle b/loader/build.gradle index a163444b..f1361d6b 100644 --- a/loader/build.gradle +++ b/loader/build.gradle @@ -61,9 +61,11 @@ repositories { configurations { implementation.extendsFrom shadowImpl + modRuntimeOnly.extendsFrom devEnv { + transitive = false + visible = false + } } - - dependencies { minecraft("com.mojang:minecraft:1.8.9") mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9") @@ -82,7 +84,9 @@ dependencies { testAnnotationProcessor "org.projectlombok:lombok:1.18.20" - modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0") + devEnv("me.djtheredstoner:DevAuth-forge-legacy:1.1.0") + def files= fileTree("../runtime/mods2").filter { it.isFile() } + modLocalRuntime(files) } diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java index cc44465d..db9f7513 100644 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java @@ -87,7 +87,7 @@ public class AuthManager { boolean shouldReAuth = false; if (getToken().isUserVerified() && !getToken().getUUID().replace("-", "").equals(Minecraft.getMinecraft().getSession().getPlayerID())) { shouldReAuth = true; - } + } // TODO: try auth, check if current dungeons guide version is acceisible, and unload it if inaccessible. if (!getToken().isAuthenticated()) { shouldReAuth = true; } |