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>

1 files changed, 160 insertions, 0 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java b/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java
new file mode 100644
index 00000000..c1d2a144
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java
@@ -0,0 +1,160 @@
+/*
+ *     Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ *     Copyright (C) 2021  cyoung06
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published
+ *     by the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Affero General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.mod.features;
+
+import com.google.gson.JsonObject;
+import kr.syeyoung.dungeonsguide.mod.config.guiconfig.GuiConfigV2;
+import kr.syeyoung.dungeonsguide.mod.config.guiconfig.location.GuiGuiLocationConfig;
+import kr.syeyoung.dungeonsguide.mod.config.types.GUIRectangle;
+import kr.syeyoung.dungeonsguide.mod.config.types.TypeConverterRegistry;
+import kr.syeyoung.dungeonsguide.mod.features.listener.ScreenRenderListener;
+import kr.syeyoung.dungeonsguide.mod.gui.MPanel;
+import kr.syeyoung.dungeonsguide.mod.gui.elements.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL14;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+public abstract class GuiFeature extends AbstractFeature implements ScreenRenderListener {
+    @Setter
+    private GUIRectangle featureRect;
+    @Setter(value = AccessLevel.PROTECTED)
+    private boolean keepRatio;
+    @Setter(value = AccessLevel.PROTECTED)
+    private double defaultWidth;
+    @Setter(value = AccessLevel.PROTECTED)
+    private double defaultHeight;
+    private final double defaultRatio;
+
+    protected GuiFeature(String category, String name, String description, String key, boolean keepRatio, int width, int height) {
+        super(category, name, description, key);
+        this.keepRatio = keepRatio;
+        this.defaultWidth = width;
+        this.defaultHeight = height;
+        this.defaultRatio = defaultWidth / defaultHeight;
+        this.featureRect = new GUIRectangle(0, 0, width, height);
+    }
+
+    @Override
+    public void drawScreen(float partialTicks) {
+        if (!isEnabled()) return;
+
+        GlStateManager.pushMatrix();
+        Rectangle featureRect = this.featureRect.getRectangleNoScale();
+        ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+        GlStateManager.scale(1.0/scaledResolution.getScaleFactor(), 1.0/scaledResolution.getScaleFactor(), 1);
+        clip(featureRect.x, featureRect.y, featureRect.width, featureRect.height);
+        GL11.glEnable(GL11.GL_SCISSOR_TEST);
+
+        GlStateManager.translate(featureRect.x, featureRect.y, 0);
+        drawHUD(partialTicks);
+
+        GL11.glDisable(GL11.GL_SCISSOR_TEST);
+        GlStateManager.popMatrix();
+
+
+        GlStateManager.enableBlend();
+        GlStateManager.color(1,1,1,1);
+        GL14.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
+    }
+
+
+    public abstract void drawHUD(float partialTicks);
+
+    public void drawDemo(float partialTicks) {
+        drawHUD(partialTicks);
+    }
+
+    private void clip(int x, int y, int width, int height) {
+//        int scale = resolution.getScaleFactor();
+        int scale = 1;
+        GL11.glScissor((x ) * scale, Minecraft.getMinecraft().displayHeight - (y + height) * scale, (width) * scale, height * scale);
+    }
+
+    public static FontRenderer getFontRenderer() {
+        FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+        return fr;
+    }
+
+    @Override
+    public void loadConfig(JsonObject jsonObject) {
+        super.loadConfig(jsonObject);
+        this.featureRect = TypeConverterRegistry.getTypeConverter("guirect",GUIRectangle.class).deserialize(jsonObject.get("$bounds"));
+    }
+
+    @Override
+    public JsonObject saveConfig() {
+        JsonObject object = super.saveConfig();
+        object.add("$bounds", TypeConverterRegistry.getTypeConverter("guirect", GUIRectangle.class).serialize(featureRect));
+        return object;
+    }
+
+    public List<MPanel> getTooltipForEditor(GuiGuiLocationConfig guiGuiLocationConfig) {
+        ArrayList<MPanel> mPanels = new ArrayList<>();
+        mPanels.add(new MLabel(){
+            {
+                setText(getName());
+            }
+
+            @Override
+            public Dimension getPreferredSize() {
+                return new Dimension(Minecraft.getMinecraft().fontRendererObj.getStringWidth(getName()), 20);
+            }
+        });
+        mPanels.add(new MButton() {
+            {
+                setText("Edit");
+                setOnActionPerformed(() -> {
+                    GuiScreen guiScreen = guiGuiLocationConfig.getBefore();
+                    if (guiScreen == null) {
+                        guiScreen = new GuiConfigV2();
+                    }
+                    Minecraft.getMinecraft().displayGuiScreen(guiScreen);
+                    if (guiScreen instanceof GuiConfigV2) {
+                        ((GuiConfigV2) guiScreen).getRootConfigPanel().setCurrentPageAndPushHistory(getEditRoute(((GuiConfigV2) guiScreen).getRootConfigPanel()));
+                    }
+                });
+            }
+
+            @Override
+            public Dimension getPreferredSize() {
+                return new Dimension(100,20);
+            }
+        });
+        mPanels.add(new MPassiveLabelAndElement("Enabled", new MToggleButton() {{
+            setEnabled(GuiFeature.this.isEnabled());
+            setOnToggle(() ->{
+                GuiFeature.this.setEnabled(isEnabled());
+            }); }
+        }));
+        return mPanels;
+    }
+}