From af60b96e4a07ad950659c95b8167331c6dcd8d9e Mon Sep 17 00:00:00 2001 From: Govindass Date: Tue, 21 Jul 2020 15:16:57 +0300 Subject: [PATCH] Add 1.16 support & Add more syntaxes & Add 1.8-1.12 support back & Remove some syntaxes that are already in vanilla Skript --- .idea/artifacts/SkStuff_jar.xml | 1 + .idea/workspace.xml | 87 +- SkStuff.iml | 88 ++ bin/META-INF/SkStuff.kotlin_module | Bin 16 -> 16 bytes bin/me/TheBukor/SkStuff/SkStuff$1.class | Bin 1158 -> 0 bytes bin/me/TheBukor/SkStuff/SkStuff.class | Bin 12710 -> 10418 bytes .../SkStuff/effects/EffResourceSound.class | Bin 3352 -> 0 bytes .../SkStuff/effects/EffShowEntityEffect.class | Bin 2689 -> 2769 bytes .../expressions/ExprClickedInventory.class | Bin 2605 -> 0 bytes .../PathfinderGoalFollow_v1_13_R2.class | Bin 3039 -> 3039 bytes .../TheBukor/SkStuff/util/NMSInterface.class | Bin 660 -> 679 bytes .../TheBukor/SkStuff/util/NMS_v1_13_R2.class | Bin 4295 -> 3820 bytes .../TheBukor/SkStuff/util/NMS_v1_14_R1.class | Bin 4295 -> 3820 bytes .../TheBukor/SkStuff/util/NMS_v1_15_R1.class | Bin 4295 -> 3820 bytes bin/org/mcstats/Metrics$1.class | Bin 2222 -> 0 bytes bin/org/mcstats/Metrics$Graph.class | Bin 1931 -> 0 bytes bin/org/mcstats/Metrics$Plotter.class | Bin 1104 -> 0 bytes bin/org/mcstats/Metrics.class | Bin 14714 -> 0 bytes plugin.yml | 6 +- src/me/TheBukor/SkStuff/SkStuff.java | 84 +- src/me/TheBukor/SkStuff/bstats/Metrics.java | 719 ++++++++++++++++ .../TheBukor/SkStuff/effects/EffGZipFile.java | 49 -- .../SkStuff/effects/EffResourceSound.java | 57 -- .../SkStuff/effects/EffSetPathGoal.java | 15 +- .../SkStuff/effects/EffShowEntityEffect.java | 10 + .../expressions/ExprClickedInventory.java | 49 -- .../SkStuff/expressions/ExprGlideState.java | 66 -- .../expressions/ExprInventoryOwner.java | 63 -- .../expressions/ExprNoGravityState.java | 82 -- .../SkStuff/expressions/ExprStepLength.java | 80 ++ .../expressions/ExprTimespanToNumber.java | 77 -- .../SkStuff/expressions/ExprToLowerCase.java | 43 - .../SkStuff/expressions/ExprToUpperCase.java | 43 - .../expressions/ExprWordsToUpperCase.java | 56 -- .../PathfinderGoalFollow_v1_13_R2.java | 21 +- .../PathfinderGoalFollow_v1_16_R1.java | 79 ++ .../TheBukor/SkStuff/util/NMSInterface.java | 14 +- .../TheBukor/SkStuff/util/NMS_v1_10_R1.java | 91 ++ .../TheBukor/SkStuff/util/NMS_v1_11_R1.java | 91 ++ .../TheBukor/SkStuff/util/NMS_v1_12_R1.java | 91 ++ .../TheBukor/SkStuff/util/NMS_v1_13_R2.java | 40 +- .../TheBukor/SkStuff/util/NMS_v1_14_R1.java | 31 +- .../TheBukor/SkStuff/util/NMS_v1_15_R1.java | 30 +- .../TheBukor/SkStuff/util/NMS_v1_16_R1.java | 94 +++ src/me/TheBukor/SkStuff/util/NMS_v1_8_R3.java | 92 ++ src/me/TheBukor/SkStuff/util/NMS_v1_9_R1.java | 91 ++ src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java | 91 ++ src/org/mcstats/Metrics.java | 785 ------------------ 48 files changed, 1771 insertions(+), 1545 deletions(-) delete mode 100644 bin/me/TheBukor/SkStuff/SkStuff$1.class delete mode 100644 bin/me/TheBukor/SkStuff/effects/EffResourceSound.class delete mode 100644 bin/me/TheBukor/SkStuff/expressions/ExprClickedInventory.class delete mode 100644 bin/org/mcstats/Metrics$1.class delete mode 100644 bin/org/mcstats/Metrics$Graph.class delete mode 100644 bin/org/mcstats/Metrics$Plotter.class delete mode 100644 bin/org/mcstats/Metrics.class create mode 100644 src/me/TheBukor/SkStuff/bstats/Metrics.java delete mode 100644 src/me/TheBukor/SkStuff/effects/EffGZipFile.java delete mode 100644 src/me/TheBukor/SkStuff/effects/EffResourceSound.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprClickedInventory.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprGlideState.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprInventoryOwner.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprNoGravityState.java create mode 100644 src/me/TheBukor/SkStuff/expressions/ExprStepLength.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprTimespanToNumber.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprToLowerCase.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprToUpperCase.java delete mode 100644 src/me/TheBukor/SkStuff/expressions/ExprWordsToUpperCase.java create mode 100644 src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_16_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_10_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_11_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_12_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_16_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_8_R3.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_9_R1.java create mode 100644 src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java delete mode 100644 src/org/mcstats/Metrics.java diff --git a/.idea/artifacts/SkStuff_jar.xml b/.idea/artifacts/SkStuff_jar.xml index 15a3c1a..b2f7fed 100644 --- a/.idea/artifacts/SkStuff_jar.xml +++ b/.idea/artifacts/SkStuff_jar.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a686155..2099ef6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,31 +2,69 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -34,8 +72,12 @@ + + + + - + - - + + - - + + - + + + + + + + + + + + jar://$PROJECT_DIR$/../../import/craftbukkit-1.13.2.jar!/net/minecraft/server/v1_13_R2/NavigationAbstract.class + 178 + + + \ No newline at end of file diff --git a/SkStuff.iml b/SkStuff.iml index 3e06e53..d9740d5 100644 --- a/SkStuff.iml +++ b/SkStuff.iml @@ -67,5 +67,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/META-INF/SkStuff.kotlin_module b/bin/META-INF/SkStuff.kotlin_module index 2983af70661ad375cc499ebc4da5a68ca46c532e..a49347afef10a9b5f95305e1058ba36adec7d6dd 100644 GIT binary patch literal 16 RcmZQzU|?ooU|@t|0RRA102TlM literal 16 RcmZQzU|?ooU|@t|egFVe02KfL diff --git a/bin/me/TheBukor/SkStuff/SkStuff$1.class b/bin/me/TheBukor/SkStuff/SkStuff$1.class deleted file mode 100644 index 5f8d9ba3e2639ae4b51d92717455884358914266..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1158 zcmb7ETW`}a6#l&4)(}`3FxZV1D5DoNZyFLpn<|Z|Oh{o!wCa1>da2vgL5VZLzk&yb z!~^1)AB8w>%hVuIjYRRe_?*w*v5)if*SGHgp5bX8Srjeg@W4VE4|8~Ak*Acy;~cgb zvbry$(k{cMGZMVj7cb*s5c1}*spGS=Kk|SA52cd2&QL7RjjXg8(#JthFf2JziPL!0 z5n;>i_~co3g0Abg-B22P>P#C74EAfKM0o7GQ6$LRnzu@6j~Jyqp&6XA6NDb`#KWP~ zT$~FlzZX)0chzzUmVgee8wu~fIcBE9G zT`dDem8?4h_uT!!-AgAwjeXzj04=y(9#3=MRUUua8Hlc7XfhHmhI~_c%GGg54Es*E z&($FCc{B{=d(C4leSRXe7U5xneWJX?%oXaY6F;jN#9>#wlIHyEXH6g8Zm~kalu25OJ`2}C`$JkC3-pqwTKfW4{fdRpWG&!2 zjaiBT_Hl#8l}QwqaFZ;9V9=-oP4P5muwIa5urjp^q&|@{3-f#iCUXgs!EM~3v=xdr z%iRSEM+A9q3b{|xK<2BpA4p#y^Ed2-olU6}G=-f3qo2s?n8+H|$8rOkB-6N$Efh$z JC^Jivp5Je29+Ut8 diff --git a/bin/me/TheBukor/SkStuff/SkStuff.class b/bin/me/TheBukor/SkStuff/SkStuff.class index da09f1090f7b2a36f2bd45b0cb9c8aa3ca6dd25f..518ab078d2dc56a419b0593313bfc3a41edccc54 100644 GIT binary patch delta 2670 zcmZuz4P2Gg8UH_*3+LR|SHM>hG!eXf30#2}F(FD(Q-c5%OhP5Rz!k1uFT}lSrt`Mi zM_a9OuUpx+*e5irm6(9tbj>!lY#)_dTdl3x+S<&u_ED|1xjpCQUZvl!^SkHyKhOU> z=lglidj~s**F{cWc;Y003d+>519!L(z@18bPKmpexLb*PG#tR^C9Ekph%adPBJNe< zK8@QB3EZz?D(;Z@lEN=5@+%r1z<|V874tO>U&l8jzA5l6fkBBO)%ihzZ$|_UyYLVm zmUu*Q-w}9J;4wuVkr(riqCvaB7dZoT5@Oup{N_}164;nTq^^XE? zXlPUFp9KD_VT)4F3B0Mn-Kq5R0)Nr4RjF@D{8gRS+Y)~h_`ASAtaJ2^Be&if|EL>UZv?lh#|#drS8%IyD&T z@%sW@*&Tu2&h4B0!S1%g?D^jCzTRMAcAhU7_J{Z6=`@9hLh0 zN~RR+jB7)pPN_7_@+KEp<62IF!R&eMdM7@PTdi}+rqww$Z$)$1*H`Zgc87ZinVZ5r zzP9WTQ`rHV%kJHJaXP}x_{;^N$xhZ?Dej}yDcRGgD7KW8*^Rv`0{%Y2v~Av9-qL_K z*j>83w>RMP2CcK%FOyqcQO1X_NXIUkuG0+cwqBZ-W31fe>)#XZ;jQy*{XTEk9_zfj z)tg2$1*PkhL9+;Qm)Ty~-n6hpr`dGbgk9C%WR_f1%UN}?msvJJ+qyYPFQ23@Y;P(r zvAj96DcABA&6?iW(A*xIK}Q%n2{~3UH`8U7RF+iEBiLTaF)uamC5Nh#@{e#RpX^Y< z4tZ)GS8N2c%vzS4FUst$A8s-27V{%o%I%i&OD!q!(bR6#8hOP>$8$8|XqZFV(dTks zNpQ@aZ+Y`(c$`pc^obW#%aMAv_n)-G=?cHR*iX?b+|Y;GG`c> z&J)OJO)%y*k0Hy*Hs%e(oj5_|G`Bj9T*ViSBJU6m6pcVP@<)(n6d2q!?l)ig725ra zVxtwaHQVsStOd4J60=HetBfa!sEJM0yWHj$8WopDU8MNSna?s7Pv$EXU#0jcu4pZC zj-tB0cm!A4i@S;!XDdrs8H(vkS?8lDI*u9#j__e6U=PaZb9sTQ zYpCko*BI9iU6Y*0*ui);W1o3j(saiC=7G$EjCYy?i_#eHHy^1##`vHa?Mi1HHJ{mg zALF>kSTTaD58mFrxOajk8pr7GVPk5O-%NvU#4=3!pMdt6nKTurX4xklPpgt&f& z>i}1^`e(VGjiRA-6pcr*#=g_F_MJW%#X4r2;%u|c4o0z_+3Vu$2AjPniWX+CkF%{d zdvg>UncWm)BgST%?uw#~=^NtC?KayO#TI70akj%|E2HRSwkyv1Y}OscR%W~7Y>&*#iDpaW>3gJ`7(u#twai4LQU9>)!I0`2q^ zymT5JbOxRDB7F2JdJu`lt%|`|v^x0>xecG-5WR($mWT8U*dp*r{?SysBqvWX)8gfQ zNLLMiI5>emJrUKI!>EdrxBM6**%_B)vjLX3#~&;Hdt+6Z?&|F$NFBipJ}{M_4%=O0 YF9q_~NN}ap1H62c1c5dH?_b delta 4958 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 MxOcI-8t(b?KRQ}rf&c&j diff --git a/bin/me/TheBukor/SkStuff/effects/EffResourceSound.class b/bin/me/TheBukor/SkStuff/effects/EffResourceSound.class deleted file mode 100644 index 1f50ee5bffed7b933a0ed67c69794c746600acc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3352 zcmb_fTXR!Y6#n+fTqIfIzK9n~Jp13Q`IZta4F2O?TSUo}9#!6WV&g z8+e)VN#1<)g%=-mMqtnx#y1C_{R93AeQ>~UpOb{7q*i8p=-zv+y{_M0Yn}AB2S42d z(1$N$*osS0Y{8pqc}p#q)$+Dl47E(^$i)!Br3j|fF58gDbObXIm=Vk>)?5Tu1O;_r z>nN(dq~n~9cXT*0Y(lvWE-E^%=$ID>m5UX7N+2?TkP)YfjsSTXCd7-wNV`W3$E;!#9$39n+r99Ht4qWEqRnDGLm)XrSm!rzb0O zbEcb?wrjeJ=`)_PXDDJ7bB4>f1P(okrLn4-XC!>3XjKYNn9X>lFex2RKU6Z^+>FY~ za9!yz7I8u#JZRdcdsraQ-7_H&JX)Nhi`8SMEq&c{#-v3~hl<6TFdS3SRc6qgF^SIp zv4TvWn~}qnxuTQK&Sl+7KA)EPyv(`f^hiE`R`T7PoXo1%Bd|f`Q^%q}+Zn?tOWs#3 zS0H}Ewxx5_GRkF1yR+RFS3oOsqApNzO)GuUlG2ujovE`M>m%#cis#YU)!;bObAd5Q zR*%5;6^NIt7Z&7%SvFa(d~Bm2S@lDLlP04Ik)XQN1c zD6nTa5@>&v<5D2T?qZLPnyOtpmv-HLHR0k&A{EC|*cQijwd_<&H+tfDMxFLx8w+^p zEF7+w)|6y#tW)za;TZD?Zwx2$MJEx*dw5^R2XPExm|c`G+yqNKF>ksvJm~(=qSz3w zlJCtR@Z6JzbK<@-bO$g zJA)Cbdh)&rOCzkkcBa8e^}{?ms+um*3Y5lIVSR7m4-_B_O%*%@o+hOs!9Ui1o!&v3 zZBVCok!Ca0>D{E+7fm!fhPHy_v7fl^C6(qbxQCK=Ab#*%?c*BunC;llbKDo8=mAm! z2k{(@E9Ku2K#2QrG8O2(1udBhatkC=A#TCs)>}0DBSPO`eKHj$E1XQ}-1M7R>oatp z5e|MwD?upFNyNBrhE5>b2}LJi*vv$>6NqlY(2E^-fvF#1x+=OpKZ0s>j0OET^9n%TOhUdF5&@@>R9Eof(@*8pG5?A))ZI!tneeL+gNiGiQ4^I|6XspC$FR9aa%2A z8*H`oMKkpHJ(CG|fcsCK^uSE`N!G!Q&Ahn zNd;?n8wY|U!@ok0-^4m~tlez7jjrca)#;Be^`^`4z5%^UztWJQ`BHE7Yc$IP*ZOtQ#bM%tJ3|_+op*c>pUdJ1RMbh3L zp28mT{RlrmKT+1PLC5*i+TVz4r?rQy<(U5t^*fF4u|cr4|6=QCxWK41Tx7gpM1t`z IF#fK802GEvdjJ3c diff --git a/bin/me/TheBukor/SkStuff/effects/EffShowEntityEffect.class b/bin/me/TheBukor/SkStuff/effects/EffShowEntityEffect.class index a87d952bcdd0af6cfc16c27afa093fd59f322fec..0597016fd07d8fea87943d7a50512c47c2d5fac7 100644 GIT binary patch delta 1077 zcmX|;%TE(g6vn?9`k0pCVN0P%tD_>|P?eX8Z{?vNMMM7hBNh zK^W&eXhc6}^f`|K&Mqjp$Z?R#B?Xr`4k@_8@v4Gr9Iq?5!Eso@h#N64{OD6K%5hA= zcp(hLc`?CR!i{7hJXN^qM#_!!;-jb}O}+mq{g$O<{*^<|?SigiD>M~5Q0<1PVj6WS zYEdV_A5UhCSu>NeG-GZ$ZCXilO2tmpsJO-Zj>JqRt0KdBAek|zv9I6eWsIeFf5@D2ve7 zC15djQ?A+t*h9sjyn$X^=4NRG1#mhE&gZL@n%tcJ0S?Ck{Q5h1mf+HT-X$onF~Zzw z^FqN@!Mm8dY+fXIvEU8N-8L@~yj1WYb7cXgbp9s6eZ(DaNPq(okdQ$H^2$?janeV~d@)vHvIE zEF^38DI1b?w4q%{*3p4Z>NrIm9+}W-N_Y%i=!TRNPdh{VtRhS|%k`_+EaMBRdL!Ra z6d~kVMMwred4agtN8LaxifIBqavvi9JU3fJctb>ZT|_ZTa0Weei9HeNFG6laY28~+ SZ8FZHnWC4(HDVG?sQd@{%%qV3 delta 934 zcmX|9OHUJF6g}T`UM)j`0i3q9T3hB*2S3>XlF>1Uln+My--`eLb$A^|EC zNe}|77%52eN3On4dcGxHzfyqruyP}#CR#zOxpNTHewoWx_rWL{=vzSn8nKCyz-Daa za5jrpgrI2zC%tYn6Yq0BKvkzu?Y={J2D)oUW?;TThxfvC+OjgM2ibBz8}+j>i5pX> zWLJfcR}xoWbF2!<)w8G}U6aPH4Sb~`Igb?~ zFq(z)mgS1iI#4j{GfoF%mKnR)j{`nq7YA{O9f#Q$RtUAzk%u3_QAY9$jWaD-lv3QR zG|VHW;4|V~jbBjSNJyVYLV^5rA%C&WZcvCQT3}OzBn6PN1te0-BvMNxqNqRzj&X|= c#DrKx(xB)HPB2!`i7m7dga!XBw~OV diff --git a/bin/me/TheBukor/SkStuff/expressions/ExprClickedInventory.class b/bin/me/TheBukor/SkStuff/expressions/ExprClickedInventory.class deleted file mode 100644 index 5b57bc3e290737a7a823b9fc455de535d954cfc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2605 zcmb_e+j1L45Iv)nEm@K6SiU4qAXz5{WIORfFy%M*F6)vjwV zsrV!K0lpy*z(Yt;1(jz$isH>ii`s2@Ee+RIHZ*s`vlMG53 ztmN=1?q>1X5I)Ch4);*b;(iVq)^fOj2N`^k!IuJqE0$vgcLlWK+>SuH?Cwc{(W>Rh zjj+8dy=`;Xrle4H8>YQudX_qOgy~@4@&%TwZE0-p%X?wV^^AI}9)wSy8uIy}Cw<>? z9p6~vzHD2KmfWj2&!iK$-cd;}Gh{>sl;^<11u0j}Cw(-!G(vhZ9>WY(g z^#~*K=*=b^mm*FoX96?lx)c~`n?Yk=?roVtAU#JwR2Y-#HSY*q>Uus&h__A7QIv~a zm48J}VCv-k^SU}UFnb=^m3fu_;d)>;TI=Rv$E=O&9>zItU8Vxn1SjA zfvZuCKR3*-(AWrVTlE#aY3vDs(wQ9Ro+PRCD|dnElQd3vKRbFNA2;9T?tyFsQY!LX=U)1#7uGB+c?(ru*5+!w%l^!|HU?Y!B zY-R8$j~eO%W2Z3l*v8j+ypJV;rT;QC1?KuqqrTUX0SEf6e(GlpA=YM(dcC1WUez`C zBnQ)o<(EUxW2;2T6qqO`N+zDyYK~p+L9yMYvF3TM_b4=ND>x!jeQkYpW4luRZmm|^ zta0X@DzhFNmd<1kY#atVP%3QoI3(C~+V@;o_3DkY=X#$fHZ$LvM0IrwBk{5b=sldG zmn)fH%<#F*^LYj`;2gvVzoR@ETm{#G`ClM@;wFWQ{0>IKF^qAaj}=hBI8RJBCaI;2 zZ}X&#wL+AGiZ2d76qkU|?Wm5CxJ<3}OIN;ufd? delta 123 zcmZ3^I)!yZJ)?6@Wl2$@droFbYH&$nNh%|QaB*shD~2dfdTNPZzI#z(S!PKkBLfdm s5u7{uDPuY#_hertS5+Pc1{OvJAqGA$EzAJni-7nHj0~bcl8HeK0Dxj1Pyhe` diff --git a/bin/me/TheBukor/SkStuff/util/NMS_v1_13_R2.class b/bin/me/TheBukor/SkStuff/util/NMS_v1_13_R2.class index f0be4f462af3d67611bde839b70f925d156f95b8..4d9473c897153c77149436d28716fc94c31243ba 100644 GIT binary patch delta 1452 zcma)*+iz4=6vlu1Ogm@h^mNdSozc?PmbSJ7g`#!@K?KDP2&GpoBBeOONC#@gc0f>c zP^_rnjq_sS15qALOpwciF~&C&{VROef4~sqx6e$D_k>KcX6?1t`o3?iz0MC^zqD6> z{QaBnfFUk@_3O2i}#WZA5Xfx?6T;xboFw^F_mjKopF<1sFW+G zrz)l6Bc+8Sl{rIue=u%Z+j0d%dZ|xK>S z6Pz@x3x1CG1fLl%Xm8xI{}oQToc4K@*9_UC#goOs6P5D(;7EDlSn2T2;?mqysp4~n zPJ=n*^E#(|-k|DpmN#8=^%m!R-ey_%MW1&#@AIzB9uQAQ@KYky=TqW6m-l^kkoUR3 zIhTt*AMl~iM||w_3FC&|V8XrUlJT!qVNMz!l=4SdCG2jdrDvbi%t+6oFwZDs zS%{ws^Rn>1V139xNkTQPtYeTy<*e85ey!JX6kCj9aHSdvy&}*-iBpgVMD2v$5P3E9 zkbK)%4Q_+rY9Q9DTfIC z8Dyl^emf}yz252X5}>C^rpo27>`@d z;9#mH__8?}PThW-s6HVC`|`DyYmQi&>o1oO`*xmCw$U3FERM2gb+*l?)_jk1li29m zwi{%wD&pwH6c6`cSm*_9){c;2b*+M)fpEEOQf)b`r;S!=LhEJ8Vxrj@iSF2HA!~wn zD`(`k1wUC69DJMV-}9%e31LiXu{Mu=1btoDuo~&2u(n$VUVHk9m&i)BF28Cqk){e*oj+u!{fy delta 1748 zcma)++f!Rr6vn@kgzS@(O%lsMv;^d0Ac26bf~~!Q7ofBSLTjPLsts+LMj~xPMA6nj zEs9pH^?0e5N?Y{Jai&v;2Ok{Yobk#3z-MRt3pyRgZ=aJKGp!FDW>)rId+l%i*4pdv zcf)VZ#ozz=`4<2^_})MZ4hu{faN&7@BRXCXc+m$BUNUeLDS>GNJ{;3=TshMQ%?ahn z_;C_hWnR`XqhxYw^NPT%0WVJZa2jU}n!JuN19K=Sy;lY14K&r`H3P3>L76vH(3{Gf z6*wpGmO%05N}WqvytV2|Y8!G3g?wr#mpz_7P)HTh8WQG`NbJ^7GnXz5+;du$QK1@S zCS4dkHIz@yXA2A5GPq*vn=K!i)1FrMBZ!(So-N)boY&B8Zq^&kYr<>(Z>hE61`*mJ(rn2O!V zXy8Hk@em^1b)g=+xEe!)b-xL2o+nH9)v62KRPbW}k75&NQp09E#@{xx%lN6NGzakj zZ8HQZgQTn>VVsPQqYXRIPVE>b$a9!9N63?>=2@yPQ}GHlSE+Xcy;lDH(0OMg@Ag<# zY@+`OPWZCp%kzfq1J;TT=o&?P2uCNjU@HOD>Pc*4LEE`jg~hF_J1A$1sFfYRlkvN_ z4ny2QT%a#;8!p!!)Rva$=b;NvF~QS#hPI9S>u{TY`unr02X&+c(*>BYh6$tCNt`~b zCRGW@Y`=+Gl~H@~Ec>cZd##F9?|Ut1kA>rbD;i+7K@6#!=6H3jc~$!QR7Umx0lcqM zLA|{Fa@9_j>e9>U%)T4LjMlIRdo7*CK&^RO8Y4<4V7>Sr>g+`|zXYY#VKpY;Xa!1I zDw^L4wRFyrQgu^r#Gz}fAWJf4{JzOXOJqM*$E=yMsV1l~$=)8Spb9%wVTUTr8MCQ^ z4pq{oVm0IBRh$dZqCzGJHuJXS8)FSEKJ-p3zJsOhyDeXf94?o diff --git a/bin/me/TheBukor/SkStuff/util/NMS_v1_14_R1.class b/bin/me/TheBukor/SkStuff/util/NMS_v1_14_R1.class index 3d3cdc0971abc8051372c694979882f58962b0db..bdc296c938acb1fc4027635b0c4a07c0942fb9c4 100644 GIT binary patch delta 1452 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 SgH}Sd#5Hl3pDJQI5c?1DRz8LR diff --git a/bin/org/mcstats/Metrics$Graph.class b/bin/org/mcstats/Metrics$Graph.class deleted file mode 100644 index 03c1a167224a9a7828da90c10f87288d8f323d1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1931 zcmah~+j84f6kSKQC12z?O_P?U6hbNB8*x&~)gfF`(iU#TJfQTQaiT;RkqU zfG37mcRq9taGH;PNLGxw$8y`X zM&LVcyDpIKb-W<3{k}jU%nt&mQ)}1(lbMFocCBFG+XmhhFfNCC1CRN%Z6?+6=B1NO9LHmFIm>!wZ6zEn zbIopDqzE*ziAfwWF@b`CH52Qon%F?qz@~}Ic;CPWCQ2w9Xb7B$bFFfXi3+L$lcV=1 zREJiJs~OIBCN9g<=0|MFk^0eb97E_1&S{ih@j4xj$?;syuP|`CUd#DZSzi^>ouj?- zosA4V=Abds;Y%-YG=>(Q;-@6fkBx>YDHrdiq;{YyRP-1!%u#VhPB8KzKSCO>Gv!@q z<=>I`co)f=NR=x$q5q;vX1PuwNzAX1)V@SP`x?{QH#o`ov9K7A;|V?yMl}@#e-d+1 ziyE(jxm5XA=s)vDgM`#&Q2S27nBj&9M(`A;8IkgbYsh5vHKVl{t!z+B!@G1?+^AqtXRxzEF PKdh@bMbE#$IRE|w;Ie~2 diff --git a/bin/org/mcstats/Metrics$Plotter.class b/bin/org/mcstats/Metrics$Plotter.class deleted file mode 100644 index 8622ecebe93a055f35533521572116e01747fc6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1104 zcmaJ=%}&%%6#j18na-3l;P4}gC@AXu0HcU2j4{EGkN}!sSh%~4btrZ^*misdUqM&y z+_2C@hs1@^tq-9)^%YEv@w;uEVFGb;@44rm^ZlILe);p^BY-6=<#5GR7Q*#hi%+wbxYUnu+TIhA*3rKyiIfK9e<1`i$YMK<;>PbE_`BZ5g=goFV z1&vy>9!4?>Ya0$p>)~u#P4cnQaY;%=uHi)6(rc5KvepC!nOJFg?WVsOTNy2tk9P`W z0w;7L_V3DYH*u16p0=e&Eqz?~cJ`clv|N730kq<{e>~|ut?mD_HnCKOA~g8W@?3DT(V4PdA}4VzyEghtS?K)G*A| z;tuUAvf4MC;@M8h2s6f$f*4OBR$0kfSd~NQmFjyKJ(L1;qI`#;{Xky(86%A+)hUu< zQo@8Gl-U@Yb4sym+?BjcI zlCmzQthq`DnGUiC{lvO)q(9f~=X<67&nc56n6G|@`4SoZp!x~s#vDB;A06agpg7k- zp7{A!FpbwRbVZ`aqc6f>$X{Exkk|QEdLbs9PC&bZo5uxAld`~lh9)#zB*p++e`ChP Wr8|PD*;xB!jB>YFY+@cGM*c5=wY%&9 diff --git a/bin/org/mcstats/Metrics.class b/bin/org/mcstats/Metrics.class deleted file mode 100644 index 3079690ef6da8116b4a340c716e14475f8cca2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14714 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 l?}jP!0oGE{3&!(OpF2QGOqaSBrl9`yb+o^j!b| diff --git a/plugin.yml b/plugin.yml index 072db22..f71e8ec 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ -name: SkStuff -author: [TheBukor, Govindas] +name: SkPathfinderGoals +authors: [TheBukor, Govindas] description: A Skript addon which adds extra functionalities such as pathfinder goals. -version: 1.7.0-fork-1.13-1.15 +version: "2.0" main: me.TheBukor.SkStuff.SkStuff softdepend: [Skript] \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/SkStuff.java b/src/me/TheBukor/SkStuff/SkStuff.java index 0a717fd..28ccad7 100644 --- a/src/me/TheBukor/SkStuff/SkStuff.java +++ b/src/me/TheBukor/SkStuff/SkStuff.java @@ -5,6 +5,7 @@ import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.util.SimpleEvent; import ch.njol.skript.registrations.EventValues; import ch.njol.skript.util.Getter; +import me.TheBukor.SkStuff.bstats.Metrics; import me.TheBukor.SkStuff.effects.*; import me.TheBukor.SkStuff.expressions.*; import me.TheBukor.SkStuff.util.*; @@ -13,7 +14,6 @@ import org.bukkit.entity.Entity; import org.bukkit.event.entity.EntityToggleGlideEvent; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.java.JavaPlugin; -import org.mcstats.Metrics; import javax.annotation.Nullable; import java.io.IOException; @@ -31,66 +31,24 @@ public class SkStuff extends JavaPlugin { public void onEnable() { if (Bukkit.getPluginManager().getPlugin("Skript") != null && Skript.isAcceptRegistrations()) { Skript.registerAddon(this); - getLogger().info("SkStuff " + this.getDescription().getVersion() + " has been successfully enabled!"); + getLogger().info("SkPathfinderGoals " + this.getDescription().getVersion() + " has been successfully enabled!"); getLogger().info("Registering general non version specific stuff..."); - Skript.registerEffect(EffShowEntityEffect.class, "(display|play|show) entity effect (0¦firework[s] explo(de|sion)|1¦hurt|2¦[[iron] golem] (give|offer) (rose|poppy)|3¦[sheep] eat grass|4¦wolf shake) at %entity%"); - Skript.registerExpression(ExprToUpperCase.class, String.class, ExpressionType.SIMPLE, "%string% [converted] to [all] (cap[ital]s|upper[ ]case)", "convert %string% to [all] (cap[ital]s|upper[ ]case)", "capitalize [all] [char[acter]s (of|in)] %string%"); - Skript.registerExpression(ExprToLowerCase.class, String.class, ExpressionType.SIMPLE, "%string% [converted] to [all] lower[ ]case", "convert %string% to [all] lower[ ]case", "un[( |-)]capitalize [all] [char[acter]s (of|in)] %string%"); - Skript.registerExpression(ExprWordsToUpperCase.class, String.class, ExpressionType.SIMPLE, "(first|1st) (letter|char[acter]) (of|in) (each word|[all] words) (of|in) %string% [converted] to (cap[ital]s|upper[ ]case) (0¦|1¦ignoring [other] upper[ ]case [(char[acter]s|letters)])", "convert (first|1st) (letter|char[acter]) (of|in) (each word|[all] words) (of|in) %string% to (cap[ital]s|upper[ ]case) (0¦|1¦ignoring [other] upper[ ]case [(char[acter]s|letters)])", "capitalize (first|1st) (letter|char[acter]) (of|in) (each word|[all] words) (of|in) %string% (0¦|1¦ignoring [other] upper[ ]case [(char[acter]s|letters)])"); - Skript.registerExpression(ExprTimespanToNumber.class, Number.class, ExpressionType.SIMPLE, "%timespan% [converted] [in]to (0¦ticks|1¦sec[ond]s|2¦min[ute]s|3¦hours|4¦days)"); - Skript.registerExpression(ExprClickedInventory.class, Inventory.class, ExpressionType.SIMPLE, "[skstuff] clicked inventory"); - Skript.registerExpression(ExprInventoryOwner.class, Object.class, ExpressionType.PROPERTY, "[inventory] (owner|holder) of %inventory%", "%inventory%'s [inventory] (owner|holder)"); - effAmount += 1; - exprAmount += 6; - if (Skript.isRunningMinecraft(1, 9)) { - Skript.registerEffect(EffResourceSound.class, "play [raw] [([resource[ ]]pack)] sound %string% (for|to) %players% at %location% [[with] volume %-number%[[(,| and)] pitch %-number%]]", "play [raw] [([resource[ ]]pack)] sound %string% for %players% at %location% [[with] pitch %-number%[[(,| and)] volume %-number%]]"); - Skript.registerEvent("Elytra glide toggle", SimpleEvent.class, EntityToggleGlideEvent.class, "[entity] elytra (fl(y|ight)|glid(e|ing)) toggl(e|ing)", "[entity] toggle elytra (fl(y|ight)|glid(e|ing))"); - Skript.registerExpression(ExprGlideState.class, Boolean.class, ExpressionType.PROPERTY, "elytra (fl(y|ight)|glid(e|ing)) state of %livingentity%", "%livingentity%'s elytra (fl(y|ight)|glid(e|ing)) state"); - //Skript.registerExpression(ExprPlayerChargeTime.class, Float.class, ExpressionType.PROPERTY, "blah of %player%", "%player%'s blah"); - //Increase exprAmount when I uncomment this - EventValues.registerEventValue(EntityToggleGlideEvent.class, Entity.class, new Getter() { - @Override - @Nullable - public Entity get(EntityToggleGlideEvent e) { - return e.getEntity(); - } - }, 0); - effAmount += 1; - evtAmount += 1; - exprAmount += 1; - if (Skript.isRunningMinecraft(1, 10)) { - Skript.registerExpression(ExprNoGravityState.class, Boolean.class, ExpressionType.PROPERTY, "no gravity (state|mode) of %entities%", "%entities%'s no gravity (state|mode)"); - exprAmount += 1; - } - } + Skript.registerEffect(EffShowEntityEffect.class, "(display|play|show) entity effect (0¦firework[s] explo(de|sion)|1¦hurt|2¦[[iron] golem] (give|offer) (rose|poppy)|3¦[sheep] eat grass|4¦wolf shake|5¦squid rotate|6¦totem resurrect|7¦rabbit jump) (at|on) %entity%"); if (setupNMSVersion()) { getLogger().info("Trying to register version specific stuff..."); + Skript.registerExpression(ExprStepLength.class, Number.class, ExpressionType.PROPERTY, "[the] step length of %entity%", "%entity%'s step length"); Skript.registerEffect(EffClearPathGoals.class, "(clear|delete) [all] pathfind[er] goals (of|from) %livingentities%"); Skript.registerEffect(EffRemovePathGoal.class, "remove pathfind[er] goal (0¦(avoid|run away from) entit(y|ies)|1¦break door[s]|2¦breed|3¦eat grass|4¦(flee from the sun|seek shad(e|ow))|5¦float (in[side]|on) water|6¦follow (owner|tamer)|7¦follow (adult|parent)[s]|8¦(fight back|react to|target) (damager|attacker)|9¦o(c|z)elot jump on blocks|10¦leap at target|11¦look at entit(y|ies)|12¦melee attack entit(y|ies)|13¦move to[wards] target|14¦target nearest entity|15¦o(c|z)elot attack [chicken[s]]|16¦open door[s]|17¦(panic|flee)|18¦look around randomly|19¦(walk around randomly|wander)|20¦sit|21¦[creeper] (explode|inflate|swell)|22¦squid (swim|wander)|23¦shoot fireball[s]|24¦[silverfish] hide (in[side]|on) block[s]|25¦(wake other silverfish[es]|[silverfish] call (help|reinforcement|other [hidden] silverfish[es]))|26¦[enderm(a|e)n] pick[[ ]up] block[s]|27¦[enderm(a|e)n] place block[s]|28¦[enderman] attack player (staring|looking) [at eye[s]]|29¦ghast move to[wards] target|30¦ghast (idle move[ment]|wander|random fl(ight|y[ing]))|31¦(tempt to|follow players (holding|with)) [a[n]] item|32¦target [random] entity (if|when) (not tamed|untamed)|33¦guardian attack [entity]|34¦[z[ombie[ ]]pig[man]] attack [player[s]] (if|when) angry|35¦[z[ombie[ ]]pig[man]] (react to|fight back|target) (attacker|damager) (if|when) angry|36¦[rabbit] eat carrot crops|37¦[killer] rabbit [melee] attack|38¦slime [random] jump|39¦slime change (direction|facing) randomly|40¦slime (idle move[ment]|wander)|41¦follow [entity]|42¦bow shoot) from %livingentities%"); // Note to self: whenever adding a new pathfinder goal, increase the expression index for 'entities' in EffSetPathGoal Skript.registerEffect(EffSetPathGoal.class, "add pathfind[er] goal [[with] priority %-integer%] (0¦(avoid|run away from) %*entitydatas%[, radius %-number%[, speed %-number%[, speed (if|when) (close|near) %-number%]]]|1¦break door[s]|2¦breed[,[move[ment]] speed %-number%]|3¦eat grass|4¦(flee from the sun|seek shad(e|ow))[, [move[ment]] speed %-number%]|5¦(float (in[side]|on) water|swim)|6¦follow (owner|tamer)[, speed %-number%[, min[imum] distance %-number%[, max[imum] distance %-number%]]]|7¦follow (adult|parent)[s][, [move[ment]] speed %-number%]|8¦(fight back|react to|target) (damager|attacker) [[of] type] %*entitydatas%[, call ([for] help|reinforcement) %-boolean%]|9¦o(c|z)elot jump on blocks[, [move[ment]] speed %-number%]|10¦leap at target[, [leap] height %-number%]|11¦look at %*entitydatas%[, (radius|max[imum] distance) %-number%]|12¦melee attack %*entitydatas%[, [move[ment]] speed %-number%[, (memorize|do('nt| not) forget) target [for [a] long[er] time] %-boolean%]]|13¦move to[wards] target[, [move[ment]] speed %-number%[, (radius|max[imum] distance) %-number%]]|14¦target nearest [entity [of] type] %*entitydatas%[, check sight %-boolean%]|15¦o(c|z)elot attack|16¦open door[s]|17¦(panic|flee)[, [move[ment]] speed %-number%]|18¦look around randomly|19¦(walk around randomly|wander)[, [move[ment]] speed %-number%[, min[imum] [of] %-timespan% between mov(e[ment][s]|ing)]]|20¦sit|21¦[creeper] (explode|inflate|swell)|22¦squid (swim around|wander)|23¦shoot fireball[s]|24¦[silverfish] hide (in[side]|on) block[s]|25¦((call|summon|wake) [other] [hidden] silverfish[es])|26¦[enderman] pick[[ ]up] block[s]|27¦[enderman] place block[s]|28¦[enderman] attack player (staring|looking) at [their] eye[s]]|29¦ghast move to[wards] target|30¦ghast (idle move[ment]|wander|random fl(ight|y[ing]))|31¦(tempt to|follow players (holding|with)) %-itemstack%[, [move[ment]] speed %number%[, scared of player movement %-boolean%]]|32¦target [random] %*entitydatas% (if|when) (not |un)tamed|33¦guardian attack [entities]|34¦[z[ombie[ ]]pig[man]] attack [player[s]] (if|when) angry|35¦[z[ombie[ ]]pig[man]] (react to|fight back|target) (attacker|damager) (if|when) angry|36¦[rabbit] eat carrot crops|37¦[killer] rabbit [melee] attack|38¦slime [random] jump|39¦slime change (direction|facing) randomly|40¦slime (idle move[ment]|wander)|41¦follow %*entitydatas%[, radius %-number%[, speed %-number%[, [custom[ ]]name[d] %-string%]]]|42¦bow shoot[, [move[ment]] speed %-number%[, unk[nown] param[eter] %-number%[, follow range %-number%]]])) to %livingentities%"); Skript.registerEffect(EffMakeJump.class, "make %livingentities% jump", "force %livingentities% to jump"); - Skript.registerEffect(EffGZipFile.class, "create [a] gzip[ped] file [at] [path] %string%"); Skript.registerExpression(ExprNoClip.class, Boolean.class, ExpressionType.PROPERTY, "no[( |-)]clip (state|mode) of %entities%", "%entities%'s no[( |-)]clip (state|mode)"); Skript.registerExpression(ExprFireProof.class, Boolean.class, ExpressionType.PROPERTY, "fire[ ]proof (state|mode) of %entities%", "%entities%'s fire[ ]proof (state|mode)"); - - effAmount += 5; - exprAmount += 12; - // 13 with the ender blocks expression - typeAmount += 2; } - effAmount += 1; - evtAmount += 1; - exprAmount += 1; - try { - Metrics metrics = new Metrics(this); - metrics.start(); - getLogger().info("Hooked into Metrics! Woohoo!!"); - } catch (IOException ex) { - getLogger().warning("Sorry, I've failed to hook SkStuff into Metrics. I'm really sorry."); - getLogger().warning("Here's an error for you: " + ex.getMessage()); - } - getLogger().info("Everything ready! Loaded a total of " + condAmount + " conditions, " + effAmount + " effects, " + evtAmount + " events, " + exprAmount + " expressions and " + typeAmount + " types!"); + Metrics metrics = new Metrics(this, 1); + metrics.startSubmitting(); + getLogger().info("Hooked into Metrics! Woohoo!!"); + getLogger().info("Everything's ready!"); } else { getLogger().info("Unable to find Skript or Skript isn't accepting registrations, disabling SkStuff..."); Bukkit.getPluginManager().disablePlugin(this); @@ -101,6 +59,30 @@ public class SkStuff extends JavaPlugin { String version = ReflectionUtils.getVersion(); switch (version) { + case "v1_8_R3.": + nmsMethods = new NMS_v1_8_R3(); + getLogger().info("It looks like you're running 1.8.8!"); + break; + case "v1_9_R1.": + nmsMethods = new NMS_v1_9_R1(); + getLogger().info("It looks like you're running 1.9.2!"); + break; + case "v1_9_R2.": + nmsMethods = new NMS_v1_9_R2(); + getLogger().info("It looks like you're running 1.9.4!"); + break; + case "v1_10_R1.": + nmsMethods = new NMS_v1_10_R1(); + getLogger().info("It looks like you're running 1.10.2!"); + break; + case "v1_11_R1.": + nmsMethods = new NMS_v1_11_R1(); + getLogger().info("It looks like you're running 1.11.2!"); + break; + case "v1_12_R1.": + nmsMethods = new NMS_v1_12_R1(); + getLogger().info("It looks like you're running 1.12.2!"); + break; case "v1_13_R2.": nmsMethods = new NMS_v1_13_R2(); getLogger().info("It looks like you're running 1.13.2!"); @@ -125,6 +107,6 @@ public class SkStuff extends JavaPlugin { } public void onDisable() { - getLogger().info("SkStuff " + this.getDescription().getVersion() + " has been successfully disabled."); + getLogger().info("SkPathfinderGoals " + this.getDescription().getVersion() + " has been successfully disabled."); } } \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/bstats/Metrics.java b/src/me/TheBukor/SkStuff/bstats/Metrics.java new file mode 100644 index 0000000..f983644 --- /dev/null +++ b/src/me/TheBukor/SkStuff/bstats/Metrics.java @@ -0,0 +1,719 @@ +package me.TheBukor.SkStuff.bstats; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.ServicePriority; + +import javax.net.ssl.HttpsURLConnection; +import java.io.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.logging.Level; +import java.util.zip.GZIPOutputStream; + +/** + * bStats collects some data for plugin authors. + *

