Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 3549dd8

Browse files
MgamerzMgamerz
authored
Merge pull request #74 from ME3Tweaks/updaterfix-backport
Mass Effect 3 Mod Manager 5.1.5 Build 93
2 parents 3ffd109 + b8041c3 commit 3549dd8

8 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎src/com/me3tweaks/modmanager/ASIModWindow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void actionPerformed(ActionEvent e) {
185185
//String filepath = ModManager.appendSlash(asiDir.getAbsolutePath()) + asifile;
186186
Object[] row = new Object[3];
187187
row[COL_ASIFILENAME] = mod;
188-
row[COL_DESCRIPTION] = "Manually installed ASI. This ASI has not been verified by ME3Tweaks. If you wish to have it verified, please visit the forums.";
188+
row[COL_DESCRIPTION] = "Manually installed ASI. This ASI has not been verified by ME3Tweaks. If you wish to have it verified, please come to the ME3Tweaks Discord server.";
189189
row[COL_ACTION] = "<html><center>Manually Installed</center></html>";
190190
model.addRow(row);
191191
}

‎src/com/me3tweaks/modmanager/CustomDLCConflictWindow.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void actionPerformed(ActionEvent e) {
267267
guiPatchPanel.add(guiPatchButton, BorderLayout.NORTH);
268268

269269
progressPanel = new JPanel(new BorderLayout());
270-
statusText = new JLabel("Preparing to create compatibilty mod", SwingConstants.CENTER);
270+
statusText = new JLabel("Preparing to create compatibility mod", SwingConstants.CENTER);
271271
guiProgressBar = new JProgressBar();
272272
guiProgressBar.setVisible(true);
273273
guiProgressBar.setIndeterminate(true);
@@ -375,6 +375,7 @@ private HashMap<String, ArrayList<CustomDLC>> detectNewFilesSupercedingUI(
375375
HashMap<String, ArrayList<CustomDLC>> nonguimodfiles = new HashMap<>();
376376
// filter out files where the gui mod is superceding, we don't care.
377377
for (Map.Entry<String, ArrayList<CustomDLC>> entry : dlcfilemap.entrySet()) {
378+
//If highest priority DLC item is a GUI mod, or the file is a blacklisted file, do not scan it
378379
if (entry.getValue().get(entry.getValue().size() - 1).isGUIMod()
379380
|| blacklistedGUIconflictfiles.contains(entry.getKey())) {
380381
// ignores heavy MP4/MP5 files that dont have any actual GUIs.
@@ -386,6 +387,7 @@ private HashMap<String, ArrayList<CustomDLC>> detectNewFilesSupercedingUI(
386387
numFilesToScan = nonguimodfiles.size();
387388
int cores = Runtime.getRuntime().availableProcessors();
388389
cores = Math.max(1, cores - 1);
390+
//cores = 1; //Debugging
389391
ModManager.debugLogger.writeMessage("GUI Conflict scanner will use " + cores + " threads.");
390392
ExecutorService guiscanExecutor = Executors.newFixedThreadPool(cores);
391393
ArrayList<Future<GUIScanResult>> futures = new ArrayList<Future<GUIScanResult>>();
@@ -423,6 +425,11 @@ class GUIScanTask implements Callable<GUIScanResult> {
423425
private String filepath;
424426
private ArrayList<CustomDLC> dlcs;
425427

428+
/**
429+
* Task to scan a DLC for a GUI export with GUI transplanter scanner.
430+
* @param filepath basic filename of the file
431+
* @param dlcs list of custom DLCs that contain this file, in order of lowest to highest priority. The highest priority one will be scanned
432+
*/
426433
public GUIScanTask(String filepath, ArrayList<CustomDLC> dlcs) {
427434
this.filepath = filepath;
428435
this.dlcs = dlcs;
@@ -431,7 +438,7 @@ public GUIScanTask(String filepath, ArrayList<CustomDLC> dlcs) {
431438
@Override
432439
public GUIScanResult call() throws Exception {
433440
// scan file
434-
String scanFile = biogameDirectory + "DLC/" + dlcs.get(0).getDlcName() + "/CookedPCConsole/" + filepath;
441+
String scanFile = biogameDirectory + "DLC/" + dlcs.get(dlcs.size()-1).getDlcName() + "/CookedPCConsole/" + filepath;
435442
ArrayList<String> commandBuilder = new ArrayList<String>();
436443
commandBuilder.add(transplanterpath);
437444
commandBuilder.add("--guiscan");
@@ -843,8 +850,7 @@ protected void done() {
843850
* Detects if the conflicts are caused by one of the following mods: -
844851
* DLC_CON_XBX (SP Controller Support) - DLC_CON_UIScaling (Interface Scaling
845852
* Mod) - DLC_CON_UIScaling_Shared (Interface Scaling Add-On).
846-
*
847-
*
853+
*
848854
* @param conflicts
849855
* hashmap of conflict files and the list of dlc they appear in
850856
* @return null if no UI mod conflicts, otherwise a map of the next superceeding

‎src/com/me3tweaks/modmanager/ModManager.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737

3838
public class ModManager {
3939
public static boolean IS_DEBUG = false;
40-
public static final String VERSION = "5.1.4";
41-
public static long BUILD_NUMBER = 92L;
42-
public static final String BUILD_DATE = "04/06/2019";
40+
public static final String VERSION = "5.1.5";
41+
public static long BUILD_NUMBER = 93L;
42+
public static final String BUILD_DATE = "04/23/2019";
4343
public static final String SETTINGS_FILENAME = "me3cmm.ini";
4444
public static DebugLogger debugLogger;
4545
public static boolean logging = false;
@@ -868,7 +868,7 @@ public static boolean installBinkw32Bypass(String biogamedir) {
868868
return false;
869869
} else if (exebuild != 5) {
870870
JOptionPane.showMessageDialog(ModManagerWindow.ACTIVE_WINDOW, "Binkw32 bypass does not support any version of Mass Effect 3 except 1.05.\n" + (exebuild == 6
871-
? "Downgrade to Mass Effect 3 1.05 to use it, or continue using LauncherWV through Mod Manager.\nThe ME3Tweaks forums has instructions on how to do this."
871+
? "Downgrade to Mass Effect 3 1.05 to use it."
872872
: "Upgrade your game to use 1.05. Pirated editions of the game are not supported."), "Unsupported ME3 version", JOptionPane.ERROR_MESSAGE);
873873
return false;
874874
}
@@ -885,7 +885,7 @@ public static boolean installBinkw32Bypass(String biogamedir) {
885885
ModManager.ExportResource("/zlib1.dll", zlib.toString());
886886
File me3logger_truncating = new File(gamedir.toString() + "\\Binaries\\Win32\\asi\\me3logger_truncating.asi");
887887
me3logger_truncating.getParentFile().mkdirs();
888-
ModManager.ExportResource("/me3logger_truncating.asi", me3logger_truncating.toString());
888+
ModManager.ExportResource("/ME3Logger_truncating.asi", me3logger_truncating.toString());
889889

890890
} catch (Exception e1) {
891891
ModManager.debugLogger.writeMessage(ExceptionUtils.getStackTrace(e1));

‎src/com/me3tweaks/modmanager/ModManagerWindow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ private void checkForContentUpdates(boolean force) {
598598
*/
599599
private void checkForALOTInstallerUpdates() {
600600
try {
601-
String alotInstallerReleaseAPIEndpoint = "https://api.github.com/repos/Mgamerz/ALOTAddonGUI/releases/latest";
601+
String alotInstallerReleaseAPIEndpoint = "https://api.github.com/repos/ME3Tweaks/ALOTInstaller/releases/latest";
602602
String response = IOUtils.toString(new URL(alotInstallerReleaseAPIEndpoint), StandardCharsets.UTF_8);
603603
JSONParser parser = new JSONParser();
604604
JSONObject latestRelease = (JSONObject) parser.parse(response);

‎src/com/me3tweaks/modmanager/StarterKitWindow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void setupWindow() {
124124

125125
modName.setUI(new HintTextFieldUI("A Most Excellent Mod", true));
126126
modDeveloper.setUI(new HintTextFieldUI("GatorZ", true));
127-
modSite.setUI(new HintTextFieldUI("https://me3tweaks.com/forums/...", true));
127+
modSite.setUI(new HintTextFieldUI("https://nexusmods.com/massefect3/...", true));
128128
internalDLCName.setUI(new HintTextFieldUI("ExcellentMod", true));
129129
internalDisplayName.setUI(new HintTextFieldUI("Excellent DLC Module", true));
130130
internalTLKId.setUI(new HintTextFieldUI("13370000", true));

‎src/com/me3tweaks/modmanager/help/HelpMenu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static void getOnlineHelp() {
109109
*/
110110
public static JMenu constructHelpMenu() {
111111
JMenu helpMenu = new JMenu("Help");
112-
JMenuItem helpModDescDocumentation, helpForums, helpAbout, helpLogViewer, helpGetLog, helpContactMgamerz;
112+
JMenuItem helpModDescDocumentation, helpAbout, helpLogViewer, helpGetLog, helpContactMgamerz;
113113

114114
helpModDescDocumentation = new JMenuItem("ModDesc File Documentation");
115115
helpModDescDocumentation.setToolTipText("Opens the documentation for Mod Manager's moddesc.ini format");

‎src/com/me3tweaks/modmanager/modmaker/ModMakerCompilerWindow.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,10 @@ protected void done() {
661661
try {
662662
get(); // this line can throw InterruptedException or ExecutionException
663663
} catch (ExecutionException e) {
664-
ModManager.debugLogger.writeMessage("Error occured in DecompilerWorker():");
664+
ModManager.debugLogger.writeMessage("Error occurred in DecompilerWorker():");
665665
ModManager.debugLogger.writeException(e);
666666
JOptionPane.showMessageDialog(ModMakerCompilerWindow.this,
667-
"An error occured while decompiling coalesced files:\n" + e.getMessage() + "\n\nYou should report this to Mgamerz via the Forums link in the help menu.",
667+
"An error occurred while decompiling coalesced files:\n" + e.getMessage() + "\n\nYou should report this to Mgamerz via the ME3Tweaks Discord link in the help menu.",
668668
"Compiling Error", JOptionPane.ERROR_MESSAGE);
669669
error = true;
670670
} catch (InterruptedException e) {

‎src/com/me3tweaks/modmanager/ui/AboutWindow2Controller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void openHttpComponentsPage() {
5353

5454
@FXML
5555
private void openME3ExplorerPage() {
56-
ResourceUtils.openWebpage("https://github.com/Mgamerz/ME3Explorer");
56+
ResourceUtils.openWebpage("https://github.com/ME3Tweaks/ME3Explorer");
5757
}
5858

5959
@FXML

0 commit comments

Comments
 (0)