1.5.9

Author: realooffyy

amaterasuSchemeTesting.txt

@@ -0,0 +1,59 @@
+.addTextInput({
+    configName: "devAddTextInput",
+    title: "Text Input",
+    description: "Example of text input that does not wrap the text",
+    category: "Dev",
+    subcategory: "All elements",
+    value: "",
+    placeHolder: "Empty... :("
+})
+.addColorPicker({
+    configName: "devAddColorPicker",
+    title: "Color Picker",
+    description: "Pick a color! (hopefully...)",
+    category: "Dev",
+    subcategory: "All elements",
+    value: [0, 0, 255, 255]
+})
+.addSwitch({
+    configName: "devAddSwitch",
+    title: "Switch",
+    description: "toggle the checkbox in Not general! tab!",
+    category: "Dev",
+    subcategory: "All elements"
+})
+.addToggle({
+    configName: "devAddToggle",
+    title: "Checkbox/Toggle",
+    description: "Check this box",
+    category: "Dev",
+    subcategory: "All elements"
+})
+.addDropDown({
+    configName: "devAddDropDown",
+    title: "DropDown",
+    description: "Select an option",
+    category: "Dev",
+    subcategory: "All elements",
+    options: ["one", "two", "three"],
+    value: 0
+})
+.addSlider({
+    configName: "devAddSlider",
+    title: "Slider",
+    description: "Select a value",
+    category: "Dev",
+    subcategory: "All elements",
+    options: [0, 100],
+    value: 0
+})
+.addButton({
+    configName: "devAddButton",
+    title: "Button",
+    description: "yay",
+    category: "Dev",
+    subcategory: "All elements",
+    onClick() {
+        ChatLib.chat("hi :P")
+    }
+})

changelog.txt

@@ -1,5 +1,4 @@
-= make 'Show potion abbreviation' show the correct colour
-Bingo Party message formatter stuff:
-+ add voicemail support 
-= fixed it triggering when it shouldn't
-= fixed custom prefix
++ add "Splash combo" feature
++ add "Timer over Spider's Den bones" feature
+= fix Chicken Head Timer not hiding properly
+= fix incoming party message formatter again

features/bingo/chickenHeadTimer.js

@@ -2,7 +2,7 @@ import { BaseGui } from "../../render/BaseGui"
 import { data } from "../../utils/constants"
 import settings from "../../settings"
 import Skyblock from "../../utils/Skyblock"
-import { registerWhen } from "../../utils/utils"
+import { getSkyblockItemID, registerWhen } from "../../utils/utils"
 import { registerGui } from "../../render/registerGui"
 
 const layCooldown = 5000
