mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Clean up Logging (#3953)
# Conflicts: # patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch # patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch # patches/minecraft/net/minecraft/entity/EntityList.java.patch # patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch # src/main/java/net/minecraftforge/oredict/OreDictionary.java
This commit is contained in:
1 parent
68c6e7862e
commit
0e9820c51c
145 files changed
+806
-785
No files matched your search
@@ -167,7 +167,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
{
|
||||
if (query.getResult() == null)
|
||||
{
|
||||
FMLLog.warning("%s", query.getText());
|
||||
FMLLog.log.warn(query.getText());
|
||||
query.finish();
|
||||
}
|
||||
else
|
||||
@@ -175,7 +175,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
String text = query.getText() +
|
||||
"\n\nRun the command /fml confirm or or /fml cancel to proceed." +
|
||||
"\nAlternatively start the server with -Dfml.queryResult=confirm or -Dfml.queryResult=cancel to preselect the answer.";
|
||||
FMLLog.warning("%s", text);
|
||||
FMLLog.log.warn(text);
|
||||
|
||||
if (!query.isSynchronous()) return; // no-op until mc does commands in another thread (if ever)
|
||||
|
||||
@@ -196,14 +196,14 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
|
||||
if (cmd.equals("/fml confirm"))
|
||||
{
|
||||
FMLLog.info("confirmed");
|
||||
FMLLog.log.info("confirmed");
|
||||
query.setResult(true);
|
||||
done = true;
|
||||
it.remove();
|
||||
}
|
||||
else if (cmd.equals("/fml cancel"))
|
||||
{
|
||||
FMLLog.info("cancelled");
|
||||
FMLLog.log.info("cancelled");
|
||||
query.setResult(false);
|
||||
done = true;
|
||||
it.remove();
|
||||
@@ -265,7 +265,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
FMLLog.getLogger().warn("Missing English translation for " + container.getModId() + ": " + e.getMessage());
|
||||
FMLLog.log.warn("Missing English translation for {}: {}", container.getModId(), e.getMessage(), e);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
@@ -273,7 +273,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
FMLLog.getLogger().error(e);
|
||||
FMLLog.log.error(e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user