From 473eaf8918f4229a7fbb2b7a43bb3417899010ae Mon Sep 17 00:00:00 2001 From: CorruptComputer Date: Thu, 2 Jul 2015 13:52:37 -0500 Subject: [PATCH] Edit the default directory with Run Map Merge.bat If no .dmm files are found there it asks for input --- tools/mapmerge/MapMerge.jar | Bin 20310 -> 20563 bytes tools/mapmerge/Run Map Merge.bat | 2 +- tools/mapmerge/Source/bin/MapMergerMain.class | Bin 3000 -> 3489 bytes tools/mapmerge/Source/src/MapMergerMain.java | 111 ++++++++++-------- 4 files changed, 65 insertions(+), 48 deletions(-) diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/MapMerge.jar index d1e515cfcd5893a8d4651c289a26033d9687743b..e0bd47ea8366b7d95b8b64c115e41d1edca244c5 100644 GIT binary patch delta 2272 zcmYk;c{~&T9|!P_unLJyvn99Yh-h+4V#OG0j#=(IXOpknk`kJ$`C*xx^-Uw0P?mCJ zC2g*p$(2Zl`)a=We%tr)`2BvLf1a=R=a0|l&)0jX7&uT06tP3|?*jusAP`_QWF|-C zCI4@FWq7O}{|)&lP>rV*5XmzMc<#3h7BHQU7qI&VfV`k8n6{r68V|Yh^Ma(rhkwI{ zWECI(n}1#_l2RllI0Z#Xu%r^Z?lS9{r_VxK=8Zl>_c>FCbte(+V#i2#ytP}iB^044WB8TUnn94+PDzV?wB+-J*VFkiGA|j zdg$yFQNlp}Psm7aopca0yRea|5@8Uuzf&T#yGPlElQ&s?Dn-o2cN;M*)-%?+jwj33 zo~E8sdign%k>+p^WHkOp_{}R;rkfRR=j9*L?j6ZJIDrr5zUCdZPrf?+(E5hDonowJ zB3k74js8BWUDz){x@f^G<&|3YDk}D=viwdaON|H zr1o)pIX((;l(mJr*}7qJi#%F)Jt6du=FEspEM;E90>A#v(ghYN$UW{_>&m9V6sPd!ZAHFW{)fD3j0 zkwywy7K6xoan6@*qt=%{qv+@)x@HnBlbumLZ2+|qRNhlnRVs-Q#XMElSsle@BqSLu zGSr<9s9$wzh3F#$4uBrEca0(Y>S99Papr2~-j%k%`a0fUC!MrTw$koXC5DL%z%GX( z;5BKn{cJryyJbDgFbDk!?>x2-`0~42)`a}i@XvWT>y|Dm{$#rHEk)d2Gh@X!h=pdv z8xUF>d3k22$)qm}9BkH~nn`7;dx&Bso0RYH zOgNO*CfkU0=vBL2GQ2``h|hpGP&jyuOX>YFOnq69RMEZZuLiAUxsYZxytlCCLiFL` z*PHY&SrIuEm{O}P($U?#%&@oVL)6s^;K{=yiQP>gj{SIRj;E(Uyby!tz25W|8E;FQ z<`N#kYwCv(ZqtE^?}=h(vd5PW={jp1xAIDK)!=4CK78&k??iNjzrqiab89OZQ}|>Q zcqyBy)BA?$-gUzN=VR&@SB*!o#g-&uw@X0&W{v&s4a%1yTEM{_M51MA>_yz$Ppzv# zyN(@U1%p}+We;#~2Ojeus$(_Pce2|(`|jAs$h$mc8tFcSoJ_*>s5^P2$~^o_NUy{j zqR$WiV2@R}r%OyIF@GHHMGkF423mY(!*AyaRrAq>}|5xc&%pxnKWsg3#beNZas=hQ$6xL`1<#N*%l1# zwqwc-IZ&o&C&VnZZr;TyKz3d34~?0!&J)*4GPl%A!-({_C3(T(F)mP)w3T~uSF~|U zeI_S{3KyR2e7wCPE`DNK9K%+SdqJ*R<$e)oe=v{OU&8$*=Rn_n=B%4~^$@4WtytQ` zA)K;Q=Ykis4yJ8Lj_H<_JQwPuTX1v=3O=_Sz< z6~>H~+S6+!E0@{h%^}=uw1{^?HM2pkAxcb__Mo{7PUp&N?qFZEtlLUW*=Xx$-R@pfE3b@0 zZx@41R286saS|JIrX$0RFp;tROHBgdU-bW6ist)e z$|tijwjy)1jisjq%Lcc^RE*xa{|XSMN)!r5k*4U;U{0$2$Njc;#TT#VtH|7~RTSL2 zhWaHf5J@GdG|e<{jrUB;6wRT!BTmU=b0WD$Ov{M0nUe3a$(Q6dVTtL;?SQ_?5^fZDj>r(7!ML29^d% A>Hq)$ delta 1970 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 delta 1577 zcmaKsSx{S57{~u7%RQItrPQQh9oic!OW0CbA|yp=EwoUe3vDsg76S<+6mBpJtyByu zwzjpl^=h??RNT-99b27{vD$G)XFB?#4?g(pn?5=`lJNj)wLPZ$nmFni*4{l&f(wlt4>DNOztm9J zIT#uVICuME!KjQTxV2lXt!*=d)JFNXkm?UaL_9>RSJe1NM2)O4iZ-p^;1xaCA)_4~+Si6Mp%dL4UD|JkeCsakW-vuV69EQexuadgUhN~Z!%=~K zGWP3!dD`!YsypkI@hEDkKn)y=aU5jG(|+K2l7u=uF5?gmYqHQ#=0%GLAHzB&6jju4 zOz|n>zLAh$p~exh7Xvc<2xvjUQ|!f%jG!(m#=@C4>MIS)ID!%FDl)`9#TLV7FO9jiA(#5jY&tw`v^F}n7h(djgDzTtXB_%JO(~Fo+}dZBJtJq z`v#80$3&cF5UK}80zPWmOL&>%ENx_$Z;ZBgAQ*_qSdR@N&QpWB!-~G~QRQeL5>N)i zan*09_WB}2QEk%X*Bs)o_Lr$Q_k9M->Z77v5F40LyDgqe7N9Nbu1;d-3>(rb_9W3Whmv&B0k@e_H{tab zm{WLc9(|T4lITxjkS3*Pgf1=rlnzE+CY$Lh)+BU|FTU1pNt|3%^dpz!}gNs!l3mtYgFKwc3;y-gsp zJ7BP{C|ME&qOX_4vzF;Q#^#nk)h*BC#DDqR{O+XXWTwO|a_X%+t02p0IhE)s$TAg( zG@1)IjY4`%;movo*=D}H^v4|T(Mirxi>}j)V?sWSAET1SH4u@5T&#tHdr=AtWv!^C zj2i`LMj>6|BJ@!lL@~zb@WinJlcX?3vrnQNXOVE=6AHdS6~2KJx3LM|(>_ru z8FUc>@CL!sF~bGCLSMP;6g0e=0E5C3cnud}KqU#ijt&@!Hk%4Ak>4q1U5Q%B(PdnL z8PhBWSLv@Ar^)Y|6bXd788doBaC5_mBV&Js-)-X foundFiles = dmmFinder.foundPaths; if (foundFiles.size() > 0) { - + try{ + merge(foundFiles); + }catch(Exception e){ + System.out.println("Something went wrong."); + e.printStackTrace(); + } + }else{ + System.out.println("No files were found in provided directory!"); + System.out.print("Path to maps folder: "); + pathToMaps = Paths.get(input.nextLine()); + dmmFinder = new FileFinder("*.dmm"); + Files.walkFileTree(pathToMaps, dmmFinder); + foundFiles = dmmFinder.foundPaths; + try{ + merge(foundFiles); + }catch(Exception e){ + System.out.println("Something went wrong."); + e.printStackTrace(); + } + } + } + + + public static void merge(ArrayList foundFiles){ - System.out.println("How many files do you want to merge?"); - int selection1; + System.out.println("How many files do you want to merge?"); + int selection1; + inputCheck:while(true){ + while(!input.hasNextInt()){ + String temp = input.next(); + System.out.println(temp + " is not a valid int."); + } + selection1 = input.nextInt(); + if(selection1 < 0){ + System.out.println("Use a number greater than 0!"); + continue inputCheck; + }else{ + break inputCheck; + } + } + + for(int numOfFiles = selection1; numOfFiles != 0; numOfFiles--){ + + for(int num = 0;num < foundFiles.size();num++){ + System.out.println(num + ": " + foundFiles.get(num)); + } + + System.out.print("File to use: "); + int selection2; inputCheck:while(true){ while(!input.hasNextInt()){ String temp = input.next(); System.out.println(temp + " is not a valid int."); } - selection1 = input.nextInt(); - if(selection1 < 0){ + selection2 = input.nextInt(); + if(selection2 < 0 || selection2 >= foundFiles.size()){ + if(selection2 < 0){ System.out.println("Use a number greater than 0!"); + }else{ + System.out.println("Use a number less than " + foundFiles.size() +"!"); + } continue inputCheck; }else{ break inputCheck; } } - for(int numOfFiles = selection1; numOfFiles != 0; numOfFiles--){ - - for(int num = 0;num < foundFiles.size();num++){ - System.out.println(num + ": " + foundFiles.get(num)); - } - - System.out.print("File to use: "); - int selection2; - inputCheck:while(true){ - while(!input.hasNextInt()){ - String temp = input.next(); - System.out.println(temp + " is not a valid int."); - } - selection2 = input.nextInt(); - if(selection2 < 0 || selection2 >= foundFiles.size()){ - if(selection2 < 0){ - System.out.println("Use a number greater than 0!"); - }else{ - System.out.println("Use a number less than " + foundFiles.size() +"!"); - } - continue inputCheck; - }else{ - break inputCheck; - } - } - - String newMap = foundFiles.get(selection2) + ""; - String oldMap = foundFiles.get(selection2) + ".backup"; - String[] passInto = new String[4]; - passInto[0] = "-clean"; - passInto[1] = oldMap; - passInto[2] = newMap; - passInto[3] = newMap; - MapPatcher.main(passInto); - } - - }else{ - System.out.println("No files were found!"); + String newMap = foundFiles.get(selection2) + ""; + String oldMap = foundFiles.get(selection2) + ".backup"; + String[] passInto = new String[4]; + passInto[0] = "-clean"; + passInto[1] = oldMap; + passInto[2] = newMap; + passInto[3] = newMap; + MapPatcher.main(passInto); } }