deobfuscate

2 files changed, 10 insertions, 22 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java
index 61d53687..299e4b48 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java
@@ -18,14 +18,7 @@
 
 package kr.syeyoung.dungeonsguide.party;
 
-import kr.syeyoung.dungeonsguide.SkyblockStatus;
-import kr.syeyoung.dungeonsguide.config.guiconfig.GuiGuiLocationConfig;
-import kr.syeyoung.dungeonsguide.e;
-import kr.syeyoung.dungeonsguide.features.AbstractFeature;
-import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
-import kr.syeyoung.dungeonsguide.features.GuiFeature;
-import kr.syeyoung.dungeonsguide.features.listener.ScreenRenderListener;
-import kr.syeyoung.dungeonsguide.utils.RenderUtils;
+import kr.syeyoung.dungeonsguide.DungeonsGuide;
 import kr.syeyoung.dungeonsguide.utils.TextUtils;
 import net.arikia.dev.drpc.DiscordRPC;
 import net.minecraft.client.Minecraft;
@@ -34,18 +27,15 @@ import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Mouse;
 
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -77,7 +67,7 @@ public class PartyInviteViewer {
         try {
             if (clientTickEvent.phase != TickEvent.Phase.START) return;
             List<PartyJoinRequest> partyJoinRequestList = new ArrayList<>();
-            boolean isOnHypixel = e.getDungeonsGuide().getSkyblockStatus().isOnHypixel();
+            boolean isOnHypixel = DungeonsGuide.getDungeonsGuide().getSkyblockStatus().isOnHypixel();
             for (PartyJoinRequest joinRequest:joinRequests) {
                 if (joinRequest.getTtl() != -1) {
                     joinRequest.setTtl(joinRequest.getTtl() - 1);
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
index aa5f2b70..f756eb08 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/party/PartyManager.java
@@ -19,10 +19,8 @@
 package kr.syeyoung.dungeonsguide.party;
 
 import kr.syeyoung.dungeonsguide.RichPresenceManager;
-import kr.syeyoung.dungeonsguide.commands.CommandReparty;
-import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.DungeonsGuide;
 import kr.syeyoung.dungeonsguide.events.HypixelJoinedEvent;
-import kr.syeyoung.dungeonsguide.events.SkyblockJoinedEvent;
 import kr.syeyoung.dungeonsguide.events.StompConnectedEvent;
 import kr.syeyoung.dungeonsguide.stomp.StompInterface;
 import kr.syeyoung.dungeonsguide.stomp.StompMessageHandler;
@@ -84,7 +82,7 @@ public class PartyManager implements StompMessageHandler {
         if (this.partyID != null && partyID == null) {
             JSONObject object = new JSONObject();
             object.put("members", new JSONArray());
-            StompInterface stompInterface = e.getDungeonsGuide().getStompConnection();
+            StompInterface stompInterface = DungeonsGuide.getDungeonsGuide().getStompConnection();
             stompInterface.send(new StompPayload().payload(object.toString()).header("destination", "/app/party.join"));
         }
 
@@ -109,7 +107,7 @@ public class PartyManager implements StompMessageHandler {
         if (partyID == null) {
             JSONObject object = new JSONObject();
             object.put("members", new JSONArray());
-            StompInterface stompInterface = e.getDungeonsGuide().getStompConnection();
+            StompInterface stompInterface = DungeonsGuide.getDungeonsGuide().getStompConnection();
             stompInterface.send(new StompPayload().payload(object.toString()).header("destination", "/app/party.join"));
         }
 
@@ -119,7 +117,7 @@ public class PartyManager implements StompMessageHandler {
         }
         this.askToJoinSecret = secretBuilder.toString();
 
-        StompInterface stompInterface = e.getDungeonsGuide().getStompConnection();
+        StompInterface stompInterface = DungeonsGuide.getDungeonsGuide().getStompConnection();
         stompInterface.send(new StompPayload().payload(new JSONObject().put("secret", askToJoinSecret).toString()).header("destination", "/app/party.setjoinsecret"));
         RichPresenceManager.INSTANCE.updatePresence();
     }
@@ -171,7 +169,7 @@ public class PartyManager implements StompMessageHandler {
                     }
                     JSONObject object = new JSONObject();
                     object.put("members", jsonArray);
-                    StompInterface stompInterface = e.getDungeonsGuide().getStompConnection();
+                    StompInterface stompInterface = DungeonsGuide.getDungeonsGuide().getStompConnection();
                     stompInterface.send(new StompPayload().payload(object.toString()).header("destination", "/app/party.join"));
                 }
                 if (checkPlayer == 3) {
@@ -179,9 +177,9 @@ public class PartyManager implements StompMessageHandler {
                     String playerName = theObject.getString("player");
                     String token = theObject.getString("token");
                     if (!members.contains(playerName)) {
-                        e.getDungeonsGuide().getStompConnection().send(new StompPayload().payload(new JSONObject().put("status", "failure").put("token", token).toString()).header("destination", "/app/party.check.resp"));
+                        DungeonsGuide.getDungeonsGuide().getStompConnection().send(new StompPayload().payload(new JSONObject().put("status", "failure").put("token", token).toString()).header("destination", "/app/party.check.resp"));
                     } else {
-                        e.getDungeonsGuide().getStompConnection().send(new StompPayload().payload(new JSONObject().put("status", "success").put("token", token).toString()).header("destination", "/app/party.check.resp"));
+                        DungeonsGuide.getDungeonsGuide().getStompConnection().send(new StompPayload().payload(new JSONObject().put("status", "success").put("token", token).toString()).header("destination", "/app/party.check.resp"));
                     }
                 }
                 if (invitedDash == 1 || invitedDash == 3) {
@@ -362,7 +360,7 @@ public class PartyManager implements StompMessageHandler {
                 }
             }
         } catch (Exception ex) {ex.printStackTrace();
-        e.sendDebugChat(new ChatComponentText("ERRORRR!! on chat "+ ex));}
+        DungeonsGuide.sendDebugChat(new ChatComponentText("ERRORRR!! on chat "+ ex));}
     }
     @SubscribeEvent
     public void onTick(TickEvent.ClientTickEvent clientTickEvent) {