Merge pull request #195 from NeverScapeAlone/v2.21.0-alpha

v2.21.0-alpha
NeverScapeAlone · Aug 29, 2022 · b0ceee7 · b0ceee7
2 parents a3a0e09 + 7547585
commit b0ceee7
Show file tree

Hide file tree

Showing 225 changed files with 293 additions and 252 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 }
 
 group = 'com.neverscapealone'
-version = 'v2.20.0-alpha'
+version = 'v2.21.0-alpha'
 sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {

diff --git a/src/main/java/com/neverscapealone/NeverScapeAlonePlugin.java b/src/main/java/com/neverscapealone/NeverScapeAlonePlugin.java
@@ -31,15 +31,15 @@
 import com.neverscapealone.enums.PlayerButtonOptionEnum;
 import com.neverscapealone.enums.SoundEffectSelectionEnum;
 import com.neverscapealone.enums.SoundPingEnum;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.MatchData;
-import com.neverscapealone.model.PingData;
-import com.neverscapealone.model.SoundPing;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.models.payload.pingdata.PingData;
+import com.neverscapealone.models.soundping.SoundPing;
 import com.neverscapealone.overlays.NeverScapeAloneMinimapOverlay;
 import com.neverscapealone.overlays.NeverScapeAlonePingOverlay;
 import com.neverscapealone.overlays.NeverScapeAlonePlayerOverlay;
 import com.neverscapealone.overlays.NeverScapeAloneWorldMapOverlay;
-import com.neverscapealone.ui.ConnectingPanelClass;
+import com.neverscapealone.ui.connecting.ConnectingPanelClass;
 import com.neverscapealone.ui.NeverScapeAlonePanel;
 import lombok.Getter;
 import lombok.Setter;
@@ -189,7 +189,7 @@ protected void startUp() throws Exception {
         }
 
         panel = injector.getInstance(NeverScapeAlonePanel.class);
-        final BufferedImage icon = ImageUtil.loadImageResource(NeverScapeAlonePlugin.class, "/tri-icon.png");
+        final BufferedImage icon = ImageUtil.loadImageResource(NeverScapeAlonePlugin.class, "/other/tri-icon.png");
         navButton = NavigationButton.builder()
                 .panel(panel)
                 .tooltip("NeverScapeAlone")

diff --git a/src/main/java/com/neverscapealone/enums/AccountTypeSelectionEnum.java b/src/main/java/com/neverscapealone/enums/AccountTypeSelectionEnum.java
@@ -25,7 +25,7 @@
 
 package com.neverscapealone.enums;
 
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.ui.utils.Icons;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/src/main/java/com/neverscapealone/enums/ActivityReferenceEnum.java b/src/main/java/com/neverscapealone/enums/ActivityReferenceEnum.java
@@ -25,7 +25,7 @@
 
 package com.neverscapealone.enums;
 
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.ui.utils.Icons;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -173,6 +173,7 @@ public enum ActivityReferenceEnum
     CA5(Icons.CA5, "misc", "Combat Achievements (Master)", "CA5"),
     CA6(Icons.CA6, "misc", "Combat Achievements (Grandmaster)", "CA6"),
     ALL_COMBAT_ACHIEVEMENTS(Icons.ALL_COMBAT_ACHIEVEMENTS, "misc", "All Combat Achievements", "ALL_COMBAT_ACHIEVEMENTS"),
+    MONEY_MAKING(Icons.COIN, "misc", "Money-making", "MONEY_MAKING"),
     F2P(Icons.F2P, "misc", "Free-to-Play", "F2P"),
     ;
 

diff --git a/src/main/java/com/neverscapealone/enums/WebLink.java b/src/main/java/com/neverscapealone/enums/WebLink.java
@@ -25,7 +25,7 @@
 
 package com.neverscapealone.enums;
 
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.ui.utils.Icons;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

diff --git a/...va/com/neverscapealone/model/Payload.java → ...verscapealone/models/payload/Payload.java b/...va/com/neverscapealone/model/Payload.java → ...verscapealone/models/payload/Payload.java
@@ -23,10 +23,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload;
 
 import com.google.gson.annotations.SerializedName;
 import com.neverscapealone.enums.ServerStatusCode;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.models.payload.pingdata.PingData;
+import com.neverscapealone.models.payload.searchmatches.SearchMatches;
+import com.neverscapealone.models.payload.servermessage.ServerMessage;
 import lombok.Builder;
 import lombok.Value;
 

diff --git a/.../com/neverscapealone/model/MatchData.java → ...e/models/payload/matchdata/MatchData.java b/.../com/neverscapealone/model/MatchData.java → ...e/models/payload/matchdata/MatchData.java
@@ -23,10 +23,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.neverscapealone.models.payload.matchdata.player.Player;
+import com.neverscapealone.models.payload.matchdata.requirement.Requirement;
 
 import java.util.List;
 

diff --git a/...ava/com/neverscapealone/model/Player.java → ...dels/payload/matchdata/player/Player.java b/...ava/com/neverscapealone/model/Player.java → ...dels/payload/matchdata/player/Player.java
@@ -23,10 +23,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata.player;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.neverscapealone.models.payload.matchdata.player.location.Location;
+import com.neverscapealone.models.payload.matchdata.player.stats.Stats;
+import com.neverscapealone.models.payload.matchdata.player.status.Status;
 
 import java.util.List;
 

diff --git a/...a/com/neverscapealone/model/Location.java → ...d/matchdata/player/location/Location.java b/...a/com/neverscapealone/model/Location.java → ...d/matchdata/player/location/Location.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata.player.location;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/...java/com/neverscapealone/model/Stats.java → ...payload/matchdata/player/stats/Stats.java b/...java/com/neverscapealone/model/Stats.java → ...payload/matchdata/player/stats/Stats.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata.player.stats;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/...ava/com/neverscapealone/model/Status.java → ...yload/matchdata/player/status/Status.java b/...ava/com/neverscapealone/model/Status.java → ...yload/matchdata/player/status/Status.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata.player.status;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/...om/neverscapealone/model/Requirement.java → ...ad/matchdata/requirement/Requirement.java b/...om/neverscapealone/model/Requirement.java → ...ad/matchdata/requirement/Requirement.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.matchdata.requirement;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/...a/com/neverscapealone/model/PingData.java → ...one/models/payload/pingdata/PingData.java b/...a/com/neverscapealone/model/PingData.java → ...one/models/payload/pingdata/PingData.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.pingdata;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/...everscapealone/model/SearchMatchData.java → ...ayload/searchmatches/SearchMatchData.java b/...everscapealone/model/SearchMatchData.java → ...ayload/searchmatches/SearchMatchData.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.searchmatches;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/.../neverscapealone/model/SearchMatches.java → .../payload/searchmatches/SearchMatches.java b/.../neverscapealone/model/SearchMatches.java → .../payload/searchmatches/SearchMatches.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.searchmatches;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/.../neverscapealone/model/ServerMessage.java → .../payload/servermessage/ServerMessage.java b/.../neverscapealone/model/ServerMessage.java → .../payload/servermessage/ServerMessage.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.payload.servermessage;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/.../com/neverscapealone/model/SoundPing.java → ...capealone/models/soundping/SoundPing.java b/.../com/neverscapealone/model/SoundPing.java → ...capealone/models/soundping/SoundPing.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.model;
+package com.neverscapealone.models.soundping;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/src/main/java/com/neverscapealone/overlays/NeverScapeAloneMinimapOverlay.java b/src/main/java/com/neverscapealone/overlays/NeverScapeAloneMinimapOverlay.java
@@ -27,9 +27,9 @@
 
 import com.neverscapealone.NeverScapeAloneConfig;
 import com.neverscapealone.NeverScapeAlonePlugin;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.MatchData;
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.ui.utils.Icons;
 import net.runelite.api.Client;
 import net.runelite.api.Player;
 import net.runelite.client.ui.overlay.*;
@@ -80,7 +80,7 @@ public Dimension render(Graphics2D graphics)
         }
 
         HashMap<String, Boolean> playerPartyleader = new HashMap<>();
-        for (com.neverscapealone.model.Player player : NeverScapeAlonePlugin.matchData.getPlayers()){
+        for (com.neverscapealone.models.payload.matchdata.player.Player player : NeverScapeAlonePlugin.matchData.getPlayers()){
             playerPartyleader.put(player.getLogin(), player.getIsPartyLeader());
         }
 

diff --git a/src/main/java/com/neverscapealone/overlays/NeverScapeAlonePingOverlay.java b/src/main/java/com/neverscapealone/overlays/NeverScapeAlonePingOverlay.java
@@ -28,8 +28,8 @@
 
 import com.neverscapealone.NeverScapeAloneConfig;
 import com.neverscapealone.NeverScapeAlonePlugin;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.PingData;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.pingdata.PingData;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;

diff --git a/src/main/java/com/neverscapealone/overlays/NeverScapeAlonePlayerOverlay.java b/src/main/java/com/neverscapealone/overlays/NeverScapeAlonePlayerOverlay.java
@@ -28,9 +28,9 @@
 
 import com.neverscapealone.NeverScapeAloneConfig;
 import com.neverscapealone.NeverScapeAlonePlugin;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.MatchData;
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.ui.utils.Icons;
 import net.runelite.api.Client;
 import net.runelite.api.Player;
 import net.runelite.client.ui.overlay.Overlay;
@@ -84,7 +84,7 @@ public Dimension render(Graphics2D graphics)
         }
 
         HashMap<String, Boolean> playerPartyleader = new HashMap<>();
-        for (com.neverscapealone.model.Player player : NeverScapeAlonePlugin.matchData.getPlayers()){
+        for (com.neverscapealone.models.payload.matchdata.player.Player player : NeverScapeAlonePlugin.matchData.getPlayers()){
             playerPartyleader.put(player.getLogin(), player.getIsPartyLeader());
         }
 

diff --git a/src/main/java/com/neverscapealone/overlays/NeverScapeAloneWorldMapOverlay.java b/src/main/java/com/neverscapealone/overlays/NeverScapeAloneWorldMapOverlay.java
@@ -27,9 +27,10 @@
 
 import com.neverscapealone.NeverScapeAloneConfig;
 import com.neverscapealone.NeverScapeAlonePlugin;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.MatchData;
-import com.neverscapealone.ui.Icons;
+import com.neverscapealone.models.payload.matchdata.player.Player;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.ui.utils.Icons;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.RenderOverview;
@@ -105,7 +106,7 @@ public Dimension render(Graphics2D graphics)
     }
 
     private void renderPlayerIcon(final Graphics2D graphics, MatchData matchData) {
-        for (com.neverscapealone.model.Player player : matchData.getPlayers()){
+        for (Player player : matchData.getPlayers()){
             if (player.getLocation() == null){
                 continue;
             }

diff --git a/...ealone/http/NeverScapeAloneWebsocket.java → ...lone/socket/NeverScapeAloneWebsocket.java b/...ealone/http/NeverScapeAloneWebsocket.java → ...lone/socket/NeverScapeAloneWebsocket.java
@@ -23,17 +23,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.http;
+package com.neverscapealone.socket;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.neverscapealone.NeverScapeAloneConfig;
 import com.neverscapealone.enums.SoundPingEnum;
-import com.neverscapealone.model.Payload;
-import com.neverscapealone.model.ServerMessage;
-import com.neverscapealone.model.SoundPing;
+import com.neverscapealone.models.payload.Payload;
+import com.neverscapealone.models.payload.servermessage.ServerMessage;
+import com.neverscapealone.models.soundping.SoundPing;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...lone/http/UnauthorizedTokenException.java → ...ne/socket/UnauthorizedTokenException.java b/...lone/http/UnauthorizedTokenException.java → ...ne/socket/UnauthorizedTokenException.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.http;
+package com.neverscapealone.socket;
 
 import java.io.IOException;
 

diff --git a/src/main/java/com/neverscapealone/ui/NeverScapeAlonePanel.java b/src/main/java/com/neverscapealone/ui/NeverScapeAlonePanel.java
@@ -32,8 +32,25 @@
 import com.neverscapealone.NeverScapeAlonePlugin;
 import com.neverscapealone.enums.PanelStateEnum;
 import com.neverscapealone.enums.SoundPingEnum;
-import com.neverscapealone.http.NeverScapeAloneWebsocket;
-import com.neverscapealone.model.*;
+import com.neverscapealone.models.payload.matchdata.player.Player;
+import com.neverscapealone.models.soundping.SoundPing;
+import com.neverscapealone.socket.NeverScapeAloneWebsocket;
+import com.neverscapealone.models.payload.matchdata.MatchData;
+import com.neverscapealone.models.payload.searchmatches.SearchMatchData;
+import com.neverscapealone.models.payload.searchmatches.SearchMatches;
+import com.neverscapealone.models.payload.servermessage.ServerMessage;
+import com.neverscapealone.ui.connecting.ConnectingPanelClass;
+import com.neverscapealone.ui.create.CreatePanelClass;
+import com.neverscapealone.ui.header.LinksPanelClass;
+import com.neverscapealone.ui.header.SwitchMenuPanelClass;
+import com.neverscapealone.ui.match.ActivityPanelClass;
+import com.neverscapealone.ui.match.DiscordInvitePanelClass;
+import com.neverscapealone.ui.match.MatchPanelClass;
+import com.neverscapealone.ui.match.PlayerPanelClass;
+import com.neverscapealone.ui.quick.QueuePanelClass;
+import com.neverscapealone.ui.search.SearchPanelClass;
+import com.neverscapealone.ui.utils.Components;
+import com.neverscapealone.ui.utils.Icons;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.client.config.ConfigManager;
@@ -56,7 +73,7 @@
 import java.util.ArrayList;
 import java.util.Objects;
 
-import static com.neverscapealone.ui.ServerWarningPanelClass.serverWarningPanel;
+import static com.neverscapealone.ui.header.ServerWarningPanelClass.serverWarningPanel;
 
 @Slf4j
 @Singleton

diff --git a/...erscapealone/ui/ConnectingPanelClass.java → ...e/ui/connecting/ConnectingPanelClass.java b/...erscapealone/ui/ConnectingPanelClass.java → ...e/ui/connecting/ConnectingPanelClass.java
@@ -23,17 +23,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.ui;
+package com.neverscapealone.ui.connecting;
 
 import com.neverscapealone.enums.PanelStateEnum;
+import com.neverscapealone.ui.utils.Icons;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
 
 import static com.neverscapealone.NeverScapeAlonePlugin.panel;
-import static com.neverscapealone.ui.Components.cleanJButton;
-import static com.neverscapealone.ui.Components.title;
+import static com.neverscapealone.ui.utils.Components.cleanJButton;
+import static com.neverscapealone.ui.utils.Components.title;
 import static com.neverscapealone.ui.NeverScapeAlonePanel.connectingPanel;
 
 public class ConnectingPanelClass {

diff --git a/.../neverscapealone/ui/CreatePanelClass.java → ...capealone/ui/create/CreatePanelClass.java b/.../neverscapealone/ui/CreatePanelClass.java → ...capealone/ui/create/CreatePanelClass.java
@@ -23,18 +23,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.neverscapealone.ui;
+package com.neverscapealone.ui.create;
 
 import com.neverscapealone.enums.ActivityReferenceEnum;
 import com.neverscapealone.enums.HelpButtonSwitchEnum;
+import com.neverscapealone.ui.utils.Components;
+import com.neverscapealone.ui.utils.Icons;
+import com.neverscapealone.ui.NeverScapeAlonePanel;
 import net.runelite.client.ui.FontManager;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 
-import static com.neverscapealone.ui.Components.*;
+import static com.neverscapealone.ui.utils.Components.*;
 import static com.neverscapealone.ui.NeverScapeAlonePanel.*;
 
 public class CreatePanelClass {