From 65421fb316a28fb38ae4e4a41fe40d97c2d10f5f Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 13 Dec 2015 09:27:53 -0800 Subject: [PATCH] Update mapmerge to -tg-'s latest --- tools/mapmerge/MapMerge.jar | Bin 0 -> 20574 bytes tools/mapmerge/Prepare Maps.bat | 12 ++ tools/mapmerge/Run Map Merge.bat | 4 + tools/mapmerge/Source/.classpath | 7 ++ tools/mapmerge/Source/.project | 17 +++ .../.settings/org.eclipse.jdt.core.prefs | 11 ++ .../Source/.settings/org.eclipse.jdt.ui.prefs | 60 ++++++++++ tools/mapmerge/Source/META-INF/MANIFEST.MF | 4 - tools/mapmerge/Source/bin/FileFinder.class | Bin 0 -> 1882 bytes tools/mapmerge/Source/bin/MapMerge.class | Bin 0 -> 3519 bytes .../mapmerge/{ => Source/bin}/MapPatcher.jar | Bin tools/mapmerge/Source/src/FileFinder.java | 25 ++++ tools/mapmerge/Source/src/MapMerge.java | 108 ++++++++++++++++++ .../{ => src/MapPatcher Source}/Location.java | 0 .../{ => src/MapPatcher Source}/Map.java | 0 .../MapPatcher Source}/MapPatcher.java | 0 .../MapPatcher Source}/SavingThread.java | 0 tools/mapmerge/Source/src/MapPatcher.jar | Bin 0 -> 10136 bytes tools/mapmerge/clean_map.bat | 7 -- tools/mapmerge/install.txt | 19 --- tools/mapmerge/install_driver.bat | 7 -- tools/mapmerge/mapmerge.sh | 9 -- tools/mapmerge/prepare_map.bat | 12 -- 23 files changed, 244 insertions(+), 58 deletions(-) create mode 100644 tools/mapmerge/MapMerge.jar create mode 100644 tools/mapmerge/Prepare Maps.bat create mode 100644 tools/mapmerge/Run Map Merge.bat create mode 100644 tools/mapmerge/Source/.classpath create mode 100644 tools/mapmerge/Source/.project create mode 100644 tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs create mode 100644 tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 tools/mapmerge/Source/META-INF/MANIFEST.MF create mode 100644 tools/mapmerge/Source/bin/FileFinder.class create mode 100644 tools/mapmerge/Source/bin/MapMerge.class rename tools/mapmerge/{ => Source/bin}/MapPatcher.jar (100%) create mode 100644 tools/mapmerge/Source/src/FileFinder.java create mode 100644 tools/mapmerge/Source/src/MapMerge.java rename tools/mapmerge/Source/{ => src/MapPatcher Source}/Location.java (100%) rename tools/mapmerge/Source/{ => src/MapPatcher Source}/Map.java (100%) rename tools/mapmerge/Source/{ => src/MapPatcher Source}/MapPatcher.java (100%) rename tools/mapmerge/Source/{ => src/MapPatcher Source}/SavingThread.java (100%) create mode 100644 tools/mapmerge/Source/src/MapPatcher.jar delete mode 100644 tools/mapmerge/clean_map.bat delete mode 100644 tools/mapmerge/install.txt delete mode 100644 tools/mapmerge/install_driver.bat delete mode 100644 tools/mapmerge/mapmerge.sh delete mode 100644 tools/mapmerge/prepare_map.bat diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/MapMerge.jar new file mode 100644 index 0000000000000000000000000000000000000000..d0f0ce08028cdbb917fe185b48e331f8433d49c5 GIT binary patch literal 20574 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 AYXATM literal 0 HcmV?d00001 diff --git a/tools/mapmerge/Prepare Maps.bat b/tools/mapmerge/Prepare Maps.bat new file mode 100644 index 00000000000..c781a8e0f72 --- /dev/null +++ b/tools/mapmerge/Prepare Maps.bat @@ -0,0 +1,12 @@ +@echo off +cd ../../_maps/ + +for /R %%f in (*.dmm) do copy "%%f" "%%f.backup" + +cls +echo All dmm files in _maps directories have been backed up +echo Now you can make your changes... +echo --- +echo Remember to run Run_Map_Merge.bat just before you commit your changes! +echo --- +pause diff --git a/tools/mapmerge/Run Map Merge.bat b/tools/mapmerge/Run Map Merge.bat new file mode 100644 index 00000000000..5bb8f1736b9 --- /dev/null +++ b/tools/mapmerge/Run Map Merge.bat @@ -0,0 +1,4 @@ +@echo off +call java -jar MapMerge.jar "../../_maps/" /wait + +pause \ No newline at end of file diff --git a/tools/mapmerge/Source/.classpath b/tools/mapmerge/Source/.classpath new file mode 100644 index 00000000000..8a11d5b17e5 --- /dev/null +++ b/tools/mapmerge/Source/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tools/mapmerge/Source/.project b/tools/mapmerge/Source/.project new file mode 100644 index 00000000000..df472fbdf11 --- /dev/null +++ b/tools/mapmerge/Source/.project @@ -0,0 +1,17 @@ + + + MapMerger + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs b/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..3a21537071b --- /dev/null +++ b/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs b/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..ea0a123b8b0 --- /dev/null +++ b/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,60 @@ +cleanup.add_default_serial_version_id=false +cleanup.add_generated_serial_version_id=true +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=true +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=true +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=false +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=true +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=false +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=true +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=true +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=true +cleanup.use_this_for_non_static_field_access=true +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=true +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Default +cleanup_settings_version=2 +eclipse.preferences.version=1 diff --git a/tools/mapmerge/Source/META-INF/MANIFEST.MF b/tools/mapmerge/Source/META-INF/MANIFEST.MF deleted file mode 100644 index 5aa53c2fa28..00000000000 --- a/tools/mapmerge/Source/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Created-By: 1.6.0_31 (Sun Microsystems Inc.) -Main-Class: MapPatcher - diff --git a/tools/mapmerge/Source/bin/FileFinder.class b/tools/mapmerge/Source/bin/FileFinder.class new file mode 100644 index 0000000000000000000000000000000000000000..ab01a656c458ab21fe7af582f5c7246df388f46e GIT binary patch literal 1882 zcmb7FZBrXn7(F)$EQAGGNTIbLMXi!eY3ggWi>W}1Vne76O$A>!$r3Imo6PP_$A0!# z_%GD4VC{_4&;BOI@!UJm;Q!^Y_1h{srJYd}kmc5MPs3cTIX_ z*EbLonA>+AI%!YV)4QBV=Vh&-=c{f(22$010i))q(w@t=i`nkvyN=r1XieHg-mN#i zvW^7;=US;vC9COW-*+BmWuTZeoR<~PQBB_!NcGEE>QlqcaOL2V^rXrVdZCq4b-YSC zuYBoM>|{Y8wpuT{aYQk0VgzRdq6^7_feC@hkajnhIL=~x7=$xnU?`4hTrhB6;6itg zT8jLmK)JQR#4EVSJ}a)e)OOsqy@&Q#f!%L+!;^8(4QK!sjNksTgGOzTUax2`-Dw9q&D#>K07|P6mYt)49OjR1U@%$2U(sK zr%b1H9j(pczFSgua%UJh+%>Q%Fx$;u)9nz$#22_n)2(jiw$^j^Nph}7>z)NvFSZ-* zRH7$Qx5L>1y*cb)v1j_ldqz|*6mc}KoYD^)PNQw8?>jx)Zts5~zswDBn*1vhAL1kW zB42O%rSK}H<8|jP3t!b53S93geB$CgCY|d57Z!VjM>~ zni$6zk{sV#Qeq>zup6Sd3qG$lxbNG|qhL2|gCcS-<1j;uEY! z@H0$)Bv^g@!Ef03g-KC7FFeV{5`4~Kme;c`Y_))n3(q5uEfyj;?xVm$1~2Icj79M! zqm<KQUu4zQy+L_!XOA+8APY5^noIvl@g3;peX>)qmy literal 0 HcmV?d00001 diff --git a/tools/mapmerge/Source/bin/MapMerge.class b/tools/mapmerge/Source/bin/MapMerge.class new file mode 100644 index 0000000000000000000000000000000000000000..dff913a6b9443f37dd53caf7992a08c542a9cf10 GIT binary patch literal 3519 zcma)9YgZfB72Q`7%pecgR{SEEWGFc1VUUCABY<&j7biG891APKY2yyk0Aout>SzQe ztsA>_)1+zKhx^K-Y10>dH^!-;_Da9EYxQGSv--Kep=-sUsC+?eUknhGKU+s+&FMm%HKv+;@P^JdBusIlx^fzJm< z{k4K;W#WmHVcVuVAP~(N-rS_aAbEiufr)K7@fj;)#!qpLHtJw1W7(EBBoJ=zND4%b zJ8AA$FR=Z-n045S?FzP4VM#3JJu|Bzh6e;fmMyR|*or%iNO%d)HI3{*6dHDF*oEB! zwS%QS_q1Kv`bZzO1)Y@{<}yF-B)cw$O%XPf-(P z(W;o>Qo_lal$1TIFPOHcFSw39+Y`l8NGLd6#z(1CcxsrGHBfRgSjLVbiDwi%T{iXw zu&yf&Q&P5DedB~@q%KUlM#@z2tU%|uqtD3FaBtVtecp7-)^n~iZ>7z&p0-?`1&+Je zqT(|ID@oNoN6)hDX`Z1#`gIBRoQBUzOf~*CvK^;2q>$zzV4D{`*+Do;olqmCH zG#QxqH_@v=9kmyTk>VMZQV8CtrJ&Suilr9ZqQrDH1vK1M-PDV@ps@wI0yR|^ad0z< z4KYl;Par$rKNb|s5M9EWwGFS}a`&E+mjAD49Z3~L-S&jDKtAooQYF%kzUUP61%qOc zOiQsHk%SgB%u7Nel28Q~1$J*7+QDIStYFEKM6nOgYxq3AKyv4eOu?KW&_^m;HaO(V zy;NC`C>GGC;susVxAMB}c)Fo8h?S-?JSuYmS2TPHU*<_`NZpm8%jaIeVMXW? zIyT<|zM|npUmczk*vkxG((p3A#;VR4`Ee#WVzYPHerM(4*EPHn#bQCZGH-t5;^yv5>GL8pN80dBd|kL6BpGri4FZv_4+HP0*; z(5&JYWTt1D-CfA3_$6!8oywR7&xT*)w+enkQmI;YS!&L7HRx#JOy10}yLl@;%0N8X zBD`yJ@&de9SF+Q{@x)B2)53hI^yd|!1;NbpId(JG0w|>yGi`b06~%MT<&AlEi<&d? zc~;V)dBQ2UDfYFzfa{6W|1#;3IMBkgH_Q*05Tf$R<|ryJDn29pt>c@(7QXfRRzSmT zXj98*Siz2)*mJ}8e9-p_`M>qFZt`bAPu}Sz|2Ut5^EI6-*t_9Y>rbk_ixwE*Av{dO zI!Pm8eT3r(S6U?uktd7@XRdXId&BQx-zxUsME7mPr(%z;;LzwYy1Q2Kv8TJ<#o*Y1 zB0l*R9z3v$6H9n*d>JQW<3*h6F5=7*{MWO5mD8Ut;<;t)DZ=>QLH%gks-oQ>&Mw}O zy}T;tDRszF5TNBCh(Jlk2a(w)Rio@Rh-)H_;&7uSxf{e>ELm z5+Xdbg#D!m&8zsPjBuS1I-865ZV^8SB3%uO=1$i6?X`c%0B^96OV}6e-ybQtH%2}b z!TSM%q2@QRB?yE=&6Q}-QVJ6LArZ)}iuh6NC+n#!t*yu$SMak6VEqv}x4!Mq1MB{p z#z=oH{}hGNoeIa65>t`Jn#5F1V{Kxpwoys+tBvX^eswjpw)gclA=@O7(TkJ-C>j+# z7}s$EzvH;bYQD#M z{)N_m!;|y*Cqh;aAAc-J4b zQs#f;sD?;diTWM>L(#={Sm8(^sv4|P_$u2Z5Ojbk%Qq?LHq>u<_%0q2cNtXvwcbIj Z { + private PathMatcher matcher; + public ArrayList foundPaths = new ArrayList<>(); + public FileFinder(String pattern) { + matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern); + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Path name = file.getFileName(); + if (matcher.matches(name)) { + foundPaths.add(file); + } + return FileVisitResult.CONTINUE; + } +} \ No newline at end of file diff --git a/tools/mapmerge/Source/src/MapMerge.java b/tools/mapmerge/Source/src/MapMerge.java new file mode 100644 index 00000000000..552a406b13d --- /dev/null +++ b/tools/mapmerge/Source/src/MapMerge.java @@ -0,0 +1,108 @@ +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Scanner; + +public class MapMerge { + + private static Scanner input = new Scanner(System.in); + private static Path pathToMaps; + + public static void main(String[] mapPath) throws IOException { + pathToMaps = Paths.get(mapPath[0]); + FileFinder dmmFinder = new FileFinder("*.dmm"); + Files.walkFileTree(pathToMaps, dmmFinder); + ArrayList foundFiles = dmmFinder.foundPaths; + if (foundFiles.size() > 0) { + try { + MapMerge.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 { + MapMerge.merge(foundFiles); + } catch (Exception e) { + System.out.println("Something went wrong."); + e.printStackTrace(); + } + } + } + + public static void merge(ArrayList foundFiles) throws IOException { + + 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."); + } + 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 selected_map = foundFiles.get(selection2) + ""; + String backup_map = selected_map + ".backup"; + String edited_map = selected_map; + String to_save = selected_map; + String[] passInto = { "-clean", backup_map, edited_map, to_save }; + MapPatcher.main(passInto); + + // Will try to fix when I have time ~CorruptComputer + /*try{ + Process process = new ProcessBuilder("dmm2tgm\\dmm2tgm.exe", selected_map).start(); + }catch(Exception e1){ + System.out.println("You are not on a windows machine, trying the .py"); + try{ + Process process = new ProcessBuilder("dmm2tgm\\Source\\dmm2tgm.py", selected_map).start(); + }catch(Exception e2){ + System.out.println("You do not have python 2.7.x installed."); + System.out.println("Downloads can be found here: https://www.python.org/downloads/"); + } + } + */ + + } + } +} \ No newline at end of file diff --git a/tools/mapmerge/Source/Location.java b/tools/mapmerge/Source/src/MapPatcher Source/Location.java similarity index 100% rename from tools/mapmerge/Source/Location.java rename to tools/mapmerge/Source/src/MapPatcher Source/Location.java diff --git a/tools/mapmerge/Source/Map.java b/tools/mapmerge/Source/src/MapPatcher Source/Map.java similarity index 100% rename from tools/mapmerge/Source/Map.java rename to tools/mapmerge/Source/src/MapPatcher Source/Map.java diff --git a/tools/mapmerge/Source/MapPatcher.java b/tools/mapmerge/Source/src/MapPatcher Source/MapPatcher.java similarity index 100% rename from tools/mapmerge/Source/MapPatcher.java rename to tools/mapmerge/Source/src/MapPatcher Source/MapPatcher.java diff --git a/tools/mapmerge/Source/SavingThread.java b/tools/mapmerge/Source/src/MapPatcher Source/SavingThread.java similarity index 100% rename from tools/mapmerge/Source/SavingThread.java rename to tools/mapmerge/Source/src/MapPatcher Source/SavingThread.java diff --git a/tools/mapmerge/Source/src/MapPatcher.jar b/tools/mapmerge/Source/src/MapPatcher.jar new file mode 100644 index 0000000000000000000000000000000000000000..5cbaad488c146d8a7453f114260dbccfe61e7861 GIT binary patch literal 10136 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 I_> ../../.git/config -echo [merge "merge-dmm"] >> ../../.git/config -echo name = mapmerge driver >> ../../.git/config -echo driver = ./tools/mapmerge/mapmerge.sh %O %A %B >> ../../.git/config -echo. >> ../../.git/config - diff --git a/tools/mapmerge/mapmerge.sh b/tools/mapmerge/mapmerge.sh deleted file mode 100644 index 145537f7ca7..00000000000 --- a/tools/mapmerge/mapmerge.sh +++ /dev/null @@ -1,9 +0,0 @@ -java -jar tools/mapmerge/MapPatcher.jar -merge $1 $2 $3 $2 -if [ "$?" -gt 0 ] -then - echo "Unable to automatically resolve map conflicts, please merge manually." - exit 1 -fi -java -jar tools/mapmerge/MapPatcher.jar -clean $1 $2 $2 - -exit 0 diff --git a/tools/mapmerge/prepare_map.bat b/tools/mapmerge/prepare_map.bat deleted file mode 100644 index d1e9d2d102e..00000000000 --- a/tools/mapmerge/prepare_map.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -cd ../../_maps/map_files/ - -for /R %%f in (*.dmm) do copy "%%f" "%%f.backup" - -cls -echo All dmm files in map_files directories have been backed up -echo Now you can make your changes... -echo --- -echo Remember to run clean_map.bat just before you commit your changes! -echo --- -pause