From b365494f2edbb6a63601cb44cf40e7fad0cc6335 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 3 Jun 2014 08:46:03 +0200 Subject: [PATCH] Fixed up logger, added needed overlays --- src/main/java/mekanism/api/ItemRetriever.java | 2 +- src/main/java/mekanism/api/RecipeHelper.java | 28 +++++++++--------- src/main/java/mekanism/api/TabProxy.java | 2 +- .../java/mekanism/client/ClientProxy.java | 2 +- .../java/mekanism/client/HolidayManager.java | 3 +- .../java/mekanism/client/MekanismClient.java | 2 +- .../mekanism/client/ThreadClientUpdate.java | 6 ++-- .../java/mekanism/client/sound/Sound.java | 3 +- .../mekanism/client/sound/SoundHandler.java | 8 ++--- .../mekanism/client/voice/VoiceClient.java | 12 ++++---- .../mekanism/client/voice/VoiceInput.java | 3 +- .../mekanism/client/voice/VoiceOutput.java | 3 +- .../mekanism/common/BoxBlacklistParser.java | 4 +-- .../java/mekanism/common/CommonProxy.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +-- .../java/mekanism/common/PacketHandler.java | 26 ++++++++-------- src/main/java/mekanism/common/Tier.java | 4 +-- .../mekanism/common/block/BlockMachine.java | 2 +- .../common/classloading/ClassEnumerator.java | 4 ++- .../common/integration/MekanismHooks.java | 10 +++---- .../common/network/PacketBoxBlacklist.java | 3 +- .../common/network/PacketElectricChest.java | 8 ++--- .../common/network/PacketPipeline.java | 2 +- .../TileEntityAdvancedElectricMachine.java | 2 +- .../tile/TileEntityElectricMachine.java | 2 +- .../tile/TileEntityElectrolyticSeparator.java | 2 +- .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityFactory.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../common/tile/TileEntityTeleporter.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 4 +-- .../common/voice/VoiceConnection.java | 10 +++---- .../common/voice/VoiceServerManager.java | 10 +++---- .../client/GeneratorsClientProxy.java | 1 + .../generators/common/MekanismGenerators.java | 2 +- .../common/block/BlockGenerator.java | 2 +- .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 3 +- .../tile/TileEntityHydrogenGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 3 +- .../common/tile/TileEntityWindTurbine.java | 3 +- .../mekanism/tools/common/MekanismTools.java | 2 +- .../resources/assets/mekanism/lang/en_US.lang | 2 ++ .../blocks/overlay/OverlayBrightPink.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayBrown.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayPink.png | Bin 1165 -> 1165 bytes 46 files changed, 108 insertions(+), 95 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png diff --git a/src/main/java/mekanism/api/ItemRetriever.java b/src/main/java/mekanism/api/ItemRetriever.java index e18f62a30..a66b8b5b1 100644 --- a/src/main/java/mekanism/api/ItemRetriever.java +++ b/src/main/java/mekanism/api/ItemRetriever.java @@ -64,7 +64,7 @@ public final class ItemRetriever return null; } } catch(Exception e) { - System.err.println("[Mekanism] Error retrieving item with identifier '" + identifier + "': " + e.getMessage()); + System.err.println("Error retrieving item with identifier '" + identifier + "': " + e.getMessage()); return null; } } diff --git a/src/main/java/mekanism/api/RecipeHelper.java b/src/main/java/mekanism/api/RecipeHelper.java index c3c0bc88e..7ef8310d5 100644 --- a/src/main/java/mekanism/api/RecipeHelper.java +++ b/src/main/java/mekanism/api/RecipeHelper.java @@ -26,7 +26,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -42,7 +42,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -58,7 +58,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -74,7 +74,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -90,7 +90,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -106,7 +106,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -122,7 +122,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalInfuserRecipe", ChemicalPair.class, GasStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -138,7 +138,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ChanceOutput.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -154,7 +154,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", AdvancedInput.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -170,7 +170,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, ChemicalPair.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -186,7 +186,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -202,7 +202,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -218,7 +218,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } @@ -234,7 +234,7 @@ public final class RecipeHelper Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfusionInput.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { - System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); + System.err.println("Error while adding recipe: " + e.getMessage()); } } } diff --git a/src/main/java/mekanism/api/TabProxy.java b/src/main/java/mekanism/api/TabProxy.java index 94238a221..c562c0247 100644 --- a/src/main/java/mekanism/api/TabProxy.java +++ b/src/main/java/mekanism/api/TabProxy.java @@ -35,7 +35,7 @@ public final class TabProxy return preferred; } catch(Exception e) { - System.err.println("[Mekanism] Error retrieving Mekanism creative tab."); + System.err.println("Error retrieving Mekanism creative tab."); return preferred; } } diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index a3ea2bd6e..ceb08937a 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -351,7 +351,7 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); - System.out.println("[Mekanism] Render registrations complete."); + Mekanism.logger.info("Render registrations complete."); } @Override diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 96492cf6f..433199640 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -5,6 +5,7 @@ import java.util.Calendar; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; @@ -25,7 +26,7 @@ public final class HolidayManager holidays.add(new NewYear()); } - System.out.println("[Mekanism] Initialized HolidayManager."); + Mekanism.logger.info("Initialized HolidayManager."); } public static void check() diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 21982ac33..a71241658 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -64,6 +64,6 @@ public class MekanismClient extends Mekanism Mekanism.proxy.loadConfiguration(); - System.out.println("[Mekanism] Reloaded config."); + Mekanism.logger.info("Reloaded config."); } } diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 28498a75a..561c9bfbb 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -89,13 +89,13 @@ public class ThreadClientUpdate extends Thread hasUpdated = true; GuiCredits.updateInfo("Update installed, reboot Minecraft for changes."); - System.out.println("[Mekanism] Successfully updated to latest version (" + Mekanism.latestVersionNumber + ")."); + Mekanism.logger.info("Successfully updated to latest version (" + Mekanism.latestVersionNumber + ")."); finalize(); } catch(Throwable t) { GuiCredits.updateInfo(EnumColor.DARK_RED + "Error updating."); hasUpdated = true; - System.err.println("[Mekanism] Error while finishing update thread: " + t.getMessage()); + Mekanism.logger.error("Error while finishing update thread: " + t.getMessage()); t.printStackTrace(); } } @@ -196,7 +196,7 @@ public class ThreadClientUpdate extends Thread } } - System.out.println("[Mekanism] Preparing to update..."); + Mekanism.logger.info("Preparing to update..."); } private static URL createURL() diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 36558f40c..607f8d2bd 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -4,6 +4,7 @@ import java.net.URL; import mekanism.api.Pos3D; import mekanism.client.MekanismClient; +import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; import net.minecraft.world.World; @@ -47,7 +48,7 @@ public abstract class Sound if(url == null) { - System.out.println("[Mekanism] Invalid sound file: " + sound); + Mekanism.logger.error("Invalid sound file: " + sound); } if(SoundHandler.getSoundSystem() != null) diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index fae2f4631..a335174ec 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -58,7 +58,7 @@ public class SoundHandler { MinecraftForge.EVENT_BUS.register(this); - System.out.println("[Mekanism] Successfully set up SoundHandler."); + Mekanism.logger.info("Successfully set up SoundHandler."); } public void preloadSounds() @@ -82,7 +82,7 @@ public class SoundHandler preloadSound(s); } - System.out.println("[Mekanism] Preloaded " + listings.size() + " object sounds."); + Mekanism.logger.info("Preloaded " + listings.size() + " object sounds."); /*listings = listFiles(corePath.replace("%20", " ").replace(".jar!", ".jar").replace("file:", ""), "assets/mekanism/sounds/etc"); @@ -96,7 +96,7 @@ public class SoundHandler mc.sndManager.addSound("mekanism:etc/" + s); } - System.out.println("[Mekanism] Initialized " + listings.size() + " sound effects.");*/ + Mekanism.logger.info("Initialized " + listings.size() + " sound effects.");*/ if(MekanismClient.holidays) { @@ -315,7 +315,7 @@ public class SoundHandler if(url == null) { - System.out.println("[Mekanism] Invalid sound file: " + soundPath); + Mekanism.logger.info("Invalid sound file: " + soundPath); } String s = getSoundSystem().quickPlay(false, url, soundPath, false, object.xCoord, object.yCoord, object.zCoord, 0, 16F); diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 189ce3738..0be714815 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -38,7 +38,7 @@ public class VoiceClient extends Thread @Override public void run() { - System.out.println("[Mekanism] VoiceServer: Starting client connection..."); + Mekanism.logger.info("VoiceServer: Starting client connection..."); try { socket = new Socket(ip, Mekanism.VOICE_PORT); @@ -50,18 +50,18 @@ public class VoiceClient extends Thread (outputThread = new VoiceOutput(this)).start(); (inputThread = new VoiceInput(this)).start(); - System.out.println("[Mekanism] VoiceServer: Successfully connected to server."); + Mekanism.logger.info("VoiceServer: Successfully connected to server."); } catch(ConnectException e) { - System.err.println("[Mekanism] VoiceServer: Server's VoiceServer is disabled."); + Mekanism.logger.error("VoiceServer: Server's VoiceServer is disabled."); } catch(Exception e) { - System.err.println("[Mekanism] VoiceServer: Error while starting client connection."); + Mekanism.logger.error("VoiceServer: Error while starting client connection."); e.printStackTrace(); } } public void disconnect() { - System.out.println("[Mekanism] VoiceServer: Stopping client connection..."); + Mekanism.logger.info("VoiceServer: Stopping client connection..."); try { try { @@ -97,7 +97,7 @@ public class VoiceClient extends Thread running = false; } catch(Exception e) { - System.err.println("[Mekanism] VoiceServer: Error while stopping client connection."); + Mekanism.logger.error("VoiceServer: Error while stopping client connection."); e.printStackTrace(); } } diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index c571008b4..c4c418cd2 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -6,6 +6,7 @@ import javax.sound.sampled.DataLine; import javax.sound.sampled.TargetDataLine; import mekanism.client.MekanismKeyHandler; +import mekanism.common.Mekanism; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -81,7 +82,7 @@ public class VoiceInput extends Thread audioInput.close(); } catch(Exception e) { - System.err.println("[Mekanism] VoiceServer: Error while running client input thread."); + Mekanism.logger.error("VoiceServer: Error while running client input thread."); e.printStackTrace(); } } diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index d8d14df34..f037c2481 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -4,6 +4,7 @@ import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; +import mekanism.common.Mekanism; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -44,7 +45,7 @@ public class VoiceOutput extends Thread } catch(Exception e) {} } } catch(Exception e) { - System.err.println("[Mekanism] VoiceServer: Error while running client output thread."); + Mekanism.logger.error("VoiceServer: Error while running client output thread."); e.printStackTrace(); } } diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index 135b2dcfd..6b25a8809 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -68,7 +68,7 @@ public final class BoxBlacklistParser if(split.length != 2 || !isInteger(split[0]) || !isInteger(split[1])) { - System.err.println("[Mekanism] BoxBlacklist.txt: Couldn't parse blacklist data on line " + line); + Mekanism.logger.error("BoxBlacklist.txt: Couldn't parse blacklist data on line " + line); } MekanismAPI.addBoxBlacklist(Block.getBlockFromName(split[0]), Integer.parseInt(split[1])); @@ -77,7 +77,7 @@ public final class BoxBlacklistParser reader.close(); - System.out.println("[Mekanism] Finished loading Cardboard Box blacklist (loaded " + entries + " entries)"); + Mekanism.logger.info("Finished loading Cardboard Box blacklist (loaded " + entries + " entries)"); } private static void writeExamples() throws IOException diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 1a2e742bf..cecda1e49 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -417,6 +417,6 @@ public class CommonProxy MekanismAPI.addBoxBlacklist(Blocks.mob_spawner, 0); } - System.out.println("[Mekanism] Received config from server."); + Mekanism.logger.info("Received config from server."); } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index f7b0592dd..ffb9b356d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -161,7 +161,7 @@ public class Mekanism public static final PacketPipeline packetPipeline = new PacketPipeline(); /** Mekanism logger instance */ - public static Logger logger = LogManager.getLogger(""); + public static Logger logger = LogManager.getLogger("Mekanism"); /** Mekanism proxy instance */ @SidedProxy(clientSide = "mekanism.client.ClientProxy", serverSide = "mekanism.common.CommonProxy") @@ -1278,7 +1278,7 @@ public class Mekanism NetworkRegistry.INSTANCE.registerGuiHandler(this, new CoreGuiHandler()); //Initialization notification - logger.info("[Mekanism] Version " + versionNumber + " initializing..."); + logger.info("Version " + versionNumber + " initializing..."); //Get data from server. new ThreadGetData(); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 8998268ae..fe31969ea 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -29,7 +29,7 @@ public class PacketHandler //implements IPacketHandler if(packets.get(packetIndex) == null) { - System.err.println("[Mekanism] Received unknown packet identifier '" + packetIndex + ".' Ignorning!"); + Mekanism.logger.error("Received unknown packet identifier '" + packetIndex + ".' Ignorning!"); return; } @@ -37,18 +37,18 @@ public class PacketHandler //implements IPacketHandler if(packetType == null) { - System.err.println("[Mekanism] Unable to create instance of packet type '" + packetIndex + ".' Ignoring!"); + Mekanism.logger.error("Unable to create instance of packet type '" + packetIndex + ".' Ignoring!"); return; } try { packetType.read(dataStream, entityplayer, entityplayer.worldObj); } catch(Exception e) { - System.err.println("[Mekanism] Error while reading '" + packetType.getName() + "' packet."); + Mekanism.logger.error("Error while reading '" + packetType.getName() + "' packet."); e.printStackTrace(); } } catch(Exception e) { - System.err.println("[Mekanism] Error while handling packet."); + Mekanism.logger.error("Error while handling packet."); e.printStackTrace(); } } @@ -121,7 +121,7 @@ public class PacketHandler //implements IPacketHandler } } } catch(Exception e) { - System.err.println("[Mekanism] Error while encoding packet data."); + Mekanism.logger.error("Error while encoding packet data."); e.printStackTrace(); } } @@ -147,13 +147,13 @@ public class PacketHandler //implements IPacketHandler { if(packetType == null) { - System.err.println("[Mekanism] Attempted to send null packet, ignoring!"); + Mekanism.logger.error("Attempted to send null packet, ignoring!"); return; } if(!packets.contains(packetType.getClass())) { - System.err.println("[Mekanism] Attempted to send unregistered packet '" + packetType.getName() + ",' ignoring!"); + Mekanism.logger.error("Attempted to send unregistered packet '" + packetType.getName() + ",' ignoring!"); return; } @@ -164,7 +164,7 @@ public class PacketHandler //implements IPacketHandler data.writeInt(packets.indexOf(packetType.getClass())); packetType.write(data); } catch(Exception e) { - System.err.println("[Mekanism] Error while encoding packet data."); + Mekanism.logger.error("Error while encoding packet data."); e.printStackTrace(); } @@ -209,19 +209,19 @@ public class PacketHandler //implements IPacketHandler switch(trans) { case SERVER: - System.out.println("[Mekanism] Sent '" + packetType.getName() + "' packet to server."); + Mekanism.logger.info("Sent '" + packetType.getName() + "' packet to server."); break; case ALL_CLIENTS: - System.out.println("[Mekanism] Sent '" + packetType.getName() + "' packet to all clients."); + Mekanism.logger.info("Sent '" + packetType.getName() + "' packet to all clients."); break; case CLIENTS_RANGE: - System.out.println("[Mekanism] Sent '" + packetType.getName() + "' packet to clients in a " + (Double)transParams[1] + " block range."); + Mekanism.logger.info("Sent '" + packetType.getName() + "' packet to clients in a " + (Double)transParams[1] + " block range."); break; case CLIENTS_DIM: - System.out.println("[Mekanism] Sent '" + packetType.getName() + "' packet to clients in dimension ID " + (Integer)transParams[0] + "."); + Mekanism.logger.info("Sent '" + packetType.getName() + "' packet to clients in dimension ID " + (Integer)transParams[0] + "."); break; case SINGLE_CLIENT: - System.out.println("[Mekanism] Sent '" + packetType.getName() + "' packet to " + ((EntityPlayer)transParams[0]).username); + Mekanism.logger.info("Sent '" + packetType.getName() + "' packet to " + ((EntityPlayer)transParams[0]).username); break; } } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 5a007dc50..58beaee6c 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -38,7 +38,7 @@ public final class Tier } } - System.out.println("[Mekanism] Invalid tier identifier when retrieving with name."); + Mekanism.logger.error("Invalid tier identifier when retrieving with name."); return BASIC; } @@ -76,7 +76,7 @@ public final class Tier } } - System.out.println("[Mekanism] Invalid tier identifier when retrieving with name."); + Mekanism.logger.error("Invalid tier identifier when retrieving with name."); return BASIC; } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 94aa395c4..79b85c109 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1195,7 +1195,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer try { return tileEntityClass.newInstance(); } catch(Exception e) { - System.err.println("[Mekanism] Unable to indirectly create tile entity."); + Mekanism.logger.error("Unable to indirectly create tile entity."); e.printStackTrace(); return null; } diff --git a/src/main/java/mekanism/common/classloading/ClassEnumerator.java b/src/main/java/mekanism/common/classloading/ClassEnumerator.java index 1c425109a..9457a1f1b 100644 --- a/src/main/java/mekanism/common/classloading/ClassEnumerator.java +++ b/src/main/java/mekanism/common/classloading/ClassEnumerator.java @@ -8,6 +8,8 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import mekanism.common.Mekanism; + public class ClassEnumerator { private static Class loadClass(String className) @@ -106,7 +108,7 @@ public class ClassEnumerator processDir(new File(resource.getPath()), pkgname, classes); } } catch(Exception e) { - System.err.println("[Mekanism] Error while loading classes in package " + pkg); + Mekanism.logger.error("Error while loading classes in package " + pkg); e.printStackTrace(); } diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 63f90a627..bb2a020b0 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -113,7 +113,7 @@ public final class MekanismHooks Recipes.matterAmplifier.addRecipe(new RecipeInputItemStack(new ItemStack(Mekanism.EnrichedAlloy), 1), tag); - System.out.println("[Mekanism] Hooked into IC2 successfully."); + Mekanism.logger.info("Hooked into IC2 successfully."); } if(BasicComponentsLoaded) @@ -130,12 +130,12 @@ public final class MekanismHooks MekanismUtils.removeRecipes(getBasicComponentsItem("itemBronzeIngot")); } - System.out.println("[Mekanism] Hooked into BasicComponents successfully."); + Mekanism.logger.info("Hooked into BasicComponents successfully."); } if(BuildCraftLoaded) { - System.out.println("[Mekanism] Hooked into BuildCraft successfully."); + Mekanism.logger.info("Hooked into BuildCraft successfully."); } if(CCLoaded) @@ -177,7 +177,7 @@ public final class MekanismHooks throw new Exception("not instanceof ItemStack"); } } catch(Exception e) { - System.out.println("[Mekanism] Unable to retrieve BuildCraft item " + name + "."); + Mekanism.logger.error("Unable to retrieve BuildCraft item " + name + "."); return null; } } @@ -201,7 +201,7 @@ public final class MekanismHooks throw new Exception("not instanceof ItemStack"); } } catch(Exception e) { - System.out.println("[Mekanism] Unable to retrieve Basic Components item " + name + "."); + Mekanism.logger.error("Unable to retrieve Basic Components item " + name + "."); return null; } } diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 2d5743a5c..c8fe2bdcb 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mekanism.api.ItemInfo; import mekanism.api.MekanismAPI; +import mekanism.common.Mekanism; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -33,7 +34,7 @@ public class PacketBoxBlacklist extends MekanismPacket MekanismAPI.addBoxBlacklist(Block.getBlockById(dataStream.readInt()), dataStream.readInt()); } - System.out.println("[Mekanism] Received Cardboard Box blacklist entries from server (" + amount + " total)"); + Mekanism.logger.info("Received Cardboard Box blacklist entries from server (" + amount + " total)"); } @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 3bbe31d01..ad1a03f37 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -183,7 +183,7 @@ public class PacketElectricChest extends MekanismPacket } } } catch(Exception e) { - System.err.println("[Mekanism] Error while handling electric chest open packet."); + Mekanism.logger.error("Error while handling electric chest open packet."); e.printStackTrace(); } } @@ -207,7 +207,7 @@ public class PacketElectricChest extends MekanismPacket Mekanism.proxy.openElectricChest(player, type, id, block, x, y, z); } catch(Exception e) { - System.err.println("[Mekanism] Error while handling electric chest open packet."); + Mekanism.logger.error("Error while handling electric chest open packet."); e.printStackTrace(); } } @@ -237,7 +237,7 @@ public class PacketElectricChest extends MekanismPacket } } } catch(Exception e) { - System.err.println("[Mekanism] Error while handling electric chest password packet."); + Mekanism.logger.error("Error while handling electric chest password packet."); e.printStackTrace(); } } @@ -265,7 +265,7 @@ public class PacketElectricChest extends MekanismPacket } } } catch(Exception e) { - System.err.println("[Mekanism] Error while handling electric chest password packet."); + Mekanism.logger.error("Error while handling electric chest password packet."); e.printStackTrace(); } } diff --git a/src/main/java/mekanism/common/network/PacketPipeline.java b/src/main/java/mekanism/common/network/PacketPipeline.java index 64d929d40..1929f3493 100644 --- a/src/main/java/mekanism/common/network/PacketPipeline.java +++ b/src/main/java/mekanism/common/network/PacketPipeline.java @@ -139,7 +139,7 @@ public class PacketPipeline extends MessageToMessageCodec4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000aNkl4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000aNkl?B(1L!(#a7{D=Sc%&ZNaOnVd7E@m?@=xIBcA<?B(1L!(w>n@~!{#8<`HcG{$YX7RW3i;dVH|gvViK;)BbK49m@!-Y?ws_z?pT Nc)I$ztaD0e0szVS7kmH!