diff options
| -rw-r--r-- | features/agentlaiThings/hiddenRequirement.js | 8 | ||||
| -rw-r--r-- | features/agentlaiThings/index.js | 195 | ||||
| -rw-r--r-- | features/agentlaiThings/metadata.json | 8 | ||||
| -rw-r--r-- | features/bestiary/index.js | 8 | ||||
| -rw-r--r-- | features/globalSettings/index.js | 25 |
5 files changed, 23 insertions, 221 deletions
diff --git a/features/agentlaiThings/hiddenRequirement.js b/features/agentlaiThings/hiddenRequirement.js deleted file mode 100644 index effd23b..0000000 --- a/features/agentlaiThings/hiddenRequirement.js +++ /dev/null @@ -1,8 +0,0 @@ -let allowedUUIDS = [ - "f2bcfe6aa54c4eb9b37156b4f1d20beb", - "dc8c39647b294e03ae9ed13ebd65dd29" -] - -module.exports = {hidden: function(featureManager){ - return !allowedUUIDS.includes(Player.getUUID().toString().replace(/-/g, "")) -}}
\ No newline at end of file diff --git a/features/agentlaiThings/index.js b/features/agentlaiThings/index.js deleted file mode 100644 index 1654be4..0000000 --- a/features/agentlaiThings/index.js +++ /dev/null @@ -1,195 +0,0 @@ -/// <reference types="../../../CTAutocomplete" /> -/// <reference lib="es2015" /> -import { SoopyGui, SoopyRenderEvent } from "../../../guimanager"; -import SoopyBoxElement from "../../../guimanager/GuiElement/SoopyBoxElement"; -import SoopyGuiElement from "../../../guimanager/GuiElement/SoopyGuiElement"; -import renderLibs from "../../../guimanager/renderLibs"; -import Feature from "../../featureClass/class"; -import ToggleSetting from "../settings/settingThings/toggle"; - -class AgentThings extends Feature { - constructor() { - super() - } - - onEnable(){ - return; - this.initVariables() - - this.nearPlayerData = [] - while(this.nearPlayerData.length < 100){this.nearPlayerData.push({})} - - this.recordNearestPlayers = new ToggleSetting("Record nearby players", "You can then view this data with /nearplayers", false, "record_near_players", this) - - this.registerStep(false, 1, this.step) - - this.nearPlayersGui = new SoopyGui().setOpenCommand("nearplayers") - - this.nearPlayersGuiBox = new SoopyBoxElement().setLocation(0.25, 0.25, 0.5, 0.5) - this.nearPlayersGui.element.addChild(this.nearPlayersGuiBox) - - this.nearPlayersRenderElement = new SoopyGuiElement() - this.nearPlayersGuiBox.addChild(this.nearPlayersRenderElement) - - - let selected = undefined - let selectedDist = undefined - let lastXY = 0 - this.nearPlayersRenderElement.addEvent(new SoopyRenderEvent().setHandler((mouseX, mouseY)=>{ - let moved = lastXY !== mouseX+mouseY - lastXY = mouseX+mouseY - - let x = this.nearPlayersRenderElement.location.getXExact() - let y = this.nearPlayersRenderElement.location.getYExact() - let width = this.nearPlayersRenderElement.location.getWidthExact() - let height = this.nearPlayersRenderElement.location.getHeightExact() - - x+=width*0.125 - y+=height*0.125 - width*=0.75 - height*=0.75 - - Renderer.drawLine(Renderer.color(0, 0, 0), x, y+height, x+width, y+height, 2)//bottom axis line - Renderer.drawLine(Renderer.color(0, 0, 0), x, y, x, y+height, 2)//left axis line - - renderLibs.drawStringCentered("&0100s ago", x, y+height+6, Renderer.screen.getWidth()/1000) - renderLibs.drawStringCentered("&050s ago", x+width/2, y+height+6, Renderer.screen.getWidth()/1000) - renderLibs.drawStringCentered("&0Now", x+width, y+height+6, Renderer.screen.getWidth()/1000) //bottom axis markers - - - renderLibs.drawStringCenteredVertically("&025m away", x+3-Renderer.getStringWidth("&025m away")*Renderer.screen.getWidth()/1000, y, Renderer.screen.getWidth()/1000) - renderLibs.drawStringCenteredVertically("&020m away", x+3-Renderer.getStringWidth("&020m away")*Renderer.screen.getWidth()/1000, y+height/5*1, Renderer.screen.getWidth()/1000) - renderLibs.drawStringCenteredVertically("&010m away", x+3-Renderer.getStringWidth("&010m away")*Renderer.screen.getWidth()/1000, y+height/5*3, Renderer.screen.getWidth()/1000) - renderLibs.drawStringCenteredVertically("&00m away", x+3-Renderer.getStringWidth("&00m away")*Renderer.screen.getWidth()/1000, y+height-6, Renderer.screen.getWidth()/1000) - - if(moved){ - selected = undefined - selectedDist = undefined - } - let lastUuids = [] - this.nearPlayerData.forEach((data, i)=>{ - let newLastUuids = [] - Object.keys(data).forEach(uuid=>{ - newLastUuids.push(uuid) - lastUuids = lastUuids.filter(a=>a!==uuid) - - let dist = data[uuid].distance - let oldDist = this.nearPlayerData[i-1]?.[uuid]?.distance || 25 - - let thisX = x+(i)/100*width - let thisY = y+height-(dist/25)*height - - if(moved && (thisX-mouseX)**2 + (thisY-mouseY)**2 < 3){ - selected = uuid - selectedDist = dist - } - - if(i !== 0){ - Renderer.drawLine(Renderer.color(0, 0, 0), x+(i-1)/100*width, y+height-(oldDist/25)*height, thisX, thisY, 1) - } - - Renderer.drawRect(Renderer.color(0, 0, 0), thisX-1, thisY-1, 3, 3) - }) - - lastUuids.forEach(uuid=>{ - let dist = 25 - let oldDist = this.nearPlayerData[i-1]?.[uuid]?.distance || 25 - - let thisX = x+(i)/100*width - let thisY = y+height-(dist/25)*height - - if(i !== 0){ - Renderer.drawLine(Renderer.color(0, 0, 0), x+(i-1)/100*width, y+height-(oldDist/25)*height, thisX, thisY, 1) - } - }) - - lastUuids = newLastUuids - }) - - if(selected){ - width = this.nearPlayersRenderElement.location.getWidthExact() - height = this.nearPlayersRenderElement.location.getHeightExact() - - width*=0.75 - height*=0.75 - - renderLibs.scizzorFast(0,0,Renderer.screen.getWidth(), Renderer.screen.getHeight()) - let selectedIgn = undefined - let lastRenderedSelected = false - this.nearPlayerData.forEach((data, i)=>{ - if(data[selected]){ - lastRenderedSelected = true - - selectedIgn = data[selected].name - - let dist = data[selected].distance - let oldDist = this.nearPlayerData[i-1]?.[selected]?.distance || 25 - - let thisX = x+(i)/100*width - let thisY = y+height-(dist/25)*height - - if(i !== 0){ - Renderer.drawLine(Renderer.color(255, 0, 0), x+(i-1)/100*width, y+height-(oldDist/25)*height, thisX, thisY, 3) - } - }else{ - if(lastRenderedSelected){ - lastRenderedSelected = false - - let dist = 25 - let oldDist = this.nearPlayerData[i-1]?.[selected]?.distance || 25 - - let thisX = x+(i)/100*width - let thisY = y+height-(dist/25)*height - - if(i !== 0){ - Renderer.drawLine(Renderer.color(255, 0, 0), x+(i-1)/100*width, y+height-(oldDist/25)*height, thisX, thisY, 3) - } - } - } - }) - - let width = Math.max(Renderer.getStringWidth(selectedIgn)*2, Renderer.getStringWidth("Distance: " + selectedDist.toFixed(1)))+8 - let height = 32 - renderLibs.drawBox([255, 255, 255], mouseX+10, mouseY-height/2, width,height, 3) - renderLibs.drawString("&0" + selectedIgn, mouseX+14, mouseY-height/2+3, 2) - renderLibs.drawString("&0Distance: &7" + selectedDist.toFixed(1) , mouseX+14, mouseY-height/2+21, 1) - } - - })) - } - - step(){ - if(!this.recordNearestPlayers.getValue()) return - - let thisSecondPlayerData = {} - World.getAllPlayers().forEach(p=>{ - let distSq = (p.getX()-Player.getX())**2+(p.getY()-Player.getY())**2+(p.getZ()-Player.getZ())**2 - - if(distSq < 25*25 && distSq !== 0){ - thisSecondPlayerData[p.getUUID().toString()] = {name: p.getName(), distance: Math.sqrt(distSq)} - } - }) - - this.nearPlayerData.push(thisSecondPlayerData) - - if(this.nearPlayerData.length > 100) this.nearPlayerData.shift() - } - - initVariables(){ - this.recordNearestPlayers = undefined - this.nearPlayerData = undefined - this.nearPlayersGui = undefined - this.nearPlayersGuiBox = undefined - this.nearPlayersRenderElement = undefined - } - - onDisable(){ - this.nearPlayersGui.delete() - - this.initVariables() - } -} - -module.exports = { - class: new AgentThings() -}
\ No newline at end of file diff --git a/features/agentlaiThings/metadata.json b/features/agentlaiThings/metadata.json deleted file mode 100644 index e44e8fa..0000000 --- a/features/agentlaiThings/metadata.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Agentlai Settings", - "description": "Settings only avalible to agentlai", - "isHidden": "hiddenRequirement.js", - "isTogglable": true, - "defaultEnabled": false, - "sortA": 0 -}
\ No newline at end of file diff --git a/features/bestiary/index.js b/features/bestiary/index.js index 3888ffb..de7d679 100644 --- a/features/bestiary/index.js +++ b/features/bestiary/index.js @@ -13,22 +13,14 @@ class Waypoints extends Feature { } onEnable() { - this.initVariables() - this.bestiaryData = JSON.parse(FileLib.read("soopyAddonsData", "bestiaryData.json") || "{}") this.bestiaryChanged = false } - initVariables() { - - } - onDisable() { if (this.bestiaryChanged) { FileLib.write("soopyAddonsData", "bestiaryData.json", JSON.stringify(this.bestiaryData)) } - - this.initVariables() } } diff --git a/features/globalSettings/index.js b/features/globalSettings/index.js index 39a2714..92132d8 100644 --- a/features/globalSettings/index.js +++ b/features/globalSettings/index.js @@ -73,9 +73,30 @@ class GlobalSettings extends Feature { this.registerEvent("tick", this.fixNEU) } - if (net.minecraftforge.fml.common.Loader.isModLoaded("SoopyV2")) { + // if (net.minecraftforge.fml.common.Loader.isModLoaded("SoopyV2")) { + //TODO: stuff here + // } - } + try { //This enables links from soopymc.my.to to be shown in patcher image preview + let hasHost = false + + for (let host of Java.type("gg.essential.util.TrustedHostsUtil").INSTANCE.getTrustedHosts()) { + if (host.getName() === "soopymc") { + hasHost = true + } + } + + if (!hasHost) { + let TrustedHost = Java.type("gg.essential.api.utils.TrustedHostsUtil").TrustedHost + let TreeSet = Java.type("java.util.TreeSet") + let hosts = new TreeSet() + hosts.add("soopymc.my.to") + + let host = new TrustedHost(124123, "soopymc", hosts) + + Java.type("gg.essential.util.TrustedHostsUtil").INSTANCE.addTrustedHost(host) + } + } catch (e) { } this.registerCommand("soopyweight", (user = Player.getName()) => { this.soopyWeight(user) |