+ * Check out https://bStats.org/ to learn more about bStats! + */ +@SuppressWarnings({"WeakerAccess", "unused"}) +public class Metrics { + + static { + // You can use the property to disable the check in your test environment + if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) { + // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D + final String defaultPackage = new String( + new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'}); + final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); + // We want to make sure nobody just copy & pastes the example and use the wrong package names + if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) { + throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); + } + } + } + + // The version of this bStats class + public static final int B_STATS_VERSION = 1; + + // The url to which the data is sent + private static final String URL = "https://bStats.org/submitData/bukkit"; + + // Is bStats enabled on this server? + private boolean enabled; + + // Should failed requests be logged? + private static boolean logFailedRequests; + + // Should the sent data be logged? + private static boolean logSentData; + + // Should the response text be logged? + private static boolean logResponseStatusText; + + // The uuid of the server + private static String serverUUID; + + // The plugin + private final Plugin plugin; + + // The plugin id + private final int pluginId; + + // A list with all custom charts + private final List charts = new ArrayList<>(); + + /** + * Class constructor. + * + * @param plugin The plugin which stats should be submitted. + * @param pluginId The id of the plugin. + * It can be found at What is my plugin id? + */ + public Metrics(Plugin plugin, int pluginId) { + if (plugin == null) { + throw new IllegalArgumentException("Plugin cannot be null!"); + } + this.plugin = plugin; + this.pluginId = pluginId; + + // Get the config file + File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); + File configFile = new File(bStatsFolder, "config.yml"); + YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); + + // Check if the config file exists + if (!config.isSet("serverUuid")) { + + // Add default values + config.addDefault("enabled", true); + // Every server gets it's unique random id. + config.addDefault("serverUuid", UUID.randomUUID().toString()); + // Should failed request be logged? + config.addDefault("logFailedRequests", false); + // Should the sent data be logged? + config.addDefault("logSentData", false); + // Should the response text be logged? + config.addDefault("logResponseStatusText", false); + + // Inform the server owners about bStats + config.options().header( + "bStats collects some data for plugin authors like how many servers are using their plugins.\n" + + "To honor their work, you should not disable it.\n" + + "This has nearly no effect on the server performance!\n" + + "Check out https://bStats.org/ to learn more :)" + ).copyDefaults(true); + try { + config.save(configFile); + } catch (IOException ignored) { } + } + + // Load the data + enabled = config.getBoolean("enabled", true); + serverUUID = config.getString("serverUuid"); + logFailedRequests = config.getBoolean("logFailedRequests", false); + logSentData = config.getBoolean("logSentData", false); + logResponseStatusText = config.getBoolean("logResponseStatusText", false); + + if (enabled) { + boolean found = false; + // Search for all other bStats Metrics classes to see if we are the first one + for (Class service : Bukkit.getServicesManager().getKnownServices()) { + try { + service.getField("B_STATS_VERSION"); // Our identifier :) + found = true; // We aren't the first + break; + } catch (NoSuchFieldException ignored) { } + } + // Register our service + Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal); + if (!found) { + // We are the first! + startSubmitting(); + } + } + } + + /** + * Checks if bStats is enabled. + * + * @return Whether bStats is enabled or not. + */ + public boolean isEnabled() { + return enabled; + } + + /** + * Adds a custom chart. + * + * @param chart The chart to add. + */ + public void addCustomChart(CustomChart chart) { + if (chart == null) { + throw new IllegalArgumentException("Chart cannot be null!"); + } + charts.add(chart); + } + + /** + * Starts the Scheduler which submits our data every 30 minutes. + */ + public void startSubmitting() { + final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags + timer.scheduleAtFixedRate(new TimerTask() { + @Override + public void run() { + if (!plugin.isEnabled()) { // Plugin was disabled + timer.cancel(); + return; + } + // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler + // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;) + Bukkit.getScheduler().runTask(plugin, () -> submitData()); + } + }, 1000 * 60 * 5, 1000 * 60 * 30); + // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start + // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted! + // WARNING: Just don't do it! + } + + /** + * Gets the plugin specific data. + * This method is called using Reflection. + * + * @return The plugin specific data. + */ + public JsonObject getPluginData() { + JsonObject data = new JsonObject(); + + String pluginName = plugin.getDescription().getName(); + String pluginVersion = plugin.getDescription().getVersion(); + + data.addProperty("pluginName", pluginName); // Append the name of the plugin + data.addProperty("id", pluginId); // Append the id of the plugin + data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin + JsonArray customCharts = new JsonArray(); + for (CustomChart customChart : charts) { + // Add the data of the custom charts + JsonObject chart = customChart.getRequestJsonObject(); + if (chart == null) { // If the chart is null, we skip it + continue; + } + customCharts.add(chart); + } + data.add("customCharts", customCharts); + + return data; + } + + /** + * Gets the server specific data. + * + * @return The server specific data. + */ + private JsonObject getServerData() { + // Minecraft specific data + int playerAmount; + try { + // Around MC 1.8 the return type was changed to a collection from an array, + // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection; + Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers"); + playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class) + ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() + : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; + } catch (Exception e) { + playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed + } + int onlineMode = Bukkit.getOnlineMode() ? 1 : 0; + String bukkitVersion = Bukkit.getVersion(); + String bukkitName = Bukkit.getName(); + + // OS/Java specific data + String javaVersion = System.getProperty("java.version"); + String osName = System.getProperty("os.name"); + String osArch = System.getProperty("os.arch"); + String osVersion = System.getProperty("os.version"); + int coreCount = Runtime.getRuntime().availableProcessors(); + + JsonObject data = new JsonObject(); + + data.addProperty("serverUUID", serverUUID); + + data.addProperty("playerAmount", playerAmount); + data.addProperty("onlineMode", onlineMode); + data.addProperty("bukkitVersion", bukkitVersion); + data.addProperty("bukkitName", bukkitName); + + data.addProperty("javaVersion", javaVersion); + data.addProperty("osName", osName); + data.addProperty("osArch", osArch); + data.addProperty("osVersion", osVersion); + data.addProperty("coreCount", coreCount); + + return data; + } + + /** + * Collects the data and sends it afterwards. + */ + private void submitData() { + final JsonObject data = getServerData(); + + JsonArray pluginData = new JsonArray(); + // Search for all other bStats Metrics classes to get their plugin data + for (Class service : Bukkit.getServicesManager().getKnownServices()) { + try { + service.getField("B_STATS_VERSION"); // Our identifier :) + + for (RegisteredServiceProvider provider : Bukkit.getServicesManager().getRegistrations(service)) { + try { + Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider()); + if (plugin instanceof JsonObject) { + pluginData.add((JsonObject) plugin); + } else { // old bstats version compatibility + try { + Class jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject"); + if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) { + Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString"); + jsonStringGetter.setAccessible(true); + String jsonString = (String) jsonStringGetter.invoke(plugin); + JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject(); + pluginData.add(object); + } + } catch (ClassNotFoundException e) { + // minecraft version 1.14+ + if (logFailedRequests) { + this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e); + } + } + } + } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { } + } + } catch (NoSuchFieldException ignored) { } + } + + data.add("plugins", pluginData); + + // Create a new thread for the connection to the bStats server + new Thread(() -> { + try { + // Send the data + sendData(plugin, data); + } catch (Exception e) { + // Something went wrong! :( + if (logFailedRequests) { + plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e); + } + } + }).start(); + } + + /** + * Sends the data to the bStats server. + * + * @param plugin Any plugin. It's just used to get a logger instance. + * @param data The data to send. + * @throws Exception If the request failed. + */ + private static void sendData(Plugin plugin, JsonObject data) throws Exception { + if (data == null) { + throw new IllegalArgumentException("Data cannot be null!"); + } + if (Bukkit.isPrimaryThread()) { + throw new IllegalAccessException("This method must not be called from the main thread!"); + } + if (logSentData) { + plugin.getLogger().info("Sending data to bStats: " + data); + } + HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection(); + + // Compress the data to save bandwidth + byte[] compressedData = compress(data.toString()); + + // Add headers + connection.setRequestMethod("POST"); + connection.addRequestProperty("Accept", "application/json"); + connection.addRequestProperty("Connection", "close"); + connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request + connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); + connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format + connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION); + + // Send data + connection.setDoOutput(true); + try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) { + outputStream.write(compressedData); + } + + StringBuilder builder = new StringBuilder(); + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { + String line; + while ((line = bufferedReader.readLine()) != null) { + builder.append(line); + } + } + + if (logResponseStatusText) { + plugin.getLogger().info("Sent data to bStats and received response: " + builder); + } + } + + /** + * Gzips the given String. + * + * @param str The string to gzip. + * @return The gzipped String. + * @throws IOException If the compression failed. + */ + private static byte[] compress(final String str) throws IOException { + if (str == null) { + return null; + } + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { + gzip.write(str.getBytes(StandardCharsets.UTF_8)); + } + return outputStream.toByteArray(); + } + + /** + * Represents a custom chart. + */ + public static abstract class CustomChart { + + // The id of the chart + final String chartId; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + */ + CustomChart(String chartId) { + if (chartId == null || chartId.isEmpty()) { + throw new IllegalArgumentException("ChartId cannot be null or empty!"); + } + this.chartId = chartId; + } + + private JsonObject getRequestJsonObject() { + JsonObject chart = new JsonObject(); + chart.addProperty("chartId", chartId); + try { + JsonObject data = getChartData(); + if (data == null) { + // If the data is null we don't send the chart. + return null; + } + chart.add("data", data); + } catch (Throwable t) { + if (logFailedRequests) { + Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t); + } + return null; + } + return chart; + } + + protected abstract JsonObject getChartData() throws Exception; + + } + + /** + * Represents a custom simple pie. + */ + public static class SimplePie extends CustomChart { + + private final Callable callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SimplePie(String chartId, Callable callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + String value = callable.call(); + if (value == null || value.isEmpty()) { + // Null = skip the chart + return null; + } + data.addProperty("value", value); + return data; + } + } + + /** + * Represents a custom advanced pie. + */ + public static class AdvancedPie extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public AdvancedPie(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + JsonObject values = new JsonObject(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue() == 0) { + continue; // Skip this invalid + } + allSkipped = false; + values.addProperty(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.add("values", values); + return data; + } + } + + /** + * Represents a custom drilldown pie. + */ + public static class DrilldownPie extends CustomChart { + + private final Callable>> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public DrilldownPie(String chartId, Callable>> callable) { + super(chartId); + this.callable = callable; + } + + @Override + public JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + JsonObject values = new JsonObject(); + Map> map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean reallyAllSkipped = true; + for (Map.Entry> entryValues : map.entrySet()) { + JsonObject value = new JsonObject(); + boolean allSkipped = true; + for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) { + value.addProperty(valueEntry.getKey(), valueEntry.getValue()); + allSkipped = false; + } + if (!allSkipped) { + reallyAllSkipped = false; + values.add(entryValues.getKey(), value); + } + } + if (reallyAllSkipped) { + // Null = skip the chart + return null; + } + data.add("values", values); + return data; + } + } + + /** + * Represents a custom single line chart. + */ + public static class SingleLineChart extends CustomChart { + + private final Callable callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SingleLineChart(String chartId, Callable callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + int value = callable.call(); + if (value == 0) { + // Null = skip the chart + return null; + } + data.addProperty("value", value); + return data; + } + + } + + /** + * Represents a custom multi line chart. + */ + public static class MultiLineChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public MultiLineChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + JsonObject values = new JsonObject(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue() == 0) { + continue; // Skip this invalid + } + allSkipped = false; + values.addProperty(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.add("values", values); + return data; + } + + } + + /** + * Represents a custom simple bar chart. + */ + public static class SimpleBarChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SimpleBarChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + JsonObject values = new JsonObject(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + for (Map.Entry entry : map.entrySet()) { + JsonArray categoryValues = new JsonArray(); + categoryValues.add(new JsonPrimitive(entry.getValue())); + values.add(entry.getKey(), categoryValues); + } + data.add("values", values); + return data; + } + + } + + /** + * Represents a custom advanced bar chart. + */ + public static class AdvancedBarChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public AdvancedBarChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObject getChartData() throws Exception { + JsonObject data = new JsonObject(); + JsonObject values = new JsonObject(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue().length == 0) { + continue; // Skip this invalid + } + allSkipped = false; + JsonArray categoryValues = new JsonArray(); + for (int categoryValue : entry.getValue()) { + categoryValues.add(new JsonPrimitive(categoryValue)); + } + values.add(entry.getKey(), categoryValues); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + data.add("values", values); + return data; + } + } + +} diff --git a/src/me/TheBukor/SkStuff/effects/EffGZipFile.java b/src/me/TheBukor/SkStuff/effects/EffGZipFile.java deleted file mode 100644 index c3f993e..0000000 --- a/src/me/TheBukor/SkStuff/effects/EffGZipFile.java +++ /dev/null @@ -1,49 +0,0 @@ -package me.TheBukor.SkStuff.effects; - -import java.io.EOFException; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.zip.GZIPOutputStream; - -import javax.annotation.Nullable; - -import org.bukkit.event.Event; - -import ch.njol.skript.lang.Effect; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.util.Kleenean; - -public class EffGZipFile extends Effect { - private Expression filePath; - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult result) { - filePath = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "create GZipped file at path " + filePath.toString(e, debug); - } - - @Override - protected void execute(Event e) { - File newFile = new File(filePath.getSingle(e)); - if (!newFile.exists()) { - try { - new GZIPOutputStream(new FileOutputStream(newFile)).close(); - } catch (FileNotFoundException ex) { - ex.printStackTrace(); - } catch (IOException ex) { - if (!(ex instanceof EOFException)) { - ex.printStackTrace(); - } - } - } - } -} diff --git a/src/me/TheBukor/SkStuff/effects/EffResourceSound.java b/src/me/TheBukor/SkStuff/effects/EffResourceSound.java deleted file mode 100644 index db2cccc..0000000 --- a/src/me/TheBukor/SkStuff/effects/EffResourceSound.java +++ /dev/null @@ -1,57 +0,0 @@ -package me.TheBukor.SkStuff.effects; - -import javax.annotation.Nullable; - -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.event.Event; - -import ch.njol.skript.lang.Effect; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.util.Kleenean; - -public class EffResourceSound extends Effect { - private Expression sound; - private Expression players; - private Expression location; - private Expression volume; - private Expression pitch; - - private int pattern; - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean isDelayed, ParseResult result) { - sound = (Expression) expr[0]; - players = (Expression) expr[1]; - location = (Expression) expr[2]; - pattern = matchedPattern; - if (pattern == 0) { - volume = (Expression) expr[3]; - pitch = (Expression) expr[4]; - } else { - pitch = (Expression) expr[3]; - volume = (Expression) expr[4]; - } - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "play raw sound for " + players.toString(e, debug) + " at " + location.toString(e, debug) + " with " + (pattern == 0 ? "volume " + volume.toString(e, debug) : "pitch " + pitch.toString(e, debug)) + " and " + (pattern == 0 ? "pitch " + pitch.toString(e, debug) : "volume " + volume.toString(e, debug)); - } - - @SuppressWarnings("deprecation") - @Override - protected void execute(Event e) { - String s = sound.getSingle(e); - Player[] ps = players.getAll(e); - Location loc = location.getSingle(e); - float vol = (volume == null ? 1.0F : volume.getSingle(e).floatValue()); - float pitch = (this.pitch == null ? 1.0F : this.pitch.getSingle(e).floatValue()); - for (Player p : ps) { - p.playSound(loc, s, vol, pitch); - } - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/effects/EffSetPathGoal.java b/src/me/TheBukor/SkStuff/effects/EffSetPathGoal.java index d20c928..b496e2e 100644 --- a/src/me/TheBukor/SkStuff/effects/EffSetPathGoal.java +++ b/src/me/TheBukor/SkStuff/effects/EffSetPathGoal.java @@ -538,10 +538,17 @@ public final class EffSetPathGoal extends Effect { className = "Living"; } Class nmsClass = ReflectionUtils.getNMSClass("Entity" + className); - if (version.equals("v1_13_R2.")) { - newGoals.add(new PathfinderGoalFollow_v1_13_R2((net.minecraft.server.v1_13_R2.EntityCreature) nmsEnt, nmsClass, radius, spd, usesName, customName)); - } else if (version.equals("v1_14_R1.")) { - newGoals.add(new PathfinderGoalFollow_v1_14_R1((net.minecraft.server.v1_14_R1.EntityCreature) nmsEnt, nmsClass, radius, spd, usesName, customName)); + switch (version) { + case "v1.12_R1.": + newGoals.add(new PathfinderGoalFollow_v1_12_R1((net.minecraft.server.v1_12_R1.EntityCreature) nmsEnt, nmsClass, radius, spd, usesName, customName)); + break; + case "v1.13_R2.": + newGoals.add(new PathfinderGoalFollow_v1_13_R2((net.minecraft.server.v1_13_R2.EntityCreature) nmsEnt, nmsClass, radius, spd, usesName, customName)); + break; + case "v1.14_R1.": + newGoals.add(new PathfinderGoalFollow_v1_14_R1((net.minecraft.server.v1_14_R1.EntityCreature) nmsEnt, nmsClass, radius, spd, usesName, customName)); + break; + } } } } else if (mark == 42) { diff --git a/src/me/TheBukor/SkStuff/effects/EffShowEntityEffect.java b/src/me/TheBukor/SkStuff/effects/EffShowEntityEffect.java index 273b0ed..493d123 100644 --- a/src/me/TheBukor/SkStuff/effects/EffShowEntityEffect.java +++ b/src/me/TheBukor/SkStuff/effects/EffShowEntityEffect.java @@ -39,7 +39,17 @@ public class EffShowEntityEffect extends Effect { } else if (mark == 4) { effect = EntityEffect.WOLF_SHAKE; toStringMark = "wolf shake"; + } else if (mark == 5) { + effect = EntityEffect.SQUID_ROTATE; + toStringMark = "squid rotate"; + } else if (mark == 6) { + effect = EntityEffect.TOTEM_RESURRECT; + toStringMark = "totem resurrect"; + } else if (mark == 7) { + effect = EntityEffect.RABBIT_JUMP; + toStringMark = "rabbit jump"; } + return true; } diff --git a/src/me/TheBukor/SkStuff/expressions/ExprClickedInventory.java b/src/me/TheBukor/SkStuff/expressions/ExprClickedInventory.java deleted file mode 100644 index c190a94..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprClickedInventory.java +++ /dev/null @@ -1,49 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.event.Event; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; - -import ch.njol.skript.ScriptLoader; -import ch.njol.skript.Skript; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.skript.log.ErrorQuality; -import ch.njol.util.Kleenean; - -public class ExprClickedInventory extends SimpleExpression { - - @Override - public Class getReturnType() { - return Inventory.class; - } - - @Override - public boolean isSingle() { - return true; - } - - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult result) { - if (!ScriptLoader.isCurrentEvent(InventoryClickEvent.class)) { - Skript.error("The expression clicked inventory can only be used in an on inventory click event", ErrorQuality.SEMANTIC_ERROR); - return false; - } - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "clicked inventory"; - } - - @Override - @Nullable - protected Inventory[] get(Event e) { - return new Inventory[] { ((InventoryClickEvent) e).getClickedInventory() }; - } - -} diff --git a/src/me/TheBukor/SkStuff/expressions/ExprGlideState.java b/src/me/TheBukor/SkStuff/expressions/ExprGlideState.java deleted file mode 100644 index 116426a..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprGlideState.java +++ /dev/null @@ -1,66 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.Event; - -import ch.njol.skript.classes.Changer.ChangeMode; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; -import ch.njol.util.coll.CollectionUtils; -import me.TheBukor.SkStuff.SkStuff; - -public class ExprGlideState extends SimpleExpression { - private Expression entity; - - @Override - public boolean isSingle() { - return true; - } - - @Override - public Class getReturnType() { - return Boolean.class; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - entity = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "elytra gliding state of " + entity.toString(e, debug); - } - - @Override - @Nullable - protected Boolean[] get(Event e) { - LivingEntity ent = entity.getSingle(e); - return new Boolean[] { SkStuff.getNMSMethods().getElytraGlideState(ent) }; - } - - @SuppressWarnings("unchecked") - @Override - @Nullable - public Class[] acceptChange(ChangeMode mode) { - if (mode == ChangeMode.SET) { - return CollectionUtils.array(Boolean.class); - } - return null; - } - - @Override - public void change(Event e, @Nullable Object[] delta, ChangeMode mode) { - LivingEntity ent = entity.getSingle(e); - if (mode == ChangeMode.SET) { - boolean newValue = (boolean) delta[0]; - SkStuff.getNMSMethods().setElytraGlideState(ent, newValue); - } - } -} diff --git a/src/me/TheBukor/SkStuff/expressions/ExprInventoryOwner.java b/src/me/TheBukor/SkStuff/expressions/ExprInventoryOwner.java deleted file mode 100644 index f114399..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprInventoryOwner.java +++ /dev/null @@ -1,63 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.block.Block; -import org.bukkit.block.BlockState; -import org.bukkit.block.DoubleChest; -import org.bukkit.entity.Entity; -import org.bukkit.event.Event; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryHolder; - -import ch.njol.skript.Skript; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; - -public class ExprInventoryOwner extends SimpleExpression { - private Expression inventory; - - @Override - public boolean isSingle() { - return true; - } - - @Override - public Class getReturnType() { - return Object.class; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - inventory = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "owner of " + inventory.toString(e, debug); - } - - @Override - @Nullable - protected Object[] get(Event e) { - if (inventory.getSingle(e) == null) - return null; - InventoryHolder holder = inventory.getSingle(e).getHolder(); - if (holder instanceof Entity) { - return new Entity[] { (Entity) holder }; - } else if (holder instanceof BlockState) { - return new Block[] { ((BlockState) holder).getBlock() }; - } else if (holder instanceof DoubleChest) { - return new Block[] { ((DoubleChest) holder).getLocation().getBlock() }; - } else { - Skript.error("Something went wrong when trying to get the owner of the specified inventory!"); - Skript.error("Post the below info on the SkStuff thread in SkUnity:"); - Skript.error("Class -> " + holder.getClass().getCanonicalName()); - } - return null; - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/expressions/ExprNoGravityState.java b/src/me/TheBukor/SkStuff/expressions/ExprNoGravityState.java deleted file mode 100644 index fc990a5..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprNoGravityState.java +++ /dev/null @@ -1,82 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.entity.Entity; -import org.bukkit.event.Event; - -import ch.njol.skript.classes.Changer.ChangeMode; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; -import ch.njol.util.coll.CollectionUtils; -import me.TheBukor.SkStuff.SkStuff; - -public class ExprNoGravityState extends SimpleExpression { - private Expression entities; - - @Override - public boolean isSingle() { - return entities.isSingle(); - } - - @Override - public Class getReturnType() { - return Boolean.class; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - entities = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "no gravity state of " + entities.toString(e, debug); - } - - @Override - @Nullable - protected Boolean[] get(Event e) { - Entity[] ents = entities.getAll(e); - if (ents.length == 0) - return null; - Boolean[] gravityStates = new Boolean[ents.length]; - int i = 0; - for (Entity ent : ents) { - if (ent == null) - continue; - gravityStates[i] = SkStuff.getNMSMethods().getNoGravity(ent); - i++; - } - return gravityStates; - } - - @SuppressWarnings("unchecked") - @Override - @Nullable - public Class[] acceptChange(ChangeMode mode) { - if (mode == ChangeMode.SET) { - return CollectionUtils.array(Boolean.class); - } - return null; - } - - @Override - public void change(Event e, @Nullable Object[] delta, ChangeMode mode) { - Entity[] ents = entities.getAll(e); - if (ents.length == 0) - return; - if (mode == ChangeMode.SET) { - boolean newValue = (boolean) delta[0]; - for (Entity ent : ents) { - if (ent == null) - continue; - SkStuff.getNMSMethods().setNoGravity(ent, newValue); - } - } - } -} diff --git a/src/me/TheBukor/SkStuff/expressions/ExprStepLength.java b/src/me/TheBukor/SkStuff/expressions/ExprStepLength.java new file mode 100644 index 0000000..60b7690 --- /dev/null +++ b/src/me/TheBukor/SkStuff/expressions/ExprStepLength.java @@ -0,0 +1,80 @@ +package me.TheBukor.SkStuff.expressions; + +import javax.annotation.Nullable; + +import org.bukkit.entity.Entity; +import org.bukkit.event.Event; + +import ch.njol.skript.classes.Changer.ChangeMode; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleExpression; +import ch.njol.util.Kleenean; +import ch.njol.util.coll.CollectionUtils; +import me.TheBukor.SkStuff.SkStuff; + +public class ExprStepLength extends SimpleExpression { + private Expression entity; + + @Override + public boolean isSingle() { + return true; + } + + @Override + public Class getReturnType() { + return Number.class; + } + + @SuppressWarnings("unchecked") + @Override + public boolean init(Expression[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + entity = (Expression) expr[0]; + return true; + } + + @Override + public String toString(@Nullable Event e, boolean debug) { + return "step length of " + entity.toString(e, debug); + } + + @Override + @Nullable + protected Number[] get(Event e) { + Entity ent = entity.getSingle(e); + if (ent == null) { + return null; + } + return new Number[] { SkStuff.getNMSMethods().getEntityStepLength(ent) }; + } + + @Override + public void change(Event e, @Nullable Object[] delta, ChangeMode mode) { + Entity ent = entity.getSingle(e); + if (ent == null) { + return; + } + if (mode == ChangeMode.ADD) { + float toAdd = ((Number) delta[0]).floatValue(); + float currentLength = SkStuff.getNMSMethods().getEntityStepLength(ent); + SkStuff.getNMSMethods().setEntityStepLength(ent, (currentLength + toAdd)); + } else if (mode == ChangeMode.REMOVE) { + float toRemove = ((Number) delta[0]).floatValue(); + float currentLength = SkStuff.getNMSMethods().getEntityStepLength(ent); + SkStuff.getNMSMethods().setEntityStepLength(ent, (currentLength - toRemove)); + } else if (mode == ChangeMode.SET) { + float toSet = ((Number) delta[0]).floatValue(); + SkStuff.getNMSMethods().setEntityStepLength(ent, toSet); + } + } + + @SuppressWarnings("unchecked") + @Override + @Nullable + public Class[] acceptChange(ChangeMode mode) { + if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE || mode == ChangeMode.SET) { + return CollectionUtils.array(Number.class); + } + return null; + } +} diff --git a/src/me/TheBukor/SkStuff/expressions/ExprTimespanToNumber.java b/src/me/TheBukor/SkStuff/expressions/ExprTimespanToNumber.java deleted file mode 100644 index 79ba7cd..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprTimespanToNumber.java +++ /dev/null @@ -1,77 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.event.Event; - -import ch.njol.skript.Skript; -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.skript.util.Timespan; -import ch.njol.util.Kleenean; - -public class ExprTimespanToNumber extends SimpleExpression { - private Expression time; - private String toStringMark; - private int mark; - - @Override - public Class getReturnType() { - return Number.class; - } - - @Override - public boolean isSingle() { - return true; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult result) { - time = (Expression) expr[0]; - mark = result.mark; - if (result.mark == 0) { - toStringMark = "ticks"; - } else if (result.mark == 1) { - toStringMark = "seconds"; - } else if (result.mark == 2) { - toStringMark = "minutes"; - } else if (result.mark == 3) { - toStringMark = "hours"; - } else if (result.mark == 4) { - toStringMark = "days"; - } - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return time.toString(e, debug) + "converted to " + toStringMark; - } - - @SuppressWarnings("deprecation") - @Override - @Nullable - protected Number[] get(Event e) { - Timespan t = time.getSingle(e); - Number ticks = null; - if (Skript.methodExists(Timespan.class, "getTicks_i")) { //Compatibility with Mirreducki's Skript patch 24+ days timespans. - ticks = t.getTicks_i(); - } else { //Standard Skript timespans, limited to roughly 24 days. - ticks = t.getTicks(); - } - if (mark == 0) { - return new Number[] { ticks }; - } else if (mark == 1) { - return new Number[] { ticks.longValue() / 20 }; - } else if (mark == 2) { - return new Number[] { ticks.longValue() / 20 / 60 }; - } else if (mark == 3) { - return new Number[] { ticks.longValue() / 20 / 60 / 60 }; - } else if (mark == 4) { - return new Number[] { ticks.longValue() / 20 / 60 / 60 / 24 }; - } - return null; - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/expressions/ExprToLowerCase.java b/src/me/TheBukor/SkStuff/expressions/ExprToLowerCase.java deleted file mode 100644 index 4eb39e5..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprToLowerCase.java +++ /dev/null @@ -1,43 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.event.Event; - -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; - -public class ExprToLowerCase extends SimpleExpression { - private Expression text; - - @Override - public Class getReturnType() { - return String.class; - } - - @Override - public boolean isSingle() { - return true; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult arg3) { - text = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "convert all characters in " + text.toString(e, debug) + " to lowercase"; - } - - @Override - @Nullable - protected String[] get(Event e) { - String s = text.getSingle(e); - return new String[] { s.toLowerCase() }; - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/expressions/ExprToUpperCase.java b/src/me/TheBukor/SkStuff/expressions/ExprToUpperCase.java deleted file mode 100644 index da99fab..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprToUpperCase.java +++ /dev/null @@ -1,43 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.bukkit.event.Event; - -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; - -public class ExprToUpperCase extends SimpleExpression { - private Expression text; - - @Override - public Class getReturnType() { - return String.class; - } - - @Override - public boolean isSingle() { - return true; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult arg3) { - text = (Expression) expr[0]; - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "convert all characters in " + text.toString(e, debug) + " to uppercase"; - } - - @Override - @Nullable - protected String[] get(Event e) { - String s = text.getSingle(e); - return new String[] { s.toUpperCase() }; - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/expressions/ExprWordsToUpperCase.java b/src/me/TheBukor/SkStuff/expressions/ExprWordsToUpperCase.java deleted file mode 100644 index cb57e40..0000000 --- a/src/me/TheBukor/SkStuff/expressions/ExprWordsToUpperCase.java +++ /dev/null @@ -1,56 +0,0 @@ -package me.TheBukor.SkStuff.expressions; - -import javax.annotation.Nullable; - -import org.apache.commons.lang.WordUtils; -import org.bukkit.event.Event; - -import ch.njol.skript.lang.Expression; -import ch.njol.skript.lang.SkriptParser.ParseResult; -import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.util.Kleenean; - -public class ExprWordsToUpperCase extends SimpleExpression { - private Expression text; - private Boolean fullyCapitalize = false; - private String toStringEnd; - - @Override - public Class getReturnType() { - return String.class; - } - - @Override - public boolean isSingle() { - return true; - } - - @SuppressWarnings("unchecked") - @Override - public boolean init(Expression[] expr, int matchedPattern, Kleenean arg2, ParseResult result) { - text = (Expression) expr[0]; - if (result.mark == 0) { - toStringEnd = " to uppercase"; - } else { - fullyCapitalize = true; - toStringEnd = " to uppercase ignoring other uppercase characters"; - } - return true; - } - - @Override - public String toString(@Nullable Event e, boolean debug) { - return "convert first character of each word in " + text.toString(e, debug) + toStringEnd; - } - - @Override - @Nullable - protected String[] get(Event e) { - String s = text.getSingle(e); - if (fullyCapitalize) { - return new String[] { WordUtils.capitalizeFully(s) }; - } else { - return new String[] { WordUtils.capitalize(s) }; - } - } -} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_13_R2.java b/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_13_R2.java index 6c869f9..13b67da 100644 --- a/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_13_R2.java +++ b/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_13_R2.java @@ -1,10 +1,10 @@ package me.TheBukor.SkStuff.pathfinders; -import net.minecraft.server.v1_13_R2.Entity; -import net.minecraft.server.v1_13_R2.EntityCreature; -import net.minecraft.server.v1_13_R2.EntityLiving; -import net.minecraft.server.v1_13_R2.PathfinderGoal; +import me.TheBukor.SkStuff.util.ReflectionUtils; +import net.minecraft.server.v1_13_R2.*; +import java.lang.reflect.Field; +import java.util.LinkedHashSet; import java.util.List; public class PathfinderGoalFollow_v1_13_R2 extends PathfinderGoal { @@ -64,16 +64,13 @@ public class PathfinderGoalFollow_v1_13_R2 extends PathfinderGoal { return false; } } - //return follower.getNavigation().n(); // n() means hasNoPath() return true; // n() is now protected void and I'm not sure how to access it, so I'm just returning a boolean, this probably will cause some issues with this pathfinder goal, if you know a better solution, let me know. - Govindas. } - // c() is execute() - @Override - public void c () { - follower.getNavigation().a(followed, speed); // a() means moveTo() - } - - + // c() is execute() + @Override + public void c() { + follower.getNavigation().a(followed, speed); // a() means moveTo() } +} diff --git a/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_16_R1.java b/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_16_R1.java new file mode 100644 index 0000000..2a0a330 --- /dev/null +++ b/src/me/TheBukor/SkStuff/pathfinders/PathfinderGoalFollow_v1_16_R1.java @@ -0,0 +1,79 @@ +package me.TheBukor.SkStuff.pathfinders; + +import net.minecraft.server.v1_16_R1.Entity; +import net.minecraft.server.v1_16_R1.EntityCreature; +import net.minecraft.server.v1_16_R1.EntityLiving; +import net.minecraft.server.v1_16_R1.PathfinderGoal; + +import java.util.List; + +public class PathfinderGoalFollow_v1_16_R1 extends PathfinderGoal { + private EntityCreature follower; + private EntityLiving followed; + private Class followedClass; + private float radius; + private double speed; + private boolean isByName; + private String customName; + + public PathfinderGoalFollow_v1_16_R1(EntityCreature follower, Class followedClass, float radius, double speed, boolean isByName, String customName) { + this.follower = follower; + this.followedClass = followedClass; + this.radius = radius; + this.speed = speed; + this.isByName = isByName; + this.customName = customName; + } + + // a() is shouldExecute() + @SuppressWarnings("unchecked") + @Override + public boolean a() { + if (followed == null) { + List list = follower.world.a((Class) followedClass, follower.getBoundingBox().grow(radius, 4.0D, radius)); + if (list.isEmpty()) { + return false; + } + if (isByName) { + for (Object entity : list) { + if (((EntityLiving) entity).getCustomName().equals(customName)) { + followed = (EntityLiving) entity; + return true; + } + } + } else { + followed = (EntityLiving) list.get(0); + return true; + } + } + return true; + } + + // b() is shouldContinueExecuting() + @Override + public boolean b() { + if (followed.dead) { + followed = null; + return false; + } else if (followed.h(follower) < 9.0D || followed.h(follower) > Math.pow(radius, 2)) { // h() = distanceSquaredFrom() + return false; // if 3 blocks away or not in radius, stop moving. + //Maybe I'll add a teleport feature later. + } else if (isByName) { + if (!followed.getCustomName().equals(customName)) { + followed = null; + return false; + } + } + //return follower.getNavigation().n(); // n() means hasNoPath() + return true; + // n() is now protected void and I'm not sure how to access it, so I'm just returning a boolean, this probably will cause some issues with this pathfinder goal, if you know a better solution, let me know. - Govindas. + } + + // c() is execute() + @Override + public void c () { + follower.getNavigation().a(followed, speed); // a() means moveTo() + } + + + } diff --git a/src/me/TheBukor/SkStuff/util/NMSInterface.java b/src/me/TheBukor/SkStuff/util/NMSInterface.java index 7d1cd14..f6f04a1 100644 --- a/src/me/TheBukor/SkStuff/util/NMSInterface.java +++ b/src/me/TheBukor/SkStuff/util/NMSInterface.java @@ -1,5 +1,4 @@ package me.TheBukor.SkStuff.util; - import org.bukkit.entity.Entity; public interface NMSInterface { @@ -22,15 +21,6 @@ public interface NMSInterface { public boolean getFireProof(Entity entity); public void setFireProof(Entity entity, boolean fireProof); - - - - - public boolean getElytraGlideState(Entity entity); - - public void setElytraGlideState(Entity entity, boolean glide); - - public boolean getNoGravity(Entity entity); - - public void setNoGravity(Entity entity, boolean noGravity); + public float getEntityStepLength(Entity entity); + public void setEntityStepLength(Entity entity, float length); } \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_10_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_10_R1.java new file mode 100644 index 0000000..4adaac4 --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_10_R1.java @@ -0,0 +1,91 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_10_R1.EntityInsentient; +import net.minecraft.server.v1_10_R1.PathfinderGoal; +import net.minecraft.server.v1_10_R1.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_10_R1 implements NMSInterface { + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.P; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.P = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_11_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_11_R1.java new file mode 100644 index 0000000..82c000e --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_11_R1.java @@ -0,0 +1,91 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_11_R1.EntityInsentient; +import net.minecraft.server.v1_11_R1.PathfinderGoal; +import net.minecraft.server.v1_11_R1.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_11_R1 implements NMSInterface { + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.P; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_11_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.P = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_12_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_12_R1.java new file mode 100644 index 0000000..d180897 --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_12_R1.java @@ -0,0 +1,91 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_12_R1.EntityInsentient; +import net.minecraft.server.v1_12_R1.PathfinderGoal; +import net.minecraft.server.v1_12_R1.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_12_R1 implements NMSInterface { + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity) entity).getHandle(); + return nmsEntity.P; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_12_R1.Entity nmsEntity = ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity) entity).getHandle(); + nmsEntity.P = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_13_R2.java b/src/me/TheBukor/SkStuff/util/NMS_v1_13_R2.java index b78a836..01753f7 100644 --- a/src/me/TheBukor/SkStuff/util/NMS_v1_13_R2.java +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_13_R2.java @@ -1,17 +1,12 @@ package me.TheBukor.SkStuff.util; - -import net.minecraft.server.v1_13_R2.*; -import org.bukkit.Location; - +import net.minecraft.server.v1_13_R2.EntityInsentient; +import net.minecraft.server.v1_13_R2.PathfinderGoal; +import net.minecraft.server.v1_13_R2.PathfinderGoalSelector; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLivingEntity; - import org.bukkit.entity.Entity; - - import java.util.Iterator; import java.util.LinkedHashSet; @@ -86,30 +81,15 @@ public class NMS_v1_13_R2 implements NMSInterface { net.minecraft.server.v1_13_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); } - - - - - + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_13_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.Q; + } @Override - public boolean getElytraGlideState(Entity entity) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - return nmsEntity.getFlag(7); - } - - public void setElytraGlideState(Entity entity, boolean glide) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - nmsEntity.setFlag(7, glide); - } - - public boolean getNoGravity(Entity entity) { + public void setEntityStepLength(Entity entity, float length) { net.minecraft.server.v1_13_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - return nmsEntity.isNoGravity(); - } - - public void setNoGravity(Entity entity, boolean noGravity) { - net.minecraft.server.v1_13_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - nmsEntity.setNoGravity(noGravity); + nmsEntity.Q = length; } } \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_14_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_14_R1.java index 793699a..3a32207 100644 --- a/src/me/TheBukor/SkStuff/util/NMS_v1_14_R1.java +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_14_R1.java @@ -2,11 +2,9 @@ package me.TheBukor.SkStuff.util; import net.minecraft.server.v1_14_R1.EntityInsentient; -import net.minecraft.server.v1_14_R1.EntityLiving; import net.minecraft.server.v1_14_R1.PathfinderGoal; import net.minecraft.server.v1_14_R1.PathfinderGoalSelector; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import java.util.Iterator; @@ -83,30 +81,15 @@ public class NMS_v1_14_R1 implements NMSInterface { net.minecraft.server.v1_14_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); } - - - - - + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_14_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.K; + } @Override - public boolean getElytraGlideState(Entity entity) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - return nmsEntity.getFlag(7); - } - - public void setElytraGlideState(Entity entity, boolean glide) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - nmsEntity.setFlag(7, glide); - } - - public boolean getNoGravity(Entity entity) { + public void setEntityStepLength(Entity entity, float length) { net.minecraft.server.v1_14_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - return nmsEntity.isNoGravity(); - } - - public void setNoGravity(Entity entity, boolean noGravity) { - net.minecraft.server.v1_14_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - nmsEntity.setNoGravity(noGravity); + nmsEntity.K = length; } } \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_15_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_15_R1.java index a3d33a6..50f04b2 100644 --- a/src/me/TheBukor/SkStuff/util/NMS_v1_15_R1.java +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_15_R1.java @@ -2,11 +2,9 @@ package me.TheBukor.SkStuff.util; import net.minecraft.server.v1_15_R1.EntityInsentient; -import net.minecraft.server.v1_15_R1.EntityLiving; import net.minecraft.server.v1_15_R1.PathfinderGoal; import net.minecraft.server.v1_15_R1.PathfinderGoalSelector; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_15_R1.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import java.util.Iterator; @@ -83,30 +81,14 @@ public class NMS_v1_15_R1 implements NMSInterface { net.minecraft.server.v1_15_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); } - - - - - + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_15_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.H; + } @Override - public boolean getElytraGlideState(Entity entity) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - return nmsEntity.getFlag(7); - } - - public void setElytraGlideState(Entity entity, boolean glide) { - EntityLiving nmsEntity = ((CraftLivingEntity) entity).getHandle(); - nmsEntity.setFlag(7, glide); - } - - public boolean getNoGravity(Entity entity) { + public void setEntityStepLength(Entity entity, float length) { net.minecraft.server.v1_15_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - return nmsEntity.isNoGravity(); - } - - public void setNoGravity(Entity entity, boolean noGravity) { - net.minecraft.server.v1_15_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); - nmsEntity.setNoGravity(noGravity); + nmsEntity.H = length; } } \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_16_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_16_R1.java new file mode 100644 index 0000000..c461475 --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_16_R1.java @@ -0,0 +1,94 @@ +package me.TheBukor.SkStuff.util; + + +import net.minecraft.server.v1_16_R1.EntityInsentient; +import net.minecraft.server.v1_16_R1.PathfinderGoal; +import net.minecraft.server.v1_16_R1.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_16_R1 implements NMSInterface { + + + + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.G; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_16_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.G = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_8_R3.java b/src/me/TheBukor/SkStuff/util/NMS_v1_8_R3.java new file mode 100644 index 0000000..e6a4d56 --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_8_R3.java @@ -0,0 +1,92 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_8_R3.EntityInsentient; +import net.minecraft.server.v1_8_R3.PathfinderGoal; +import net.minecraft.server.v1_8_R3.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.List; + +public class NMS_v1_8_R3 implements NMSInterface { + + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((List) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((List) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((List) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((List) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((List) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((List) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.S; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.S = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_9_R1.java b/src/me/TheBukor/SkStuff/util/NMS_v1_9_R1.java new file mode 100644 index 0000000..0e3b5bb --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_9_R1.java @@ -0,0 +1,91 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_9_R1.EntityInsentient; +import net.minecraft.server.v1_9_R1.PathfinderGoal; +import net.minecraft.server.v1_9_R1.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_9_R1 implements NMSInterface { + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.P; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.P = length; + } +} \ No newline at end of file diff --git a/src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java b/src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java new file mode 100644 index 0000000..5248801 --- /dev/null +++ b/src/me/TheBukor/SkStuff/util/NMS_v1_9_R2.java @@ -0,0 +1,91 @@ +package me.TheBukor.SkStuff.util; + +import net.minecraft.server.v1_9_R2.EntityInsentient; +import net.minecraft.server.v1_9_R2.PathfinderGoal; +import net.minecraft.server.v1_9_R2.PathfinderGoalSelector; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity; +import org.bukkit.entity.Entity; + +import java.util.Iterator; +import java.util.LinkedHashSet; + +public class NMS_v1_9_R2 implements NMSInterface { + @Override + public void clearPathfinderGoals(Entity entity) { + EntityInsentient nmsEnt = (EntityInsentient) ((CraftEntity) entity).getHandle(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.goalSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + ((LinkedHashSet) ReflectionUtils.getField("c", PathfinderGoalSelector.class, nmsEnt.targetSelector)).clear(); + } + + @Override + public void removePathfinderGoal(Object entity, Class goalClass, boolean isTargetSelector) { + if (entity instanceof EntityInsentient) { + ((EntityInsentient) entity).setGoalTarget(null); + if (isTargetSelector) { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).targetSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } else { + Iterator goals = ((LinkedHashSet) ReflectionUtils.getField("b", PathfinderGoalSelector.class, ((EntityInsentient) entity).goalSelector)).iterator(); + while (goals.hasNext()) { + Object goal = goals.next(); + if (ReflectionUtils.getField("a", goal.getClass(), goal).getClass() == goalClass) { + goals.remove(); + } + } + } + } + } + + @Override + public void addPathfinderGoal(Object entity, int priority, Object goal, boolean isTargetSelector) { + if (entity instanceof EntityInsentient && goal instanceof PathfinderGoal) { + if (isTargetSelector) + ((EntityInsentient) entity).targetSelector.a(priority, (PathfinderGoal) goal); + else + ((EntityInsentient) entity).goalSelector.a(priority, (PathfinderGoal) goal); + } + } + + + @Override + public boolean getNoClip(Entity entity) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.noclip; + } + + @Override + public void setNoClip(Entity entity, boolean noclip) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.noclip = noclip; + } + + @Override + public boolean getFireProof(Entity entity) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.isFireProof(); + } + + @Override + public void setFireProof(Entity entity, boolean fireProof) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + ReflectionUtils.setField("fireProof", nmsEntity.getClass(), nmsEntity, fireProof); + } + @Override + public float getEntityStepLength(Entity entity) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + return nmsEntity.P; + } + + @Override + public void setEntityStepLength(Entity entity, float length) { + net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.P = length; + } +} \ No newline at end of file diff --git a/src/org/mcstats/Metrics.java b/src/org/mcstats/Metrics.java deleted file mode 100644 index 73aa145..0000000 --- a/src/org/mcstats/Metrics.java +++ /dev/null @@ -1,785 +0,0 @@ -/* - * Copyright 2011-2013 Tyler Blair. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and contributors and should not be interpreted as representing official policies, - * either expressed or implied, of anybody else. - */ -package org.mcstats; - -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.scheduler.BukkitTask; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Method; -import java.net.Proxy; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; -import java.util.zip.GZIPOutputStream; - -public class Metrics { - - /** - * The current revision number - */ - private final static int REVISION = 7; - - /** - * The base url of the metrics domain - */ - private static final String BASE_URL = "http://report.mcstats.org"; - - /** - * The url used to report a server's status - */ - private static final String REPORT_URL = "/plugin/%s"; - - /** - * Interval of time to ping (in minutes) - */ - private static final int PING_INTERVAL = 15; - - /** - * The plugin this metrics submits for - */ - private final Plugin plugin; - - /** - * All of the custom graphs to submit to metrics - */ - private final Set graphs = Collections.synchronizedSet(new HashSet()); - - /** - * The plugin configuration file - */ - private final YamlConfiguration configuration; - - /** - * The plugin configuration file - */ - private final File configurationFile; - - /** - * Unique server id - */ - private final String guid; - - /** - * Debug mode - */ - private final boolean debug; - - /** - * Lock for synchronization - */ - private final Object optOutLock = new Object(); - - /** - * The scheduled task - */ - private volatile BukkitTask task = null; - - public Metrics(final Plugin plugin) throws IOException { - if (plugin == null) { - throw new IllegalArgumentException("Plugin cannot be null"); - } - - this.plugin = plugin; - - // load the config - configurationFile = getConfigFile(); - configuration = YamlConfiguration.loadConfiguration(configurationFile); - - // add some defaults - configuration.addDefault("opt-out", false); - configuration.addDefault("guid", UUID.randomUUID().toString()); - configuration.addDefault("debug", false); - - // Do we need to create the file? - if (configuration.get("guid", null) == null) { - configuration.options().header("http://mcstats.org").copyDefaults(true); - configuration.save(configurationFile); - } - - // Load the guid then - guid = configuration.getString("guid"); - debug = configuration.getBoolean("debug", false); - } - - /** - * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics - * website. Plotters can be added to the graph object returned. - * - * @param name The name of the graph - * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given - */ - public Graph createGraph(final String name) { - if (name == null) { - throw new IllegalArgumentException("Graph name cannot be null"); - } - - // Construct the graph object - final Graph graph = new Graph(name); - - // Now we can add our graph - graphs.add(graph); - - // and return back - return graph; - } - - /** - * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend - * - * @param graph The name of the graph - */ - public void addGraph(final Graph graph) { - if (graph == null) { - throw new IllegalArgumentException("Graph cannot be null"); - } - - graphs.add(graph); - } - - /** - * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the - * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200 - * ticks. - * - * @return True if statistics measuring is running, otherwise false. - */ - public boolean start() { - synchronized (optOutLock) { - // Did we opt out? - if (isOptOut()) { - return false; - } - - // Is metrics already running? - if (task != null) { - return true; - } - - // Begin hitting the server with glorious data - task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { - - private boolean firstPost = true; - - public void run() { - try { - // This has to be synchronized or it can collide with the disable method. - synchronized (optOutLock) { - // Disable Task, if it is running and the server owner decided to opt-out - if (isOptOut() && task != null) { - task.cancel(); - task = null; - // Tell all plotters to stop gathering information. - for (Graph graph : graphs) { - graph.onOptOut(); - } - } - } - - // We use the inverse of firstPost because if it is the first time we are posting, - // it is not a interval ping, so it evaluates to FALSE - // Each time thereafter it will evaluate to TRUE, i.e PING! - postPlugin(!firstPost); - - // After the first post we set firstPost to false - // Each post thereafter will be a ping - firstPost = false; - } catch (IOException e) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage()); - } - } - } - }, 0, PING_INTERVAL * 1200); - - return true; - } - } - - /** - * Has the server owner denied plugin metrics? - * - * @return true if metrics should be opted out of it - */ - public boolean isOptOut() { - synchronized (optOutLock) { - try { - // Reload the metrics file - configuration.load(getConfigFile()); - } catch (IOException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } catch (InvalidConfigurationException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } - return configuration.getBoolean("opt-out", false); - } - } - - /** - * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task. - * - * @throws java.io.IOException - */ - public void enable() throws IOException { - // This has to be synchronized or it can collide with the check in the task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set it. - if (isOptOut()) { - configuration.set("opt-out", false); - configuration.save(configurationFile); - } - - // Enable Task, if it is not running - if (task == null) { - start(); - } - } - } - - /** - * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task. - * - * @throws java.io.IOException - */ - public void disable() throws IOException { - // This has to be synchronized or it can collide with the check in the task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set it. - if (!isOptOut()) { - configuration.set("opt-out", true); - configuration.save(configurationFile); - } - - // Disable Task, if it is running - if (task != null) { - task.cancel(); - task = null; - } - } - } - - /** - * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status - * - * @return the File object for the config file - */ - public File getConfigFile() { - // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use - // is to abuse the plugin object we already have - // plugin.getDataFolder() => base/plugins/PluginA/ - // pluginsFolder => base/plugins/ - // The base is not necessarily relative to the startup directory. - File pluginsFolder = plugin.getDataFolder().getParentFile(); - - // return => base/plugins/PluginMetrics/config.yml - return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml"); - } - - /** - * Gets the online player (backwards compatibility) - * - * @return online player amount - */ - private int getOnlinePlayers() { - try { - Method onlinePlayerMethod = Server.class.getMethod("getOnlinePlayers"); - if(onlinePlayerMethod.getReturnType().equals(Collection.class)) { - return ((Collection)onlinePlayerMethod.invoke(Bukkit.getServer())).size(); - } else { - return ((Player[])onlinePlayerMethod.invoke(Bukkit.getServer())).length; - } - } catch (Exception ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - } - - return 0; - } - - /** - * Generic method that posts a plugin to the metrics website - */ - private void postPlugin(final boolean isPing) throws IOException { - // Server software specific section - PluginDescriptionFile description = plugin.getDescription(); - String pluginName = description.getName(); - boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled - String pluginVersion = description.getVersion(); - String serverVersion = Bukkit.getVersion(); - int playersOnline = this.getOnlinePlayers(); - - // END server software specific section -- all code below does not use any code outside of this class / Java - - // Construct the post data - StringBuilder json = new StringBuilder(1024); - json.append('{'); - - // The plugin's description file containg all of the plugin data such as name, version, author, etc - appendJSONPair(json, "guid", guid); - appendJSONPair(json, "plugin_version", pluginVersion); - appendJSONPair(json, "server_version", serverVersion); - appendJSONPair(json, "players_online", Integer.toString(playersOnline)); - - // New data as of R6 - String osname = System.getProperty("os.name"); - String osarch = System.getProperty("os.arch"); - String osversion = System.getProperty("os.version"); - String java_version = System.getProperty("java.version"); - int coreCount = Runtime.getRuntime().availableProcessors(); - - // normalize os arch .. amd64 -> x86_64 - if (osarch.equals("amd64")) { - osarch = "x86_64"; - } - - appendJSONPair(json, "osname", osname); - appendJSONPair(json, "osarch", osarch); - appendJSONPair(json, "osversion", osversion); - appendJSONPair(json, "cores", Integer.toString(coreCount)); - appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0"); - appendJSONPair(json, "java_version", java_version); - - // If we're pinging, append it - if (isPing) { - appendJSONPair(json, "ping", "1"); - } - - if (graphs.size() > 0) { - synchronized (graphs) { - json.append(','); - json.append('"'); - json.append("graphs"); - json.append('"'); - json.append(':'); - json.append('{'); - - boolean firstGraph = true; - - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - Graph graph = iter.next(); - - StringBuilder graphJson = new StringBuilder(); - graphJson.append('{'); - - for (Plotter plotter : graph.getPlotters()) { - appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue())); - } - - graphJson.append('}'); - - if (!firstGraph) { - json.append(','); - } - - json.append(escapeJSON(graph.getName())); - json.append(':'); - json.append(graphJson); - - firstGraph = false; - } - - json.append('}'); - } - } - - // close json - json.append('}'); - - // Create the url - URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName))); - - // Connect to the website - URLConnection connection; - - // Mineshafter creates a socks proxy, so we can safely bypass it - // It does not reroute POST requests so we need to go around it - if (isMineshafterPresent()) { - connection = url.openConnection(Proxy.NO_PROXY); - } else { - connection = url.openConnection(); - } - - - byte[] uncompressed = json.toString().getBytes(); - byte[] compressed = gzip(json.toString()); - - // Headers - connection.addRequestProperty("User-Agent", "MCStats/" + REVISION); - connection.addRequestProperty("Content-Type", "application/json"); - connection.addRequestProperty("Content-Encoding", "gzip"); - connection.addRequestProperty("Content-Length", Integer.toString(compressed.length)); - connection.addRequestProperty("Accept", "application/json"); - connection.addRequestProperty("Connection", "close"); - - connection.setDoOutput(true); - - if (debug) { - System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length); - } - - // Write the data - OutputStream os = connection.getOutputStream(); - os.write(compressed); - os.flush(); - - // Now read the response - final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String response = reader.readLine(); - - // close resources - os.close(); - reader.close(); - - if (response == null || response.startsWith("ERR") || response.startsWith("7")) { - if (response == null) { - response = "null"; - } else if (response.startsWith("7")) { - response = response.substring(response.startsWith("7,") ? 2 : 1); - } - - throw new IOException(response); - } else { - // Is this the first update this hour? - if (response.equals("1") || response.contains("This is your first update this hour")) { - synchronized (graphs) { - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - final Graph graph = iter.next(); - - for (Plotter plotter : graph.getPlotters()) { - plotter.reset(); - } - } - } - } - } - } - - /** - * GZip compress a string of bytes - * - * @param input - * @return - */ - public static byte[] gzip(String input) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = null; - - try { - gzos = new GZIPOutputStream(baos); - gzos.write(input.getBytes("UTF-8")); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (gzos != null) try { - gzos.close(); - } catch (IOException ignore) { - } - } - - return baos.toByteArray(); - } - - /** - * Check if mineshafter is present. If it is, we need to bypass it to send POST requests - * - * @return true if mineshafter is installed on the server - */ - private boolean isMineshafterPresent() { - try { - Class.forName("mineshafter.MineServer"); - return true; - } catch (Exception e) { - return false; - } - } - - /** - * Appends a json encoded key/value pair to the given string builder. - * - * @param json - * @param key - * @param value - * @throws UnsupportedEncodingException - */ - private static void appendJSONPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException { - boolean isValueNumeric = false; - - try { - if (value.equals("0") || !value.endsWith("0")) { - Double.parseDouble(value); - isValueNumeric = true; - } - } catch (NumberFormatException e) { - isValueNumeric = false; - } - - if (json.charAt(json.length() - 1) != '{') { - json.append(','); - } - - json.append(escapeJSON(key)); - json.append(':'); - - if (isValueNumeric) { - json.append(value); - } else { - json.append(escapeJSON(value)); - } - } - - /** - * Escape a string to create a valid JSON string - * - * @param text - * @return - */ - private static String escapeJSON(String text) { - StringBuilder builder = new StringBuilder(); - - builder.append('"'); - for (int index = 0; index < text.length(); index++) { - char chr = text.charAt(index); - - switch (chr) { - case '"': - case '\\': - builder.append('\\'); - builder.append(chr); - break; - case '\b': - builder.append("\\b"); - break; - case '\t': - builder.append("\\t"); - break; - case '\n': - builder.append("\\n"); - break; - case '\r': - builder.append("\\r"); - break; - default: - if (chr < ' ') { - String t = "000" + Integer.toHexString(chr); - builder.append("\\u" + t.substring(t.length() - 4)); - } else { - builder.append(chr); - } - break; - } - } - builder.append('"'); - - return builder.toString(); - } - - /** - * Encode text as UTF-8 - * - * @param text the text to encode - * @return the encoded text, as UTF-8 - */ - private static String urlEncode(final String text) throws UnsupportedEncodingException { - return URLEncoder.encode(text, "UTF-8"); - } - - /** - * Represents a custom graph on the website - */ - public static class Graph { - - /** - * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is - * rejected - */ - private final String name; - - /** - * The set of plotters that are contained within this graph - */ - private final Set plotters = new LinkedHashSet(); - - private Graph(final String name) { - this.name = name; - } - - /** - * Gets the graph's name - * - * @return the Graph's name - */ - public String getName() { - return name; - } - - /** - * Add a plotter to the graph, which will be used to plot entries - * - * @param plotter the plotter to add to the graph - */ - public void addPlotter(final Plotter plotter) { - plotters.add(plotter); - } - - /** - * Remove a plotter from the graph - * - * @param plotter the plotter to remove from the graph - */ - public void removePlotter(final Plotter plotter) { - plotters.remove(plotter); - } - - /** - * Gets an unmodifiable set of the plotter objects in the graph - * - * @return an unmodifiable {@link java.util.Set} of the plotter objects - */ - public Set getPlotters() { - return Collections.unmodifiableSet(plotters); - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Graph)) { - return false; - } - - final Graph graph = (Graph) object; - return graph.name.equals(name); - } - - /** - * Called when the server owner decides to opt-out of BukkitMetrics while the server is running. - */ - protected void onOptOut() { - } - } - - /** - * Interface used to collect custom data for a plugin - */ - public static abstract class Plotter { - - /** - * The plot's name - */ - private final String name; - - /** - * Construct a plotter with the default plot name - */ - public Plotter() { - this("Default"); - } - - /** - * Construct a plotter with a specific plot name - * - * @param name the name of the plotter to use, which will show up on the website - */ - public Plotter(final String name) { - this.name = name; - } - - /** - * Get the current value for the plotted point. Since this function defers to an external function it may or may - * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called - * from any thread so care should be taken when accessing resources that need to be synchronized. - * - * @return the current value for the point to be plotted. - */ - public abstract int getValue(); - - /** - * Get the column name for the plotted point - * - * @return the plotted point's column name - */ - public String getColumnName() { - return name; - } - - /** - * Called after the website graphs have been updated - */ - public void reset() { - } - - @Override - public int hashCode() { - return getColumnName().hashCode(); - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Plotter)) { - return false; - } - - final Plotter plotter = (Plotter) object; - return plotter.name.equals(name) && plotter.getValue() == getValue(); - } - } -} \ No newline at end of file