aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyeyoung <42869671+cyoung06@users.noreply.github.com>2023-01-14 03:16:22 +0900
committerGitHub <noreply@github.com>2023-01-14 03:16:22 +0900
commitba4ce4e30d5778d0ad00c163823dc5abb8b78b76 (patch)
tree533cdac7f9ae2b0cc6c9248baf1d783a510d4f58
parentdf33e015ade0be0df3d9ab1e242606dbdc7229ea (diff)
downloadSkyblock-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>
-rw-r--r--gradle.properties3
-rw-r--r--loader/build.gradle10
-rw-r--r--loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/AuthManager.java2
-rw-r--r--mod/build.gradle6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/DGEventHandler.java (renamed from mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DiscordUserJoinRequestListener.java)17
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java150
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/DGTickEvent.java (renamed from mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/AuthChangedEvent.java)6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/DungeonListener.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/FeatureListener.java513
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/AbstractFeature.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java3
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/IFeature.java (renamed from mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DiscordUserUpdateListener.java)13
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPepole.java13
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureAutoReparty.java9
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureBoxRealLivid.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureChestPrice.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java11
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureThornSpiritBowTimer.java14
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java19
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java17
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/inviteViewer/PartyInviteViewer.java22
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/onlinealarm/PlayingDGAlarm.java20
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxBats.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxSkelemaster.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxStarMobs.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonDeaths.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java21
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMilestone.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonRealTime.java17
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureHideNameTags.java11
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePlayerESP.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePressAnyKeyToCloseChest.java9
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureWatcherWarning.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureAutoAcceptReparty.java7
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCooldownCounter.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCopyMessages.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDecreaseExplosionSound.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDisableMessage.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java14
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipDungeonStat.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipPrice.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureUpdateAlarm.java13
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/ability/FeatureAbilityCooldown.java13
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/APIKey.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeatureGoodParties.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeaturePartyReady.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java9
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java9
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/FeatureBloodRush.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/FeatureFreezePathfind.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/FeatureSoulRoomWarning.java9
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/FeatureTogglePathfind.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/mechanicbrowser/FeatureMechanicBrowse.java21
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/BossroomEnterListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/ChatListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/ChatListenerGlobal.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DungeonContextInitializationListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DungeonEndListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DungeonQuitListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/DungeonStartListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/EntityLivingRenderListener.java26
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiBackgroundRenderListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiClickListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiOpenListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiPostRenderListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiPreRenderListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/GuiUpdateListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/InteractListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/KeyInputListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/KeybindPressedListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/PlayerRenderListener.java26
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/ScreenRenderListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/SkyblockJoinListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/SkyblockLeaveListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/SoundListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/StompConnectedListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/TextureStichListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/TickListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/TitleListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/TooltipListener.java25
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/listener/WorldRenderListener.java23
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/text/StyledTextRenderer.java21
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/AhUtils.java2
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());