From c66ac2fc13467e2e4cdcec57ca6df64a0d104a94 Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Mon, 5 Apr 2021 14:45:04 -0400 Subject: [PATCH] refactor: update for api level 3 --- .../NoSoliciting.MessageClassifier.csproj | 16 +-- NoSoliciting.Trainer/data.csv | 28 ++++- NoSoliciting/Definitions.cs | 2 +- NoSoliciting/Filter.cs | 6 +- NoSoliciting/Interface/Report.cs | 4 +- NoSoliciting/Message.cs | 8 +- NoSoliciting/NoSoliciting.csproj | 20 +-- NoSoliciting/PfPacket.cs | 117 ------------------ 8 files changed, 55 insertions(+), 146 deletions(-) delete mode 100644 NoSoliciting/PfPacket.cs diff --git a/NoSoliciting.MessageClassifier/NoSoliciting.MessageClassifier.csproj b/NoSoliciting.MessageClassifier/NoSoliciting.MessageClassifier.csproj index 7a8d08c..0ba2fe8 100755 --- a/NoSoliciting.MessageClassifier/NoSoliciting.MessageClassifier.csproj +++ b/NoSoliciting.MessageClassifier/NoSoliciting.MessageClassifier.csproj @@ -9,23 +9,23 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - + diff --git a/NoSoliciting.Trainer/data.csv b/NoSoliciting.Trainer/data.csv index d7d95cd..58bc8dc 100755 --- a/NoSoliciting.Trainer/data.csv +++ b/NoSoliciting.Trainer/data.csv @@ -69,6 +69,7 @@ FC,0,"HAIL - Active, Social & Mature Company recruiting members! Our FC touches FC,0,"Join Dairy Queen! A new FC looking for helpful, friendly players of all levels to join our community! Join for more info! ^^" FC,0,Journey's End seeking New Members! R30 FC looking for friendly individuals to enjoy the game with. join or PST for details. FC,0,"Late night gamers, RP, casual convos, recruiting all! Tsukuyomi FC discord.gg/bPjMQZvHdb Send PM or Visit! Jenova/Mist W5 P37" +FC,0,let me know if you need an FC. New players welcome as well :) FC,0,"LF Members| Breath of the Dragon FC| House and Discord Available| Ward 20 Plot 10| Come check us out \o/ . " FC,0,Looking for a place to call home? Well you are in luck! Log_Horizon We are accepting all kinds of players! /Tell to join! FC,0,Mognificents is a really small fc recruiting people so we can make a beautiful community that we've all dreamed of! Send a tell! :D @@ -203,6 +204,12 @@ FC,11, Hey Cactuar! Has your Free Company already joined the ? Are you a FC,13,"<>>Eclipse would like you to join a - Low & High end Casual FC (24/7buffs). Accept, Decline or PM me♡." FC,13,"Hello!;-) I've just send u an invite to join Artemis Moonlight. Join us if u like! We are a friendly and helpful FC, willing to help all level players and for fun teamplay. Kupo!" FC,13,"<<>> Eclipsehey what about joining a  fc full of  people? Low & High end Casual FC (24/7buffs). Accept, Decline or PM me♡." +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" +NORMAL,0," blue mage log for the HW 24 man! We'll be doing Void Ark -> Weeping City -> Dun Scath, come for fun!" NORMAL,0," Its taking to long to get a party" NORMAL,0," level 80 - FFA - bring 2 maps ^^" NORMAL,0,"‹50 - 200, Aetherpool 99/99› §Fast Key strat§ ¦Discord will be available at Floor 151 - 200¦ «Be experienced or cleared»" @@ -296,6 +303,7 @@ NORMAL,0,Come bonk the pope to get your bird NORMAL,0,come for weapons and dragons :) 4/4 orbs please NORMAL,0,come get your time worn artifacts. NORMAL,0,Come grind your crystals +NORMAL,0,come hang out faerie LB W2 P16 RM 79 free food! NORMAL,0,Come have some fun and watch out for those 8-way landslides <3 NORMAL,0,"come help me get through floors 1-50, I'll give you a /dote" NORMAL,0,"Come join the fun, get a win. Must hug Lily for drops." @@ -412,6 +420,7 @@ NORMAL,0,Looking For Lvl 70 experienced Blu mages fr Ballafell Soccer TeamTonigh NORMAL,0,Looking for other Filipino (Tagalog-Speaking) players for a Discord server/Cross-world LS. Add me: Kilee#2258 NORMAL,0,looking for party to get to floor 50 please getting few silver cheast if we can NORMAL,0,Looking for someone who can draw mostly lalafells and shortstacks +NORMAL,0,"Looking to clear T1-T5 synced " NORMAL,0,"Looking to complete it. Goodbye world, box strat Callouts in discord https://discord.gg/gXXDBr3c" NORMAL,0,looking to do pony farm for a few ex primals. plz be lvl 80 or close NORMAL,0,Looking to find an LGBTQ+ Linkshell. Send me a tell. Thanks! @@ -436,6 +445,7 @@ NORMAL,0,New or Old and havent completed these Raids yet? Join up and see the se NORMAL,0,"New season of Dr Stone, Re Zero, 7 Deadly Sins, and that Slime isekai anime" NORMAL,0,New to ocean fishing working towards getting the mount! NORMAL,0,new to the fight.... lets wipe together +NORMAL,0,Newly decorated apartment in the Mist Ward 21 room 26 on Hyperion! would love to read comments! NORMAL,0,"No rewards, Just kill. Famous words from Casus Belli - Nobel prize of peace nomnee. Queue up tonight and get a chat with Casus." NORMAL,0,NO SALT. Pairs / Cards. Tanks north pls. ^.^ ♥ NORMAL,0,Not a learning party. If you need to polish your gameplay make one yourself. @@ -530,6 +540,7 @@ NORMAL,0,Want some free ishgard material? Come on over to malboro head over to c NORMAL,0,we waited in q for like a million years so heres to this attempt lol NORMAL,0,We're running gazelle skin maps and could really uses some adventurers. Anyone who joins will also get a wedding invite! NORMAL,0,weapon/dragon farm // 2's +NORMAL,0,"Weekly 1-2 chest run. Akito strat for VG2. Too many fails and get kicked. Say if you have clear when you enter, please." NORMAL,0,Weekly 2 Chests // Bring patience and good attitude! [Rest of this info section has been removed by Yoshi P due to toxicity.] NORMAL,0,"weekly 2-chest, if you bring a macro atleast read your own" NORMAL,0,"Weekly reclear :3 2 chest, Ilya uptime, Garuda sister orbs, G1 N>E>W G2 S>W>E" @@ -2165,6 +2176,7 @@ RP,0,[18+] CLUB AFTERLIFE is open! Come through our gates and drink the night aw RP,0,"[18+] LuXe Nightclub - Hiring Entertainers, Hosts, Cocktail Staff, Bartenders, Dealers, Security - https://discord.gg/fpx4DFcbdt" RP,0,[18+] Please join us tonight at 9PM EST LB P33W22 Yorha theme For more info: https://milkym.carrd.co/ RP,0,[18+] Scarlet Night is open! Live Music w/ Two imaginary Girls/Baths/Bar/Trivia! Adamantoise Shirogane W16 P7 +RP,0,"[18+] The Cat Boy Maid Cafe is open now! [Open mic] Come by for drinks, food, dancing & live music! Siren, Lav Beds Ward 10 Plot 45." RP,0,"[18+] The MUDD Pit - Surprises in store! 11-2 am EST. Zal - Gob, W23 P60 - https://discord.gg/FmPMYEzX54 Come play tonight :h" RP,0,"[18+] The MUDD Pit, 11pm - 2am EST. ZALERA - GOBLET, W23P60. https://discord.gg/HVAEc3nEkz ""Come play with us.♥""" RP,0,[18+] '  is recruiting Dancers and Bartenders! Apply here for more information: https://discord.gg/gHRf6g6 @@ -2180,6 +2192,7 @@ RP,0,"[18+RP] Hiring <3  <3 Several PAID RP,0,"[18+RP] Teraflare is having a VIP sleepover at 1am EST!! Talk to management, and get your VIP access to join our shenanigans!!" RP,0,[E/RP 18+] Viera escort that would offer her thighs to rest your weary head and soothe your troubles. Send tells for info. RP,0,"[Faerie, Goblet, Ward 7 #40] Join us TONIGHT from 8-10pm EST at The Bottom Line, a jazz cafe! https://thebottomline.carrd.co/" +RP,0,"[Faerie, Goblet, Ward 7 #40] Join us TONIGHT from 8-10pm EST at The Bottom Line, a jazz cafe! https://thebottomline.carrd.co/" RP,0,[FAERIE][RP] LB W23P6. SLOPPY JHO OPENS @ 11PM EST. GAY CLUB/BAR. CELEBRATING HELIO AL’SKETCH RELEASE FROM JAIL. RP,0,"[Haunted House] They say there's a whole new world to explore just beyond the window...Exodus Lavender Beds Ward 22, Plot 21" RP,0,"[HIRING] Eden Hall Erozas premier hostess club is currently looking for bartenders, greeters, and hostesses. DM for more info" @@ -2285,6 +2298,7 @@ RP,0,"[RP18+] OschonsLounge is open! Gilga Goblet Ward 23 Plot 23. Music, drinks RP,0,[RP18+] The Tender Tonberry is opening TONIGHT at 9pm EST! Free Raffle @12am EST-Siren-Lav-W23-P3 discord.gg/TnvBgGQjuk RP,0,[RP18+]The Tender Tonberry™ ★Open NOW★9pm-1am EST★ ♪Live Music♪ SirenLavW23P3 discord.gg/TnvBgGQjuk RP,0,"[SFW RP] Spaget is open now until midnight PST! Come hang out, eat pasta, or visit the Red Room upstairs.. Gilga/Mist/W13 P7" +RP,0,[SFW] [RP] The Cat Cafe now OPEN! Come in and enjoy our Easter menu or just hang out! Jenova. Lav.Beds W22P18 RP,0,[SFW] [RP] The Cat Cafe now OPEN! Come in and enjoy some food/drink or just hang out! Jenova. Lav.Beds W22P18 RP,0,"[SFW] [RP] The Primals Bar, back open! It's been a while! Come downstairs, grab a drink, and relax! Ada, Goblet W22 P15!" RP,0,"[SFW] Drunken Moogle is open! Join us for Giveaways, Drinks, Food, and Music! Faerie, Lavender Beds, W15, p52." @@ -2292,6 +2306,7 @@ RP,0,[SFW] Maid For You is open NOW! FAERIE/LB/W7/P13 https://discord.gg/27CmeQW RP,0,[SFW] Maid For You is open NOW!! FAE/LB/W7/P13 https://discord.gg/27CmeQWtXa RP,0,[SFW] New Xaela RP Discord: discord.gg/YjTqdmfPBj RP,0,"[SFW][RP] Midnight Tranquility / Relaxing Garden & Baths / AFK Friendly / Faerie, Lavender Beds, W16, Lily Hills, R2." +RP,0,[SFW][RP] Xaela Discord for Aether: discord.gg/YjTqdmfPBj RP,0,[SFW]VLVT DRMS Soft Opening|02/28|9pm et|JenLavBedsW8P32|https://discord.gg/WKVGj9PSNm RP,0,[SFW/RP] Xaela RP Discord for Aether: discord.gg/YjTqdmfPBj RP,0,{Belalagio Casino Resort} NOW OPEN!! 3 working slot machines! Blackjack! Roulette! Dice! Poolside View! Gilg GobW15P17 @@ -2364,6 +2379,7 @@ RP,0,Back to School Night Hosted by Memento Mori! Attendance will be graded! Cac RP,0,Bard looking for work! Mainly Piano. I have my list of music available but requests can be sorted out! RP,0,Beep Beep The Velvet Room Crew Party Bus JUST Landed at | Bottoms Up Nightlife W24p16 shiro ADAM | Come chill with us <3 RP,0,"Black Lotus HalloweenParty Oct.26th7pmCST!CostumeContest,DJ, Auction and More! https://blacklotushalloweenparty.carrd.co/" +RP,0,"Bluebird is open now for all your friday evening lounging, chatting, or afk needs! Music downstairs - GIlga / Mist / W13 P8" RP,0,Bored Big Titty MilkMaid this is not to erp just to be big titty RP,0,"Bored? Come party at The Willow! We have music, drinks, and fun- Bring your friends! Siren, Lavender Beds, Ward 21, Plot 6! ?" RP,0,Bored? Looking for a *different* place to AFK? Jump up the elevator at the NOMNOMAZU. HYPE ◆ LAV BEDS ◆ W11 ◆ P58 @@ -2382,11 +2398,11 @@ RP,0,CHUBBY CASTLE OPEN FOR VISITORS W20 P30 GOBLET ZALERA. RP,0,CLUB KARMA serves what you deserve every Wednesday! Join our Discord for more fun and info: https://discord.gg/xmNc7rn RP,0,"Club MANTRA is open and ready to entertain! - Giveaways, live music, fully-stocked bar, and more! Siren, Shiro W17 P56. Join Us!" RP,0,Come grab a cup of tea with your favorite host at DINC Academy! @ Jenova LB W23 P41 from 8pm-3am Est -RP,0,come hang out faerie LB W2 P16 RM 79 free food! RP,0,Come have a cold drink at the Emerald Lounge. Make a new friend enjoy some music have a drink (adam shiro ward 7 plot 3 5-8cst RP,0,"Come join & make new friends at Bonding Bringers! discord.gg/NK7Xwdv " RP,0,Come join & make new friends or try to find an EB partner at Bonding Bringers! discord.gg/NK7Xwdv RP,0,Come meet the maids of Tomo! Cafe. Open 8-11pm EST Midgard/Gob/W2/P12 +RP,0,Come meet the maids of Tomo! Cafe. Open 8-11pm EST Midgard/Gob/W2/P12 RP,0,"Come pull up to the Bread Bank and buy some bread In the Adamantoise Goblet, Ward 20, plot 40" RP,0,"Come relax at The Dactylanthus Flower Cafe with treats and fresh flowers! Jenova Goblet W21 P51, Southeast Subdivision" RP,0,Come sign my message book? :D Don't forget to check out the opium den in the basement! Gilgamesh Shiro W23 P24 @@ -2402,6 +2418,7 @@ RP,0,"Concert and shopping at Plot 31, Ward 4, Mist Levi! Come shop while listen RP,0,Craving Pizza? Pogazu Pizza is open! Dine in @ Ada Mist W23 P21 / Join Party 4 Delivery. Ultimate combo 3000gil. RP,0,Crescents Keep All Saints Date Auction and Costume Party! Over 1mil in prizes! Mist Ward 14 Plot 34 7-10 EST RP,0,cute bun egirl looking for eboys uwu +RP,0,DEVIL MAY CARE / 9PM EST Grand Reopening / Bask in the Devilish Decadence / Cact / Gob / W6 P 12 / dmcbuilding.carrd.co RP,0,DEVIL MAY CARE // Open Now // Cozy bar & lounge // music fun and possessions!! // Cact / Mist / W18 /P26 RP,0,DJ DARTH AND NARTOZ WEDDING AFTER PARTY!!! Ever partied on a roof before? You about to now!! Goblin Goblet Ward 23 Plot 43 RP,0,"DLITE Is OPEN! Come grab a courtesan and relax in our lounge and let our expert staff see to your every whim, SIren, gob W19,43" @@ -2630,6 +2647,7 @@ RP,11,"~♥~ Empress's Casino© ~♥~ is OPEN for business! 10k-100k Bets! /rand RP,11,★   ★ (Night Club) Currently looking for dancers. If interested join discord to apply. RP,11,☆P32 ☆9PM EST♡ https://discord.gg/vYHARSN RP,11,♥The Cuddle Cafe is open today!♥ 4EST-7EST Come get your cuddles on! \ (´･ω･｀) ﾉ {https://cuddlecafe.carrd.co/ Discord: GXqjMwUUwT} +RP,11,A nightclub stocked with delights of the far east as well as a live DJ RP,11,A nightclub stocked with delights of the far east as well as Live Music with our in house DJ. RP,11,Anyone looking for a bodyguard? Catgirls only pls. Prices negiotable. PM me. RP,11,"Cactuar's Howl presents Barwoo Trivia! (Bar/Pub style trivia) - Tonight @ 5:30 pm PDT on Cactuar @ Mist, Ward 13, Plot 35. Teams of 1-3 with a top prize of 4.5M Gil!" @@ -2645,6 +2663,7 @@ RP,11,"Food, drink, and great company from friends and staff alike! We hope to s RP,11,Give us a try over at Crystal Gardens (18+): discord.gg/rQM7C5hK RP,11,"Hello everyone! Tonight, The Carbuncle Cafe will be open at 8:00 PM EST . We humbly invite each and every one of you to enjoy the night with us!" RP,11,Her smokey halls beckons all who wish to taste the fruit of eastern culture and bath in the pleasure of her gilded petals. +RP,11,her smokey halls beckons all who wish to taste the fruit of eastern culture and bathe in the pleasure of her gilded pleasure RP,11,"Hey everyone! Come on down to the Sugar Sugar Hime Lounge on Faerie in the Goblet W14P35 for a fun night from 8-11pm EST! Enjoy drinks, dancing, blackjack and more! Feel free to join our Discord server as well for more info and fun: https://discord.gg/8xN4UHf" RP,11,"If interested in joining our discord https://discord.gg/rATyA2VKMD.""" RP,11,If you would like to see anything we offer please see our card @ https://devilsdwelling.carrd.co @@ -2763,10 +2782,13 @@ STATIC,0,"7/8 Static LF1M listed class for e9-12s reclears + parses, possibility STATIC,0,"7/8 static lookinbg for any DPS withe the exception of DRG, RDM and DNC for full reclears due to an emergency situation" STATIC,0,7/8 static looking for a Physical Ranged DPS. Group is currently progging 12s /tell or join for info >:3 STATIC,0,7/8 Static looking for Non-Sch Healer! We're on LC/ Fresh BJCC! Raidtimes MWF 12:30-3:30pm PST. Join pf or DM Tignle#8885 +STATIC,0,"7/8 static looking for phys ranged for e12s basic relativity, Thur Sat 6:30 est - 8:30 est" STATIC,0,"7/8 with UWU&TEA cleared LF skilled MELEE (not DRG) for UCoB. T/W/Th, raid experience required. AFK, contact Lar#5481 for info." STATIC,0,"7/8. Static LF Tank/Melee in E12s, P1 Progression. Tues/Wed 6-9pm PST. " +STATIC,0,7/8static[sMC]LF non-PLD tank for E12s P1 clean up/P2 basic prog Times are 7-10pm est T/W (flexible days)(inquire within) STATIC,0,"Bard LF Static E9S-E12S reclears. Available Sun-Thu 8pm PST onwards, Fri-Sat 1pm PST onwards. Discord: Mountainwhale#0001" STATIC,0,BLM and Tank/DPS main LF static. Open to days of raiding. 2PM-5PM EST are the times that work for us. Open for discussion. +STATIC,0,"brd LF ucob group, at quickmarch+ dm for details" STATIC,0,BRD/ DNC LFG. Have been to Anihilation but willing to start fresh. Looking to prog and clear quickly. discord Raijin#6869 STATIC,0,C/MC 7/8 LF Non-War Tank. T-W-T 7p-9p PDT (10p-12p EDT). Prog between orbs and second bog/towers. Discord: ebrhune#8156 STATIC,0,"C/MC raid 5.4+ lfm Healer/Non-SAM melee. Have cleared e9s, starting to learn e10s. T-W-T 7-9p PST. Tell, join, or ebrhune#8156" @@ -2796,6 +2818,7 @@ STATIC,0,"lf non war tank to sub tomorrow for e12s prog ! currently on dual apoc STATIC,0,LF non-WHM healer for once weekly raid Saturdays 7pm-9pm CST // current prog Diamond Dust // im afk pls add Orchid#9273 STATIC,0,LF non-WHM healer for once weekly raid Saturdays 7pm-9pm CST // current prog Diamond Dust // im afk pls add Orchid#9273 STATIC,0,LF perm members on listed jobs. Times Sun 12:30-3:30pm M/W 12-3pm EST. Msg Kuromaru#9625 or AsherXIII#4631 for info +STATIC,0,LF permanent caster for optimizing tier then UWU prog. M/W/Th 10pm-12:30am EST. Prev Ultimate exp pref. Discord: Mews#6043 STATIC,0,LF permanent tank & melee. BJCC experience highly preferred. Add me on discord: kc#0720 STATIC,0,"lf static for savage/TEA. Have cleared ucob/uwu On wormhole form on tea, can do anyday but friday night. Tetra#6615" STATIC,0,LF>Static BLM/Tank or DPS -Tue Wed Thu- available from 2pm~5pm EST 3 hrs sessions @@ -2821,6 +2844,7 @@ STATIC,0,New C to MC static for 5.4 Savage and older savage when bored. TWT 7-9p STATIC,0,New mc static lf phys ranged and any healer 7:30-10:00pm pst Tue Wed Thu msg ThickestThighs#9002 for more info STATIC,0,"New MC static, fresh e9s-12s prog, T/W/Th@7:30-10:00 PM PST, begins Mar. 9th, LF non-ninja melee, msg Xaefe#1230" STATIC,0,New Prog static 7/8 recruiting a Frontline Dps <510 Non Sam> for tuesday/thursday night No salt Static. 9-11pm EST. New/Used ok +STATIC,0,"New retro raid party seeking members for synced runs of coil, alex and omega. no experience needed! Please join for details" STATIC,0,"New static looking for dps healer e9s, new players welcome" STATIC,0,"P1 Classical Sculpture Prog 7/8 Static, Discord is optional! " STATIC,0,"PLEASE READ [AFK] Looking for the following roles for T13 morbol runs at 11PM EST: MT, H, DPS, and either OT/H. Join party." @@ -2871,6 +2895,7 @@ STATIC_SUB,0,5/8 Static. Cleaning up P1 hopefully going to P2. doing line strat. STATIC_SUB,0,6/8 group needs melee sub for 9-12 reclears from 3-5 PST. Msg Such Devastation#2262. Chestpiece and mount are locked. STATIC_SUB,0,6/8 lf melee+caster to sub for reclears and intermediate rel prog on tuesday 6-9pmEST; afk contact discord princessfili#8661 STATIC_SUB,0,6/8 static for weekly clear - Happy brambles ... T'H N/W DPS S/E boss relative +STATIC_SUB,0,"6/8 static, mostly pug strat, except bili bili lion." STATIC_SUB,0,"7/8 reclearing 9/10, happy brambles, and jp strat, also progging 11s at prismatic starting 7pm est" STATIC_SUB,0,7/8 Static | Kill | 2 Chest STATIC_SUB,0,"7/8 Static 2 Chest reclear - Fox mist, blue uptime" @@ -2887,6 +2912,7 @@ STATIC_SUB,0,"7/8 static looking for fill 7-9pm est, Prism/Cycles Prog PLEASE us STATIC_SUB,0,DRG LF weekly 12s. Cleared WK1. Leave disc STATIC_SUB,0,"e12s line lions prog, dps is coming, dps cw. 7/8 static" STATIC_SUB,0,e9 + 10 clear 6/8 static - need a sch/ast + gnb/pld/war8:15pm est +STATIC_SUB,0,E9->E11S Reclears. 2 Chest. 7/8 static. STATIC_SUB,0,E9-11s 2 chest Regular pug stuff will clarify inside STATIC_SUB,0,"E9-11S weekly Farm Clears, Please Stay for all 3, 2 Chest Only. 7/8 Static" STATIC_SUB,0,healer needed for 7/8 static at 8:30pm PT - e12s after - pug strats diff --git a/NoSoliciting/Definitions.cs b/NoSoliciting/Definitions.cs index a0c91bb..daf4e40 100644 --- a/NoSoliciting/Definitions.cs +++ b/NoSoliciting/Definitions.cs @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Dalamud.Game.Chat; +using Dalamud.Game.Text; using Dalamud.Plugin; using NoSoliciting.Interface; using NoSoliciting.Properties; diff --git a/NoSoliciting/Filter.cs b/NoSoliciting/Filter.cs index 33fdbc2..a6a3cbf 100644 --- a/NoSoliciting/Filter.cs +++ b/NoSoliciting/Filter.cs @@ -1,10 +1,10 @@ -using Dalamud.Game.Chat; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Hooking; +using Dalamud.Hooking; using Dalamud.Plugin; using System; using Dalamud.Game.Internal.Gui; using Dalamud.Game.Internal.Gui.Structs; +using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; using NoSoliciting.Ml; namespace NoSoliciting { diff --git a/NoSoliciting/Interface/Report.cs b/NoSoliciting/Interface/Report.cs index a3f6c58..9fd1793 100755 --- a/NoSoliciting/Interface/Report.cs +++ b/NoSoliciting/Interface/Report.cs @@ -6,8 +6,8 @@ using System.Net; using System.Numerics; using System.Text; using System.Threading.Tasks; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Game.Chat.SeStringHandling.Payloads; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Plugin; using ImGuiNET; diff --git a/NoSoliciting/Message.cs b/NoSoliciting/Message.cs index f17947b..39b2d77 100644 --- a/NoSoliciting/Message.cs +++ b/NoSoliciting/Message.cs @@ -1,12 +1,12 @@ -using Dalamud.Game.Chat; -using Dalamud.Game.Chat.SeStringHandling; -using Dalamud.Game.Chat.SeStringHandling.Payloads; -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; using System.Linq; using Dalamud.Data; +using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; using Lumina.Excel.GeneratedSheets; #if DEBUG using System.Text; diff --git a/NoSoliciting/NoSoliciting.csproj b/NoSoliciting/NoSoliciting.csproj index 653a9d0..f1b608a 100755 --- a/NoSoliciting/NoSoliciting.csproj +++ b/NoSoliciting/NoSoliciting.csproj @@ -9,7 +9,7 @@ x64 - + $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll False @@ -35,16 +35,16 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -58,9 +58,9 @@ ResXFileCodeGenerator Resources.Designer.cs - + - + diff --git a/NoSoliciting/PfPacket.cs b/NoSoliciting/PfPacket.cs deleted file mode 100644 index 04a3496..0000000 --- a/NoSoliciting/PfPacket.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using Dalamud.Game.Chat.SeStringHandling; - -namespace NoSoliciting { - public static class PacketInfo { - public static readonly int PacketSize = Marshal.SizeOf(); - } - - [StructLayout(LayoutKind.Sequential)] - public struct PfPacket { - private readonly int unk0; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] - private readonly byte[] padding1; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] - public PfListing[] listings; - } - - [StructLayout(LayoutKind.Sequential)] - public struct PfListing { - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] - private readonly byte[] header1; - - internal readonly uint id; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] - private readonly byte[] header2; - - private readonly uint unknownInt1; - private readonly ushort unknownShort1; - private readonly ushort unknownShort2; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] - private readonly byte[] header3; - - internal readonly byte category; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] - private readonly byte[] header4; - - private readonly ushort duty; - internal readonly byte dutyType; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)] - private readonly byte[] header5; - - internal readonly ushort world; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] - private readonly byte[] header6; - - internal readonly byte objective; - internal readonly byte beginnersWelcome; - internal readonly byte conditions; - internal readonly byte dutyFinderSettings; - internal readonly byte lootRules; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] - private readonly byte[] header7; // all zero in every pf I've examined - - private readonly uint lastPatchHotfixTimestamp; // last time the servers were restarted? - internal readonly ushort secondsRemaining; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)] - private readonly byte[] header8; // 00 00 01 00 00 00 in every pf I've examined - - internal readonly ushort minimumItemLevel; - internal readonly ushort homeWorld; - internal readonly ushort currentWorld; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] - private readonly byte[] header9; // 02 XX 01 00 in every pf I've examined - - internal readonly byte searchArea; - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] - private readonly byte[] header10; // 00 01 00 00 00 for every pf except alliance raids where it's 01 03 00 00 00 (second byte # parties?) - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] - internal readonly uint[] slots; - private readonly uint job; // job started as? - - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] - private readonly byte[] header11; // all zero in every pf I've examined - - // Note that ByValTStr will not work here because the strings are UTF-8 and there's only a CharSet for UTF-16 in C#. - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] - private readonly byte[] name; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 192)] - private readonly byte[] description; - - // 128 (0x80) before name and desc - // 160 (0xA0) with name (32 bytes/0x20) - // 352 (0x160) with both (192 bytes/0xC0) - - private static SeString HandleString(SeStringManager manager, IEnumerable bytes) { - var nonNull = bytes.TakeWhile(b => b != 0).ToArray(); - return manager.Parse(nonNull); - } - - internal SeString Name(SeStringManager manager) { - return HandleString(manager, this.name); - } - - internal SeString Description(SeStringManager manager) { - return HandleString(manager, this.description); - } - - internal bool IsNull() { - // a valid party finder must have at least one slot set - return this.slots.All(slot => slot == 0); - } - } -}