1.5.8

Author: realooffyy

changelog.txt

@@ -1 +1,5 @@
-= fix random /bingo
+= 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

features/party/messageFormatter.js

@@ -3,16 +3,17 @@ import constants from "../../utils/constants"
 import { onChatPacket } from "../../utils/Events"
 import Party from "../../utils/Party"
 
-const incomingRegex = new RegExp(`^From (?:\\[.*?\\] )?${Party.getBotIGN(false)}: (.*) \\|.*$`)
+const incomingRegex = new RegExp(`^(?:From|Voicemail) (?:\\[.*?\\] )?${Party.getBotIGN(false)}: (.*)$`)
 const outgoingRegex = new RegExp(`^To (?:\\[.*?\\] )?${Party.getBotIGN(false)}: !p .*$`)
 
 // incoming formatter
 onChatPacket((message, event) => {
     if (!settings().bingoPartyIncomingFormatter) return
-    const prefix = settings().bingoPartyMessageFormatterPrefix == "" ?
+    const prefix = settings().bingoPartyMessageFormatterPrefix !== "" ?
                     settings().bingoPartyMessageFormatterPrefix :
                     constants.DEFAULT_MESSAGE_FORMATTER_PREFIX
-    let final = `${prefix}&r${message}`
+                    
+    let final = `${prefix}&r${message.slice(0, message.lastIndexOf("|"))}`
     ChatLib.chat(final)
     cancel(event)
 }).setCriteria(incomingRegex)

features/splasher/potionUtils.js

@@ -6,15 +6,21 @@ const nameRegex = /^§\w(.*?) (Splash )?Potion$/ // https://regex101.com/r/aWdGG
 const loreRegex = /§(\w).*/ // https://regex101.com/r/kht3Li/2
 
 // Show potion abbreviation
+// thanks chick man
+const items = new (Java.type('java.util.WeakHashMap'))();
 registerWhen(register("renderItemIntoGui", (item, x, y) => {
-    const name = item.getName()
-    if (!name.includes("Splash Potion")) return
-    const text = name.slice(0,5) + "."
-
-    Renderer.translate(x, y, 251) // 251 puts it behind the tooltip, in front of its texture, and in front of head other textures 
+    const stack = item.itemStack
+    let str = items.get(stack)
+    if (str === '') return
+    if (!str) {
+        const n = item.getName()
+        str = n.includes('Splash Potion') ? item.getLore()[2].match(/^([§\w]*§\w\w{1,3})/)[1] + '.' : ''
+        items.put(stack, str)
+        if (!str) return
+    }
+    Renderer.translate(x, y, 251)
     Renderer.scale(0.6)
-    Renderer.drawString(text, 0, 0)
-
+    Renderer.drawString(str, 0, 0)
 }), () => settings().potionAbbreviation && Skyblock.inSkyblock)
 
 // these functions will have a use eventually trust

index.js

@@ -61,6 +61,13 @@ import "./features/world/windCompass"
 
 
 /*
+    1.5.8 changelog
+= 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
+
     1.5.7 changelog
 = fix random /bingo
 

metadata.json

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