diff options
| author | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-07-14 18:17:53 +0800 |
|---|---|---|
| committer | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-07-14 18:17:53 +0800 |
| commit | 9ffe3b2c22e30974087d4812bc757155f09d6e57 (patch) | |
| tree | 3af726747089775e4f6da2b2f0b1d9f8b612d8aa | |
| parent | 598dadc9efadf69401f08d27e5b0ff1b36a0f2bc (diff) | |
| download | SoopyV2-9ffe3b2c22e30974087d4812bc757155f09d6e57.tar.gz SoopyV2-9ffe3b2c22e30974087d4812bc757155f09d6e57.tar.bz2 SoopyV2-9ffe3b2c22e30974087d4812bc757155f09d6e57.zip | |
+ Update website url
| -rw-r--r-- | featureClass/featureManager.js | 4 | ||||
| -rw-r--r-- | features/changeLogGUI/index.js | 8 | ||||
| -rw-r--r-- | features/cosmetics/cosmetic/dragon/dragonWings.js | 2 | ||||
| -rw-r--r-- | features/cosmetics/index.js | 2 | ||||
| -rw-r--r-- | features/dataLoader/index.js | 4 | ||||
| -rw-r--r-- | features/dungeonMap/index.js | 6 | ||||
| -rw-r--r-- | features/dungeonRoutes/index.js | 71 | ||||
| -rw-r--r-- | features/dungeonRoutes/routesData.json | 1299 | ||||
| -rw-r--r-- | features/dungeonSolvers/index.js | 2 | ||||
| -rw-r--r-- | features/globalSettings/index.js | 14 | ||||
| -rw-r--r-- | features/networthGUI/index.js | 12 | ||||
| -rw-r--r-- | features/settings/helpDataLoader.js | 22 | ||||
| -rw-r--r-- | features/spamHider/index.js | 2 | ||||
| -rw-r--r-- | features/statHistoryGui/index.js | 8 | ||||
| -rw-r--r-- | features/streamsGUI/index.js | 4 | ||||
| -rw-r--r-- | features/suggestionsGui/index.js | 14 | ||||
| -rw-r--r-- | metadata.json | 4 | ||||
| -rw-r--r-- | utils/networkUtils.js | 2 | ||||
| -rw-r--r-- | utils/renderJavaUtils.js | 10 |
19 files changed, 1221 insertions, 269 deletions
diff --git a/featureClass/featureManager.js b/featureClass/featureManager.js index 0f0edeb..f39d762 100644 --- a/featureClass/featureManager.js +++ b/featureClass/featureManager.js @@ -82,7 +82,7 @@ class FeatureManager { this.featureSettingsData = {} - let fetchD = fetch("http://soopymc.my.to/api/soopyv2/ping").async(d => { + let fetchD = fetch("http://soopy.dev/api/soopyv2/ping").async(d => { if (fetchD.responseCode() >= 400 || fetchD.responseCode() === -1) { ChatLib.chat(this.messagePrefix + "&cError: Could not connect to Soopy's server. This may cause issues with some features but will (hopefully) be back soon.") } @@ -238,7 +238,7 @@ class FeatureManager { } reportLagData(data) { - return fetch("http://soopymc.my.to/soopy/submitlag", { postData: data }).text() + return fetch("http://soopy.dev/soopy/submitlag", { postData: data }).text() } loadSoopyLag() { diff --git a/features/changeLogGUI/index.js b/features/changeLogGUI/index.js index d370b50..4d392bd 100644 --- a/features/changeLogGUI/index.js +++ b/features/changeLogGUI/index.js @@ -24,7 +24,7 @@ class ChangeLogGui extends Feature { onEnable() { this.initVariables() - + this.ChangelogPage = new ChangelogPage() this.latestAnnouncedVersion = this.ChangelogPage.currVersionId @@ -137,7 +137,7 @@ class ChangelogPage extends GuiPage { } loadChangeLog() { - fetch("http://soopymc.my.to/api/soopyv2/changelog.json").json(data => { + fetch("http://soopy.dev/api/soopyv2/changelog.json").json(data => { this.changelogData = data.changelog.reverse() @@ -168,7 +168,7 @@ class ChangelogPage extends GuiPage { this.openSidebarPage(this.updatingSidebar) } - + downloadUpdate() { new Thread(() => { this.updatingSidebarConfirmPage.location.location.x.set(-1, 500) @@ -178,7 +178,7 @@ class ChangelogPage extends GuiPage { this.progressBar.setProgress(0.1) - this.urlToFile("http://soopymc.my.to/api/soopyv2/downloadLatest.zip", "./config/ChatTriggers/modules/SoopyAddonsTempDownload/SoopyAddons.zip", 10000, 20000) + this.urlToFile("http://soopy.dev/api/soopyv2/downloadLatest.zip", "./config/ChatTriggers/modules/SoopyAddonsTempDownload/SoopyAddons.zip", 10000, 20000) this.progressBar.setProgress(0.5) diff --git a/features/cosmetics/cosmetic/dragon/dragonWings.js b/features/cosmetics/cosmetic/dragon/dragonWings.js index fc447d3..a309e58 100644 --- a/features/cosmetics/cosmetic/dragon/dragonWings.js +++ b/features/cosmetics/cosmetic/dragon/dragonWings.js @@ -19,7 +19,7 @@ let loadingTextures = new Set() function loadTexture(id) { new Thread(() => { loadingTextures.add(id) - textures.set(id, renderLibs.getImage("http://soopymc.my.to/api/soopyv2/textures/cosmetic/dragon/" + id + "/img.png", true)) + textures.set(id, renderLibs.getImage("http://soopy.dev/api/soopyv2/textures/cosmetic/dragon/" + id + "/img.png", true)) }).start() } loadTexture("classic") diff --git a/features/cosmetics/index.js b/features/cosmetics/index.js index 6c832ef..dcac5e9 100644 --- a/features/cosmetics/index.js +++ b/features/cosmetics/index.js @@ -84,7 +84,7 @@ class Cosmetics extends Feature { } loadCosmeticsData() { - fetch("http://soopymc.my.to/api/soopyv2/cosmetics.json").json(data => { + fetch("http://soopy.dev/api/soopyv2/cosmetics.json").json(data => { this.cosmeticsData = data this.playerHasACosmeticA = !!data[Player.getUUID().toString().replace(/-/g, "")] if (this.playerHasACosmeticA && !this.postRenderEntityTrigger) { diff --git a/features/dataLoader/index.js b/features/dataLoader/index.js index d31bd86..d4134d2 100644 --- a/features/dataLoader/index.js +++ b/features/dataLoader/index.js @@ -94,7 +94,7 @@ class DataLoader extends Feature { } step_5min() { - fetch("http://soopymc.my.to/api/v2/mayor").json(data => { + fetch("http://soopy.dev/api/v2/mayor").json(data => { if (!data.success) return this.mayorData = data.data this.currentMayorPerks = new Set(data.data.mayor.perks.map(a => a.name)) @@ -111,7 +111,7 @@ class DataLoader extends Feature { this.loadApiData("skyblock", false) } loadApi() { - fetch("http://soopymc.my.to/api/v2/player_skyblock/" + Player.getUUID().replace(/-/g, "")).json(data => { + fetch("http://soopy.dev/api/v2/player_skyblock/" + Player.getUUID().replace(/-/g, "")).json(data => { if (!data.success) return diff --git a/features/dungeonMap/index.js b/features/dungeonMap/index.js index 68adf7e..1da7c3f 100644 --- a/features/dungeonMap/index.js +++ b/features/dungeonMap/index.js @@ -869,13 +869,13 @@ class DungeonMap extends Feature { isGreen = true } } - console.log(ent[1], isGreen) + // console.log(ent[1], isGreen) if (isGreen) { let total = ent[1].split(" ")[1] ent[1] = "&a" + total + " " + total - console.log(ent[1]) + // console.log(ent[1]) } - console.log(ent[1], isGreen) + // console.log(ent[1], isGreen) } } // if (!this.renderImage) return diff --git a/features/dungeonRoutes/index.js b/features/dungeonRoutes/index.js index a7d8691..3eb50c3 100644 --- a/features/dungeonRoutes/index.js +++ b/features/dungeonRoutes/index.js @@ -3,6 +3,7 @@ import { m } from "../../../mappings/mappings"; import Feature from "../../featureClass/class"; import { drawBoxAtBlock, drawBoxAtBlock2, drawFilledBox, drawLine, drawLinePoints } from "../../utils/renderUtils"; +import { calculateDistanceQuick } from "../../utils/utils"; import SettingBase from "../settings/settingThings/settingBase"; const EntityItem = Java.type("net.minecraft.entity.item.EntityItem") @@ -70,7 +71,8 @@ class DungeonRoutes extends Feature { this.recordingData[this.recordingData.length - 1].tnts.forEach((loc) => { drawFilledBox(loc[0], loc[1] - 0.5, loc[2], 1, 1, 1, 0, 0, 50 / 255, true) }) - this.recordingData[this.recordingData.length - 1].interacts.forEach(({ loc }) => { + this.recordingData[this.recordingData.length - 1].interacts.forEach((data) => { + let loc = data.loc drawFilledBox(loc[0], loc[1], loc[2], 1, 1, 0, 0, 1, 50 / 255, true) drawBoxAtBlock(loc[0] - 0.5, loc[1], loc[2] - 0.5, 0, 0, 1, 1, 1, 1) }) @@ -79,7 +81,6 @@ class DungeonRoutes extends Feature { } if (this.currRoomData) { - drawBoxAtBlock(...this.toRoomCoordinates(0, 70, 0), 1, 0, 0, 1, 1, 1) if (this.currentRouteDisplay) { this.currentRouteDisplay[this.currentActionIndex].etherwarps.forEach(loc => { let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) @@ -87,17 +88,17 @@ class DungeonRoutes extends Feature { drawBoxAtBlock(coords[0] - 0.5, coords[1], coords[2] - 0.5, 1, 0, 0, 1, 1, 1) }) this.currentRouteDisplay[this.currentActionIndex].mines.forEach(loc => { - let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) - drawFilledBox(coords[0], coords[1] + 0.5, coords[2], 1, 1, 0, 255, 0, 50 / 255, true) + let coords = this.toRoomCoordinates(loc[0], loc[1] - 0.5, loc[2]) + drawBoxAtBlock(coords[0] - 0.5, coords[1], coords[2] - 0.5, 1, 1, 0, 1, 1, 50 / 255) }) this.currentRouteDisplay[this.currentActionIndex].tnts.forEach(loc => { let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) - drawFilledBox(coords[0], coords[1] + 0.5, coords[2] + 0.5, 1, 1, 255, 0, 0, 50 / 255, true) + drawBoxAtBlock(coords[0] - 0.5, coords[1] + 0.5, coords[2] - 0.5, 1, 1, 255, 1, 1, 50 / 255) }) this.currentRouteDisplay[this.currentActionIndex].interacts.forEach((data) => { let coords = this.toRoomCoordinates(data.loc[0], data.loc[1], data.loc[2]) drawFilledBox(coords[0], coords[1], coords[2], 1, 1, 0, 0, 1, 50 / 255, true) - drawBoxAtBlock(coords[0], coords[1], coords[2], 0, 0, 1, 1, 1, 1) + drawBoxAtBlock(coords[0] - 0.5, coords[1], coords[2] - 0.5, 0, 0, 1, 1, 1, 1) }) // if (this.currentRouteDisplay.locations.length >= 2) drawLinePoints(this.currentRouteDisplay.locations.map(a => this.toRoomCoordinates(...a)).map(a => [a[0] - 0.5, a[1] + 0.1, a[2] - 0.5]), 0, 0, 255, 2, false) @@ -144,14 +145,14 @@ class DungeonRoutes extends Feature { let data = { index: this.fullRoomData[this.idMap.get(this.lastRoomId)].index, data: this.recordingData.map(a => { - a.etherwarps = a.etherwarps.map(a => this.fromRoomCoordinates(a[0] + 0.5, a[1], a[2] + 0.5)) - a.mines = a.mines.map(a => this.fromRoomCoordinates(a[0] + 0.5, a[1], a[2] + 0.5)) + a.etherwarps = a.etherwarps.map(a => this.fromRoomCoordinates(a[0], a[1], a[2])) + a.mines = a.mines.map(a => this.fromRoomCoordinates(a[0], a[1], a[2])) a.locations = a.locations.map(a => this.fromRoomCoordinates(...a)) a.interacts = a.interacts.map(b => { - b.pos = this.fromRoomCoordinates(...b.pos) + b.loc = this.fromRoomCoordinates(...b.loc) return b }) - a.tnts = a.tnts.map(a => this.fromRoomCoordinates(a[0] + 0.5, a[1], a[2] + 0.5)) + a.tnts = a.tnts.map(a => this.fromRoomCoordinates(a[0], a[1], a[2])) return a }) @@ -172,24 +173,6 @@ class DungeonRoutes extends Feature { this.registerStep(true, 5, () => { if (this.currRoomData) { if (this.currentRouteDisplay) { - // this.currentRouteDisplay.etherwarps.forEach(loc => { - // let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) - // drawFilledBox(coords[0] + 0.5, coords[1], coords[2] + 0.5, 1, 1, 1, 0, 0, 50 / 255, true) - // drawBoxAtBlock(coords[0], coords[1], coords[2], 1, 0, 0, 1, 1, 1) - // }) - // this.currentRouteDisplay.mines.forEach(loc => { - // let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) - // drawFilledBox(coords[0] + 0.5, coords[1] + 0.5, coords[2] + 0.5, 1, 1, 0, 255, 0, 50 / 255, true) - // }) - // this.currentRouteDisplay.tnts.forEach(loc => { - // let coords = this.toRoomCoordinates(loc[0], loc[1] - 1, loc[2]) - // drawFilledBox(coords[0] + 0.5, coords[1] + 0.5, coords[2] + 0.5, 1, 1, 255, 0, 0, 50 / 255, true) - // }) - // this.currentRouteDisplay.interacts.forEach(loc => { - // let coords = this.toRoomCoordinates(loc[0], loc[1], loc[2]) - // drawFilledBox(coords[0] + 0.5, coords[1], coords[2] + 0.5, 1, 1, 0, 0, 1, 50 / 255, true) - // drawBoxAtBlock(coords[0], coords[1], coords[2], 0, 0, 1, 1, 1, 1) - // }) if (this.currentRouteDisplay[this.currentActionIndex].locations.length >= 2) this.drawLineMultipleParticles(this.currentRouteDisplay[this.currentActionIndex].locations.map(a => this.toRoomCoordinates(a[0], a[1], a[2]))) @@ -202,7 +185,7 @@ class DungeonRoutes extends Feature { if (type) { this.recordingData[this.recordingData.length - 1][type].push(point) } - if (!type || type === "interact") { + if (!type || type === "interacts") { this.recordingData.push({ etherwarps: [], mines: [], @@ -411,7 +394,7 @@ class DungeonRoutes extends Feature { if (event.entity instanceof EntityItem) { // console.log("Blaze joined world") let e = new Entity(event.entity) - let pos = { x: e.getX(), y: e.getY(), z: e.getZ() } + let pos = [e.getX(), e.getY(), e.getZ()] this.tempItemIdLocs.set(event.entity[m.getEntityId.Entity](), pos) // console.log(event.entity[m.getEntityId.Entity]()) @@ -419,24 +402,46 @@ class DungeonRoutes extends Feature { } pickupItem(packet) { - if (!this.recordRoute) return let packetType = new String(packet.class.getSimpleName()).valueOf() if (packetType === "S0DPacketCollectItem") { let pos = this.tempItemIdLocs.get(packet[m.getCollectedItemEntityID]()) + let data = this.currentRouteDisplay[this.currentActionIndex].interacts[0] + if (data && data.type === "item") { + let coords = this.toRoomCoordinates(data.loc[0], data.loc[1], data.loc[2]) + if (calculateDistanceQuick(pos, coords) < 2) { + if (this.currentRouteDisplay.length >= this.currentActionIndex) { + this.currentActionIndex++ + } + } + } + + if (!this.recordRoute) return if (pos) this.addRecordingPoint("interacts", { loc: pos, type: "item" }) } } playerInteract(action, position, event) { - if (!this.recordRoute) return if (action.toString() !== "RIGHT_CLICK_BLOCK") return - let pos = { x: Player.lookingAt().getX() + 0.5, y: Player.lookingAt().getY(), z: Player.lookingAt().getZ() + 0.5 } + let pos = [Player.lookingAt().getX() + 0.5, Player.lookingAt().getY(), Player.lookingAt().getZ() + 0.5] let id = Player.lookingAt().getType().getID() if (id !== 54 && id !== 144 && id !== 69) return + + let data = this.currentRouteDisplay[this.currentActionIndex].interacts[0] + if (data && data.type === "interact") { + let coords = this.toRoomCoordinates(data.loc[0], data.loc[1], data.loc[2]) + console.log(coords.join(","), pos.join(",")) + if (coords.join(",") === pos.join(",")) { + if (this.currentRouteDisplay.length > this.currentActionIndex) { + this.currentActionIndex++ + } + } + } + + if (!this.recordRoute) return this.addRecordingPoint("interacts", { loc: pos, type: "interact" }) } diff --git a/features/dungeonRoutes/routesData.json b/features/dungeonRoutes/routesData.json index ed64acf..d701fc7 100644 --- a/features/dungeonRoutes/routesData.json +++ b/features/dungeonRoutes/routesData.json @@ -1,350 +1,1293 @@ [ { - "index": 86, + "index": 84, "data": [ { "etherwarps": [ [ - 10.5, - 82, - -20.5 + 23.5, + 83, + 12.5 + ] + ], + "mines": [], + "locations": [ + [ + -4, + 68, + 16 ], [ - 8.5, - 82, - 19.5 + 23, + 83, + 13 ], [ - 12.5, - 93, - 21.5 + 24, + 84, + 13 + ], + [ + 24, + 85, + 13 + ], + [ + 25, + 85, + 13 + ], + [ + 25, + 84, + 12 + ], + [ + 25, + 84, + 11 + ], + [ + 26, + 84, + 11 + ], + [ + 27, + 84, + 9 + ], + [ + 26, + 84, + 6 + ], + [ + 23, + 84, + 5 + ], + [ + 19, + 84, + 5 + ], + [ + 19, + 85, + 5 + ] + ], + "interacts": [ + { + "loc": [ + 17.5, + 84, + 5.5 + ], + "type": "interact" + } + ], + "tnts": [] + }, + { + "etherwarps": [ + [ + -1.5, + 85, + 23.5 ] ], "mines": [ [ - 4.5, - 82.5, - -19.5 + -2.5, + 84.5, + 23.5 ] ], "locations": [ [ - 18, - 69, - -25 + 19, + 85, + 5 ], [ - 16, - 69, - -24 + 21, + 85, + 5 ], [ - 15, - 69, - -24 + 22, + 84, + 5 ], [ - 14, - 69, - -24 + 25, + 84, + 7 ], [ - 14, - 67, - -24 + 26, + 84, + 10 ], [ - 14, - 64, - -24 + 25, + 84, + 13 ], [ - 14, - 61, - -24 + 24, + 85, + 13 ], [ - 11, - 82, - -20 + 24, + 84, + 14 ], [ - 10, - 82, - -20 + 23, + 83, + 14 ], [ - 9, - 82, - -20 + -2, + 85, + 24 ], [ - 8, - 82, - -19 + -2, + 84, + 24 ], [ - 7, - 82, - -19 + -3, + 84, + 24 ], [ - 6, - 82, - -19 + -6, + 84, + 24 ], [ - 6, + -8, 83, - -19 + 24 ], [ - 5, + -8, + 81, + 24 + ], + [ + -8, + 84, + 24 + ], + [ + -11, + 83, + 24 + ], + [ + -15, + 83, + 24 + ], + [ + -18, + 83, + 24 + ], + [ + -21, + 83, + 25 + ] + ], + "interacts": [ + { + "loc": [ + -21.5, + 83, + 25.5 + ], + "type": "interact" + } + ], + "tnts": [] + }, + { + "etherwarps": [ + [ + -18.5, + 91, + 24.5 + ], + [ + -9.5, + 83, + 2.5 + ] + ], + "mines": [], + "locations": [ + [ + -21, + 83, + 25 + ], + [ + -19, + 92, + 25 + ], + [ + -19, + 91, + 25 + ], + [ + -17, + 91, + 22 + ], + [ + -17, + 91, + 21 + ], + [ + -15, + 91, + 18 + ], + [ + -16, + 91, + 21 + ], + [ + -16, + 91, + 19 + ], + [ + -15, + 90, + 17 + ], + [ + -15, + 88, + 16 + ], + [ + -14, + 86, + 13 + ], + [ + -15, + 86, + 10 + ], + [ + -15, + 84, + 8 + ], + [ + -15, + 83, + 6 + ], + [ + -16, + 83, + 4 + ], + [ + -10, + 84, + 3 + ], + [ + -10, + 83, + 3 + ], + [ + -8, + 83, + 3 + ] + ], + "interacts": [ + { + "loc": [ + -4.5, + 84, + 1.5 + ], + "type": "interact" + } + ], + "tnts": [] + }, + { + "etherwarps": [ + [ + -4.5, + 88, + 1.5 + ], + [ + -4.5, + 92, + 1.5 + ] + ], + "mines": [], + "locations": [ + [ + -8, + 83, + 3 + ], + [ + -5, + 89, + 2 + ], + [ + -5, + 88, + 2 + ], + [ + -5, + 92, + 2 + ] + ], + "interacts": [ + { + "loc": [ + -4.5, + 93, + 1.5 + ], + "type": "interact" + } + ], + "tnts": [] + }, + { + "etherwarps": [], + "mines": [], + "locations": [ + [ + -5, + 92, + 2 + ], + [ + -8, + 92, + 2 + ], + [ + -11, + 92, + 1 + ], + [ + -11, + 96, + 1 + ], + [ + -11, + 97, + 1 + ], + [ + -13, + 96, + 1 + ], + [ + -13, + 97, + 1 + ], + [ + -13, + 96, + 1 + ], + [ + -13, + 92, + 1 + ], + [ + -13, + 92, + 2 + ], + [ + -13, + 92, + 1 + ], + [ + -13, + 93, + 1 + ], + [ + -13, + 92, + 1 + ] + ], + "interacts": [ + { + "loc": [ + -16.5, + 92, + 0.5 + ], + "type": "interact" + } + ], + "tnts": [] + }, + { + "etherwarps": [ + [ + -6.5, + 91, + 8.5 + ] + ], + "mines": [], + "locations": [ + [ + -13, + 92, + 1 + ], + [ + -13, + 93, + 1 + ], + [ + -13, + 93, + 2 + ], + [ + -14, + 92, + 2 + ], + [ + -15, + 92, + 2 + ], + [ + -16, + 92, + 2 + ], + [ + -18, |
