Merge branch 'dev'

assets/contract.txt

@@ -0,0 +1,54 @@
+VolcAddons Module User Agreement & Terms of Service
+
+This Agreement ("Agreement") is entered into between VolcAddons and user, collectively referred to as the "Parties," with respect to the use of the Minecraft modification created by The Pirate King.
+
+1. License Grant
+
+1.1 Mod Creator hereby grants User a non-exclusive, non-transferable license to use the Mod in accordance with the terms and conditions of this Agreement.
+
+2. Acceptable Use
+
+2.1 User agrees to use the Mod solely for personal, non-commercial purposes and in compliance with the rules and policies set forth by Minecraft and its developer, Mojang AB as well any involved servers, i.e. Hypixel.
+
+2.2 User acknowledges that the Mod is provided "as-is" and that Mod Creator does not provide any warranties or guarantees regarding the performance, functionality, or compatibility of the Mod.
+
+2.3 User acknowledges that the Mod Creator holds no responsibility in any punishments that may result from use of the Mod.
+
+3. Restrictions
+
+3.1 User agrees not to reverse engineer, decompile, or modify the Mod in any way that may violate applicable laws or regulations.
+
+3.2 User shall not distribute, sell, or transfer the Mod to any third party without the express written consent of Mod Creator.
+
+4. Support and Updates
+
+4.1 Mod Creator may, at their sole discretion, provide support or updates for the Mod.
+
+5. Termination
+
+5.1 Mod Creator reserves the right to terminate this Agreement and revoke the license granted herein if User violates any of the terms and conditions set forth in this Agreement.
+
+6. Governing Law
+
+6.1 This Agreement shall be governed by and construed in accordance with the laws of the "Code of Hammurabi".
+
+7. Entire Agreement
+
+7.1 This Agreement constitutes the entire agreement between the Parties regarding the use of the Mod and supersedes all prior agreements and understandings, whether oral or written.
+
+8. Contact Information
+
+8.1 For questions or concerns regarding this Agreement, please contact Mod Creator at "grapefruited" on Discord.
+
+IN WITNESS WHEREOF, the Parties hereto have executed this Agreement as of the date first above written.
+
+Mod Creator:
+
+VolcAddons
+Volcaronitee
+
+User (Enter IGN below):
+
+_____________*
+
+*The Parties agree that digital signatures and electronic acceptance of this Agreement shall have the same legal force and effect as traditional, ink-on-paper signatures.`

changelog.json

@@ -1,25 +1,26 @@
 [
-    "- Added calendar real time",
-    "- Added inventory buttons (`/va buttons`)",
-    "- Added bestiary tracker",
-    "- Added texture schemes to container preview",
-    "- Added Skyblock XP alert",
-    "- Reworked autocomplete",
-    "- Changed overlay boxes to have outlines",
-    "- Changed equipment display to also display buttons",
-    "- Changed slot binding commands (`/va binds`)",
-    "- Changed some rendering to be more optimized",
-    "- Changed autocorrect to be more reliable",
-    "- Changed some overlay formatting and colors",
-    "- Fixed features not registering in Hub",
-    "- Fixed chocolate calculations",
-    "- Fixed spamlist",
-    "- Fixed valuelist",
-    "- Fixed tooltip flicker",
-    "- Fixed `/pesttp` parsing",
-    "- Fixed skulls rendering without skin",
-    "- Fixed no pet display",
-    "- Removed `/va test`",
-    "- Removed `/va be`",
-    "- Removed Garden webhook"
+    "- Added global toggle",
+    "- Added socket toggle",
+    "- Added additional mining event checks",
+    "- Added `/va [npc, zone]` scraped info",
+    "- Added `/va preview`",
+    "- Added more container value calcs",
+    "   - Auction",
+    "   - Bazaar",
+    "   - Composter",
+    "- Added dungeon chest profit",
+    "- Changed rabbit highlight to be selectable",
+    "- Changed chocolate factory to support 2.0",
+    "- Changed storage preview to be hoverable",
+    "- Changed chest tracker to hide opened",
+    "- Fixed socket reconnections",
+    "- Fixed enchanted book calc",
+    "- Fixed lore rendering",
+    "- Fixed lore 'ed' spam",
+    "- Removed image viewer",
+    "= Removed Gurokinetic features",
+    "- Removed Jacob highlight",
+    "- Removed Primal Fear highlight",
+    "- Removed Vanquisher sounds",
+    "- Removed Imepl enlarger"
 ]

docs/_posts/2024-05-17-v2_9_8.md

@@ -0,0 +1,37 @@
+---
+layout: post
+title: v2.9.8 Testing
+gh-repo: zhenga8533/VolcAddons
+gh-badge: [star, fork, follow]
+tags: [release]
+comments: true
+author: Volcaronitee
+---
+
+## [Changelog](https://github.com/zhenga8533/VolcAddons/releases/tag/v2.9.8) (download by clicking [here](https://github.com/zhenga8533/VolcAddons/releases/download/v2.9.8/VolcAddons.zip))
+
+{: .box-note}
+#### New Features
+- Added socket beta testing [WIP]
+   - Alloy tracking?
+   - Cache ?w from imgur?
+   - Mining event tracking?
+   - Users tracking?
+
+{: .box-warning}
+#### Changes/Fixes
+- Changed calendar time to track icon
+- Changed worker to calc Jackrabbit/Tower
+- Changed overlay to show border
+- Changed slot binding functionality
+- Changed autocomplete to be more responsive
+- Changed powder tracker to be more compact
+- Changed equipment to show lore (budget)
+- Changed party to be persistant
+- Changed dev mode to also require a `/va dev`
+- Fixed `/resetBe`
+- Fixed dict list printing
+
+{: .box-error}
+#### Deprecated
+- None!

docs/commands.md

@@ -11,13 +11,6 @@ subtitle: List of every non-gui related commands.
     - `/va settings`: Opens the settings' menu.
     - `/va toggles`: Opens the setting toggles' menu.
     - `/va version`: Checks if you are currently on latest version and prints out changelog.
-- **Waypoints**
-    - `/va cat`: Controls Montezuma Soul Piece waypoints.
-    - `/va enigma`: Controls Enigma Soul waypoints.
-    - `/va fairy`: Controls Fairy Soul waypoints.
-    - `/va npc`: Creates waypoints to user inputted rift NPCs.
-    - `/va zone`: Creates waypoints to user inputted rift locations.
-    - `/va waypoint`: Creates waypoints to user inputted coordinates.
 - **Lists**
     - `/va attributelist`: Set wanted attributes to calculate for.
     - `/va blacklist`: Set players to kick and ignore.
@@ -31,16 +24,28 @@ subtitle: List of every non-gui related commands.
     - `/va whitelist`: Set player party invites to auto join.
     - `/va binds`: Set slot bindings and their presets.
     - `/va buttons`: Set container buttons and their presets.
+- **Waypoints**
+    - `/va cat`: Controls Montezuma Soul Piece waypoints.
+    - `/va enigma`: Controls Enigma Soul waypoints.
+    - `/va fairy`: Controls Fairy Soul waypoints.
+    - `/va npc`: Creates waypoints to user inputted rift NPCs.
+    - `/va zone`: Creates waypoints to user inputted rift locations.
+    - `/va waypoint`: Creates waypoints to user inputted coordinates.
 - **Economy**
     - `/va attribute`: Various calculations that deal with attribute values.
     - `/va calc`: Various calculations that deal with general economical values.
     - `/va nw`: Calculates the networth of a SkyBlock profile using custom API.
 - **Kuudra**
     - `/va splits`: Prints out Kuudra splits' stats.
     - `/kv`: Display important Kuudra stats for inputted player profile.
+- **Socket**
+    - `/alloy`: Fetches last dropped alloy.
+    - `/chEvent`: Fetches current events active in the Crystal Hollows.
+    - `/dmEvent`: Fetches current events active in the Dwarven Mines.
 - **Dev**
     - `/printTab`: Prints out Tablist names to console.
     - `/printScore`: Prints out Scoreboard lines to console.
+    - `/va dev`: Toggles devButton usage.
 - **Misc**
     - `/missingskins`: Scans user inventory API to determine any missing fire sale skins.
     - `/pesttp`: Warps to plot with most pests.

features/combat/Bestiary.js

@@ -1,9 +1,13 @@
+/**
+ * ARCHIVED
+ */
+
 import request from "../../../requestV2";
-import settings from "../../utils/settings";
-import { BOLD, GOLD, GRAY, GREEN, LOGO, RED, WHITE } from "../../utils/constants";
+import Settings from "../../utils/Settings";
+import { BOLD, GOLD, GRAY, GREEN, LOGO, RED, WHITE } from "../../utils/Constants";
 import { formatTime, romanToNum } from "../../utils/functions/format";
-import { registerWhen } from "../../utils/register";
-import { data } from "../../utils/data";
+import { registerWhen } from "../../utils/RegisterTils";
+import { data } from "../../utils/Data";
 
 
 /**

features/combat/BestiaryDisplay.js

@@ -1,10 +1,10 @@
-import settings from "../../utils/settings";
+import Settings from "../../utils/Settings";
 import { formatTime, romanToNum, unformatNumber } from "../../utils/functions/format";
-import { registerWhen } from "../../utils/register";
-import { Overlay } from "../../utils/overlay";
-import { data } from "../../utils/data";
-import { BOLD, DARK_GRAY, GOLD, GRAY, RED, UNDERLINE, WHITE, YELLOW } from "../../utils/constants";
-import { Json } from "../../utils/json";
+import { registerWhen } from "../../utils/RegisterTils";
+import { Overlay } from "../../utils/Overlay";
+import { data } from "../../utils/Data";
+import { BOLD, GOLD, GRAY, GREEN, LOGO, WHITE, YELLOW } from "../../utils/Constants";
+import { Json } from "../../utils/Json";
 
 
 /**
@@ -69,19 +69,19 @@ registerWhen(register("guiOpened", () => {
         setLevels.register();
         setHighlight.register();
     });
-}), () => settings.bestiaryGUI);
+}), () => Settings.bestiaryGUI);
 registerWhen(register("guiClosed", () => {
     setLevels.unregister();
     setHighlight.unregister();
     bestiaryData[0] = [];
     bestiaryData[1] = [];
-}), () => settings.bestiaryGUI);
+}), () => Settings.bestiaryGUI);
 
 
 /**
  * Bestiary widget tracker.
  */
-const maxBestiary = new Json("bestiary.json").getData();
+const maxBestiary = new Json("bestiary.json", false).getData();
 register("guiOpened", () => {
     Client.scheduleTask(1, () => {
         const containerName = Player.getContainer().getName();
@@ -98,7 +98,7 @@ register("guiOpened", () => {
                 let lore = item.getLore();
                 let ind = lore.findIndex(line => line.startsWith("§5§o§7Overall Progress: §b"));
                 let max = unformatNumber(lore[ind + 1].removeFormatting().split('/')[1]);
-                maxBestiary[name] = max;
+                if (max !== 0 && name !== '') maxBestiary[name] = max;
             }
         }
     });
@@ -111,11 +111,13 @@ const bestiaryExample =
 const bestiaryOverlay = new Overlay("bestiaryCounter", data.BEL, "moveBe", bestiaryExample);
 
 // Dict of [start, now, next]
-const beCounter = {};
+let beCounter = {};
 let beTime = 0;
 
 register("command", () => {
     beCounter = {};
+    bestiaryOverlay.setMessage("");
+    ChatLib.chat(`${LOGO + GREEN}Successfully reset bestiary counter.`);
 }).setName("resetBe");
 
 registerWhen(register("step", () => {
@@ -135,8 +137,10 @@ registerWhen(register("step", () => {
         let now = unformatNumber(count[0]);
         let next = unformatNumber(count[1]);
 
-        if (beCounter.hasOwnProperty(name)) beCounter[name][1] = now;
-        else beCounter[name] = [now, now, next];
+        if (beCounter.hasOwnProperty(name)) {
+            beCounter[name][1] = now;
+            beCounter[name][2] = Math.max(next, beCounter[name][2]);
+        } else beCounter[name] = [now, now, next];
     }
 
     // Sort by now - start
@@ -165,4 +169,4 @@ registerWhen(register("step", () => {
     });
 
     bestiaryOverlay.setMessage(message);
-}).setFps(1), () => settings.bestiaryCounter);
+}).setFps(1), () => Settings.bestiaryCounter);

features/combat/ComboDisplay.js

@@ -1,8 +1,8 @@
-import settings from "../../utils/settings";
-import { AQUA, BOLD, DARK_AQUA, DARK_GRAY, GOLD } from "../../utils/constants";
-import { registerWhen } from "../../utils/register";
-import { Overlay } from "../../utils/overlay";
-import { data } from "../../utils/data";
+import Settings from "../../utils/Settings";
+import { AQUA, BOLD, DARK_AQUA, DARK_GRAY, GOLD } from "../../utils/Constants";
+import { registerWhen } from "../../utils/RegisterTils";
+import { Overlay } from "../../utils/Overlay";
+import { data } from "../../utils/Data";
 
 
 /**
@@ -43,24 +43,24 @@ registerWhen(register("chat", (color, kills, bonus, event) => {
     cancel(event);
     stats[0] = `${color + BOLD + kills}:`;
     updateOverlay();
-}).setCriteria("&r${color}&l+${kills} &r&8${bonus}&r"), () => settings.comboDisplay);
+}).setCriteria("&r${color}&l+${kills} &r&8${bonus}&r"), () => Settings.comboDisplay);
 
 /**
  * Updates overlay with formatted kill combo message.
  */
 registerWhen(register("chat", (color, kills) => {
     stats[0] = `${color + kills} Kill Combo:`;
     updateOverlay();
-}).setCriteria("&r${color}+${kills} Kill Combo&r"), () => settings.comboDisplay);
+}).setCriteria("&r${color}+${kills} Kill Combo&r"), () => Settings.comboDisplay);
 
 /**
  * Resets statistics and overlay message.
  */
 registerWhen(register("chat", () => {
     stats = ["", 0, 0, 0];
     comboOverlay.setMessage("");
-}).setCriteria("Your Kill Combo has expired! You reached a ${kills} Kill Combo!"), () => settings.comboDisplay);
+}).setCriteria("Your Kill Combo has expired! You reached a ${kills} Kill Combo!"), () => Settings.comboDisplay);
 registerWhen(register("worldUnload", () => {
     stats = ["", 0, 0, 0];
     comboOverlay.setMessage("");
-}), () => settings.comboDisplay);
+}), () => Settings.comboDisplay);

features/combat/DamageTracker.js

@@ -1,7 +1,7 @@
-import settings from "../../utils/settings";
-import { BOLD, DARK_GRAY, EntityArmorStand, GOLD, GRAY, LOGO, RED, WHITE, YELLOW } from "../../utils/constants";
+import Settings from "../../utils/Settings";
+import { BOLD, DARK_GRAY, EntityArmorStand, GOLD, GRAY, LOGO, RED, WHITE, YELLOW } from "../../utils/Constants";
 import { formatNumber, formatTime } from "../../utils/functions/format";
-import { registerWhen } from "../../utils/register";
+import { registerWhen } from "../../utils/RegisterTils";
 
 
 /**
@@ -124,7 +124,7 @@ registerWhen(register("tick", () => {
 
     // Do calcs when no new damage ticks
     if (!ticked && last - start > 1) {
-        if (settings.damageTracker === 2) {
+        if (Settings.damageTracker === 2) {
             const { sum, max, min, range, mean, median, mode, lowerQ, upperQ, iqr, variance, stdDev } = statisticalAnalysis(damages);
 
             const time = Date.now()/1000 - start;
@@ -154,4 +154,4 @@ ${RED + BOLD}Dispersion:
         start = 0;
         last = 0;
     }
-}), () => settings.damageTracker !== 0);
+}), () => Settings.damageTracker !== 0);