file relocation

changelog.json

@@ -5,6 +5,7 @@
     "- TODO: Added /va nw",
     "- Changed blacklist to auto kick",
     "- Changed warplist to dianalist",
+    "- Changed file pathing",
     "- TODO: Recoded skill and powder? tracker",
     "- Changed valuelist to only register held item"
 ]

features/garden/FarmingWebhook.js → features/farming/FarmingWebhook.js

@@ -4,7 +4,7 @@ import { formatNumber, getTime, unformatNumber } from "../../utils/functions";
 import { registerWhen } from "../../utils/variables";
 import { getWorld } from "../../utils/worlds";
 import { getBazaar } from "../economy/Economy";
-import { getWaifu } from "../general/party/PartyCommands";
+import { getWaifu } from "../party/PartyCommands";
 
 
 /**

features/general/ChatWebhook.js

@@ -3,7 +3,7 @@ import toggles from "../../utils/toggles";
 import { request } from "../../../axios";
 import { getGuildName, getPlayerName } from "../../utils/functions";
 import { registerWhen } from "../../utils/variables";
-import { getWaifu } from "./party/PartyCommands";
+import { getWaifu } from "../party/PartyCommands";
 
 
 /**

features/mining/PowderTracker.js

@@ -5,7 +5,7 @@ import { commafy, getTime } from "../../utils/functions";
 import { Overlay } from "../../utils/overlay";
 import { Stat, data, getPaused, registerWhen } from "../../utils/variables";
 import { getWorld } from "../../utils/worlds";
-import { getWaifu } from "../general/party/PartyCommands";
+import { getWaifu } from "../party/PartyCommands";
 
 
 /**

features/general/party/AntiGhostParty.js → features/party/AntiGhostParty.js

@@ -1,8 +1,8 @@
-import settings from "../../../utils/settings";
-import { getInParty } from "../../../utils/party";
-import { delay } from "../../../utils/thread";
-import { registerWhen } from "../../../utils/variables";
-import { GREEN, LOGO } from "../../../utils/constants";
+import settings from "../../utils/settings";
+import { getInParty } from "../../utils/party";
+import { delay } from "../../utils/thread";
+import { registerWhen } from "../../utils/variables";
+import { GREEN, LOGO } from "../../utils/constants";
 
 
 /**

features/general/party/AutoKick.js → features/party/AutoKick.js

@@ -1,9 +1,15 @@
-import { getPlayerName } from "../../../utils/functions";
-import { delay } from "../../../utils/thread";
-import { data, registerWhen } from "../../../utils/variables";
+import { getPlayerName } from "../../utils/functions";
+import { getIsLeader } from "../../utils/party";
+import { delay } from "../../utils/thread";
+import { data, registerWhen } from "../../utils/variables";
 
 
+/**
+ * Kick users on blacklist.
+ */
 registerWhen(register("chat", (player) => {
+    if (!getIsLeader()) return;
+
     player = getPlayerName(player).toLowerCase();
     if (data.blacklist.find(name => {
         name === player;

features/general/party/AutoTransfer.js → features/party/AutoTransfer.js

@@ -1,9 +1,9 @@
-import settings from "../../../utils/settings";
-import { getPlayerName } from "../../../utils/functions";
-import { delay } from "../../../utils/thread";
-import { registerWhen } from "../../../utils/variables";
-import { getWorld } from "../../../utils/worlds";
-import { getInParty, getIsLeader, getParty } from "../../../utils/party";
+import settings from "../../utils/settings";
+import { getPlayerName } from "../../utils/functions";
+import { delay } from "../../utils/thread";
+import { registerWhen } from "../../utils/variables";
+import { getWorld } from "../../utils/worlds";
+import { getInParty, getIsLeader, getParty } from "../../utils/party";
 
 
 /**

features/general/party/JoinMessage.js → features/party/JoinMessage.js

@@ -1,6 +1,6 @@
-import settings from "../../../utils/settings";
-import { delay } from "../../../utils/thread";
-import { registerWhen } from "../../../utils/variables";
+import settings from "../../utils/settings";
+import { delay } from "../../utils/thread";
+import { registerWhen } from "../../utils/variables";
 
 registerWhen(register("chat", () => {
     delay(() => ChatLib.command(`pc ${settings.partyMessage}`), 100);

features/general/party/JoinParty.js → features/party/JoinParty.js

@@ -1,7 +1,7 @@
-import settings from "../../../utils/settings";
-import { getPlayerName } from "../../../utils/functions";
-import { delay } from "../../../utils/thread";
-import { data, registerWhen } from "../../../utils/variables";
+import settings from "../../utils/settings";
+import { getPlayerName } from "../../utils/functions";
+import { delay } from "../../utils/thread";
+import { data, registerWhen } from "../../utils/variables";
 
 
 /**

features/general/party/PartyCommands.js → features/party/PartyCommands.js

@@ -1,13 +1,13 @@
-import axios from "../../../../axios";
-import settings from "../../../utils/settings";
-import toggles from "../../../utils/toggles";
-import { request } from "../../../../requestV2";
-import { AQUA, DARK_AQUA, DARK_GREEN, GRAY, GREEN, LOGO, RED, WHITE } from "../../../utils/constants";
-import { getGuildName, getPlayerName } from "../../../utils/functions";
-import { getIsLeader } from "../../../utils/party";
-import { delay } from "../../../utils/thread";
-import { data, registerWhen } from "../../../utils/variables";
-import { getPing, getTPS } from "../Performance";
+import axios from "../../../axios";
+import settings from "../../utils/settings";
+import toggles from "../../utils/toggles";
+import { request } from "../../../requestV2";
+import { AQUA, DARK_AQUA, DARK_GREEN, GRAY, GREEN, LOGO, RED, WHITE } from "../../utils/constants";
+import { getGuildName, getPlayerName } from "../../utils/functions";
+import { getIsLeader } from "../../utils/party";
+import { delay } from "../../utils/thread";
+import { data, registerWhen } from "../../utils/variables";
+import { getPing, getTPS } from "../general/Performance";
 
 
 /**

index.js

@@ -3,8 +3,8 @@ import "./utils/player";
 import settings from "./utils/settings";
 import toggles from "./utils/toggles";
 import "./utils/waypoints";
-import { AQUA, BOLD, CAT_SOULS, CONTRACT, DARK_AQUA, DARK_GRAY, ENIGMA_SOULS, FAIRY_SOULS, GOLD, GRAY, GREEN, ITALIC, LOGO, RED, RESET, RIFT_NPCS, RIFT_ZONES, UNDERLINE, WHITE } from "./utils/constants";
-import { formatNumber, getTime, unformatNumber } from "./utils/functions";
+import { AQUA, BOLD, CAT_SOULS, CONTRACT, DARK_AQUA, DARK_GRAY, ENIGMA_SOULS, FAIRY_SOULS, GOLD, GRAY, GREEN, LOGO, RED, RESET, RIFT_NPCS, RIFT_ZONES, UNDERLINE, WHITE } from "./utils/constants";
+import { getTime } from "./utils/functions";
 import { getInParty, getIsLeader, getParty } from "./utils/party";
 import { openGUI } from "./utils/overlay";
 import { delay } from "./utils/thread";
@@ -17,14 +17,8 @@ for (const key in settings) if (CHANGED_SETTINGS.has(key) && typeof settings[key
 if (typeof settings.partyCommands !== "boolean") settings.partyCommands = false;
 
 // General Features
-import "./features/general/party/AntiGhostParty";
-import "./features/general/party/AutoKick";
-import "./features/general/party/JoinMessage";
-import "./features/general/party/JoinParty";
-import { executeCommand } from "./features/general/party/PartyCommands";
 import "./features/general/ArmorDisplay";
 import "./features/general/Autocorrect";
-import "./features/general/party/AutoTransfer";
 import "./features/general/ChangeMessage";
 import "./features/general/ChatWebhook";
 import "./features/general/Cooldowns";
@@ -41,6 +35,13 @@ import "./features/general/SlotBinding";
 import "./features/general/SpamHider";
 import { getStat } from "./features/general/Statistics";
 import { createWaypoint } from "./features/general/UserWaypoints";
+// Party Features
+import "./features/party/AntiGhostParty";
+import "./features/party/AutoKick";
+import "./features/party/AutoTransfer";
+import "./features/party/JoinMessage";
+import "./features/party/JoinParty";
+import { executeCommand } from "./features/party/PartyCommands";
 // Economy Features
 import { getAttributes } from "./features/economy/AttributePricing";
 import "./features/economy/BitsAlert";
@@ -65,12 +66,12 @@ import "./features/mining/PowderChest";
 import "./features/mining/PowderTracker";
 import "./features/mining/WishingCompass";
 // Farming Features
-import { calcCompost } from "./features/garden/ComposterCalc";
-import "./features/garden/FarmingWebhook";
-import { getNextVisitor } from "./features/garden/GardenTab";
-import "./features/garden/GardenWarp";
-import "./features/garden/JacobHighlight";
-import "./features/garden/PestTracking";
+import { calcCompost } from "./features/farming/ComposterCalc";
+import "./features/farming/FarmingWebhook";
+import { getNextVisitor } from "./features/farming/GardenTab";
+import "./features/farming/GardenWarp";
+import "./features/farming/JacobHighlight";
+import "./features/farming/PestTracking";
 // Event Features
 import "./features/event/BurrowDetect";
 import "./features/event/GreatSpook";