aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--features/betterGuis/index.js2
-rw-r--r--features/dungeonSolvers/index.js7
-rw-r--r--features/improvements/index.js39
-rw-r--r--features/improvements/metadata.json8
-rw-r--r--features/mining/index.js14
-rw-r--r--features/slayers/index.js2
-rw-r--r--features/statHistoryGui/index.js8
-rw-r--r--features/stat_next_to_name/index.js5
-rw-r--r--utils/delayUtils.js2
9 files changed, 30 insertions, 57 deletions
diff --git a/features/betterGuis/index.js b/features/betterGuis/index.js
index 2d188bf..e91d856 100644
--- a/features/betterGuis/index.js
+++ b/features/betterGuis/index.js
@@ -26,7 +26,7 @@ class BetterGuis extends Feature {
this.museumGuiEnabled = new ToggleSetting("Custom Museum GUI", "Custom gui for the Museum", true, "custom_museum_enabled", this)
this.dungeonReadyGuiEnabled = new ToggleSetting("Custom Dungeon Ready GUI", "Custom gui for the dungeon ready up menu", false, "custom_dungeon_ready_enabled", this)
- this.chestSearchBar = new ToggleSetting("Inventory Search Bar", "u can use '&' to make it filter buy stuff that contains multiple things", false, "inv_search", this)
+ this.chestSearchBar = new ToggleSetting("Inventory Search Bar", "use '&' to make it filter by stuff that contains multiple things", false, "inv_search", this)
this.lastWindowId = 0
this.shouldHold = 10
diff --git a/features/dungeonSolvers/index.js b/features/dungeonSolvers/index.js
index 898dbda..787f5fa 100644
--- a/features/dungeonSolvers/index.js
+++ b/features/dungeonSolvers/index.js
@@ -8,6 +8,7 @@ import HudTextElement from "../hud/HudTextElement";
import LocationSetting from "../settings/settingThings/location";
import ToggleSetting from "../settings/settingThings/toggle";
import { fetch } from "../../utils/networkUtils";
+import { delay } from "../../utils/delayUtils";
import { Waypoint } from "../../utils/renderJavaUtils";
const EntityBlaze = Java.type("net.minecraft.entity.monster.EntityBlaze");
@@ -185,8 +186,10 @@ class DungeonSolvers extends Feature {
this.goneInBonus = true;
});
this.registerChat("[BOSS] The Watcher: You have proven yourself. You may pass.", () => {
- this.bloodOpenedBonus = false; //TODO: add 5second delay
- this.goneInBonus = true;
+ delay(5000,()=>{
+ this.bloodOpenedBonus = false;
+ this.goneInBonus = true;
+ })
});
let enteredBossMessages = ["&r&4[BOSS] Maxor&r&c: &r&cWELL WELL WELL LOOK WHO’S HERE!&r", "&r&c[BOSS] Livid&r&f: Welcome, you arrive right on time. I am Livid, the Master of Shadows.&r", "&r&c[BOSS] Thorn&r&f: Welcome Adventurers! I am Thorn, the Spirit! And host of the Vegan Trials!&r", "&r&c[BOSS] The Professor&r&f: I was burdened with terrible news recently...&r", "&r&c[BOSS] Scarf&r&f: This is where the journey ends for you, Adventurers.&r", "&r&c[BOSS] Bonzo&r&f: Gratz for making it this far, but I’m basically unbeatable.&r", "&r&c[BOSS] Sadan&r&f: So you made it all the way &r&fhere...and&r&f you wish to defy me? Sadan?!&r"]
enteredBossMessages.forEach(msg => {
diff --git a/features/improvements/index.js b/features/improvements/index.js
deleted file mode 100644
index fa573af..0000000
--- a/features/improvements/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/// <reference types="../../../CTAutocomplete" />
-/// <reference lib="es2015" />
-import Feature from "../../featureClass/class";
-import ToggleSetting from "../settings/settingThings/toggle";
-
-class Improvements extends Feature {
- constructor() {
- super()
- }
-
- onEnable(){
- this.initVariables()
-
- this.betterLineBreaks = new ToggleSetting("Better line breaks", "Changes all dashed lines (-------) in chat into solid lines", true, "better_line_breaks", this)
-
- this.registerChat("${color}-----------------------------------------------------&r", (color, event)=>{
- if(this.betterLineBreaks.getValue()){
- if(color.length > 6) return
- cancel(event)
- ChatLib.chat(color + "&m" + ChatLib.getChatBreak(" ") + "&r");
- }
- }).trigger.triggerIfCanceled(false)
- this.registerCommand("dung", (...args)=>{
- ChatLib.command("warp dungeon_hub")
- })
- }
-
- initVariables(){
- this.betterLineBreaks = undefined
- }
-
- onDisable(){
- this.initVariables()
- }
-}
-
-module.exports = {
- class: new Improvements()
-} \ No newline at end of file
diff --git a/features/improvements/metadata.json b/features/improvements/metadata.json
deleted file mode 100644
index 4e147f6..0000000
--- a/features/improvements/metadata.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "Improvements",
- "description": "A bunch of random features that improve aspects of the game",
- "isHidden": false,
- "isTogglable": true,
- "defaultEnabled": true,
- "sortA": 1
-} \ No newline at end of file
diff --git a/features/mining/index.js b/features/mining/index.js
index 3536501..98f045c 100644
--- a/features/mining/index.js
+++ b/features/mining/index.js
@@ -56,7 +56,7 @@ class Mining extends Feature {
.setLocationSetting(new LocationSetting("HUD Location", "Allows you to edit the location of the gemstone $/h", "gemstone_money_location", this, [10, 60, 1, 1])
.requires(this.gemstoneMoneyHud)
.editTempText("&6$/h&7> &f$12,345,678\n&6$ made&7> &f$123,456,789\n&6Time tracked&7> &f123m"))
- this.gemstoneMoneyHudMoneyOnly = new ToggleSetting("Force npc price", "(Eg if u are ironman)", true, "gemstone_money_hud_npc", this).requires(this.gemstoneMoneyHud)
+ this.gemstoneMoneyHudMoneyOnly = new ToggleSetting("Force npc price", "(Eg if u are ironman)", false, "gemstone_money_hud_npc", this).requires(this.gemstoneMoneyHud)
this.hudElements.push(this.gemstoneMoneyHudElement)
this.nextChEvent = new ToggleSetting("Show the current and next crystal hollows event", "(syncs the data between all users in ch)", true, "chevent_hud", this)
@@ -187,6 +187,18 @@ class Mining extends Feature {
let ignoreLocation = undefined
+ this.registerEvent("worldLoad", () => {
+ lastLoc = [0, 0, 0]
+
+ this.baseCoordinates = undefined
+
+ this.lastSearchedForBase = 0
+
+ this.predictedChestLocations = []
+
+ ignoreLocation = undefined
+ })
+
let registerActionBar = this.registerCustom("actionbar", (dist) => {
let lapis = false
diff --git a/features/slayers/index.js b/features/slayers/index.js
index ee29c92..8961c41 100644
--- a/features/slayers/index.js
+++ b/features/slayers/index.js
@@ -39,7 +39,7 @@ class Slayers extends Feature {
.setLocationSetting(new LocationSetting("Slayer Xp Location", "Allows you to edit the location of you current slayer xp", "slayer_xp_location", this, [10, 50, 1, 1]).requires(this.slayerXpGuiElement).editTempText("&6Enderman&7> &d&l2,147,483,647 XP").contributor("EmeraldMerchant"));
this.hudElements.push(this.slayerXpElement);
- this.betterHideDeadEntity = new ToggleSetting("Also hides mob nametag when it's dead.", "An improvement for Patcher's hide dead entity", false, "hide_dead_mob_nametag", this);
+ this.betterHideDeadEntity = new ToggleSetting("Also hides mob nametag when it's dead.", "An improvement for Skytils's hide dead entity", false, "hide_dead_mob_nametag", this);
this.rcmDaeAxeSupport = new ToggleSetting("Eman Hyp hits before Dae axe swapping", "This will tell u how many clicks with hyp is needed before swapping to dae axe", true, "eman_rcm_support", this).requires(this.emanHpGuiElement).contributor("EmeraldMerchant");
this.rcmDamagePerHit = new TextSetting("Hyperion damage", "Your hyp's single hit damage w/o thunderlord/thunderbolt", "", "hyp_dmg", this, "Your hyp dmg (Unit: M)", false).requires(this.rcmDaeAxeSupport).contributor("EmeraldMerchant");
diff --git a/features/statHistoryGui/index.js b/features/statHistoryGui/index.js
index bd9998b..5fe8356 100644
--- a/features/statHistoryGui/index.js
+++ b/features/statHistoryGui/index.js
@@ -101,22 +101,24 @@ class StatGraphPage extends GuiPage {
this.errorElm.setDesc("§0" + playerData.error.description)
return
}
+ this.statArea.clearChildren()
+ let nameElm = new SoopyTextElement().setText(playerData.data.stats.nameWithPrefix.replace(/§f/g, "§7")).setMaxTextScale(2).setLocation(0.1, 0.05, 0.8, 0.1)
+ this.statArea.addChild(nameElm)
+ this.statArea.addChild(this.loadingElm)
fetch("http://soopymc.my.to/api/v2/player_skyblock/" + playerData.data.uuid).json(skyblockData => {
if (player !== this.playerLoad) return
- this.statArea.clearChildren()
if (!skyblockData.success) {
+ this.statArea.clearChildren()
this.statArea.addChild(this.errorElm)
this.errorElm.setText("§0" + skyblockData.error.name)
this.errorElm.setDesc("§0" + skyblockData.error.description)
return
}
- let nameElm = new SoopyTextElement().setText(playerData.data.stats.nameWithPrefix.replace(/§f/g, "§7")).setMaxTextScale(2).setLocation(0.1, 0.05, 0.8, 0.1)
- this.statArea.addChild(nameElm)
fetch("http://soopymc.my.to/statgraphgenerations/" + playerData.data.uuid + "/" + skyblockData.data.stats.bestProfileId).json(graphData => {
if (player !== this.playerLoad) return
diff --git a/features/stat_next_to_name/index.js b/features/stat_next_to_name/index.js
index 372103b..d72f988 100644
--- a/features/stat_next_to_name/index.js
+++ b/features/stat_next_to_name/index.js
@@ -19,7 +19,8 @@ class StatNextToName extends Feature {
"skillAvg": "Skill Average",
"totalSlayer": "Total Slayer Exp",
"networth": "Networth",
- "classAverage": "Class Average"
+ "classAverage": "Class Average",
+ "bestiary": "Bestiary"
})
this.decimals = {
@@ -28,6 +29,7 @@ class StatNextToName extends Feature {
"skillAvg": 2,
"totalSlayer": 0,
"classAverage": 2,
+ "bestiary": 1,
"networth": "small"
}
@@ -135,6 +137,7 @@ class StatNextToName extends Feature {
}
playerStatsLoaded(stats) {
+ stats.bestiary /= 10
this.userStats[stats.uuid] = stats
}
diff --git a/utils/delayUtils.js b/utils/delayUtils.js
index 4c66d0f..6604203 100644
--- a/utils/delayUtils.js
+++ b/utils/delayUtils.js
@@ -22,7 +22,7 @@ if (!global.delayThingSoopy) {
})
global.delayThingSoopy = {
- delay
+ delay: delay
}
}
generated by cgit (git 2.46.0) at 2024-11-23 20:28:42 +0000