jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed broken patching and endless Steam nags introduced in SMM 1.7

Browse source
This commit is contained in:
Vhati 2017-12-12 07:38:17 -05:00
parent cefb4986c0
commit a2bd02123e
7 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/vhati/modmanager/core/ModPatchThread.java
View file

@ -260,8 +260,11 @@ public class ModPatchThread extends Thread {
AbstractPack pack = packContainer.getPackFor( innerPath );
if ( pack == null ) {
if ( !knownRoots.contains( root ) )
if ( !knownRoots.contains( root ) ) {
log.warn( String.format( "Unexpected innerPath: %s", innerPath ) );
} else {
log.debug( String.format( "Ignoring innerPath with known root: %s", innerPath ) );
}
zis.closeEntry();
continue;
}

4
src/main/java/net/vhati/modmanager/core/SlipstreamConfig.java
View file

@ -16,6 +16,7 @@ public class SlipstreamConfig {
public static final String ALLOW_ZIP = "allow_zip";
public static final String FTL_DATS_PATH = "ftl_dats_path";
public static final String STEAM_DISTRO = "steam_distro";
public static final String STEAM_EXE_PATH = "steam_exe_path";
public static final String RUN_STEAM_FTL = "run_steam_ftl";
public static final String NEVER_RUN_FTL = "never_run_ftl";
@ -81,8 +82,9 @@ public class SlipstreamConfig {
userFieldsMap.put( ALLOW_ZIP, "Sets whether to treat .zip files as .ftl files. Default: false." );
userFieldsMap.put( FTL_DATS_PATH, "The path to FTL's resources folder. If invalid, you'll be prompted." );
userFieldsMap.put( STEAM_DISTRO, "If true, FTL was installed via Steam. Stops the GUI asking for a path." );
userFieldsMap.put( STEAM_EXE_PATH, "The path to Steam's executable, if FTL was installed via Steam." );
userFieldsMap.put( RUN_STEAM_FTL, "If true, SMM will use Steam to launch FTL, if possible. Default: false." );
userFieldsMap.put( RUN_STEAM_FTL, "If true, SMM will use Steam to launch FTL, if possible." );
userFieldsMap.put( NEVER_RUN_FTL, "If true, there will be no offer to run FTL after patching. Default: false." );
userFieldsMap.put( UPDATE_CATALOG, "If a number greater than 0, check for new mod descriptions every N days." );
userFieldsMap.put( UPDATE_APP, "If a number greater than 0, check for newer app versions every N days." );

2
src/main/java/net/vhati/modmanager/json/JacksonAutoUpdateReader.java
View file

@ -54,7 +54,7 @@ public class JacksonAutoUpdateReader {
JsonNode changelogNode = historyNode.get( "changelog" );
for ( JsonNode releaseNode : changelogNode ) {
// Skip any versions with optional "hidden" field set to true.
// Skip any versions with optional "hidden" field set to true (true without quotes!).
if ( releaseNode.get( "hidden" ) != null && releaseNode.get( "hidden" ).booleanValue() ) {
continue;
}