keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix up derpy file name handling: closes #127

Browse source 
Fix up duping childmods: closes #126
FMLPreinitializationEvent now offers a getLogger() that'll return your mod a personalized logger instance
This commit is contained in:
Christian 2012-11-12 17:50:44 -05:00
parent 5355348181
commit 8a40e72f90
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml/client/cpw/mods/fml/client/GuiModList.java
View file

@ -57,7 +57,7 @@ public class GuiModList extends GuiScreen
if (mod.getMetadata()!=null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) { if (mod.getMetadata()!=null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
String parentMod = mod.getMetadata().parent; String parentMod = mod.getMetadata().parent;
ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod); ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod);
if (parentContainer != null) if (parentContainer != null && mod.getMetadata().parentMod==null)
{ {
mod.getMetadata().parentMod = parentContainer; mod.getMetadata().parentMod = parentContainer;
parentContainer.getMetadata().childMods.add(mod); parentContainer.getMetadata().childMods.add(mod);

14
fml/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java
View file

@ -2,7 +2,9 @@ package cpw.mods.fml.common.event;
import java.io.File; import java.io.File;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Logger;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.LoaderState.ModState;
import cpw.mods.fml.common.FMLModContainer; import cpw.mods.fml.common.FMLModContainer;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
@ -74,4 +76,16 @@ public class FMLPreInitializationEvent extends FMLStateEvent
return null; return null;
} }
/**
* Get a logger instance configured to write to the FML Log as a parent, identified by modid. Handy for mod logging!
*
* @return A logger
*/
public Logger getModLog()
{
Logger log = Logger.getLogger(modContainer.getModId());
log.setParent(FMLLog.getLogger());
return log;
}
} }

10
fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
View file

@ -170,11 +170,11 @@ public class RelaunchLibraryManager
if (!download) if (!download)
{ {
downloadMonitor.updateProgressString("Found library file %s present and correct in lib dir\n", libName); downloadMonitor.updateProgressString("Found library file %s present and correct in lib dir", libName);
} }
else else
{ {
downloadMonitor.updateProgressString("Library file %s was downloaded and verified successfully\n", libName); downloadMonitor.updateProgressString("Library file %s was downloaded and verified successfully", libName);
} }
try try
@ -455,11 +455,9 @@ public class RelaunchLibraryManager
{ {
try try
{ {
//rootUrl.replace("%s", libFile.getPath())
URL libDownload = new URL(String.format(rootUrl,realFilePath)); URL libDownload = new URL(String.format(rootUrl,realFilePath));
String infoString = String.format("Downloading file %s", libDownload.toString()); downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString());
downloadMonitor.updateProgressString(infoString); FMLRelaunchLog.info("Downloading file %s", libDownload.toString());
FMLRelaunchLog.info(infoString);
URLConnection connection = libDownload.openConnection(); URLConnection connection = libDownload.openConnection();
connection.setConnectTimeout(5000); connection.setConnectTimeout(5000);
connection.setReadTimeout(5000); connection.setReadTimeout(5000);