added option to create remapped server jar file

0uti · Apr 2, 2022 · 6d572f9 · 6d572f9
1 parent e5d29c3
commit 6d572f9
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 27 deletions.
diff --git a/BuildTools/BuildTools.Designer.cs b/BuildTools/BuildTools.Designer.cs
diff --git a/BuildTools/BuildTools.cs b/BuildTools/BuildTools.cs
@@ -77,6 +77,7 @@ public BuildTools(Guid guid, Job job) {
         // Run BuildTools Button Clicked
         private void RunBT_Click(object sender, EventArgs e) {
             bool update = autoUpdateCB.Checked;
+            bool remapped = checkRemapped.Checked;
             string version;
             if (versionBox.SelectedIndex == 0) {
                 version = "latest";
@@ -85,7 +86,7 @@ private void RunBT_Click(object sender, EventArgs e) {
             }
 
             Thread thread = new Thread(delegate() {
-                _runner.RunBuildTools(update, version);
+                _runner.RunBuildTools(update, version, remapped);
                 Enable();
                 ProgressHide();
             });

diff --git a/BuildTools/Runner.cs b/BuildTools/Runner.cs
@@ -302,7 +302,7 @@ public bool UpdateJar()
         /// </summary>
         /// <param name="autoUpdate">If true, this will first call <see cref="UpdateJar()"/> Before continuing.</param>
         /// <param name="version">Version to build.</param>
-        public void RunBuildTools(bool autoUpdate, string version)
+        public void RunBuildTools(bool autoUpdate, string version, bool remapped)
         {
             if (!Environment.Is64BitOperatingSystem)
             {
@@ -450,6 +450,15 @@ public void RunBuildTools(bool autoUpdate, string version)
             _form.AppendRawText("");
             _form.AppendText("Running BuildTools.jar\n");
 
+            string startArgs = "--login -c \"git config --global --replace-all core.autocrlf true & " + GetBashJavaPath() + " -jar " + (string)_json["buildTools"]["name"] + " --rev " + version;
+            if (remapped)
+            {
+                startArgs += " --remapped";
+            }
+            startArgs += "\"";
+
+            _form.AppendText("Arguments: " + startArgs);
+
             // Run Build Tools
             using (Process buildProcess = new Process())
             {
@@ -463,9 +472,7 @@ public void RunBuildTools(bool autoUpdate, string version)
                     buildProcess.StartInfo.RedirectStandardOutput = true;
                     buildProcess.StartInfo.RedirectStandardError = true;
                     buildProcess.StartInfo.WorkingDirectory = Path.GetFullPath(Dir);
-                    buildProcess.StartInfo.Arguments =
-                        "--login -c \"git config --global --replace-all core.autocrlf true & " + GetBashJavaPath() + " -jar " +
-                        (string)_json["buildTools"]["name"] + " --rev " + version + "\"";
+                    buildProcess.StartInfo.Arguments = startArgs;
                     buildProcess.OutputDataReceived += (sender, args) => _form.AppendRawText(args.Data);
                     buildProcess.ErrorDataReceived += (sender, args) => _form.AppendRawText(args.Data);
                     buildProcess.Start();