Merge remote-tracking branch 'origin/dg4.0' into dg4.0

# Conflicts:
#	gradle.properties
#	mod/build.gradle

86 files changed, 455 insertions, 1460 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;
             }
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());
 
@@ -298,6 +295,9 @@ public class DungeonsGuide implements DGInterface {
         for (Object registeredListener : registeredListeners) {
             MinecraftForge.EVENT_BUS.unregister(registeredListener);
         }
+
+        EventHandlerRegistry.unregisterListeners();
+
         List<ListenerList> all = ReflectionHelper.getPrivateValue(ListenerList.class, null, "allLists");
         int busId = ReflectionHelper.getPrivateValue(EventBus.class, MinecraftForge.EVENT_BUS, "busID");
         for (ListenerList listenerList : all) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java
index 5b553bdc..c3c8f581 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java
@@ -459,10 +459,12 @@ public class CommandDgDebug extends CommandBase {
         } else if ("testgui".equals(arg)) {
             GuiScreenAdapter adapter = new GuiScreenAdapter(new TestView());
             new Thread(DungeonsGuide.THREAD_GROUP, () -> {
-                            Minecraft.getMinecraft().addScheduledTask(() -> {
-                                Minecraft.getMinecraft().displayGuiScreen(adapter);
-                            });
-                        }).start();
+                Minecraft.getMinecraft().addScheduledTask(() -> {
+                    Minecraft.getMinecraft().displayGuiScreen(adapter);
+                });
+            }).start();
+        } else if ("clearprofile".equals(arg)) {
+            Minecraft.getMinecraft().mcProfiler.clearProfiling();
         } else {
             sender.addChatMessage(new ChatComponentText("ain't gonna find much anything here"));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg loadrooms §7-§f Reloads dungeon roomdata."));