diff options
-rw-r--r-- | babel-import-promise/babel-import-promise.mjs | 17 | ||||
-rw-r--r-- | src/featureClass/featureManager.js | 3 | ||||
-rw-r--r-- | src/features/changeLogGUI/index.js | 1 | ||||
-rw-r--r-- | src/features/cosmetics/index.js | 1 | ||||
-rw-r--r-- | src/features/dataLoader/index.js | 1 | ||||
-rw-r--r-- | src/features/dungeonSolvers/index.js | 1 | ||||
-rw-r--r-- | src/features/globalSettings/index.js | 1 | ||||
-rw-r--r-- | src/features/guild/index.js | 1 | ||||
-rw-r--r-- | src/features/mining/index.js | 1 | ||||
-rw-r--r-- | src/features/networthGUI/index.js | 1 | ||||
-rw-r--r-- | src/features/senitherGui/index.js | 1 | ||||
-rw-r--r-- | src/features/settings/helpDataLoader.js | 2 | ||||
-rw-r--r-- | src/features/spamHider/index.js | 1 | ||||
-rw-r--r-- | src/features/statHistoryGui/index.js | 1 | ||||
-rw-r--r-- | src/features/stat_next_to_name/index.js | 1 | ||||
-rw-r--r-- | src/features/streamsGUI/index.js | 1 | ||||
-rw-r--r-- | src/features/suggestionsGui/index.js | 1 | ||||
-rw-r--r-- | src/features/waypoints/index.js | 2 |
18 files changed, 18 insertions, 20 deletions
diff --git a/babel-import-promise/babel-import-promise.mjs b/babel-import-promise/babel-import-promise.mjs index 10aee6a..24cc28f 100644 --- a/babel-import-promise/babel-import-promise.mjs +++ b/babel-import-promise/babel-import-promise.mjs @@ -25,6 +25,23 @@ export default function ({ types: t }) { const importDeclaration = t.importDeclaration([importDefaultSpecifier], t.stringLiteral("../".repeat(depth) + 'PromiseV2')); path.unshiftContainer('body', importDeclaration); } + + let shouldAdd2 = false + const MyVisitor2 = { + Identifier(path) { + if (path.node.name === "fetch") { + shouldAdd = true + } + } + }; + path.traverse(MyVisitor2) + if (shouldAdd2) { + let depth = state.filename.replace(state.cwd, "").split(/[\\/]/g).length - 3 + const identifier = t.identifier('fetch'); + const importDefaultSpecifier = t.importDefaultSpecifier(identifier); + const importDeclaration = t.importDeclaration([importDefaultSpecifier], t.stringLiteral("../".repeat(depth) + 'utils/networkUtils')); + path.unshiftContainer('body', importDeclaration); + } } } }; diff --git a/src/featureClass/featureManager.js b/src/featureClass/featureManager.js index 5a4b240..f80e6d6 100644 --- a/src/featureClass/featureManager.js +++ b/src/featureClass/featureManager.js @@ -5,7 +5,6 @@ import logger from "../logger"; const File = Java.type("java.io.File") import metadata from "../metadata.js" import soopyV2Server from "../socketConnection"; -import { fetch } from "../utils/networkUtils"; import NonPooledThread from "../utils/nonPooledThread"; import { setRendering } from "../utils/renderJavaUtils"; import { registerForge as registerForgeBase, unregisterForge as unregisterForgeBase } from "./forgeEvents.js" @@ -137,7 +136,7 @@ class FeatureManager { let moduleToReload = this.watches[key] if (this.features[moduleToReload] && !this.reloadingModules.has(moduleToReload)) { //if enabled && not alr in queue this.reloadingModules.add(moduleToReload) - this.reloadModuleTime = Date.now() + 5000 + this.reloadModuleTime = Date.now() + 100 } key.pollEvents()/*.forEach(event=>{ logger.logMessage(event.context().toString(), 1) diff --git a/src/features/changeLogGUI/index.js b/src/features/changeLogGUI/index.js index c9c25fe..914b2a7 100644 --- a/src/features/changeLogGUI/index.js +++ b/src/features/changeLogGUI/index.js @@ -10,7 +10,6 @@ import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseClickEvent"; import ProgressBar from "../../../guimanager/GuiElement/ProgressBar" import SoopyRenderEvent from "../../../guimanager/EventListener/SoopyRenderEvent" -import { fetch } from "../../utils/networkUtils"; import { numberWithCommas } from "../../utils/numberUtils"; const File = Java.type("java.io.File") const URL = Java.type("java.net.URL"); diff --git a/src/features/cosmetics/index.js b/src/features/cosmetics/index.js index f3deece..97dcf3e 100644 --- a/src/features/cosmetics/index.js +++ b/src/features/cosmetics/index.js @@ -5,7 +5,6 @@ import DragonWings from "./cosmetic/dragon/dragonWings" import Toggle from "../settings/settingThings/toggle" import { f } from "../../../mappings/mappings"; import FakeRequireToggle from "../settings/settingThings/FakeRequireToggle"; -import { fetch } from "../../utils/networkUtils"; class Cosmetics extends Feature { constructor() { diff --git a/src/features/dataLoader/index.js b/src/features/dataLoader/index.js index eccafb4..b2a273d 100644 --- a/src/features/dataLoader/index.js +++ b/src/features/dataLoader/index.js @@ -2,7 +2,6 @@ /// <reference lib="es2015" /> import Feature from "../../featureClass/class"; import socketConnection from "../../socketConnection"; -import { fetch } from "../../utils/networkUtils"; class DataLoader extends Feature { constructor() { diff --git a/src/features/dungeonSolvers/index.js b/src/features/dungeonSolvers/index.js index a959a66..ae57736 100644 --- a/src/features/dungeonSolvers/index.js +++ b/src/features/dungeonSolvers/index.js @@ -8,7 +8,6 @@ import HudTextElement from "../hud/HudTextElement"; import LocationSetting from "../settings/settingThings/location"; import ToggleSetting from "../settings/settingThings/toggle"; import TextSetting from "../settings/settingThings/textSetting"; -import { fetch } from "../../utils/networkUtils"; import { delay } from "../../utils/delayUtils"; import { Waypoint } from "../../utils/renderJavaUtils"; import { calculateDistanceQuick } from "../../utils/utils"; diff --git a/src/features/globalSettings/index.js b/src/features/globalSettings/index.js index b135337..91d9583 100644 --- a/src/features/globalSettings/index.js +++ b/src/features/globalSettings/index.js @@ -12,7 +12,6 @@ import Notification from "../../../guimanager/Notification"; import logger from "../../logger"; import { numberWithCommas } from "../../utils/numberUtils"; import { firstLetterCapital } from "../../utils/stringUtils"; -import { fetch } from "../../utils/networkUtils"; import socketConnection from "../../socketConnection"; import renderLibs from "../../../guimanager/renderLibs"; import { f, m } from "../../../mappings/mappings"; diff --git a/src/features/guild/index.js b/src/features/guild/index.js index 27b143b..d7897c3 100644 --- a/src/features/guild/index.js +++ b/src/features/guild/index.js @@ -2,7 +2,6 @@ /// <reference lib="es2015" /> import Feature from "../../featureClass/class"; import { toMessageWithLinks } from "../../utils/utils"; -import { fetch } from "../../utils/networkUtils"; import ToggleSetting from "../settings/settingThings/toggle"; import TextSetting from "../settings/settingThings/textSetting"; diff --git a/src/features/mining/index.js b/src/features/mining/index.js index 0e9c7c0..8060d19 100644 --- a/src/features/mining/index.js +++ b/src/features/mining/index.js @@ -8,7 +8,6 @@ import HudTextElement from "../hud/HudTextElement"; import LocationSetting from "../settings/settingThings/location"; import ToggleSetting from "../settings/settingThings/toggle"; import { numberWithCommas, timeSince2 } from "../../utils/numberUtils"; -import { fetch } from "../../utils/networkUtils"; import socketConnection from "../../socketConnection"; import { drawCoolWaypoint } from "../../utils/renderUtils"; diff --git a/src/features/networthGUI/index.js b/src/features/networthGUI/index.js index b1ff5c2..3a887a3 100644 --- a/src/features/networthGUI/index.js +++ b/src/features/networthGUI/index.js @@ -14,7 +14,6 @@ import SoopyBoxElement from "../../../guimanager/GuiElement/SoopyBoxElement"; import SoopyMarkdownElement from "../../../guimanager/GuiElement/SoopyMarkdownElement"; import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseClickEvent"; import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; -import { fetch } from "../../utils/networkUtils"; import Dropdown from "../../../guimanager/GuiElement/Dropdown"; import SoopyContentChangeEvent from "../../../guimanager/EventListener/SoopyContentChangeEvent"; diff --git a/src/features/senitherGui/index.js b/src/features/senitherGui/index.js index a3e005c..b826589 100644 --- a/src/features/senitherGui/index.js +++ b/src/features/senitherGui/index.js @@ -17,7 +17,6 @@ import Dropdown from "../../../guimanager/GuiElement/Dropdown"; import SoopyMarkdownElement from "../../../guimanager/GuiElement/SoopyMarkdownElement" import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; import SoopyRenderUpdateEvent from "../../../guimanager/EventListener/SoopyRenderUpdateEvent"; -import { fetch } from "../../utils/networkUtils"; class SenitherGui extends Feature { constructor() { diff --git a/src/features/settings/helpDataLoader.js b/src/features/settings/helpDataLoader.js index 21ca241..fc6afaf 100644 --- a/src/features/settings/helpDataLoader.js +++ b/src/features/settings/helpDataLoader.js @@ -1,5 +1,3 @@ -import { fetch } from "../../utils/networkUtils"; - class HelpDataLoader { constructor() { this.availableHelpData = {} diff --git a/src/features/spamHider/index.js b/src/features/spamHider/index.js index 697e571..c0f14d2 100644 --- a/src/features/spamHider/index.js +++ b/src/features/spamHider/index.js @@ -3,7 +3,6 @@ import SoopyContentChangeEvent from "../../../guimanager/EventListener/SoopyContentChangeEvent"; import Feature from "../../featureClass/class"; import soopyV2Server from "../../socketConnection"; -import { fetch } from "../../utils/networkUtils"; import ToggleSetting from "../settings/settingThings/toggle"; class SpamHider extends Feature { diff --git a/src/features/statHistoryGui/index.js b/src/features/statHistoryGui/index.js index 0390772..dd620b9 100644 --- a/src/features/statHistoryGui/index.js +++ b/src/features/statHistoryGui/index.js @@ -11,7 +11,6 @@ import SoopyKeyPressEvent from "../../../guimanager/EventListener/SoopyKeyPressE import { firstLetterWordCapital } from "../../utils/stringUtils"; import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseClickEvent"; import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; -import { fetch } from "../../utils/networkUtils"; import SoopyImageElement from "../../../guimanager/GuiElement/SoopyImageElement"; import renderLibs from "../../../guimanager/renderLibs"; import SoopyBoxElement from "../../../guimanager/GuiElement/SoopyBoxElement"; diff --git a/src/features/stat_next_to_name/index.js b/src/features/stat_next_to_name/index.js index 063a67b..2045db5 100644 --- a/src/features/stat_next_to_name/index.js +++ b/src/features/stat_next_to_name/index.js @@ -5,7 +5,6 @@ import soopyV2Server from "../../socketConnection"; import SettingBase from "../settings/settingThings/settingBase"; import * as numberUtils from "../../utils/numberUtils"; import DropdownSetting from "../settings/settingThings/dropdownSetting"; -import { fetch } from "../../utils/networkUtils" import ToggleSetting from "../settings/settingThings/toggle"; class StatNextToName extends Feature { diff --git a/src/features/streamsGUI/index.js b/src/features/streamsGUI/index.js index e47bbc3..25cda23 100644 --- a/src/features/streamsGUI/index.js +++ b/src/features/streamsGUI/index.js @@ -10,7 +10,6 @@ import SoopyGuiElement from "../../../guimanager/GuiElement/SoopyGuiElement"; import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseClickEvent"; import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; import BoxWithText from "../../../guimanager/GuiElement/BoxWithText"; -import { fetch } from "../../utils/networkUtils"; class StreamsGui extends Feature { constructor() { diff --git a/src/features/suggestionsGui/index.js b/src/features/suggestionsGui/index.js index 4a31b11..04630ca 100644 --- a/src/features/suggestionsGui/index.js +++ b/src/features/suggestionsGui/index.js @@ -16,7 +16,6 @@ import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseCl import ButtonWithArrow from "../../../guimanager/GuiElement/ButtonWithArrow"; import Dropdown from "../../../guimanager/GuiElement/Dropdown"; import SoopyContentChangeEvent from "../../../guimanager/EventListener/SoopyContentChangeEvent"; -import { fetch } from "../../utils/networkUtils"; let allowed = new Set(["dc8c39647b294e03ae9ed13ebd65dd29", "83c5626ede2d4754b86064d558809615"]) diff --git a/src/features/waypoints/index.js b/src/features/waypoints/index.js index 10c45d0..9d98ef2 100644 --- a/src/features/waypoints/index.js +++ b/src/features/waypoints/index.js @@ -192,7 +192,6 @@ class Waypoints extends Feature { if (!this.orderedWaypoints.get(this.currentOrderedWaypointIndex)) { this.currentOrderedWaypointIndex = 0 } - ChatLib.chat(this.currentOrderedWaypointIndex) return } if (distanceTo1 < 5) { @@ -203,7 +202,6 @@ class Waypoints extends Feature { if (!this.orderedWaypoints.get(this.currentOrderedWaypointIndex)) { this.currentOrderedWaypointIndex = 0 } - ChatLib.chat(this.currentOrderedWaypointIndex) } }) |