diff options
| author | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2023-01-14 03:16:22 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 03:16:22 +0900 |
| commit | ba4ce4e30d5778d0ad00c163823dc5abb8b78b76 (patch) | |
| tree | 533cdac7f9ae2b0cc6c9248baf1d783a510d4f58 | |
| parent | df33e015ade0be0df3d9ab1e242606dbdc7229ea (diff) | |
| download | Skyblock-Dungeons-Guide-ba4ce4e30d5778d0ad00c163823dc5abb8b78b76.tar.gz Skyblock-Dungeons-Guide-ba4ce4e30d5778d0ad00c163823dc5abb8b78b76.tar.bz2 Skyblock-Dungeons-Guide-ba4ce4e30d5778d0ad00c163823dc5abb8b78b76.zip | |
Dg4.0 eventpropagation (#270)
* - Event Handler Interface -> Annotations (for features)
Signed-off-by: syeyoung <cyoung06@naver.com>
* - Event Handler Interface -> Annotations (for features)
Signed-off-by: syeyoung <cyoung06@naver.com>
* - profiling
- build.gradle update
Signed-off-by: syeyoung <cyoung06@naver.com>
Signed-off-by: syeyoung <cyoung06@naver.com>
88 files changed, 460 insertions, 1464 deletions
diff --git a/gradle.properties b/gradle.properties index ad947b8b..ab7e8705 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx2G org.gradle.caching=true -loom.platform=forge -fabric.loom.natives.dir=/Users/syeyoung/.mcnatives
\ No newline at end of file +loom.platform=forge
\ No newline at end of file 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; } diff --git a/mod/build.gradle b/mod/build.gradle index 0d7138fe..ce44fbd3 100644 --- a/mod/build.gradle +++ b/mod/build.gradle @@ -59,15 +59,17 @@ 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") forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") - implementation "org.jetbrains:annotations-java5:19.0.0" implementation "org.java-websocket:Java-WebSocket:1.5.1" implementation "org.json:json:20171018" diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java index 9dd515c7..d54613b8 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java @@ -32,8 +32,8 @@ import kr.syeyoung.dungeonsguide.mod.cosmetics.CustomNetworkPlayerInfo; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.GameSDK; import kr.syeyoung.dungeonsguide.mod.discord.rpc.RichPresenceManager; import kr.syeyoung.dungeonsguide.mod.dungeon.DungeonFacade; +import kr.syeyoung.dungeonsguide.mod.events.annotations.EventHandlerRegistry; import kr.syeyoung.dungeonsguide.mod.events.listener.DungeonListener; -import kr.syeyoung.dungeonsguide.mod.events.listener.FeatureListener; import kr.syeyoung.dungeonsguide.mod.events.listener.PacketListener; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.mod.party.PartyManager; @@ -54,7 +54,6 @@ import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.IResourceManager; @@ -62,8 +61,6 @@ import net.minecraft.client.resources.IResourcePack; import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.launchwrapper.LaunchClassLoader; import net.minecraft.network.play.server.S38PacketPlayerListItem; import net.minecraft.util.ResourceLocation; @@ -227,7 +224,7 @@ public class DungeonsGuide implements DGInterface { registerEventsForge(commandReparty = new CommandReparty()); - registerEventsForge(new FeatureListener()); +// registerEventsForge(new FeatureListener()); registerEventsForge(packetListener = new PacketListener()); registerEventsForge(new Keybinds()); |
