diff --git a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java index 6cc8080..03cfb9b 100644 --- a/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java +++ b/src/main/java/mcp/mobius/opis/api/MessageHandlerRegistrar.java @@ -25,12 +25,12 @@ public enum MessageHandlerRegistrar { if (msgHandlers.containsKey(msg)){ for (IMessageHandler handler : msgHandlers.get(msg)){ if (!handler.handleMessage(msg, rawdata)){ - modOpis.log.warning(String.format("Unhandled msg %s in handler %s", msg, handler)); + modOpis.log.warn(String.format("Unhandled msg %s in handler %s", msg, handler)); } } } else{ - modOpis.log.warning(String.format("Unhandled msg : %s", msg)); + modOpis.log.warn(String.format("Unhandled msg : %s", msg)); } } } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandChunkDump.java b/src/main/java/mcp/mobius/opis/commands/server/CommandChunkDump.java index 66d74eb..11f8e48 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandChunkDump.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandChunkDump.java @@ -3,7 +3,8 @@ package mcp.mobius.opis.commands.server; import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.util.logging.Level; + +import org.apache.logging.log4j.Level; import com.google.common.collect.ImmutableSetMultimap; diff --git a/src/main/java/mcp/mobius/opis/data/holders/DataType.java b/src/main/java/mcp/mobius/opis/data/holders/DataType.java index 028e5fa..a8f9aab 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/DataType.java +++ b/src/main/java/mcp/mobius/opis/data/holders/DataType.java @@ -98,7 +98,7 @@ public enum DataType { public static DataType getForClass(Class clazz){ DataType type = bimap.inverse().get(clazz); if (type == null){ - modOpis.log.warning(String.format("Class %s was not registered with the DataType enum", clazz)); + modOpis.log.warn(String.format("Class %s was not registered with the DataType enum", clazz)); } return type; } @@ -109,11 +109,11 @@ public enum DataType { DataType type = DataType.values()[ordinal]; retVal = bimap.get(type); if (retVal == null){ - modOpis.log.warning(String.format("DataType doesn't have a class registered for %s", type)); + modOpis.log.warn(String.format("DataType doesn't have a class registered for %s", type)); } } catch (Exception e) { retVal = null; - modOpis.log.warning(String.format("Index out of bound for ordinal %d in DataType", ordinal)); + modOpis.log.warn(String.format("Index out of bound for ordinal %d in DataType", ordinal)); } return retVal; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java index f665a17..2248e64 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -152,7 +152,7 @@ public enum TileEntityManager { } } - modOpis.log.warning(String.format("Found %d potential orphans !", orphans.size())); + modOpis.log.warn(String.format("Found %d potential orphans !", orphans.size())); return orphans; } diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java index 1c6a814..de83db8 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerEntityUpdate.java @@ -39,7 +39,7 @@ public class ProfilerEntityUpdate extends ProfilerAbstract implements IProfilerB try{ data.get(entity).addValue(clock.getDelta()); } catch (Exception e){ - modOpis.log.warning(String.format("Error while profiling entity %s\n", key)); + modOpis.log.warn(String.format("Error while profiling entity %s\n", key)); } } } diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderEntity.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderEntity.java index d2d92aa..2160e3c 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderEntity.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderEntity.java @@ -34,7 +34,7 @@ public class ProfilerRenderEntity extends ProfilerAbstract { //data.get((Entity)key).addValue((double)clock.getDelta()); data.get(key).addValue(clock.getDelta()); } catch (Exception e) { - modOpis.log.warning(String.format("Error while profiling entity %s\n", key)); + modOpis.log.warn(String.format("Error while profiling entity %s\n", key)); } } } \ No newline at end of file diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderTileEntity.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderTileEntity.java index b363b84..49b0347 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderTileEntity.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerRenderTileEntity.java @@ -33,7 +33,7 @@ public class ProfilerRenderTileEntity extends ProfilerAbstract { try{ data.get(key).addValue(clock.getDelta()); } catch (Exception e) { - modOpis.log.warning(String.format("Error while profiling entity %s\n", key)); + modOpis.log.warn(String.format("Error while profiling entity %s\n", key)); } } } diff --git a/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java index bf22e3e..e6bc8b3 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisClientTickHandler.java @@ -98,7 +98,7 @@ public enum OpisClientTickHandler{ tileEntData.add(dataTe); tileEntTotal += dataTe.update.timing; } catch (Exception e) { - modOpis.log.warning(String.format("Error while adding entity %s to the list", te)); + modOpis.log.warn(String.format("Error while adding entity %s to the list", te)); } } @@ -118,7 +118,7 @@ public enum OpisClientTickHandler{ entData.add(dataEnt); entTotal += dataEnt.update.timing; } catch (Exception e) { - modOpis.log.warning(String.format("Error while adding entity %s to the list", ent)); + modOpis.log.warn(String.format("Error while adding entity %s to the list", ent)); } } @@ -150,7 +150,7 @@ public enum OpisClientTickHandler{ DataBlockRender dataBlock = new DataBlockRender().fill(coord); blockData.add(dataBlock); } catch (Exception e) { - modOpis.log.warning(String.format("Error while adding block %s to the list", coord)); + modOpis.log.warn(String.format("Error while adding block %s to the list", coord)); } } diff --git a/src/main/java/mcp/mobius/opis/modOpis.java b/src/main/java/mcp/mobius/opis/modOpis.java index 74daf50..99dd7b7 100644 --- a/src/main/java/mcp/mobius/opis/modOpis.java +++ b/src/main/java/mcp/mobius/opis/modOpis.java @@ -1,8 +1,8 @@ package mcp.mobius.opis; -import java.util.logging.Logger; - import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -70,7 +70,7 @@ public class modOpis { @Instance("Opis") public static modOpis instance; - public static Logger log = Logger.getLogger("Opis"); + public static Logger log = LogManager.getLogger("Opis"); @SidedProxy(clientSide="mcp.mobius.opis.proxy.ProxyClient", serverSide="mcp.mobius.opis.proxy.ProxyServer") public static ProxyServer proxy; diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index 060528a..08d7dd2 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -2,7 +2,8 @@ package mcp.mobius.opis.network; import java.util.ArrayList; import java.util.HashMap; -import java.util.logging.Level; + +import org.apache.logging.log4j.Level; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; @@ -227,7 +228,7 @@ public class ServerMessageHandler { } else{ - modOpis.log.log(Level.WARNING, String.format("Unknown data request : %s ", maintype)); + modOpis.log.log(Level.WARN, String.format("Unknown data request : %s ", maintype)); } } diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java index 23b07ed..2380d90 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java @@ -3,7 +3,8 @@ package mcp.mobius.opis.proxy; import java.awt.Font; import java.util.ArrayList; import java.util.HashMap; -import java.util.logging.Level; + +import org.apache.logging.log4j.Level; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly;