From c9ef1beea101afa85c05738b05b7b9782cf40386 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 22 Nov 2015 15:54:29 +0100 Subject: [PATCH] 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 --- src/main/java/appeng/client/ClientHelper.java | 2 +- .../java/appeng/client/gui/AEBaseGui.java | 8 +- .../gui/implementations/GuiCraftConfirm.java | 4 +- .../gui/implementations/GuiCraftingCPU.java | 2 +- .../implementations/GuiCraftingStatus.java | 2 +- .../gui/implementations/GuiLevelEmitter.java | 4 +- .../gui/implementations/GuiMEMonitorable.java | 2 +- .../gui/implementations/GuiNetworkTool.java | 2 +- .../gui/implementations/GuiPriority.java | 4 +- .../gui/implementations/GuiQuartzKnife.java | 2 +- .../gui/implementations/GuiSecurity.java | 2 +- .../gui/implementations/GuiStorageBus.java | 2 +- .../client/render/RenderBlocksWorkaround.java | 2 +- .../appeng/client/render/TESRWrapper.java | 4 +- .../appeng/client/render/WorldRender.java | 6 +- .../render/blocks/RenderBlockCharger.java | 2 +- .../blocks/RenderBlockCraftingCPUMonitor.java | 2 +- .../render/blocks/RenderBlockInscriber.java | 2 +- .../appeng/container/AEBaseContainer.java | 10 +- .../appeng/container/guisync/SyncData.java | 18 +- .../ContainerCraftConfirm.java | 2 +- .../implementations/ContainerCraftingCPU.java | 2 +- .../ContainerMEMonitorable.java | 6 +- src/main/java/appeng/core/AELog.java | 357 ++++++++++++++++-- src/main/java/appeng/core/IMCHandler.java | 4 +- src/main/java/appeng/core/RecipeLoader.java | 4 +- src/main/java/appeng/core/api/ApiPart.java | 22 +- .../registries/GridCacheRegistry.java | 8 +- .../registries/RecipeHandlerRegistry.java | 6 +- .../network/AppEngClientPacketHandler.java | 8 +- .../network/AppEngServerPacketHandler.java | 8 +- .../core/sync/packets/PacketCraftRequest.java | 2 +- .../sync/packets/PacketMEInventoryUpdate.java | 2 +- .../appeng/core/worlddata/PlayerData.java | 3 +- .../appeng/core/worlddata/PlayerMapping.java | 6 +- .../worlddata/PlayerMappingsInitializer.java | 6 +- .../java/appeng/core/worlddata/SpawnData.java | 8 +- .../appeng/core/worlddata/StorageData.java | 2 +- .../java/appeng/crafting/CraftingJob.java | 68 +++- src/main/java/appeng/facade/FacadePart.java | 2 +- src/main/java/appeng/fmp/CableBusPart.java | 4 +- src/main/java/appeng/hooks/TickHandler.java | 2 +- .../modules/BuildCraftBuilder.java | 4 +- .../java/appeng/integration/modules/FMP.java | 6 +- .../modules/ImmibisMicroblocks.java | 2 +- .../items/tools/powered/ToolMassCannon.java | 4 +- src/main/java/appeng/me/GridStorage.java | 2 +- src/main/java/appeng/me/NetworkEventBus.java | 8 +- .../java/appeng/me/cluster/MBCalculator.java | 2 +- .../implementations/CraftingCPUCluster.java | 11 +- .../java/appeng/parts/CableBusContainer.java | 2 +- .../parts/automation/PartExportBus.java | 2 +- .../parts/p2p/PartP2POpenComputers.java | 2 +- .../appeng/parts/p2p/PartP2PTunnelME.java | 4 +- .../parts/reporting/AbstractPartMonitor.java | 2 +- .../java/appeng/recipes/RecipeHandler.java | 26 +- .../java/appeng/recipes/handlers/Shaped.java | 2 +- .../appeng/recipes/handlers/Shapeless.java | 2 +- .../recipes/ores/OreDictionaryHandler.java | 2 +- .../java/appeng/services/VersionChecker.java | 2 +- .../export/MinecraftItemCSVExporter.java | 14 +- .../services/version/ModVersionFetcher.java | 2 +- .../version/github/ReleaseFetcher.java | 6 +- src/main/java/appeng/spatial/CachedPlane.java | 6 +- src/main/java/appeng/tile/AEBaseTile.java | 6 +- .../appeng/tile/grid/AENetworkInvTile.java | 1 + .../inventory/AppEngInternalAEInventory.java | 2 +- .../inventory/AppEngInternalInventory.java | 2 +- .../java/appeng/util/ClassInstantiation.java | 2 +- src/main/java/appeng/util/ConfigManager.java | 2 +- src/main/java/appeng/util/Platform.java | 8 +- 71 files changed, 537 insertions(+), 213 deletions(-) diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index cd8b690d..35c4ea0b 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -413,7 +413,7 @@ public class ClientHelper extends ServerHelper } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 41439f95..3529aa46 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -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. diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index bc34a04c..e3e61c11 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -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 ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 7d832564..08df1b02 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -129,7 +129,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index b9a7a400..32495804 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -121,7 +121,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java index afa81df9..9fa0d9e6 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java @@ -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 diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index d65a54e2..5ff5980a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -199,7 +199,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java index 3b2ba00b..b1bea51c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java @@ -59,7 +59,7 @@ public class GuiNetworkTool extends AEBaseGui } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index 95ab6832..e0c66297 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPriority.java @@ -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 diff --git a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java index ed49f06d..f3b3c525 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java +++ b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java @@ -85,7 +85,7 @@ public class GuiQuartzKnife extends AEBaseGui } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } else diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index d2c8f8c4..1f59318f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java @@ -90,7 +90,7 @@ public class GuiSecurity extends GuiMEMonitorable } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index a3fa6d65..df8c553b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -137,7 +137,7 @@ public class GuiStorageBus extends GuiUpgradeable } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index f359ee1a..d4da0380 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -209,7 +209,7 @@ public class RenderBlocksWorkaround extends RenderBlocks } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); // meh } return false; diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index 52bfd0f5..70121179 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -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 ); } } diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index b7e9a0f3..ff7a27d3 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -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() ); } } } diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index a45181a1..a7ac6590 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -169,7 +169,7 @@ public class RenderBlockCharger extends BaseBlockRender mappings; - public PlayerMapping( final ConfigCategory category, final FMLRelaunchLog log ) + public PlayerMapping( final ConfigCategory category ) { - final PlayerMappingsInitializer init = new PlayerMappingsInitializer( category, log ); + final PlayerMappingsInitializer init = new PlayerMappingsInitializer( category ); this.mappings = init.getPlayerMappings(); } diff --git a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java index 10ddae25..fd0357de 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java +++ b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java @@ -26,8 +26,6 @@ import java.util.UUID; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Property; -import cpw.mods.fml.relauncher.FMLRelaunchLog; - import appeng.core.AELog; import appeng.util.UUIDMatcher; @@ -53,7 +51,7 @@ class PlayerMappingsInitializer * @param playerList the category for the player list, generally extracted using the "players" tag * @param log the logger used to warn the server or user of faulty entries */ - PlayerMappingsInitializer( final ConfigCategory playerList, final FMLRelaunchLog log ) + PlayerMappingsInitializer( final ConfigCategory playerList ) { // Matcher for UUIDs final UUIDMatcher matcher = new UUIDMatcher(); @@ -78,7 +76,7 @@ class PlayerMappingsInitializer } else { - AELog.warning( "The configuration for players contained an outdated entry instead an expected UUID " + maybeUUID + " for the player " + id + ". Please clean this up." ); + AELog.warn( "The configuration for players contained an outdated entry instead an expected UUID " + maybeUUID + " for the player " + id + ". Please clean this up." ); } } } diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index 789d406d..c2e8be85 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -153,7 +153,7 @@ final class SpawnData implements IWorldSpawnData catch( final Throwable e ) { data = new NBTTagCompound(); - AELog.error( e ); + AELog.debug( e ); } finally { @@ -165,7 +165,7 @@ final class SpawnData implements IWorldSpawnData } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } @@ -196,7 +196,7 @@ final class SpawnData implements IWorldSpawnData } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); } finally { @@ -208,7 +208,7 @@ final class SpawnData implements IWorldSpawnData } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index 87867af1..5cbd14cb 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -140,7 +140,7 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn } catch( final NumberFormatException err ) { - AELog.warning( "The config contained a value which was not represented as a Long: %s", lastString ); + AELog.warn( "The config contained a value which was not represented as a Long: %s", lastString ); this.lastGridStorage = 0; } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index e8ca4ffb..875a2547 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -24,26 +24,35 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingCallback; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingJob; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.networking.security.BaseActionSource; +import appeng.api.networking.security.IActionHost; +import appeng.api.networking.security.MachineSource; +import appeng.api.networking.security.PlayerSource; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import appeng.api.util.DimensionalCoord; import appeng.core.AELog; import appeng.hooks.TickHandler; public class CraftingJob implements Runnable, ICraftingJob { + private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms"; + private static final String LOG_MACHINE_SOURCE_DETAILS = "Machine[object=%s, %s]"; private final MECraftingInventory original; private final World world; @@ -145,7 +154,7 @@ public class CraftingJob implements Runnable, ICraftingJob AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) ); } - AELog.crafting( "------------- " + this.bytes + "b real" + timer.elapsed( TimeUnit.MILLISECONDS ) + "ms" ); + this.logCraftingJob( "real", timer ); // if ( mode == Actionable.MODULATE ) // craftingInventory.moveItemsToStorage( storage ); } @@ -171,15 +180,15 @@ public class CraftingJob implements Runnable, ICraftingJob AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) ); } - AELog.crafting( "------------- " + this.bytes + "b simulate" + timer.elapsed( TimeUnit.MILLISECONDS ) + "ms" ); + this.logCraftingJob( "simulate", timer ); } catch( final CraftBranchFailure e1 ) { - AELog.error( e1 ); + AELog.debug( e1 ); } catch( final CraftingCalculationFailure f ) { - AELog.error( f ); + AELog.debug( f ); } catch( final InterruptedException e1 ) { @@ -190,7 +199,7 @@ public class CraftingJob implements Runnable, ICraftingJob } catch( final CraftingCalculationFailure f ) { - AELog.error( f ); + AELog.debug( f ); } catch( final InterruptedException e1 ) { @@ -199,7 +208,7 @@ public class CraftingJob implements Runnable, ICraftingJob return; } - this.log( "crafting job now done" ); + AELog.craftingDebug( "crafting job now done" ); } catch( final Throwable t ) { @@ -227,14 +236,14 @@ public class CraftingJob implements Runnable, ICraftingJob if( !this.running ) { - this.log( "crafting job will now sleep" ); + AELog.craftingDebug( "crafting job will now sleep" ); while( !this.running ) { this.monitor.wait(); } - this.log( "crafting job now active" ); + AELog.craftingDebug( "crafting job now active" ); } } @@ -263,11 +272,6 @@ public class CraftingJob implements Runnable, ICraftingJob } } - private void log( final String string ) - { - // AELog.crafting( string ); - } - @Override public boolean isSimulation() { @@ -327,7 +331,7 @@ public class CraftingJob implements Runnable, ICraftingJob this.watch.start(); this.running = true; - this.log( "main thread is now going to sleep" ); + AELog.craftingDebug( "main thread is now going to sleep" ); this.monitor.notify(); @@ -342,7 +346,7 @@ public class CraftingJob implements Runnable, ICraftingJob } } - this.log( "main thread is now active" ); + AELog.craftingDebug( "main thread is now active" ); } return true; @@ -363,9 +367,41 @@ public class CraftingJob implements Runnable, ICraftingJob this.tree = tree; } + private void logCraftingJob( String type, Stopwatch timer ) + { + if( AELog.isCraftingLogEnabled() ) + { + final String itemToOutput = this.output.toString(); + final long elapsedTime = timer.elapsed( TimeUnit.MILLISECONDS ); + final String actionSource; + + if( this.actionSrc instanceof MachineSource ) + { + final IActionHost machineSource = ( (MachineSource) this.actionSrc ).via; + final IGridNode actionableNode = machineSource.getActionableNode(); + final IGridHost machine = actionableNode.getMachine(); + final DimensionalCoord location = actionableNode.getGridBlock().getLocation(); + + actionSource = String.format( LOG_MACHINE_SOURCE_DETAILS, machine, location ); + } + else if( this.actionSrc instanceof PlayerSource ) + { + final PlayerSource source = (PlayerSource) this.actionSrc; + final EntityPlayer player = source.player; + + actionSource = player.toString(); + } + else + { + actionSource = "[unknown source]"; + } + + AELog.crafting( LOG_CRAFTING_JOB, type, actionSource, itemToOutput, this.bytes, elapsedTime ); + } + } + private static class TwoIntegers { - private final long perOp = 0; private final long times = 0; } diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index b71a4a1d..33fd40af 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -339,7 +339,7 @@ public class FacadePart implements IFacadePart, IBoxProvider } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } } } diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index 437c1d28..811393b6 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -259,7 +259,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } @@ -322,7 +322,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 62066c9a..c5157609 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -289,7 +289,7 @@ public class TickHandler } catch( final Exception e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java index 31ed5789..fb14a538 100644 --- a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java +++ b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java @@ -119,11 +119,11 @@ public class BuildCraftBuilder implements IIntegrationModule } catch( final InvocationTargetException ignore ) { - AELog.warning( "Encountered problems while initializing the BuildCraft Builder support. Can not invoke the method %s", blockDefinition ); + AELog.warn( "Encountered problems while initializing the BuildCraft Builder support. Can not invoke the method %s", blockDefinition ); } catch( final IllegalAccessException ignore ) { - AELog.warning( "Encountered problems while initializing the BuildCraft Builder support. Can not access the method %s", blockDefinition ); + AELog.warn( "Encountered problems while initializing the BuildCraft Builder support. Can not access the method %s", blockDefinition ); } } } diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index bf525284..4fd63be8 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -178,7 +178,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } return null; } @@ -211,8 +211,8 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF } catch( final Throwable t ) { - AELog.severe( "Failed to register " + layerInterface.getName() + " with FMP, some features may not work with MultiParts." ); - AELog.error( t ); + AELog.error( "Failed to register " + layerInterface.getName() + " with FMP, some features may not work with MultiParts." ); + AELog.debug( t ); } } diff --git a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java index 25642375..b5c09f50 100644 --- a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java +++ b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java @@ -72,7 +72,7 @@ public class ImmibisMicroblocks implements IImmibisMicroblocks, IIntegrationModu } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } } diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 5f1a165e..1c25bcff 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -263,7 +263,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } catch( final Exception err ) { - AELog.error( err ); + AELog.debug( err ); } if( pos != null && type != null && type.getItem() instanceof ItemPaintBall ) @@ -385,7 +385,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } catch( final Exception err ) { - AELog.error( err ); + AELog.debug( err ); } if( pos != null ) diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 42b3fd3f..057f7c5a 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -110,7 +110,7 @@ public class GridStorage implements IGridStorage } catch( final IOException e ) { - AELog.error( e ); + AELog.debug( e ); } return ""; diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 90e777b1..893ec0df 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -184,10 +184,10 @@ public class NetworkEventBus } catch( final Throwable e1 ) { - AELog.severe( "[AppEng] Network Event caused exception:" ); - AELog.severe( "Offending Class: " + obj.getClass().getName() ); - AELog.severe( "Offending Object: " + obj.toString() ); - AELog.error( e1 ); + AELog.error( "[AppEng] Network Event caused exception:" ); + AELog.error( "Offending Class: " + obj.getClass().getName() ); + AELog.error( "Offending Object: " + obj.toString() ); + AELog.debug( e1 ); throw new IllegalStateException( e1 ); } diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 10c867cb..3f83097f 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -116,7 +116,7 @@ public abstract class MBCalculator } catch( final Throwable err ) { - AELog.error( err ); + AELog.debug( err ); } this.disconnect(); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 8f93eb83..b1937e48 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -83,6 +83,8 @@ import appeng.util.item.AEItemStack; public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { + private static final String LOG_MARK_AS_COMPLETE = "Completed job for %s."; + private final WorldCoord min; private final WorldCoord max; private final int[] usedOps = new int[3]; @@ -427,12 +429,19 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU ( (CraftingLink) this.myLastLink ).markDone(); } - AELog.crafting( "marking job as complete" ); + if( AELog.isCraftingLogEnabled() ) + { + final IAEItemStack logStack = this.finalOutput.copy(); + logStack.setStackSize( this.startItemCount ); + AELog.crafting( LOG_MARK_AS_COMPLETE, logStack ); + } + this.remainingItemCount = 0; this.startItemCount = 0; this.lastTime = 0; this.elapsedTime = 0; this.isComplete = true; + } private void updateCPU() diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 18c610e8..e9737b29 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -1074,7 +1074,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } else { - AELog.warning( "Invalid NBT For CableBus Container: " + iss.getItem().getClass().getName() + " is not a valid part; it was ignored." ); + AELog.warn( "Invalid NBT For CableBus Container: " + iss.getItem().getClass().getName() + " is not a valid part; it was ignored." ); } } } diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index fcebc209..00b432ec 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -306,7 +306,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest } catch( final GridAccessException e ) { - AELog.error( e ); + AELog.debug( e ); } return items; diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index 3f127246..bfb4885d 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -194,7 +194,7 @@ public final class PartP2POpenComputers extends PartP2PTunnel implements I { final TileEntity start = this.getTile(); final TileEntity end = me.getTile(); - AELog.warning( "Failed to establish a ME P2P Tunnel between the tunnels at [x=%d, y=%d, z=%d] and [x=%d, y=%d, z=%d]", start.xCoord, start.yCoord, start.zCoord, end.xCoord, end.yCoord, end.zCoord ); + AELog.warn( "Failed to establish a ME P2P Tunnel between the tunnels at [x=%d, y=%d, z=%d] and [x=%d, y=%d, z=%d]", start.xCoord, start.yCoord, start.zCoord, end.xCoord, end.yCoord, end.zCoord ); // :( } } } catch( final GridAccessException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 02a34f2f..39fa48b2 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -370,7 +370,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } catch( final Exception e ) { - AELog.error( e ); + AELog.debug( e ); } finally { diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 98c9437c..251d0dee 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -257,10 +257,10 @@ public class RecipeHandler implements IRecipeHandler } catch( final Exception err ) { - AELog.warning( "Error Loading Recipe File:" + path ); + AELog.warn( "Error Loading Recipe File:" + path ); if( this.data.exceptions ) { - AELog.error( err ); + AELog.debug( err ); } return; } @@ -360,7 +360,7 @@ public class RecipeHandler implements IRecipeHandler } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); if( this.data.crash ) { throw new IllegalStateException( e ); @@ -398,10 +398,10 @@ public class RecipeHandler implements IRecipeHandler } catch( final RegistrationError e ) { - AELog.warning( "Unable to register a recipe: " + e.getMessage() ); + AELog.warn( "Unable to register a recipe: " + e.getMessage() ); if( this.data.exceptions ) { - AELog.error( e ); + AELog.debug( e ); } if( this.data.crash ) { @@ -412,10 +412,10 @@ public class RecipeHandler implements IRecipeHandler { if( this.data.errorOnMissing ) { - AELog.warning( "Unable to register a recipe:" + e.getMessage() ); + AELog.warn( "Unable to register a recipe:" + e.getMessage() ); if( this.data.exceptions ) { - AELog.error( e ); + AELog.debug( e ); } if( this.data.crash ) { @@ -429,7 +429,7 @@ public class RecipeHandler implements IRecipeHandler { if( this.data.exceptions ) { - AELog.error( e ); + AELog.debug( e ); } if( this.data.crash ) { @@ -505,11 +505,11 @@ public class RecipeHandler implements IRecipeHandler } catch( final FileNotFoundException e1 ) { - AELog.error( e1 ); + AELog.debug( e1 ); } catch( final IOException e1 ) { - AELog.error( e1 ); + AELog.debug( e1 ); } } } @@ -529,7 +529,7 @@ public class RecipeHandler implements IRecipeHandler } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } } @@ -678,10 +678,10 @@ public class RecipeHandler implements IRecipeHandler } catch( final RecipeError e ) { - AELog.warning( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + this.tokens.toString() ); + AELog.warn( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + this.tokens.toString() ); if( this.data.exceptions ) { - AELog.error( e ); + AELog.debug( e ); } if( this.data.crash ) { diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index a5384e45..42f056ff 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -118,7 +118,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); throw new RegistrationError( "Error while adding shaped recipe." ); } } diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index 91c73def..4de1515c 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -81,7 +81,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); throw new RegistrationError( "Error while adding shapeless recipe." ); } } diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index 391eb62c..f4330a93 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -89,7 +89,7 @@ public class OreDictionaryHandler } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/services/VersionChecker.java b/src/main/java/appeng/services/VersionChecker.java index 11d698f6..83fcc4b3 100644 --- a/src/main/java/appeng/services/VersionChecker.java +++ b/src/main/java/appeng/services/VersionChecker.java @@ -102,7 +102,7 @@ public final class VersionChecker implements Runnable catch( Exception exception ) { // Log any unhandled exception to prevent the JVM from reporting them as unhandled. - AELog.error( exception ); + AELog.debug( exception ); } AELog.info( "Stopping AE2 VersionChecker" ); diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index 0ef8b79f..2cb709f0 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -73,7 +73,8 @@ final class MinecraftItemCSVExporter implements Exporter /** * @param exportDirectory directory of the resulting export file. Non-null required. - * @param itemRegistry the registry with minecraft items. Needs to be populated at that time, thus the exporting can only happen in init (pre-init is the + * @param itemRegistry the registry with minecraft items. Needs to be populated at that time, thus the exporting can + * only happen in init (pre-init is the * phase when all items are determined) * @param mode mode in which the export should be operated. Resulting CSV will change depending on this. */ @@ -103,7 +104,7 @@ final class MinecraftItemCSVExporter implements Exporter { FileUtils.forceMkdir( this.exportDirectory ); - final Writer writer = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( file ), Charset.forName("UTF-8") ) ); + final Writer writer = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( file ), Charset.forName( "UTF-8" ) ) ); final String header = this.mode == ExportMode.MINIMAL ? MINIMAL_HEADER : VERBOSE_HEADER; writer.write( header ); @@ -116,8 +117,8 @@ final class MinecraftItemCSVExporter implements Exporter } catch( final IOException e ) { - AELog.warning( EXPORT_UNSUCCESSFUL_MESSAGE ); - AELog.error( e ); + AELog.warn( EXPORT_UNSUCCESSFUL_MESSAGE ); + AELog.debug( e ); } } @@ -186,7 +187,6 @@ final class MinecraftItemCSVExporter implements Exporter } } - /** * transforms an item into a row representation of the CSV file */ @@ -198,6 +198,7 @@ final class MinecraftItemCSVExporter implements Exporter private static final String LOCALIZATION_NAME_EXTENSION = ".name"; private static final String EXPORTING_NOTHING_MESSAGE = "Exporting nothing"; private static final String EXPORTING_SUBTYPES_MESSAGE = "Exporting input %s with subtypes: %b"; + private static final String EXPORTING_SUBTYPES_FAILED_MESSAGE = "Could not export subtypes of: %s"; @Nonnull private final FMLControlledNamespacedRegistry itemRegistry; @@ -243,7 +244,8 @@ final class MinecraftItemCSVExporter implements Exporter } catch( final Exception ignored ) { - AELog.error( ignored ); + AELog.warn( EXPORTING_SUBTYPES_FAILED_MESSAGE, input.getUnlocalizedName() ); + AELog.debug( ignored ); // ignore if mods do bullshit in their code return null; diff --git a/src/main/java/appeng/services/version/ModVersionFetcher.java b/src/main/java/appeng/services/version/ModVersionFetcher.java index 6a4c5b1f..eb5e8015 100644 --- a/src/main/java/appeng/services/version/ModVersionFetcher.java +++ b/src/main/java/appeng/services/version/ModVersionFetcher.java @@ -67,7 +67,7 @@ public final class ModVersionFetcher implements VersionFetcher } catch( final VersionCheckerException e ) { - AELog.error( e ); + AELog.debug( e ); return EXCEPTIONAL_VERSION; } diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index c63b0960..56bcc2e5 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -75,15 +75,15 @@ public final class ReleaseFetcher } catch( final VersionCheckerException e ) { - AELog.error( e ); + AELog.debug( e ); } catch( MalformedURLException e ) { - AELog.error( e ); + AELog.debug( e ); } catch( IOException e ) { - AELog.error( e ); + AELog.debug( e ); } return EXCEPTIONAL_RELEASE; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 99112d00..8a8cf2a1 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -178,7 +178,7 @@ public class CachedPlane } catch( final Exception e ) { - AELog.error( e ); + AELog.debug( e ); } } } @@ -292,7 +292,7 @@ public class CachedPlane } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); // attempt recovery... te.setWorldObj( this.getWorld() ); @@ -319,7 +319,7 @@ public class CachedPlane } catch( final Throwable e ) { - AELog.error( e ); + AELog.debug( e ); } } diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 0f752481..841021f1 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -199,7 +199,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } stream.capacity( stream.readableBytes() ); @@ -279,7 +279,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } return output; @@ -319,7 +319,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } } diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTile.java b/src/main/java/appeng/tile/grid/AENetworkInvTile.java index a497d7af..ee296508 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTile.java @@ -104,4 +104,5 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH { return this.gridProxy; } + } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index d6da37f3..90d16b36 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -125,7 +125,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable } catch( final Exception e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/util/ClassInstantiation.java b/src/main/java/appeng/util/ClassInstantiation.java index a9589327..583212a9 100644 --- a/src/main/java/appeng/util/ClassInstantiation.java +++ b/src/main/java/appeng/util/ClassInstantiation.java @@ -113,7 +113,7 @@ public class ClassInstantiation } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } } } diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index 82c57407..64c28487 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -125,7 +125,7 @@ public final class ConfigManager implements IConfigManager } catch( final IllegalArgumentException e ) { - AELog.error( e ); + AELog.debug( e ); } } } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index e8dd6614..53167858 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -576,8 +576,8 @@ public class Platform } catch( final Throwable z ) { - AELog.error( t ); - AELog.error( z ); + AELog.debug( t ); + AELog.debug( z ); } } } @@ -589,7 +589,7 @@ public class Platform } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } return new ArrayList(); @@ -2010,7 +2010,7 @@ public class Platform } catch( final Throwable t ) { - AELog.error( t ); + AELog.debug( t ); } }