From d05b674efaecc44851ef6363763964c270b8a9b1 Mon Sep 17 00:00:00 2001 From: Chase Eller Date: Sun, 8 Jan 2023 16:57:30 -0500 Subject: [PATCH] Logging Update Updated resource generating plugin to handle new logging standards moving forward for all logging functions. --- ...vsix => CSTM-RESOURCE-GENERATOR-0.2.2.vsix | Bin 4665822 -> 4666140 bytes package.json | 2 +- template/client/client.lua | 9 ++++++++- template/server/server.lua | 15 ++++++++++++++- 4 files changed, 23 insertions(+), 3 deletions(-) rename CSTM-RESOURCE-GENERATOR-0.2.1.vsix => CSTM-RESOURCE-GENERATOR-0.2.2.vsix (99%) diff --git a/CSTM-RESOURCE-GENERATOR-0.2.1.vsix b/CSTM-RESOURCE-GENERATOR-0.2.2.vsix similarity index 99% rename from CSTM-RESOURCE-GENERATOR-0.2.1.vsix rename to CSTM-RESOURCE-GENERATOR-0.2.2.vsix index 4d5b8b4f607f1d8c9cf7e3f52de6fe0beddfe2e4..005425e0f0c2fa033070e00f196d2f6d27ae4f80 100644 GIT binary patch delta 4313 zcmZA51yEGq{s8b@SegYS6j`YSX_oF>YJsI2l#mc41u3aZh)4*?3QL0sNJ@8zgwiM= z-H1p@qX_D|{@$DS=KsGlpP4iF%=w;kXU>`L_uQrRY=Z1B*#vY3SV9;*1VTy*`SF;? z%!Ja87WItoCa@+=^LybJgPCH~A~MI;)YR;G9_I9b*h7nYOs6ZQ_k#~`&wW!YEL+Gm6J;;YlCEBtBkABF>nMnEA?}?I;`=+>1vHz0b=wE?wfeV zVps+h?i){wR&mt%p1A8TxebM-_!;XKVJ7nx1hZs{j9ssqs!wT+u+Ib4m|s7CYF9?H$Fp{6x~-WIW+3IaN{ zAIy|}qmuNS;%X~vp0>~yqi`x?W^JVpv={S;pykokx^fxx?$3{MK7&Kg{8y01vIs0s zmk|T6wbSMG?;PQ#LceJ9fqLBl<)l%iNv8*}wHe-fCqS}i)@MXwW0KVBXo+V7!Dj~# zRv>w78#(vF%p-AfGlQz!$585fb??eiyP8uzx5n|?Q0o`jYD=3Rp~s{I#9M@gZ=$VZ z-VF8a+vTRJuZBoRTDkPr=6GUilF&iHu-8_ZQr z{x~1&LX}t~=eoa83pKU=sKdfqYphxPv+qdE`5 zHewhKJW#j@7!$q&g`vb5kzWNkDX07kXKge{;x7BlxUm{3IgiHwC@xksCn$(BV#Z}; zmluVuZ8}>{c*;yLl(;{xJzxJqRjCP=MaUS;I01?_LM*Id6`S#guHJ7fmOWXfB20uA z@B6f~-v5~57w*{-T!kJoGgRiM$$#>U&xTN!!Hp8vZ9Q+I!*M|qkuD76!&dt>w`@uX zmhxY^3r3a@*r)ScK@*(0V8vfPX@Zq5jq34vEoV_T${NVdwe%Xx!(Xv!bGes@o!B>} z6_pBvP`=^*(Zd~*F}rTAU(~D2%W%AFoBPY|_W176fS9HmUunve@B@*TS~_SBiMm*6 zu2vbzTpQ8#P`M$izC|?Pr1R4Gp=U(dqCMYE$dW6^PV1-VJ>s?=p1@;GoZ?INNe%RS zyS#k?t96a%?7P}iAChU8c=z{xG|(=9-|4Sg0StP7y1a!n{6DyQR^dB04VBI7dlKhU_)hkMuJAGvk|A$RXnkvI_6#Ql&t z`-@d> zi{}U~Chw?d6oOyQA$Biyd@A|zaCkY$&ude-_Du!xN3Qo3$Qw*3hLVMI53#k|3F+$J z8GbmPRxFL0cRX*0kbaUoOEieo*T=b23c%L4&*X90l-IGhsFzmAI)marrI__bu}*Mv zMIg)cULUd}+1pDbJG6?IW}0JTR1bI5PUr5#-SB-{m9j|F->e@W|IQu-zqWaHPGNv0 zAtgls<3&+WcnlN{1rdMdiR3K^)4d@Dp7DNZ42Qh%I zg06uWLDxY{AOz?Jh#ABJVg<2**g;4T2Z$4N6T}7L2JwJ+L3|*7kN`*!gaQeHgh3)8 zQIHr&93%mf1WAFUK{6m&kQ_)JqySO`DS?zhXpjm>6{H4I2Wd1x;TRP<*xxLN$FN~E zVY7c*I5vzVFz=bAOcUDl8Av~RbTg`qPe1K;teyR>?&L^jUj3^P(fJhtIZibQ_4Dte z5dU4Sd!`LUL%XB7ExQ>M_p2@$d+yUuy$}Oj8XeMOuT$Kq}Hdw?PO!ruiTc~4nrsp*Vq!;rEjahZu0MmjUh2E<}iCP@mw%n zuU3tlYjA<7BW~R=oINXwow1Cr!Z<_3fi#a~A7f`3_ElDKLHgrD%Sp$N6{S?95QXpM z<@o+bH^9zZhqv{?Bi@eFmJQ&9$a`k8;a z*Kvis`#fVqr`at5N*!4#;bpxvi4{wv=;-9WAMiLifIah`O+Hb0UL3TKbEGKJhcwB; zUt)R^I$vm#I=e>9DER^sVwwI<>ZI)m?|(}+qVAxpdQWfK(;>f=xw|jll>b3sFr|b0 zibFZ$Bo1e99CE7)87@vV#!JIQP;}i zzxn5w3#xat^vo&T4TRXff1j1N5f{3wUF5=#C}m~W$8H@R>6W+GO1e8BvWpXmd!D&v zzdj7He{FWGMd%tQW1l2ZF1|rWou$Fn^+e@W--{>n^K_1vOf#qMClQ8~7A+3fdBuwl z;uAvLZA7g3(Fdq+U|J#}r87OaKTQCEY!Nq6b6}QXu&;kNzL+3}6MvNlLjx?D-+GXx zK_B)#;ZIK*cRKky*W=HnVlV9k%A*XB$zl(WD(*zPe0W_KPA`S~eU@8C!JjPT!L@}= zO(1d}3)>7cmWB zheDq*wL*g_;tU6*DGZ-NwOIRsC>PFJ0#fs7BleqEx7wm?v4=rxtzMB^0?6OU)=b^Q zP$txpjtXb*0H^la1kR}R8mhSI&V9N^`D^8g&6I0>u3IEczt=>=qj<~l6$CGMv+6SM z))z~DxFjz0c|adA*eHffb0=#m?N66LI_r_N$3@Mb$NXT{E+_J84A7YamY;YE(~Bze zA8UKZj9zUoszXL}@tqXk>~%$rSYe?CxaA2g7xljPd}wvmvpq$eO?A*uxv%ioO$+A2 z54j5AbF$ynd)&C#?>m$HtX-wZ71a@$t%fe{uPx;4N~sS7ac3yI>Z>4C&~=hxRNO>D zt~hbPBr^DVk9*UzHtZ~aR~RpjnvF%pBJrg<{Z816+sPs?TtLn4h&da^X%b?y5WIthC;!f5I>=Yv=#WPV~R!`8% ziRd3Ykx z8;YumnNu2npdsl?!eNt4e_L7d!%_7-FEX`uCSnf3HT%TGerWrtkF&Zz-t9^rc4V*1+DbW@^I;RT(Mg$G8f|Hc$QV4Xk_Hf~BffFps*7S%m#_o$Ib+8KWNt(M*H98rJW7L|a}(!%Tfs zGYwycFQa9ux_c*Luj_t+*2q_N?A*IIqe1mTR(xVfL=T`Cs_>oa+WMvI6?jZcagwY( z#*xL~52+|^I$lw?V{SWhW9(|&J9mPH>Px*r2Sg#Ir^97Sn(mS12E6C6m(A@~P_V3R zFUj{)+qGRak)!ygSF0mptJ=ZeUVCf?lT-Nbe0;a{G&;CA?(oQBSs?zOyG zQ$g=&zCPgh3^|G2as80x%MKQOj<4zuH7uBIOf@H7~%-1KJh3&elQ7TZIygIqMX*# zhaI}qIc>Pn=Rnj>m5dQh7SfM7mX6Gx>)UTv7m}Ci%ioF8jl+5JPBD zpzkf5aM6RA5Msa{{eFaX#+>F)UFi7)h7)KqdnDesR%C2Dc zLSz9fZC9q%MEKY2TS3oXs_SKWunx%${T0T@lD-5vs-!G;11Wi=es#@et&Nk@7na(t zmjz5(HsM%`JJiSy*w}!JO&1x+(vdYrw8A#;1|N%^eW=z~)PwMbXZre@9@))g9T^D} z8|73Ev0^i%jKIEhDt6JZ%W|~zccjcww~dC*`jg`Ko5GrcZW@hz%#y>gA0h+sAqF)K z6I=2w`4WRBAHuI1Pltoqc>^55hd$&K;z(7Irq@_A4lpLlLp)!lP#j65L)F6v5bzlkMF!p#}bh&8-j3+m}^IX!5{F#_otdq&{+>upGq77J`vepWIO^YnE z++b6D#k2(rw*4`wNp@1|-9{1a_q$6f7tDY*F)ZoUZu3avQ6g#lrVcR*s$k*e@rX!? zw8yeeAe%e`N;Qaqwwe2FtyDsk_zfX(aG8tJ*5Z4XVZ+rR?j2crKIbPIS|?63LC3aZ z=T!TR63~r4vMC*b%$-2h2T_p8IdIE)+sB;fcS?53^qaOPr&H>UnGmP0dhO;xFgk9U z60_A*Ow%6UaR5T_X(*~9BmR=$MkHSPjO}?I_2#qZlWV3-+}yen7pLETxGJCQpiKg! z;Pl1ZBOSGN5}pq|=O4~Tu{zm_2fN->C5D*Zo^)ftDAMsyfc9M9wBu@1HwCUnDCqsb zUUXpnx^<)BXF}mK@xHVVceifur}lIgmn8jom!3&K+&Vil_f)2HkVJ9GkTcRy#qdOx zb>-g1CXtQ4IAVC+xGg{LoT;~*?n#Hk;N+QT>1oFPeoMbg?iKNcjm3!0z5iZA4SwKu zN-_gn4CDg-R2mJ#SwWFldDw^G(pg7+s>HK5)*{CGY5DiY&o$;NTawh}+0c{9DvR?2 zkM^^B;4GZr5w_)F4e$G_CjFgtms-R{Bh*RA`B3`6wx? z!CF2i2Sxj|M$~AHSet7ZGZa2Z6?X(*Vex|Ddapa!ToyQGh{=+{7DAQ=4K^KLkS`R* z-I0uaLGF?ziqIwxcGs0Jc|d@?To|(!_g&1TZ&oo=A+^4?P@^g1H4?t_;;+C)hmlE3 zq(;Ib)7cVJ*XZ`Qin6ONh3Sc5htfohyp%`q&u#Wng$zqWudLRr3Bl)usX4QHT#WNv z9H!FQ-@5W|RW0upV&$GsG^i1@-uuX81Zns-r3TG=4&TU;o+fDOmKr{tVDKy{bgdmB zAgk^Q3^N1^dAS?V?4=)tD3|aycDJ4Vu4;#tVL#R4%9Ymo9g<>ZNUyD&idx`nDY=se zm2yo(VuY#MM=qsgJV;zMXSdG7w?swM3*j_qgjEEXJ zE^MRpoSUNjzO(S9LDD_$x}agXGxWu#!!p~P9<*fUxk6lZaZjIM)Ow1kR!+@%m}X*R zAB;Xbg?Vx9sEn-LqF#UNbLhHnXB#1aZPv*;&K>7!jW~qkp_aR6&Fpuj^hb-^p^^3B z*1j7RUAPVq^?TLBWV2XPBF+~k0onO-D2ICrV>jcZU-(4R75?abn)T~Ao*j|fCrD=V zApgfl2%4o!O`BKbe)RWWQR7N<5-Fdivsf+kipB7h z0x$zu07w8UfDOP7-~ey}xBwRb+yEW`FMtog4-fzd0)zm<01<#FKnx%bKmjBGk^m`y zG(ZL*3y=f+1&{|Q04@R)0ZIU6fC@krpaxI}XaF<;S^#Z;4nP;62e<^#CkVpPd`yr( zl@4#ni#EWG(lFrjMbWJI7G5+HcEl%Fi+SGRyXMDw@}WYh`ubHPNQx{YC97s>r3Cpj zgoUWo_es9|WUmw4%%pg?qFmAdmZy9aMLE}X3&Rk@ipIU#JGwJh^E%2tMkKWAYV{XP z4I?|*jcs3@=G%NppVlG5cMvs>?N30PMNp@%|3@1HuWi?IPm^+ z1&}Ux%oSmOdCIR7;hNw%I#(k6#*T1I1ZVvlF^uqWvxMkZ!rrffF7Mn+D>m=XrYmTF z`mn(l%)JV|N7IG2sZHj8o|%+ruVR&C&tLCrb_POfww9K&-Gro_C%<0Ki0xBK5OwU8 za}2X^4~-9k6N_V{uc`IC!|IlkYApFzV`2Fi>7L?BmSJiZ)$xwEv|&ogvfD0Ihk`JU z@LS^@^J>0B@6tC|h8O2x&JmX8heo$5AT3(^? zNRYk4%tUSZw>CH5FZvp}b;bi1+Oq4MRMuND9<1SwBHjoS=a}!&R~3tnN4`DnpS&1| zK5HxtwkoFn7Hu`BP=1+aVSCqOd?VQQt4HAT>&yvGM>^%CBDMRgfnpuyktG#)2C$NT zlcP;JaY9+)gk3VW&ZyO%VkL8GOrvLj((Bns*;{MH9GNNTxO7=|h}^sM31iRw&98|T zLUn4+)o^>8#5@mz99)re8D`5*G{~Y+7@1l^{L|T3* ziuAK6d1xe{drbYN_i3DBHpM5Y*tyx&@4d|;znA+4@w6lE%z7gukMaftsj#wkrwg4M zeee!1q^@tPZG1H$nAMeDQMeK2(St=H-YH8O>KM5!|vuX?e|%w ztd}s%WBNRiL`%N)JGf_TQ%|uTYSL_k#G`IZsqW4}hU6UPl}YrMzA4(yaO_=`w)Ti8 z6%EecEnI&}4r(3LKmnSXTxOjW2(VoK16uoh69WFvFGc6T;;kI=Yk6xB$ zy>NG%_dfZ!t>)X1*Bs0!WrKC#=HCrSn;KQxzA1r%dtjuM0vN?-eGIn}>In~`l82}m z&^iYvQ9Jx|jZ|xt30k%;lj4MQk9J`;yCT-4I84-Xu|(d(+q*w1sn?R<`;H=P=bB}w z{3|lM7hXxDDIb?eXX#|%-=Ml~=7_UY2yp+pNPQwpja`gZSGx<&Ps4U^u2@+6*z{~C zq1@}7b-%|Jgen)C>=%hNYql)yqTs$7se_a0P~VjMRgSo3?tAP7Zw;zbN)Cejc^a2h zdmDG`J|!%Cq~&K$vSJ8Z%C>LBoWc64i-;B#HpGX8%`ez+B?Yo|Erqm!mXjDvdT#O!#yWH7sUrxI}G#(90HpKocM^rcFM0Z zQ}q(86(x!|`3*NfEe;&mgtmG%Vl5MqeXKDo>_w2`2~NqaRwx3Rq?;rZEooF>soG?4 zZ}5=qFcYd09lPh=YPBZeY${vj)?-d*H9^vDHoE=$&Z#vf7pvxyAsO~sOvkh|+Dbdf zbewiYNN;I)t9k7)W1jKi>zH|5AzV+=KB$58_?j5z^W$E*nH}DwtAt*eWR29y#snK1 zn=kk5`>|6Ng{`6{QD+HE(*t*B{9+(Wrfi4>jjQyuykW`mRf{yWh{$O_w>W_v1L^Ww zsAcd_Qc-oDIW~cmat(*6*DeY5zg%D-EW@n+Y`xt470=x~8_cS^3uQ?wmHNO-q6#TD zJyo}Y&V@wEBwQk@ZHDI;6P&{5aYz1I^p@eAv-!!fG)9K3wl&oo3wF-)?I#s;uj~&$ zs_D+ZTb?#o%tsy5&mzs{i#YwZ{MeOR77F@2Gz$>TPGo{{%a@+zL5eg|q2 zl{^`T?tP}5EE?V1Y!X;BuX=DNVso)K4Vo@vxP73y7<)Ts?aB6dL8;|%#FuyKZ>_Xb ztJblM3E1VRP^{~y%1!SDX0{E5Sp92MUKiHh=Uvd+X)2MwP{i(b38msa9aMZ>k4w^3 zD$UjDK5k(AINf%v|AVIj=h0)z_ybzUGNX7ui=ia>mdsebb9X_VZimvLC84H{T*q!Q zduaJ?$t`&NqCpN}>D%`z2yR_`7Yq8cEp8ZTQz`F3Kp=lQ{0%9z3(bFSn)p#EwCdmG zm{uCiLFR-PmPTul1>oJJ(YoZ_G`IyCR+O1B8M!8y8MvZSgA9Pm{h!kg1qg%${qvN@ zaN~D@ab(nZIT^G8Sr$G*25m-WiXW9h^ZcD;PXz2C8u_mpfo}vNkqb%w>A6T5CW!_n^nWvD_m2Po diff --git a/package.json b/package.json index 3afeef3..2bca73a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "CSTM-RESOURCE-GENERATOR", "displayName": "CSTM Five Alive Resource Generator", "description": "This is an internal tool to help you in creating a new basic lua resource for FiveAlive", - "version": "0.2.1", + "version": "0.2.2", "engines": { "vscode": "^1.59.0" }, diff --git a/template/client/client.lua b/template/client/client.lua index 7709bd7..a428170 100644 --- a/template/client/client.lua +++ b/template/client/client.lua @@ -1,3 +1,4 @@ +local CLASS = "CHANGEME"--This is the name that the logging framework will use to display your logs in the correct manner --BEGIN CONFIG --Global Constants local LOG_LEVEL = 4 @@ -35,8 +36,14 @@ AddEventHandler(RESOURCE_CODE..":ConfigUpdate_cl", function(cfg) end) --SLF Server Logging Function DO NOT TOUCH unless you know what you are doing. function Log(message, logLevel) + local line = debug.getinfo(2, "l").currentline + local name = debug.getinfo(2, "n").name + if name == "fn" then + name = "Thread" + end + local value = "{"..CLASS.."."..name.."("..line..")} "..message if tonumber(LOG_LEVEL) >= logLevel then - exports.SLF:LogToClient(RESOURCE_CODE, logLevel, message) + exports.SLF:LogToClient(RESOURCE_CODE, logLevel, value) end end diff --git a/template/server/server.lua b/template/server/server.lua index 0d3deae..7de7d41 100644 --- a/template/server/server.lua +++ b/template/server/server.lua @@ -1,3 +1,4 @@ +local CLASS = "CHANGEME"--This is the name that the logging framework will use to display your logs in the correct manner --BEGIN CONFIG --GLOBAL CONSTANTS local LOG_LEVEL = 4 @@ -95,12 +96,24 @@ end) --SLF Server Logging Function DO NOT TOUCH unless you know what you are doing. function Log(message, logLevel) + local line = debug.getinfo(2, "l").currentline + local name = debug.getinfo(2, "n").name + if name == "fn" then + name = "Thread" + end + local value = "{"..CLASS.."."..name.."("..line..")} "..message if tonumber(LOG_LEVEL) >= logLevel then - exports.SLF:LogToServer(RESOURCE_CODE, logLevel, message) + exports.SLF:LogToServer(RESOURCE_CODE, logLevel, value) end end function DisLog(message) + local line = debug.getinfo(2, "l").currentline + local name = debug.getinfo(2, "n").name + if name == "fn" then + name = "Thread" + end + local value = "{"..CLASS.."."..name.."("..line..")} "..message exports.SLF:LogServerToDiscord(RESOURCE_CODE, message) end