3rd time is the charm (#70)

* Updated some dependencies, used my crusty skytils forgegradle fork + removed the IRRELEVANT hytils fixes. generally made the thing build

* made the logs less annoying

* temp fix so it doesn't throw an exception

* FAT REFACTOR
 General refactor on
  Authenticator.java
  DungeonsGuide.java
  Main.java
 removed unnecessary imports where not needed

to be removed DGInterface.java (no real reason to exist)
in DungeonsGuide.java made the retry stomp a singe-thread executor, so it doesn't leak when offline
added an "offline mode" so it doesn't just error when server down
TODO: move auth to DungeonsGuide.java and make it retry when network down on launch

* New auth implementation that should replace the old one:
 does all the things the old one did
 removed progressBar cuz it would make the impl 3x more complicated in the name of a splash screen
 added a token changed event (so now it supports re-logging with a different account)
 code is (should) be more readable / extensible

TODO: surgically replace Authenticator.java with new impl AND support re-logging

* Made the chat processor logger name less obnoxious

* implemented my implementation of an implementation of auth
can and is very buggy, essentially the loading of the remote classes but the mod works so idk
TODO: MAKE STOMP NOT DO STUFF TILL STOMPCONNECTED IS EMITTED

* fix for stomp client null bc forge events not going tru on pre-init
TODO: make work and test the web loadable classes, then make all the stuff that relies on stomp not throw exceptions when stomp is not connected

* move the create auth method into AuthProvider interface,
so we don't clutter AuthManager with implementation details

* Decouple AuthProviderUtil and DgAuth,
move some stuff around and make it more readable

* moved AuthUtil to make more sense

* de-clutter the tree a little bit

* Inline StompClientStatus.java / refactor

* inline the useless interface

* refactoringgg

* fix ahUtils exeption spam

* small StompClient refactor

* fix GLCursors exeption spam + logger

* make sure we are authenticated when downloading resources

* new .destination("value") instead of .header("destination", "value")

* StompMessageHandler -> StompMessageSubscription

* Introduced StompManager

* fix dungeon map not showing ppl heads

* ehhh

* wip (commit cuz im chekig out)

* fix player profile not never loading in chat

* remove this specific line

* fix player profile not never loading in chat

* cut out hychat like a cancer

* ApiFetchur now caches whole players not single profiles,
added a switch profile button in gui

* ugh git

* Revert "cut out hychat like a cancer"

This reverts commit 2ee11afa

* ugh git x2

* I tried, good luck maintaining this

* forgot to uncomment hychat fix

* make my new party ready work and look ok

* change the look and add some "somewhere" locations

* make stomp connection "null safe"

* i hate git

* introduce callbacks on parameter change for cleaner code
add one example

* impl new system,
half way done

* now shows which profile is now selected
put button on top
a lil refactor

* fix player profile sometimes not loading

* add players knowing who is using dg (try to)

* announcing that we are a dg user will get reworked in the future

* update deps

* make it not spam logs

* sanity check for premium features so it doesn't 403

* add YoMamaOutdated that checks if you are using outdated dg

* hychat?? anyone

* try catch in FeatureRegistry

* added Ether transmission ability

* chat shredder borken, disabled for now

* party deserves its own folder

* dungeon stuff in dungeon folder

* events folders moved

* fix score data collection hanging forever if stomp is not connected

* fix stomp never connecting

* re-add the removed

* fix wonky rendering

* server side implementation is not ready, canning this for a future release

* attempt to fix heads loading on main thread

* discord

* me when sonar lint

* new consumer based stomp subscriptions

* replace old with new subscriptions

* remove the remains of StompSubscription and replace CloseListener with a forge event

* StompSubscription is now a functional interface

* remove unnecessary event message chains,
feature logic should be in the feature

* fix events being set up wrongly

* Revert "fix events being set up wrongly"

This reverts commit e6ea7efa557a5f5c8a3ea33be998717bc024b8cb.

* Revert "remove unnecessary event message chains,"

This reverts commit 96f508bae85b33cdcef6be19226c00fc52a1439b.

* fix stomp client sending payload object instead of the actual payload

* fix null pointer on empty party

* fix players with cosmetics name being white in tab

* added message when not connected to dg
changed YoMamaOutdated to use CloudFlare workers
added client sided message queue

* the mod doesn't init when outdated

* mcmod.info

* dont busy wait in authmenager

* test pepole crusty tests

* chill out the authmanager

* name the thread pool in auth manager

* clear most compiler warnings

* make outdated check allow to play without the mod initialized

* make first startup VERY noticeable, move config creation to main

* major dungeon package refactor

* refactor checkpoint

* refactor checkpoint #1

* final refactor checkpoint #2

* remove the player if from version check, made the version check not nesssery for playing

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* remove trap room fix that didnt fix anything

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* make secret beacons optional

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* make the checkmarks on map align with the rest of everyone

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* removed debug function

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move the menus to make more sense + make destination text on secrets optional

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* improve dungeonMap performance by ~90%
temporarly disabled 9 slot map player location due to bugs
fix DungeonContext not getting player from ScoreBoard

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* add epic countdown on dungeon start (still wip)

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* added a option to cache blockstaes

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* added TabListUtil

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* fixed epic countdown

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* (i want to sleep) made all the dungeon room detection async
TODO: fix ol the bugs i created by doing that

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* stuff still broken but almost playable, unlike last commit

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* upload build jar to discord

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* cache the deps for the love of god

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* who needs linux and 32bit windows anyway

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* only upload to discord on beta branch

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* added "kick" when a member joins party

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move stuff that sends chat to player into a separate class

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* use our chat queue instead of calling `thePlayer.addChatMessage` to proxy ourselves from 1.8 code

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* Added and implemented MortDetector2000.java

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* extract duplicate + make more readable

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* added dummy support in FeatureDebugTrap

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* gradle now puts version in mcmod.info

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* remove side effects from DgAuth.java

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move debug commands into debug CommandDgDebug.java

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* fix key being wrong

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move epic countdown to dungeon huds, clean up

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* Revert "who needs linux and 32bit windows anyway"

This reverts commit 0f3c2d544a70fc799cd3215dad5e997c0c8b6c06.

* make FeatureRegistry not static initialise to get rid of "ClassNotDefined" errors

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* null check on Exception since it threw NullPointers

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* finish up progress bar in DungeonsGuide.java

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* warn about null features

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move stuff around in SkyblockStatus, move the stuff that updates status into SkyblockStatus from DungeonListener

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* rename DungeonGodObject.java to DungeonFacade.java

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* add cleanChat clause in FeatureEpicCountdown

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* implement getPreRequisites and isComplete in ActionBreakWithSuperBoom

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* clean up FeatureParameter

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* eliminate possible state inconsistency in DungeonListener

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move percentage from DungeonFacade to DungeonContext

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move `purge` and `partymax` back into CommandDungeonsGuide

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* stop repeating ReceiveChatQueue in ChatTransmitter

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* Clean up DungeonsGuide

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move `sendDebugChat` to `ChatTransmitter.java`

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* change CommandDgDebug into a `else if` from an `switch` because some bigot decided its better

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* duplicate code since it currently doesn't make sense, to be reworked

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* fix typo

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* remove the trycatch so we fail fast

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* fix null pointer when trying to get fontRenderer before minecraft is initialised

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* broken checkpoint 0

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* broken checkpoint 1

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* Revert "broken checkpoint 1"

This reverts commit 64985e6287c7b5650b509668e42b9803e25c419c.

* Revert "broken checkpoint 0"

This reverts commit 5f62e1345d9c8e7f66f1e5792004a05027913d92.

* Revert "fix null pointer when trying to get fontRenderer before minecraft is initialised"

This reverts commit 57d92a78d31c410f699b58c8995c94055d57e2a4.

* Revert "remove the trycatch so we fail fast"

This reverts commit 12772255ed575e411fb99edf37ec16d0e5f42924.

* Revert "fix typo"

This reverts commit aa96cc2436d3ead42d53ead78f3334fac5100713.

* Revert "duplicate code since it currently doesn't make sense, to be reworked"

This reverts commit 6d71b88e3102d23bcfd90d85e8996327776fd52f.

* Revert "change CommandDgDebug into a `else if` from an `switch` because some bigot decided its better"

This reverts commit ffea84d9b5fd4adbe034a88249bc920eafa7c53a.

* Revert "move `sendDebugChat` to `ChatTransmitter.java`"

This reverts commit 5b8b2e22fff33768134a01c15c7650100ebb9257.

* Revert "Clean up DungeonsGuide"

This reverts commit 2069ad3ebc4344eb1e778954dc1d8f6c9303de69.

* fix typo

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>
(cherry picked from commit aa96cc2436d3ead42d53ead78f3334fac5100713)

* duplicate code since it currently doesn't make sense, to be reworked

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>
(cherry picked from commit 6d71b88e3102d23bcfd90d85e8996327776fd52f)

* change CommandDgDebug into a `else if` from an `switch` because some bigot decided its better

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>
(cherry picked from commit ffea84d9b5fd4adbe034a88249bc920eafa7c53a)

* move debug chat into ChatTransmitter

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* null pointer in SkyblockStatus bc context was not initialised yet

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move dungeon starting door detection up the tree since it was a duplicate in both children, inline MortDetector2000

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move dungeon name to DungeonContext

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* clean up Main

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* separate the "loader" and "mod"

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* separate DungeonsGuide and Main even more

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* change singleton implementation of DungeonsGuide

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move classes since their paths are hardcoded into roomdatas

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* create CatacombsDataProvider.java and implement it

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* remove unnecessary `DungeonsGuide.getDungeonsGuide();` (IntelliJ refactor bug)

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* move `help` text in commands

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* a certain someone hates switch statements

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* remove my version check, since we have to wait for out lord and savior to make his own

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* make `Main` and `DungeonsGuide` compatible with supported jar classloading

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* make the beta upload action run on push
since it didnt get the secret on pull request and failed anyway,
TODO: make the jar name not hardcoded

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

* upload all jar

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>

Signed-off-by: kingstefan26 <70776766+kingstefan26@users.noreply.github.com>
Co-authored-by: syeyoung <42869671+cyoung06@users.noreply.github.com>

3 files changed, 12 insertions, 14 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/url/DGConnection.java b/src/main/java/kr/syeyoung/dungeonsguide/url/DGConnection.java
index 725abab9..6e9520ef 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/url/DGConnection.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/url/DGConnection.java
@@ -18,18 +18,20 @@
 
 package kr.syeyoung.dungeonsguide.url;
 
-import kr.syeyoung.dungeonsguide.Authenticator;
+import kr.syeyoung.dungeonsguide.auth.ResourceManager;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 
 public class DGConnection extends URLConnection {
-    private final Authenticator authenticator;
-    protected DGConnection(URL url, Authenticator a) {
+
+    protected DGConnection(URL url) {
         super(url);
         connected = false;
-        this.authenticator = a;
     }
 
     @Override
@@ -37,10 +39,10 @@ public class DGConnection extends URLConnection {
     }
     @Override
     public InputStream getInputStream() throws IOException {
-            if (authenticator != null) {
+            if (ResourceManager.getInstance().getResources() != null) {
                 String path = url.getPath().substring(1);
-                if (!authenticator.getResources().containsKey(path)) throw new FileNotFoundException();
-                return new ByteArrayInputStream(authenticator.getResources().get(path));
+                if (!ResourceManager.getInstance().getResources().containsKey(path)) throw new FileNotFoundException();
+                return new ByteArrayInputStream(ResourceManager.getInstance().getResources().get(path));
             }
         throw new FileNotFoundException();
     }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandler.java b/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandler.java
index bc6fa10d..f740848f 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandler.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandler.java
@@ -18,7 +18,6 @@
 
 package kr.syeyoung.dungeonsguide.url;
 
-import kr.syeyoung.dungeonsguide.Authenticator;
 import lombok.AllArgsConstructor;
 
 import java.io.IOException;
@@ -28,9 +27,8 @@ import java.net.URLStreamHandler;
 
 @AllArgsConstructor
 public class DGStreamHandler extends URLStreamHandler {
-    private final Authenticator auth;
     @Override
     protected URLConnection openConnection(URL url) throws IOException {
-        return new DGConnection(url, this.auth);
+        return new DGConnection(url);
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandlerFactory.java b/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandlerFactory.java
index 9f574a86..00b1e5f2 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandlerFactory.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/url/DGStreamHandlerFactory.java
@@ -18,7 +18,6 @@
 
 package kr.syeyoung.dungeonsguide.url;
 
-import kr.syeyoung.dungeonsguide.Authenticator;
 import lombok.AllArgsConstructor;
 
 import java.net.URLStreamHandler;
@@ -26,11 +25,10 @@ import java.net.URLStreamHandlerFactory;
 
 @AllArgsConstructor
 public class DGStreamHandlerFactory implements URLStreamHandlerFactory {
-    private final Authenticator auth;
     @Override
     public URLStreamHandler createURLStreamHandler(String protocol) {
         if ("z".equals(protocol)) {
-            return new DGStreamHandler(this.auth);
+            return new DGStreamHandler();
         }
         return null;
     }