@@ -13,21 +13,19 @@ let chickenHeadTimerGui = new BaseGui('chickenHeadTimerDisplay', ['chickenHeadTi
 registerGui(chickenHeadTimerGui)
 
 register("tick", () => {
-    opened = (settings().chickenHeadTimer && Skyblock.inSkyblock && Player.armor?.getHelmet()?.getName()?.includes("Chicken Head")) || chickenHeadTimerGui.isOpen()
+    opened = (settings().chickenHeadTimer && Skyblock.inSkyblock && getSkyblockItemID(Player.armor?.getHelmet()) === "CHICKEN_HEAD") || chickenHeadTimerGui.isOpen()
 })
 
 register("worldLoad", () => {
     lastLay = new Date().getTime()
 })
 
 registerWhen(register("renderOverlay", () => { // thanks bloom
-    if (!opened) return
-    
     Renderer.translate(data.chickenHeadTimerDisplay.x, data.chickenHeadTimerDisplay.y)
     Renderer.scale(data.chickenHeadTimerDisplay.scale ?? 1)
 
     // Move GUI
-    if (chickenHeadTimerGui.isOpen()) { Renderer.drawStringWithShadow("Chicken Head Timer:", 0, 0); return }
+    if (chickenHeadTimerGui.isOpen()) return Renderer.drawStringWithShadow("Chicken Head Timer:", 0, 0)
 
     let sinceLay = new Date().getTime() - lastLay
     let remainingTime = layCooldown - sinceLay

features/other/splashCombo.js

@@ -0,0 +1,82 @@
+import settings from "../../settings"
+import Skyblock from "../../utils/Skyblock"
+
+const colours = ["§8", "§c", "§6", "§e", "§2", "§a", "§b"]
+const thresholds = [5, 10, 15, 20, 25, 30, 35]
+
+// BUFF! You were splashed by BingoSplasher with Mushed Glowy Tonic I! Press TAB or type /effects to view your active effects!
+const regex =
+	/^BUFF! (?:You splashed yourself|You were splashed by (\w{1,16})) with (.*)! Press TAB or type \/effects to view your active effects!$/
+
+let splashedPotions = {}
+let messageID = 5967
+
+// splash combo!
+register("chat", (user = Player.getName(), potion, event) => {
+	if (!Skyblock.inSkyblock) return
+	if (!settings().splashCombo) return
+
+	// create user
+	if (!splashedPotions[user]) {
+		messageID += 1
+		splashedPotions[user] = {
+			displayName:
+				World.getAllPlayers()
+					?.find((player) => player?.getName() === user)
+					?.getDisplayName()?.text || user,
+			id: messageID,
+			combo: 0,
+			potions: []
+		}
+	}
+
+	let currentUser = splashedPotions[user]
+
+	// return if the same potion type is already splashed
+	// TODO: disregard potion level (roman numerals)
+	if (currentUser.potions.includes(potion)) return
+
+	currentUser.potions.push(potion)
+	currentUser.combo += 1
+
+	let combo = currentUser.combo
+
+	// chat message
+	/*
+	ChatLib.clearChat(currentUser.id)
+	new Message(`Combo: ${currentUser.combo}`)
+		.setChatLineId(currentUser.id)
+		.chat()
+    */
+
+	// title
+	let colour = colours[thresholds.findIndex((threshold) => combo < threshold)]
+	if (colour === undefined) colour = "&b"
+	Client.showTitle(
+		`${colour}${combo} combo!`,
+		"", // TODO: fix the splasher not showing
+            // `&7Splasher: ${currentUser.displayName}`
+		0,
+		60,
+		20
+	)
+
+	// sounds
+	const pitch = 0.5 + combo / 20
+	World.playSound("note.pling", 100, pitch)
+	if (combo <= 10) return
+	new Thread(() => {
+		Thread.sleep(30)
+		World.playSound("random.successful_hit", 100, pitch - 0.5)
+		if (combo <= 15) return
+		Thread.sleep(5)
+		World.playSound("random.orb", 100, pitch - 1)
+	}).start()
+}).setCriteria(regex)
+
+register("worldLoad", init)
+
+function init() {
+	splashedPotions = {}
+	messageID = 5967
+}

features/party/messageFormatter.js

@@ -3,7 +3,8 @@ import constants from "../../utils/constants"
 import { onChatPacket } from "../../utils/Events"
 import Party from "../../utils/Party"
 
-const incomingRegex = new RegExp(`^(?:From|Voicemail) (?:\\[.*?\\] )?${Party.getBotIGN(false)}: (.*)$`)
+// https://regex101.com/r/a9UlVQ/1
+const incomingRegex = new RegExp(`^(?:From|Voicemail) (?:\\[[^\\]]*?\\] )?${Party.getBotIGN(false)}: (.*)$`, 'm');
 const outgoingRegex = new RegExp(`^To (?:\\[.*?\\] )?${Party.getBotIGN(false)}: !p .*$`)
 
 // incoming formatter

features/splasher/brewingStandUtils.js

@@ -125,12 +125,14 @@ register("blockBreak", (block) => {
     brewingStands = brewingStands.filter(stand => !compareCoords(stand, brokenStand))
 })
 
-// get info from inside the thing
+// get info from inside the brewing stand
 register("tick", () => {
     if (!enabled) return
     if (!openedStand) return
 
     const inv = Player.getContainer()
+    if (!inv) return
+    
     let name, match
 
     // time left

features/world/timerOverBones.js

@@ -0,0 +1,81 @@
+import { drawStringWithShadow } from "../../render/utils"
+import { registerWhen } from "../../utils/utils"
+import settings from "../../settings"
+import Skyblock from "../../utils/Skyblock"
+
+let bones = []
+let enabled = false
+
+const reset = () => {
+    bones = []
+}
+
+register("tick", () => {
+    enabled = Skyblock.area === "Spider's Den" && settings().timerOverBones
+})
+
+// bone manager
+register("tick", () => {
+    if (!enabled) return reset()
+
+    const entities = World.getAllEntitiesOfType(net.minecraft.entity.item.EntityItem)
+
+    entities.forEach(item => {
+        if (item.name !== "item.item.bone") return
+        // update existing bones
+        let index = bones.findIndex(bone => bone.uuid === item.getUUID())
+        if (index !== -1) {
+            bones[index].item = item
+            return 
+        }
+        
+        bones.push({
+            text: "",
+            item: item,
+            uuid: item.getUUID(),
+            timer: 5.0
+        })
+    })
+    
+    // remove bones that are no longer in the world
+    bones.forEach(bone => {
+        if (!entities.includes(bone.item)) {
+            bones.splice(bones.indexOf(bone), 1)
+            return
+        }
+
+
+        bone.timer -= 0.05
+
+        // -30 to ensure the bone is absolutely gone lol
+        if (bone.timer <= -30) {
+            bones.splice(bones.indexOf(bone), 1)
+        }
+    })
+})
+
+registerWhen(register("renderWorld", () => {
+    bones.forEach(bone => {
+        let text, colour
+        if (bone.timer <= 0) {
+            text = "!!!"
+            colour = [1, 0, 0]
+        } else if (bone.timer <= -5) {
+            text = "..?"
+            colour = [1, 1, 0]
+        } else {
+            text = bone.timer.toFixed(1)
+            colour = [1, 1, 1]
+        }
+        
+
+        drawStringWithShadow(
+            text,
+            bone.item.getX(),
+            bone.item.getY() + 2,
+            bone.item.getZ(),
+            3,
+            colour
+        )
+    })
+}), () => enabled && bones.length > 0)

index.js

@@ -29,6 +29,8 @@ import "./features/party/messageFormatter"
 
 import "./features/chat/oringoCost"
 
+import "./features/other/splashCombo"
+
 import "./features/splasher/brewingUtils"
 import "./features/splasher/brewingStandUtils"
 import "./features/splasher/splasherDisplay"
@@ -37,11 +39,14 @@ import "./features/splasher/hubSelector"
 
 import "./features/world/rats"
 import "./features/world/puzzlerSolver"
+import "./features/world/timerOverBones"
 import "./features/world/windCompass"
 
 
 
 /* TODO
+ * - fix feature file structure !!!
+
  * - reminder to do bingo stuff like cakes, experiments, fetchur, puzzler, bednom
  * - hotm tree unlock reminders
  * - king talisman helper!
@@ -61,6 +66,9 @@ import "./features/world/windCompass"
 
 
 /*
+    1.5.9 changelog
+= maybe fixed brewing stand-related features
+
     1.5.8 changelog
 = make 'Show potion abbreviation' show the correct colour
 Bingo Party message formatter stuff:

metadata.json

@@ -3,7 +3,7 @@
   "name": "BingoPlus",
   "creator": "ooffyy",
   "description": "A module with various Bingo-related features",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "entry": "index.js",
   "requires": ["Amaterasu", "PogData", "requestV2", "RenderLibV2", "BeaconBeam"]
 }