Merge pull request #9 from TheMatrixNetwork/feature/matridex

Feature/matridex

Author: d4rpx1

.github/workflows/angular.yml

@@ -18,12 +18,12 @@ jobs:
         working-directory: ./frontend
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1 #this installs node and npm for us
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3 #this installs node and npm for us
         with:
           node-version: "16.x"
 
-      - uses: actions/cache@v1 # this allows for re-using node_modules caching, making builds a bit faster.
+      - uses: actions/cache@v3 # this allows for re-using node_modules caching, making builds a bit faster.
         with:
           path: ~/.npm
           key: ${{ runner.os }}-nodejs-${{ hashFiles('**/package-lock.json') }}

.github/workflows/gradle.yml

@@ -7,7 +7,7 @@ on:
       - 'frontend/**'
 
 env:
-  COPY_JARFILE_TO: '/Minecraft/Hardcore/plugins/ /Minecraft/Classic/plugins/'
+  COPY_JARFILE_TO: '/Minecraft/Hardcore/plugins/'
 
 jobs:
   build:
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 17
 
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 17
 
@@ -153,7 +153,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 17
 

frontend/src/app/components/player-status/player-status.component.html

@@ -23,34 +23,34 @@
     <div>
       <div class="flex justify-between items-center">
         <img ngSrc="assets/img/Slimeball_JE2_BE2.webp" width="40" height="40">
-        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.sfLevel}}</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.sfTitle}}</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <img ngSrc="assets/img/minecraft-diamond.webp" width="40" height="40">
         <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.threatTier}}</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <img ngSrc="assets/img/crossed-swords.png" width="40" height="40">
-        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.guildRank}}</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.guildRankName}}</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <img ngSrc="assets/img/medal.png" width="50" height="50">
-        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.prestige}}</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.threatTier}}</p>
       </div>
     </div>
     <div class="inline-block h-[320px] min-h-[1em] w-0.5 self-stretch bg-black opacity-100"></div>
     <div>
       <div class="flex justify-between items-center">
         <img ngSrc="assets/img/mcmmo.jpeg" width="40" height="40">
-        <p style="font-size: 35px;" class="ml-4">--</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.mcmmoPower}}</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <img ngSrc="assets/img/potion.webp" width="40" height="40">
-        <p style="font-size: 35px;" class="ml-4">--</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.mageRank}}</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <img ngSrc="assets/img/skills.png" width="60" height="50">
-        <p style="font-size: 35px;" class="ml-4">--</p>
+        <p style="font-size: 35px;" class="ml-4">{{latestPlayerStats.skillClass}} ({{latestPlayerStats.skillLevel}})</p>
       </div>
       <div class="flex justify-between items-center mt-4">
         <p style="font-size: 35px;" class="ml-4 text-white" >.</p>

frontend/src/app/components/player-status/player-status.component.ts

@@ -23,10 +23,15 @@ export class PlayerStatusComponent implements OnInit, OnChanges {
     lastDamageCause: "",
     remainingAir: 0,
     timeStamp: "",
-    guildRank: 0,
+    guildRankName: "",
     threatTier: 0,
-    sfLevel: 0,
-    prestige: 0
+    sfTitle: "",
+    skillLevel: 0,
+    mcmmoPower: 0,
+    skillClass: "",
+    mageRank: "",
+    element: "",
+    matrik: 0
   }
   heartRows: number[] = []
   @Input() playerName: string = '';

frontend/src/app/models/player-stats.ts

@@ -10,8 +10,13 @@ export interface PlayerStats {
   lastDamageCause: string,
   remainingAir: number,
   timeStamp: string,
-  guildRank: number,
+  guildRankName: string,
   threatTier: number,
-  sfLevel: number,
-  prestige: number
+  sfTitle: string,
+  mcmmoPower: number,
+  mageRank: string,
+  skillClass: string,
+  skillLevel: number,
+  element: string,
+  matrik: number
 }