Refactored the logging

Using LogManager instead of FMLRelaunchLog to access the logger instance. Added logging of the name of failed exports instead of exception. Improved crafting log to include issuer including their location and the requested item. Removed superfluous FMLRelaunchLog instance. Removed superfluous parameters for PlayerData constructor. Closes #2009 Refs #2069
2015-11-22 15:54:29 +01:00
parent 04b1ca3485
commit c9ef1beea1
71 changed files with 537 additions and 213 deletions
@@ -413,7 +413,7 @@ public class ClientHelper extends ServerHelper
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 	}
@@ -410,7 +410,7 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 		else if( slot instanceof SlotCraftingTerm )
@@ -779,7 +779,7 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 			catch( final Exception err )
 			{
-				AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
+				AELog.warn( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
 			}
 			this.setItemRender( pIR );
 			return;
@@ -846,7 +846,7 @@ public abstract class AEBaseGui extends GuiContainer
 							}
 							catch( final Exception err )
 							{
-								AELog.error( err );
+								AELog.debug( err );
 							}
 						}
 						( (AppEngSlot) s ).setIsValid( isValid ? hasCalculatedValidness.Valid : hasCalculatedValidness.Invalid );
@@ -880,7 +880,7 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 			catch( final Exception err )
 			{
-				AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
+				AELog.warn( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
 			}
 		}
 		// do the usual for non-ME Slots.
@@ -556,7 +556,7 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}

@@ -573,7 +573,7 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 			catch( final Throwable e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 	}
@@ -129,7 +129,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 	}
@@ -121,7 +121,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}

@@ -233,7 +233,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
 		}
 		catch( final IOException e )
 		{
-			AELog.error( e );
+			AELog.debug( e );
 		}
 	}

@@ -269,7 +269,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
 				}
 				catch( final IOException e )
 				{
-					AELog.error( e );
+					AELog.debug( e );
 				}
 			}
 			else
@@ -199,7 +199,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 					}
 					catch( final IOException e )
 					{
-						AELog.error( e );
+						AELog.debug( e );
 					}
 				}

@@ -59,7 +59,7 @@ public class GuiNetworkTool extends AEBaseGui
 		}
 		catch( final IOException e )
 		{
-			AELog.error( e );
+			AELog.debug( e );
 		}
 	}

@@ -240,7 +240,7 @@ public class GuiPriority extends AEBaseGui
 		}
 		catch( final IOException e )
 		{
-			AELog.error( e );
+			AELog.debug( e );
 		}
 	}

@@ -276,7 +276,7 @@ public class GuiPriority extends AEBaseGui
 				}
 				catch( final IOException e )
 				{
-					AELog.error( e );
+					AELog.debug( e );
 				}
 			}
 			else
@@ -85,7 +85,7 @@ public class GuiQuartzKnife extends AEBaseGui
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 		else
@@ -90,7 +90,7 @@ public class GuiSecurity extends GuiMEMonitorable
 			}
 			catch( final IOException e )
 			{
-				AELog.error( e );
+				AELog.debug( e );
 			}
 		}
 	}
@@ -137,7 +137,7 @@ public class GuiStorageBus extends GuiUpgradeable
 		}
 		catch( final IOException e )
 		{
-			AELog.error( e );
+			AELog.debug( e );
 		}
 	}
 }
@@ -209,7 +209,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
 		}
 		catch( final Throwable t )
 		{
-			AELog.error( t );
+			AELog.debug( t );
 			// meh
 		}
 		return false;
@@ -77,9 +77,9 @@ public class TESRWrapper extends TileEntitySpecialRenderer
 				}
 				catch( final Throwable t )
 				{
-					AELog.severe( "Hi, Looks like there was a crash while rendering something..." );
+					AELog.error( "Hi, Looks like there was a crash while rendering something..." );
 					t.printStackTrace();
-					AELog.severe( "MC will now crash ( probably )!" );
+					AELog.error( "MC will now crash ( probably )!" );
 					throw new IllegalStateException( t );
 				}
 			}
@@ -104,9 +104,9 @@ public final class WorldRender implements ISimpleBlockRenderingHandler
 			if( !this.hasError )
 			{
 				this.hasError = true;
-				AELog.severe( "Invalid render - item/block mismatch" );
-				AELog.severe( "		item: " + item.getUnlocalizedName() );
-				AELog.severe( "		block: " + blk.getUnlocalizedName() );
+				AELog.error( "Invalid render - item/block mismatch" );
+				AELog.error( "		item: " + item.getUnlocalizedName() );
+				AELog.error( "		block: " + blk.getUnlocalizedName() );
 			}
 		}
 	}
@@ -169,7 +169,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
 		}
 		catch( final Exception err )
 		{
-			AELog.error( err );
+			AELog.debug( err );
 		}
 		finally
 		{
@@ -165,7 +165,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
 		}
 		catch( final Exception e )
 		{
-			AELog.error( e );
+			AELog.debug( e );
 		}
 		finally
 		{
@@ -318,7 +318,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
 			}
 			catch( final Exception err )
 			{
-				AELog.error( err );
+				AELog.debug( err );
 			}

 			GL11.glPopMatrix();