From 630ad5d01bba663dca3571c7b7b18531ed28d68c Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 1 Apr 2018 18:16:44 -0400 Subject: [PATCH] Resolved an issue with the kit command not overriding correctly. CommandHandler redone. player instancing is now using UUID's as to dramatically cut down on memory usage. Player instancing condensed. Redid some of the code with the BlockEditor. --- .gitignore | 4 + .idea/compiler.xml | 6 - .idea/encodings.xml | 36 ----- .idea/kotlinc.xml | 7 - .idea/libraries/Lib.xml | 13 -- .idea/libraries/spigot_1_12_2.xml | 11 -- .idea/misc.xml | 6 - .idea/modules.xml | 8 -- .idea/uiDesigner.xml | 124 ------------------ .idea/vcs.xml | 6 - KitPreview.iml | 74 ----------- src/com/songoda/kitpreview/KitPreview.java | Bin 13706 -> 14084 bytes .../kitpreview/events/InventoryListeners.java | Bin 33106 -> 33254 bytes .../kitpreview/events/QuitListeners.java | Bin 1704 -> 1444 bytes .../kitpreview/handlers/CommandHandler.java | Bin 33902 -> 30708 bytes .../songoda/kitpreview/kits/BlockEditor.java | Bin 29914 -> 30470 bytes src/com/songoda/kitpreview/kits/Buy.java | Bin 7830 -> 7858 bytes src/com/songoda/kitpreview/kits/Editor.java | Bin 68320 -> 68376 bytes src/com/songoda/kitpreview/kits/Kit.java | Bin 41638 -> 41696 bytes src/com/songoda/kitpreview/kits/KitsGUI.java | Bin 21820 -> 21854 bytes 20 files changed, 4 insertions(+), 291 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/kotlinc.xml delete mode 100644 .idea/libraries/Lib.xml delete mode 100644 .idea/libraries/spigot_1_12_2.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 KitPreview.iml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6d07cfb --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +\.idea/ + +out/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 80745f7..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index fffc603..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index 1c24f9a..0000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/libraries/Lib.xml b/.idea/libraries/Lib.xml deleted file mode 100644 index e132053..0000000 --- a/.idea/libraries/Lib.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/spigot_1_12_2.xml b/.idea/libraries/spigot_1_12_2.xml deleted file mode 100644 index 3e6a868..0000000 --- a/.idea/libraries/spigot_1_12_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0548357..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3e4783e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/KitPreview.iml b/KitPreview.iml deleted file mode 100644 index 39818ce..0000000 --- a/KitPreview.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/songoda/kitpreview/KitPreview.java b/src/com/songoda/kitpreview/KitPreview.java index 418b9c1357680c385503c3148791c964dbbd2f9a..07973f5633dcd351bf3cd717c3a26bfc5c115553 100644 GIT binary patch delta 685 zcmeCmZpqsa&CMRl5X#`m;4(RlI~&fv!<`Oi`|%*ekMJPG&3G@u)d=xLPVVRBP=}hu zpu?cR5X?}*P{feQkjIeDUquO#^DnXUK(#0qJ6}Q6P0ilLJJhHzz7)FiArUat12R11bO+ zR?3hJq!kzvC;yX_nH zax>I1Ksp)hkX(jDpdBe7GbX=R6f^b)^74T`%wquAo(qIvd7yp;23vGp48B0wg2@Ls zQW$XBGnq$K7v>RQOh_1`x&svcIPHPDQDbr+ zuVg5?K24x35%x3a0b>~yff}eG1oi6!QF%q&_Ukbe0As3T^DMQQ%)Cg+1Sm8?i&o5`&CMOaki(G3P|1+WP&7G-I~#?6g*zRE@5F;Dzl8@?UWxZ2iuzx?k=8y8 znGD4YB@8wUp+M-#;KE?XpukW8w6O|E+X8VO(C%^|?Z{9Bgdn#-^-LDvQMSdW--u!p zj0u^rc>&*V!OfzI8BCjRDi<(LPF9xMoT#eAI9XneZ!*6+2Y(UJ_32PQ0>g0g8;zOF zf)MZNF(d;6Hx=lmqR9>hlEM&CBL?i^#^~ac@AJn^?&LqU`M&M}4(0-eoXPk2q$i&@ OGno8dQ*3gzStkIX3~FHj diff --git a/src/com/songoda/kitpreview/events/InventoryListeners.java b/src/com/songoda/kitpreview/events/InventoryListeners.java index 4f738e6e8d421556db66684c40f53dd4c2a51d83..38c80c9985035bcf036d0665f88e1a5df19f0529 100644 GIT binary patch delta 589 zcmccA#PqD0X+tH?1Y?zX88&uCe)Cgtj8`pd1pF delta 531 zcmaFX%yg-VX+tFss{%s}L(Sv>AyLT+hDwGi1|tSNhGd3(hCGH6hD3%;AYD9pft>f` zzqJ~h-}64=WQQu7tWa+{nbTik@_iYx&7KlsEEp2Lb#g$-dk7oEAzE>oKlwfHg3UMO z<$~B17}S7JVe*1nQGA*g$>PPX{~p`Qs@ delta 50 pcmZ3&y@GecWER#6hDwI2$qQIgCs(pav4eRGMreHF%?nsq7y*g(4ov_6 diff --git a/src/com/songoda/kitpreview/handlers/CommandHandler.java b/src/com/songoda/kitpreview/handlers/CommandHandler.java index 7d2d76a926e311825f5d213b4331beb0b8dc1cb6..804cac1a50347df25f3e6ee9052f8d9ed6a8caff 100644 GIT binary patch delta 1512 zcmb7ETS${(7D`yAf)`!*H6u`YU^ z772Z%75aFE*Aw|H7XCOfj*X{aP^EyRC>6I7wBBLGKzK+&Lj@g5RCX$gF|V3JiQ0(; zbvb>-5G59{`Zf?0<{0p|XCIRHZy+mLi!9|*D5hu--#hdSaj{W@2F-c?lo^K)Oz@Nf zomb3K#HTp;?lD*&(&AN8K32?~a3!T(e9WhQ5XcTN~>g-fg;%A4Fl&QUII%z}*bp@lIMs(6qm;I8yS`uqSe@-7W zr9VfBPjU_X3DO;mk;3BCL6Tcc^zA6?k>h>t2pRQ&a5Pb+VVW>QSO!evX_SbDrWn3~ zSuCFnDhp0K$J~IAr%HE1U>&)fTvueUSLhWaNpV)GGYciskYjl9fZ!?!a98EG1;8RhhwRw1VbbA;2iQ z@DwV?Bm8pw;p@BY0k_iJq?mY4X570J%qK8qyLrYv36|~__Q3eN+i7yg@Y(f4z@v_;~0Wcn2^#kGUZ)t_ox#No1sW(;s$nQeh}vN?*&oCp~u zhM0+2G=7mpUJ!!`goKflkSJLi!-G*`W{mMkvnRs?fd=A>z%uSR_y2!7O^BLhx#ymH z|L>mjo$s9fS*f`@RePnS?pg0M{D$AjM3G1QSgnU@?s~JyCVDs;okP1U%>SGpONXZqL_#ys5Ejy#nf5^n~(5*$N~gOt*Irv=@If2|+Du4w90l1!TWz@2(aLsN4Quzz zLM&NiJfgPAy?j>jyoO9%g(ZCgX9uT{3_F>B!YC)kHLR@gOFlDQQGq2jMVyiV5q*D2 zy8k}4m?y$7xRQr?r7A3ht(ZHI*CMiFd18#uh?4&jRc|PYo>$@=*$+9;#kwVKweobOQydf@ zDPE6HmjL;Q8`%XO#Nz#2e%XZ|FgEc*(zxyQ!m`ecb3NyoC;8TIODg(T?=~b=KPDX; zklUrQeaB42mx4XyKH)FHQHQ34Pq{EEQ_DFlw_ZD~XvDZ%+ zwW4>1`s6v`6djG2?UPuv52m7wGjI3HRdJ%?G2vY5u;w?331G+i{=BiD?*G!T)6OhD zPXECB>Uh7~dx3pH#frkfdBa}$#v}Z3aHFxOuAmsJ^J0B*xBOG(q=kiyUQa&;veGX2 zCQu$ZX=v(cwfyMNu+e>guW9?>eWROcx&_+oxRgJ|eCmUP;v>yk+7&Dg<@xMkmksZ| zDSLx8eDD;0G$~7S6Sb4M=>sZ?i^H-vV%>gNM*d$e)p6<*`RjrhhT4R`SBPLoOGHdx zIe|&56l2fZXIQ)R3quoFOp#Jx>=*jkQhDrC15^i=b`GQX&T&KVbe^6V*B%lg6XR*I N$*YZX8v^fs{}_4W%NhUx diff --git a/src/com/songoda/kitpreview/kits/BlockEditor.java b/src/com/songoda/kitpreview/kits/BlockEditor.java index 476428ebe642528151a257961481fd25b407d3fc..72f27b76a243666ebcfcff57b60bfac92e24d009 100644 GIT binary patch delta 1148 zcmcchlCkX_3Q*_`lqmtSv%xg7j1xl+ zP){;YMu8y-&PG-d02EDRsANb5nyJ80fW!l-g4;2_C zWB~0gX3&G0k8r61gDtYXlMk?4%HviI_Sa+$_C%;X3Ig)#2-V0ggP4mXGTDG%mJ_aa zvId8@GMtCxZ*=zhd9H(_v7()%8b0*W~*$yR`y7`=+vtU;q>$Q&?VeaHOt@zEAVVI7Z zY!k5&!+A9uo1>%8VJfnTm^t~alM)saH5su?-^2NIu E0ojEe*8l(j delta 565 zcmZpB$9U@{`|sFhdDL5kn?WE*&V6!;sIA45ZOj zBh-5X)s_HNWJ75rm6Lhcqy;hbPBvhZ=0_8qT)-nexsXj`@_aV2$;yQilehDzh+=a| z{v=Dq$+OuVCV$jW5=~}E1X`U5bYdRViAfAOla<&lg^`^NVdqcYARs&0m&1#@0IIeC zs1_*3orI)!g7)sorJT1WmvU9H>Hx))CO=@8pZq`GXmT;P!seaaaRQSC3#}&WDtc^Q zDRYEza$t$bNEL&smJEtm~)I^6|o6QKouH{ zlYtDlD%t!Slf7egChI1Bn{1qXZ!=IgRCTHbRCTHbNcCpTj2gzt{81?&LnrI&@J!YZ q=9s)bX3u29>{FXrbN;XZE!i;nV&Ms>f7VQ{EC#U;Y*s9N$_M})H>mvp diff --git a/src/com/songoda/kitpreview/kits/Buy.java b/src/com/songoda/kitpreview/kits/Buy.java index 4fefad85f5e7f15569b27e42f77d3b53ca217dab..7d8241a928e71177030e2940f545a1aae58f2efc 100644 GIT binary patch delta 39 tcmbPcyUBLLYFTMLhIEEhh7yKQhCGH$hC+r?AkUK_g+YTsbMh+LHvrjX3V#3q delta 11 TcmdmFJI!{(YT3!hWnTjTAZi7j diff --git a/src/com/songoda/kitpreview/kits/Editor.java b/src/com/songoda/kitpreview/kits/Editor.java index 21d2aa3f6ab692c259cb775774d630bdc063c977..0ca011d8a1af4a9dccf4b20658c59e3edce250b3 100644 GIT binary patch delta 78 zcmaDbm1V{>mJN{{(s~T(45l)0qxPL-9LEHBBoS>Eno3IJLI B4fOy3 diff --git a/src/com/songoda/kitpreview/kits/KitsGUI.java b/src/com/songoda/kitpreview/kits/KitsGUI.java index 014e00a61ad236d62eac56e846d000d634475ab3..9bc17ee7b23de96c2a952222ff94eeaf1a71129f 100644 GIT binary patch delta 81 zcmdn9it*km#tnsRlfBtxCKs|D6D?=RU`S;s0%Avo5(Yhn0)|qClF4rDiu^hZ3JgjN k*$kOL@nQz0$p-}FC;wFC+dP^5hQ?$^4UNr<4Q8qU0K?N4r2qf` delta 55 zcmV-70LcH|ssX&J0kClflZ^((4|o810D1s204@Mw0Av7UlWYbdlOrD