From 6d6c799904c1bae48e0505e9ffb53c43b7cd8b55 Mon Sep 17 00:00:00 2001 From: Marcus Gosselin Date: Wed, 8 Oct 2014 22:40:33 -0400 Subject: [PATCH] new gitignore, not much else. --- .gitignore | 248 +++++++++++++++--- bin/MAndApps/AppHelper.class | Bin 2650 -> 0 bytes bin/MAndApps/BasicApp.class | Bin 518 -> 0 bytes bin/MAndApps/Button.class | Bin 5292 -> 0 bytes bin/MAndApps/ButtonListener.class | Bin 159 -> 0 bytes bin/MAndApps/Engine.class | Bin 8949 -> 0 bytes bin/MAndApps/ImageCreator.class | Bin 5947 -> 0 bytes bin/MAndApps/LogItem.class | Bin 946 -> 0 bytes bin/MAndApps/Pointer.class | Bin 666 -> 0 bytes bin/MAndApps/Variable$1.class | Bin 597 -> 0 bytes bin/MAndApps/Variable.class | Bin 3081 -> 0 bytes bin/MAndApps/VariableNotFoundException.class | Bin 440 -> 0 bytes src/{MAndApps => MAndEngine}/AppHelper.java | 2 +- src/{MAndApps => MAndEngine}/BasicApp.java | 2 +- src/{MAndApps => MAndEngine}/Button.java | 8 +- .../ButtonListener.java | 2 +- src/{MAndApps => MAndEngine}/Engine.java | 105 ++++---- .../ImageCreator.java | 2 +- src/{MAndApps => MAndEngine}/LogItem.java | 2 +- src/{MAndApps => MAndEngine}/Pointer.java | 2 +- src/{MAndApps => MAndEngine}/Variable.java | 2 +- .../VariableNotFoundException.java | 2 +- 22 files changed, 268 insertions(+), 109 deletions(-) delete mode 100644 bin/MAndApps/AppHelper.class delete mode 100644 bin/MAndApps/BasicApp.class delete mode 100644 bin/MAndApps/Button.class delete mode 100644 bin/MAndApps/ButtonListener.class delete mode 100644 bin/MAndApps/Engine.class delete mode 100644 bin/MAndApps/ImageCreator.class delete mode 100644 bin/MAndApps/LogItem.class delete mode 100644 bin/MAndApps/Pointer.class delete mode 100644 bin/MAndApps/Variable$1.class delete mode 100644 bin/MAndApps/Variable.class delete mode 100644 bin/MAndApps/VariableNotFoundException.class rename src/{MAndApps => MAndEngine}/AppHelper.java (99%) rename src/{MAndApps => MAndEngine}/BasicApp.java (99%) rename src/{MAndApps => MAndEngine}/Button.java (97%) rename src/{MAndApps => MAndEngine}/ButtonListener.java (81%) rename src/{MAndApps => MAndEngine}/Engine.java (84%) rename src/{MAndApps => MAndEngine}/ImageCreator.java (99%) rename src/{MAndApps => MAndEngine}/LogItem.java (97%) rename src/{MAndApps => MAndEngine}/Pointer.java (86%) rename src/{MAndApps => MAndEngine}/Variable.java (99%) rename src/{MAndApps => MAndEngine}/VariableNotFoundException.java (87%) diff --git a/.gitignore b/.gitignore index 58bcbf8..b9d6bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,43 +1,215 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap .DS_Store -.AppleDouble -.LSOverride -# Icon must end with two \r -Icon -# Thumbnails -._* +############# +## Python +############# -# Files that might appear on external disk -.Spotlight-V100 -.Trashes +*.py[co] -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg diff --git a/bin/MAndApps/AppHelper.class b/bin/MAndApps/AppHelper.class deleted file mode 100644 index 59aa296ffc3aa71f92f4c5d8b60070021f213cc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2650 zcmah~T~iZR7=8{3SqKX#0`e6LwP+I5Sg49Xv3x1f@KHjsLai=g#l^6RyNQbZys+bK zr!&3quD$ZcnW`1EA3C+8ooQ#SBp(&aj zNX_Yfcu=dN3fl!d!O&DG1nO0&D3_;36&0wIr+|trxzj5uwxUF!GG>_iXm)W{x7?ho zVyT3doYE{qV&GnSGv^JN+InVdFf%oel{FRY64>UTmCYE*NS|eCOEJUF_|b}5KSF3z z5GHu*fDT9)V<~M;w^Z!GUfQ46Gw~%mqc7&YF_mB_uMT-n-O_GE#eTdlP@1GE=TV?F zn5WkHLjq-{emQE|8O=DLvocv(^Bq;inq|mQrgBBq@|q`DoRlzPa`T6l$4ZN5SN3X`MzIx{}b- z86#z?n39aEOtUdE@r;(ZFllKCvhiI^D>zjck5g6^GkA}g>Q@YA;$Q9hYUhvXDs%0o{XCTd+3Z~hgHgZbu38gre+rk^;|q@mY}$y6{bzK z+QKGTO0PCbc(Yu3*4t)nAoS8oxr5n=wmNPUR)c-TMym~mHlHF=WY8HTqzOk!8NbKZ zrU~x`1ytTe2WOX@95)cpMI{vVV;ET#mvEV7(l2JUq#d0%Q12HG+kEgO$LO*Iqrd6!Xj(xK2&_Zf@_$wwm{gR=a z>wd{u?nSZ(oSnnW**VIborBETImWmv)UU!euGRd~s8__jK71cFVb3z^j zwu~Kj9Mxv74e)Vogcmh*S<6Yeoo1R)hX4ZuZyZB-6+8JwlX7m-jlgS^blepcQ(NKN zA3vb=)P3xZJwR~8(|Z$#!}qWw(B9?UQ}12DzOLf>;uW-a`RaX-(Rl;qZS}sN(7A%H zli^eM(BM7GAg_5uK&n0Z`uUS^+X{LgqH`Jj(p)v~`vYx(6%0}>?n?Gk@-O-F=plx` z#qsrHOe(e9#c{`Apgn#UF?s9{w10foV>&AR6NEL&Hyi( zncq2P51vYhjEY@EVmEI>{0bw82*>b#bfF!Cd>h9B_WB{5<+L%mUqv@Q<2?KvZ{kZF z!B?Dlw|V}N(vLBOr#OaR5ykH~;oyFbg(spe?j`tz->033e#ZMa!>UxEpVli$oqDvf zPa~>9Wy1<(bls>~&1+5A~ z;u(Sph81)u@caX{Zp+TVbN-Kd$hn+^+~blINi1@e42*CW+>0gLw|OXX5cD~hqfUm> zD+SyP1yM@zW}|Z5tqsZ(n<}Sq(N#W37^Gp9o*S-nX}X^JW`m8XJR7PTKq)NPt__Rf zO4>JjddNDmrm;P|g3JvRH{QA?L?drVy1$ELY#t}ES|$QabDbeAPP2ukv4cfv;cc#k znsJ3Cl0Y;$MaThN0?)rF7Ue~3zNMG=zxq=DN%~);{}lZv>EAB!|Iz>Y7x>tT?vwuj D*zz%s diff --git a/bin/MAndApps/BasicApp.class b/bin/MAndApps/BasicApp.class deleted file mode 100644 index b33fe2c18e5910505183daa87aa5e405b50be49a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmYjOO-}+b5S=RWy$Xnk$`62xo9K}fiWs6q1IB~5vP`hBbV=LAz)$nw5Aa7Br)7y= z`ld5)-@bYM{`vd@fNN-EV2?q0(2a{_${y()bU!zO#kn7Kl5<5V<2~ z$@hyeA(^S}EW5==O5{fHEf6qbODZ_JpN)yM!-oY-tAc6}<$2M}Z$e8f@?x$U4j=m`|{fU=chw iKZGNPr3A}Rara}WIy`}z!&9g`JhMoDJg0LHE`9;#BX@fM diff --git a/bin/MAndApps/Button.class b/bin/MAndApps/Button.class deleted file mode 100644 index 6f314ea4d1498ff092dbb3481e872789b9be0880..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/bin/MAndApps/ButtonListener.class b/bin/MAndApps/ButtonListener.class deleted file mode 100644 index e30ff24489f701d735399a88dc2dce1c3521b70c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 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 DFy`tiI4 zjP_o@iKy<iw39b|+ZSW3liNRf=%2cyPIRaf1}& zA%?=kG6avxP*NzzHmSgqGQ7Z++vP}`;I}a*-jnZIp988t3)Et+TEf$$i0bpw=u$75K#&u%a(r!{oYE)DGP0b#Gy0^* z_K?U(oT1`2lFG=sEO_aHbBnO+RILlK^DM-gGjajpUQt<5nURb7Fnt4t)sB=)IB*CD z$mLQ?t!o3yYb*Tj-;7+r375^O8M%4`HuXU}-p~oXIGp{ej9j-()|2tl;dmy*+)&{U zRaKZ3p^R*}NOo3j-1&AdBCT8yx3bGdvZ?iWvZtK14dI8srqOp7DRoqA|atzw3JA(vCH<#_~|#(&5>iEx-kb5AEE z>M@*cr8E#0vj~f3!eS1Nhlsd8O-`_4~v`k=z;2XDeK_xD2!dQnoi_^nBzwM4at`e+pox!Fvj_8nALwePZCWkBPiWgS-*&=*(_T<8F?(975p}~ z&L@EjEKfHLjgTkgm)t3Oy~+p!@^TJ+N9lV08KQ|=e(M>K*Yd<%xz_W44cy4++hB<*KfgY~WtFU_ z1WKZu2XH~1zdMnQ4C7lEzPDN;uK&tK^R@c#4S6$5ZVp>zQBKFa#j6CH_jsGwo!lm7 zggZ#?&H_ctbBdPJR(~KNkw5-_3Exe^_mJ?t-$D3;9N~ZHga-;p?CJzpwhzCXMBjIi z_~^SyxRtmI-MvZiagM}^S<@FYG^XVZ?#AB3^xxJ3X^L~kE+(p6g+AGn6l>=_NIgzc c+x{u3BKedMD3U+PpV{iG?_c=R_?frt@4*U2$N&HU diff --git a/bin/MAndApps/ImageCreator.class b/bin/MAndApps/ImageCreator.class deleted file mode 100644 index a19db156d1e439706563a7f4f3cb3cc6d9e868e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5947 zcmai2dvw#)9sk_?@^0EDO@Afn0}v(@gq2ndwpIG%(Fs&q(@`)8j0Klg`!%$@CQXXoq;o!#f&Uz&s(H9fiad%ySI z@B4An-+lhh6#zHleH%;y`sS8cUrQn}QqwUU90<21!@*QMX@gn7y+3#$SQ8D#25LHc z_lH9%0qZT1SR}PpK&xK1UBKKH?+ZJj!Qp}hR)OM8kyv=k=x}d1xh>cm4GWZPiid*H z?ZIS3uG2_!YA`Y)FmF>{=8Xcrkd(uaC?1U`cSKTyTjG%s61=gxqhphjEO;u7&}I2rC!BpPk-2vlY+^jmu~UH=0~%mN%sxc0~G8g94U= z#w^o$fEcO%+FrP<93FceIVmkZ}#l0d3eC4 z=*Oszi153g-z2~7{0{Kj%kL2Rg=8cO6n3YAp`p#eL^{;%M->q zQI$_t>C2ri?80sur7xHq3X@++ZY&z^azbE_3wL0zKx-a0SuNA<%_8!#wKl6rlCe~c zpbNdAA1wXRxK!6%-M);LFoo)92Fg`LA9ge0)0rpG{Dly>HZ>VOU(H^?x$aOXoRAJ4 zv4Q6IsvwTUYdShJJ2H-Az5DzOR8Co^O8(w z)VE!@ceWI4JDgyl9mNqBj^Y^o&m?5D)6qG^@_8@ID&KC7a{0DtdxcJCWr14ECbxA& z`gtd1QNS)bUjZ4r3M|NS&#NdKMsFlaUj&mXXgU)Di?VkNk-lI{=48{?Xr1e|{EAtW ztn|9d&v1uoe$n`7pEje)roe;?kK!@uE?MK|N_A}%%anUUo_|u{dQ}v^?uNBF{%4g} z^6Jy_>M7%D`!yk#Pk4FbvyB3lR`D-Hfuu}h0nGC77bI^Ar2el(8|F=k!5H*+FQ1@+|}K&dmZac z_quhgGv>ZvD#%L17U3L;^o2KtV*|2Z*aw5r{%#_;M+$;jrUehsGFoID0d9E04m z-IWZdMw4u|)%dlvBCDCRJ3g8Wh1W;qi^Zb^Oh1IaDHEG*nzxmm3JCF~!_mfd4QIjG zviuV4ZxS%kj!@fx3k8H-#sSWSTscsLV&k%DG0#cke{dP@UF8+lODJhD`^{6(8!S}; zs}`_L;${ui-{kd0i=QjS*G zDd8Blpp*Vuh5K+jp#n;K09y$aqJd)<&lOX;5_FSWF}9K4R#<1Kq+JLb%K3HMP%9|X zXRwGF>R5Q~hR`&PyPu+c1}ov1vk6=!D+i6T-3S;8ZdOrPP+qZuF|cDAcS?Kb#@r3c zHVcho8QTC*AS;Gw4F~Cr=7~csV4cKP6^gg&R^8S!UW$G3Y4mU!DLQo; zHuEIR3{pmjovRgGtuz9Lr;UKgga`xX%9vH?*4co$kQ*?|RoK+fS*z%#TDql<4q44c z9-yPv&SZB%ZzkykmL z7-j%ScXq-4Is9oiN+0^0=|)%DQ*`mHhgk&ZY1uanCtkB<;uaBC;Wqr)j{&-DkcZ85 zKt$D%KXH^gwJo2*&{__|0dvK8)p)$#QaP@hIoo^|pKTiP2FGQL?(#b31%d zPOGTom3vq}rf^?2BIYa7Yw6u45^rIowo<(|=2JTh*ZLeIwkhL~KX+w5$t-G9<}~s4 zTHH^Z#`8Dh0YYX{s>OrM0SoELOz9-2#aM{%;2}Dth8aGN@6w$P^fQO&D*Jol=PJ9j z-m>(ob*vg+Iy6C3aQt#*Wn$k(;+t6gr1ZP=})DYECuq@hDUfp*7Gl_ zScIF>DtZ`qhKf>IL&YU5RI@5Rn#s?-q$InI4@B4m-`D;g)z};e2(yjY&^SIwZLRFF+8oh8{knPxLYCtAqHUtUqk%s&~gQX}0U7t?rZE|YzV$!gxYyG7rFHG=nt?cZ z;#%4FD=D+GZ&pTh`-1H&vXbMO`4l_6Z&ao-HlHvMdhU-bibyRT;8(gRG1Lh~w^T>Gh&_rNf7Hc=K zJ~Pq23|dQLt;G6g1=r_EA$6ZDCAy!5B$xe}4EslNdbsY_`Ihv%HNTr(#chxFDQH+i ze7;@W;n!vQs^^+0W1j>cUxnO?>{4~?Qft_uTCg8O{7WE;!x-k%EXFz*XSybE zl8?1>oS$c3zQFla{+525^G}e%ulRfQFFf}z#Doclgq=Trb=)JC;M-y~=bLb^Xye?D z`@|ibcjAcX!BLUq58QikzqlU{h!c2FJc%)Jj(1-tjVp+XKjLBW5grjA<5BSmj*EZd zg!m68Ocp$5D#qicDm-CYiW8<<95*%Md!`mVW!iwJP0w+jVht6r0IHN7WX>Ao=&~Cwt+8(?l%bB>DC77jXwww`4KQ#%x#SX%9M(D?c%nF(! zWJRIYg-e9&sMA(rnkCMOHCi>TBOjA3+I+l2`h`fC{=tWBCp*>wv4?hR7E zM|>hu_$48)_&d9#eD><%-+YA2XK$HlExo63rgp}HfqRSpgfMXL(EkSRL%yM8A)iOv z)u}@6qXjEfA@|dEi|PA~j3fDqN}IgGgl400+1dUlG4fsYDfV7PanWaR zad}YVQ_0Hpe^EBWhksG-Exx$an_1qPH_vpH|9CbC?975eg0wY%9;dt5TKa{afwOuV m?=9gs{svdM&*oQD+bUCy$w@6bxiA0Ub%l_LRDPq*|Mvf1x77sz diff --git a/bin/MAndApps/LogItem.class b/bin/MAndApps/LogItem.class deleted file mode 100644 index ba36531a65e05655570c481900db345384a9807e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 946 zcmZuu!A=uV6g{sqZDE)Sot9ckQBc$}DAl;cm^4OAlOhWYiL4yju?!ui%`kv|ic9xy zOspm@`~W}7c<$>&8g(&!=iPVDIrpCa{Pq0@fX8^0M@C^`w-xnTqtRKjGwin$|1=Mi z)f4Z+YldFbZ|)tP_}xUo41>46f@%|X+B?q`vR)WmNa;|)2#0+Ir*p;IPvRizZ!6@U z1W}MYRj4%neQs|YQ198W=UXtaV8cd{YK@J9StyijSeO&EXk!Mmg09=hBPVFdMix1R z`A!h|FV9bp{P>l36mlY`GwgcdffomIPm5-99GuD9-y3sA#RoG9x&wv6e&TfpyWS|J z+b}zx1IinTQUdMn32K1+C)ZzBFac~ z`ec~;WW2hATol-Ujkf{>z2=!@RpWhU1!Jl->Fm71tP}`dL$J{Hi4f{o;f<2G!7indjFch1iDGJe$ZmOCc3*!%)qF!Mmw;d8BWA?9EY=2X z0f(j{Xz{j4vl=bL(w<19maD8#w8r8ZZlykbQibeLx%>fzO`cAD?jGE2f_aGJ1`iF0N0Fo=rUzn!4-Z EZ&($Uf&c&j diff --git a/bin/MAndApps/Pointer.class b/bin/MAndApps/Pointer.class deleted file mode 100644 index 4e5d0e2ad6277b8460bef33dfbeb01978f0b458a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmZWm%TB^j5IwgKptS-b58uXJi-|1UDIr0FD|{pn_ANAc3AUsZ6aPvRjfo3Cz>hM{ zEd>Kz^xl~>bLPys{rUa+25^q!G$e-nZPObxCzEOI!RKD+25BgSj_hZe3}3N diff --git a/bin/MAndApps/Variable$1.class b/bin/MAndApps/Variable$1.class deleted file mode 100644 index 886277763b6b96811df4506e5dcf2e7058593f04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmZuuT}#725S(kOY2#^QYwNdG=|inxErJM&Afg~t1(m*E)1ys^7s)05FF{d!@CW## z#JyTktbt?iW_M<1H}4;>Zvb|%ZX?A|I6qRIqq{p@Z;8kk?LbxR>)PsSX>oAEtdFq=nC%?OGnI({^6XgY=_Eq;>#=Wq^v5GR$wTxRLNQhCa zHh=bY9Y<8UZ^q$gO3COr5L!!(G7WCg83S`&Ge7;F6rC&_LMQ09M{k2Twaq8++B2pe z1~t6na$}2)Fi0cqtU2I zjAmb|VkK3na*1FmC?{522vn>-*ll_uO-r=AVE6_zS>JeCLNpLved! za;Pz#wrYBfOw1UJn||bJC^~J788vYud9tQ+@U$7VHTcGi_^7EN6q!BiwllHh$$AZe z;aJ@4GVD_t{IYG1Wi%|3UCUY9Oj@y2l9!qqyIYPow;kfPAsUY*WA+{m-ipdz4SD-g zLv+1Z!_ueCH;u;PLuMw3LKN!=LD!Jqpp*kBrN73muI9#`#vqnpnIB8%fbTwM*=9n= za;%`%Nt0N{G;FGvA4BDQk$7CC<5{exu8~fg$sr9}|Cg?dxjulk8nmNgX}yjOC}-$) z%Arj|X~hCw3qXK6g2)e`g7l0T84-nb6o_bx23>L%i47i&rZQ##)fx)SEXzS&-6kw; z*HE_r)cH})mkd<)ikY1{b}7K5t=Gx@;z%rMc8n$l%}kHfic~`?YQ(d(;|fb6^Qx*o z2rr6*s6&GvESQ`EbJ)=FB3KQ6Rb`#SPbJAI!ukd15^DEKz>ONp76`bqSJ>O9BOvUx zFdNk(*ssHnd{Bs|DH@V$ z&r2E!65<<9WujcQ0UlVkv_ZFRL`T|WzoN~2IE{YG2Y-LpG`@3)JP^JA=mMV zRKuq{byJWyk{qgBgY4TNi?_+JoB7`OAL%DI}fS_6X|OcIQ!y;WtkS%v97%Q1o_~R=HkvHy{J|;Dc7KkI<;~Nsx^RT zpi^%V-_n$6Tx+LM*gu7$P|0JIO=4we4Ih(O_YfOHn;)Wb8d`s-Dzr7U**k@rgW*Z+ zp!7a9J$R1KCG-v~!wOFLHCT&ktfzbfYAF?8)kIZ+=lRAlhwYActsHp@(|C9aFN6ic z18jVZ-BWm}%JKgQP4ndn+!jIE%*O*%X79Gr&Vf4La^K%r9Nzi}2l?K97c0v0?#vMs zgqQnxD)7Aueyt*-mT-1s73b;!>_G>b(Tx^PfmR&Fem405#L$KW4wAMA`=&#Mx5o(q zT`D|a9Iv>fj^hw_9(oy9$&o~j(`FC-bf6Ni^3;c3N>{@B1jmu@hvr9}^D8@`$VaaD z>2MfB4OhvRFZ>%0-s8rh-$`QM4Bb)?4jv7CXmphiQz~edg{v6-G!FMqW1ycL9i77Q zNes@WGem^I3EnqQ3KL5)tZXlF^k-sS#v9_>BlFz#@(Vc?FZDER^6%6%M*0c2bqa|{ zm0M>5-^rTyPk1Mh>|??+cM*ti9lcLe0qkIE#@qz0=Q|K5tOR#yf;z*R%J7awVB=)! zoC3I(_vzXNSc=s+kJo8UQu_wpvBjMm# zcF{&$rKro=fqz%17?j2W|NBlV}g?SOW=7z!yZ*` z6H;?mg$sVVUA*7ZrBuL%TzJ#C-d{C^n*#5%4nA&gy%*8$Q3a~!v$=9`{z#lZp$tEB zCj3h5_c#^qb6!1EICrsdXnqD~sf)9Wv*`}LAea>-QX0fd9Zyc~SZ*hnJ5IGPX9{~K zF*sepc{Q7@AQgefjO2IaRI(wRA^nM>0KUR8N@NUfoH4+GF>AnSs}ZFvrabssJ-@-X MT;-cSz?DD$0cUk~asU7T diff --git a/bin/MAndApps/VariableNotFoundException.class b/bin/MAndApps/VariableNotFoundException.class deleted file mode 100644 index 48f41fcc65c73ac4333847e313689153073c68ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmah_yH3ME5S+8~!WaTcY7`Jff&?xogODObDkn`)`ip&-L*~x1&xp^03W-@@%2+AG9$HWqQ=m@ z=Z`!{xk`ec21DaQDrqhm+`(|cP`lEx@Ze(0M;#4@b|{sYl@Cji-&k#iPN*ZER=d{4 znz@q&!*TfkF(U>q5oRiif+wWc8w|tEX>*fHm5f^0r%lz8zS5?DYb_CXuFE_U6KQWb zs3!hcKC_ZI1R0~h0vvjgA;KnQ0Yyf!e)5Xe%c|`W+BOxjP3W)RK6WT$*hQPrl20kx YIk&U-Ou@m1+WJLxN#dK@Sxt4n07JQ7RR910 diff --git a/src/MAndApps/AppHelper.java b/src/MAndEngine/AppHelper.java similarity index 99% rename from src/MAndApps/AppHelper.java rename to src/MAndEngine/AppHelper.java index 4db6ba1..23f2493 100644 --- a/src/MAndApps/AppHelper.java +++ b/src/MAndEngine/AppHelper.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.io.BufferedReader; import java.io.File; diff --git a/src/MAndApps/BasicApp.java b/src/MAndEngine/BasicApp.java similarity index 99% rename from src/MAndApps/BasicApp.java rename to src/MAndEngine/BasicApp.java index d740bf8..45a3a67 100644 --- a/src/MAndApps/BasicApp.java +++ b/src/MAndEngine/BasicApp.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.awt.*; import java.awt.event.KeyEvent; diff --git a/src/MAndApps/Button.java b/src/MAndEngine/Button.java similarity index 97% rename from src/MAndApps/Button.java rename to src/MAndEngine/Button.java index a15abd2..5654aeb 100644 --- a/src/MAndApps/Button.java +++ b/src/MAndEngine/Button.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.awt.AlphaComposite; @@ -7,9 +7,9 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; -import static MAndApps.Engine.mouseX; -import static MAndApps.Engine.mouseY; -import static MAndApps.Engine.mouse; +import static MAndEngine.Engine.mouse; +import static MAndEngine.Engine.mouseX; +import static MAndEngine.Engine.mouseY; public class Button { private int clickLevel = 0; diff --git a/src/MAndApps/ButtonListener.java b/src/MAndEngine/ButtonListener.java similarity index 81% rename from src/MAndApps/ButtonListener.java rename to src/MAndEngine/ButtonListener.java index 2e82146..bbf337f 100644 --- a/src/MAndApps/ButtonListener.java +++ b/src/MAndEngine/ButtonListener.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; diff --git a/src/MAndApps/Engine.java b/src/MAndEngine/Engine.java similarity index 84% rename from src/MAndApps/Engine.java rename to src/MAndEngine/Engine.java index 885bd21..1c15bf7 100644 --- a/src/MAndApps/Engine.java +++ b/src/MAndEngine/Engine.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.awt.*; import java.awt.event.KeyEvent; @@ -11,8 +11,7 @@ import java.util.Stack; import javax.swing.*; -public class Engine extends Canvas implements KeyListener, MouseMotionListener, - MouseListener { +public class Engine extends Canvas implements KeyListener, MouseMotionListener, MouseListener { /** * to track the x and y @@ -54,8 +53,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, /** * more framerate stuff, again, chill. */ - private static long nextSecond = System.currentTimeMillis() + 1000, - startTime = 0; + private static long nextSecond = System.currentTimeMillis() + 1000, startTime = 0; /** * if our current framerate is below our expected. its not directly @@ -102,8 +100,8 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, private static double progress = 1; /** - * These are fonts. because STANDARDIZATION! - * worked good for oil, WHY NOT ME? + * These are fonts. because STANDARDIZATION! worked good for oil, WHY NOT + * ME? */ public static final Font largerFont = new Font("Ubuntu", Font.BOLD, 20); public static final Font defaultFont = new Font("Ubuntu", Font.BOLD, 11); @@ -131,14 +129,14 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, */ public Engine(String[] classes, boolean showLoading) { - //frame.setVisible(true); - + // frame.setVisible(true); + // set static object staticMain = this; // initialize keys keys = new boolean[512]; - + // set up window frame = new JFrame(); setSize(WIDTH, HEIGHT); @@ -148,50 +146,46 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, addKeyListener(this); requestFocus(); - if(showLoading) frame.setVisible(true); - - //make a new thread of the appinitializer thing - //and like... make it do things. - appInitializer = new AppHelper(classes); - Thread thread = new Thread(appInitializer); - thread.start(); - - + if (showLoading) + frame.setVisible(true); - //we need to make a frame and such first - //more on that later - createBuffer(); - - - //while its faffing about, RENDER THINGS AND MAKE A LOADY THING - while(!appInitializer.getDone() || !(progress >= 0.999)){ - try{ + // make a new thread of the appinitializer thing + // and like... make it do things. + appInitializer = new AppHelper(classes); + Thread thread = new Thread(appInitializer); + thread.start(); + + // we need to make a frame and such first + // more on that later + createBuffer(); + + // while its faffing about, RENDER THINGS AND MAKE A LOADY THING + while (!appInitializer.getDone() || !(progress >= 0.999)) { + try { Thread.sleep(17); - }catch(Exception e){ + } catch (Exception e) { } - //this is the later part referred to by a few lines back + // this is the later part referred to by a few lines back repaint(); - progress += (appInitializer.getProgress() - progress)/ANIMATION_CONSTANT; + progress += (appInitializer.getProgress() - progress) / ANIMATION_CONSTANT; } - //we done now, gather the loot. - apps = appInitializer.getApps(); + // we done now, gather the loot. + apps = appInitializer.getApps(); + + switchApps(0); - switchApps(0); - } + //TODO at some point redo this to allow frame drop + //if it gets laggy.... public void run() { - // REALLY???? running = true; - - frame.setVisible(true); - // now we do stuff. while (running) { // FPS STUFF WORRY NOT, ITS ALL GOOD. MOVE ALONG. @@ -211,8 +205,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, // FRAMERATE OVERCLOCKING AND SUCH, MOVE ALONG. try { if (!overclock) - Thread.sleep((long) Math.floor(sleepTime - - (System.currentTimeMillis() - startTime))); + Thread.sleep((long) Math.floor(sleepTime - (System.currentTimeMillis() - startTime))); else Thread.sleep(0); lag = false; @@ -226,8 +219,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, * makes a buffer and stuff, called with new windows and things. MOVE ALONG */ private static void createBuffer() { - buffer = (Image) (new BufferedImage(WIDTH, HEIGHT, - BufferedImage.TRANSLUCENT)); + buffer = (Image) (new BufferedImage(WIDTH, HEIGHT, BufferedImage.TRANSLUCENT)); g2 = (Graphics2D) buffer.getGraphics(); } @@ -259,7 +251,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, log("setting window properties"); setWindowProperties(apps[app]); log("Started up " + apps[app].getTitle()); - + frame.pack(); // because we now use the ONE buffer system... yeah @@ -280,8 +272,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, * @param app */ private static void setWindowProperties(BasicApp app) { - setWindowProperties(app.getResolution(), app.getFramerate(), - app.getResizable()); + setWindowProperties(app.getResolution(), app.getFramerate(), app.getResizable()); } /** @@ -291,8 +282,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, * @param fps * @param resizable */ - private static void setWindowProperties(Dimension dimension, int fps, - boolean resizable) { + private static void setWindowProperties(Dimension dimension, int fps, boolean resizable) { staticMain.setSize(dimension); frame.setResizable(true); @@ -315,10 +305,8 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, private static void render(Graphics2D g) { - g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, - RenderingHints.VALUE_TEXT_ANTIALIAS_ON); - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); + g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g.setFont(defaultFont); @@ -345,8 +333,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, g.setColor(Color.WHITE); if (!(log.size() == 0)) for (int i = log.size() - 1; i >= 0; i--) - log.elementAt(i).render(g, WIDTH - 200, - HEIGHT - 10 - (i * 12)); + log.elementAt(i).render(g, WIDTH - 200, HEIGHT - 10 - (i * 12)); } catch (Exception e) { g.setFont(largerFont); g.setColor(Color.BLACK); @@ -387,7 +374,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, @Override public void keyPressed(KeyEvent e) { apps[app].keyPressed(e); - if (e.getKeyCode() == KeyEvent.VK_O) { + if (e.getKeyCode() == KeyEvent.VK_O && keys[KeyEvent.VK_CONTROL]) { overclock = !overclock; } keys[e.getKeyCode()] = true; @@ -398,27 +385,27 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener, apps[app].keyReleased(e); keys[e.getKeyCode()] = false; } - + @Override public void keyTyped(KeyEvent arg0) { } - + public static void exit() { frame.dispose(); System.exit(0); } - + private static void setFramerate(int fps) { frameSync = fps; sleepTime = 1000 / frameSync; } - + @Override public void mouseDragged(MouseEvent e) { mouseX = e.getX(); mouseY = e.getY(); } - + @Override public void mouseMoved(MouseEvent e) { mouseX = e.getX(); diff --git a/src/MAndApps/ImageCreator.java b/src/MAndEngine/ImageCreator.java similarity index 99% rename from src/MAndApps/ImageCreator.java rename to src/MAndEngine/ImageCreator.java index c07be57..27586c5 100644 --- a/src/MAndApps/ImageCreator.java +++ b/src/MAndEngine/ImageCreator.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.awt.Color; diff --git a/src/MAndApps/LogItem.java b/src/MAndEngine/LogItem.java similarity index 97% rename from src/MAndApps/LogItem.java rename to src/MAndEngine/LogItem.java index 464c8fd..0f0badd 100644 --- a/src/MAndApps/LogItem.java +++ b/src/MAndEngine/LogItem.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.awt.Graphics; diff --git a/src/MAndApps/Pointer.java b/src/MAndEngine/Pointer.java similarity index 86% rename from src/MAndApps/Pointer.java rename to src/MAndEngine/Pointer.java index cf59058..6d48247 100644 --- a/src/MAndApps/Pointer.java +++ b/src/MAndEngine/Pointer.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; public class Pointer { private volatile E object; diff --git a/src/MAndApps/Variable.java b/src/MAndEngine/Variable.java similarity index 99% rename from src/MAndApps/Variable.java rename to src/MAndEngine/Variable.java index f9d51b4..7388ffa 100644 --- a/src/MAndApps/Variable.java +++ b/src/MAndEngine/Variable.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine; import java.io.File; diff --git a/src/MAndApps/VariableNotFoundException.java b/src/MAndEngine/VariableNotFoundException.java similarity index 87% rename from src/MAndApps/VariableNotFoundException.java rename to src/MAndEngine/VariableNotFoundException.java index 80a59cb..963f6a2 100644 --- a/src/MAndApps/VariableNotFoundException.java +++ b/src/MAndEngine/VariableNotFoundException.java @@ -1,4 +1,4 @@ -package MAndApps; +package MAndEngine;