From 204f73cb0538e669c4fc9e000cdd9a3f21ca0d96 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sat, 11 Aug 2012 14:12:39 -0400
Subject: [PATCH] Remove profiler stuff - it's been deeply reorged. I'll look
 at re-adding it later

---
 .../cpw/mods/fml/client/FMLClientHandler.java | 10 ----------
 .../cpw/mods/fml/client/TextureFXManager.java | 11 +++++-----
 .../cpw/mods/fml/common/FMLCommonHandler.java | 10 ----------
 .../cpw/mods/fml/common/IFMLSidedHandler.java |  4 ----
 .../cpw/mods/fml/server/FMLServerHandler.java | 20 +------------------
 5 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java
index d608feb67e..dfedcd8ebd 100644
--- a/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -266,16 +266,6 @@ public class FMLClientHandler implements IFMLSidedHandler
         }
     }
 
-    @Override
-    public void profileStart(String profileLabel) {
-        client.field_71424_I.func_76320_a(profileLabel);
-    }
-
-    @Override
-    public void profileEnd() {
-        client.field_71424_I.func_76319_b();
-    }
-
     /**
      * @param mods
      */
diff --git a/client/cpw/mods/fml/client/TextureFXManager.java b/client/cpw/mods/fml/client/TextureFXManager.java
index c0367944e1..536dcfd4eb 100644
--- a/client/cpw/mods/fml/client/TextureFXManager.java
+++ b/client/cpw/mods/fml/client/TextureFXManager.java
@@ -53,12 +53,12 @@ public class TextureFXManager
     private List<TextureFX> addedTextureFX = new ArrayList<TextureFX>();
 
     private Minecraft client;
-    
+
     void setClient(Minecraft client)
     {
         this.client = client;
     }
-    
+
     public boolean onUpdateTextureEffect(TextureFX effect)
     {
         ITextureFX ifx = (effect instanceof ITextureFX ? ((ITextureFX)effect) : null);
@@ -69,8 +69,7 @@ public class TextureFXManager
         }
 
         String name = effect.getClass().getSimpleName();
-        FMLClientHandler.instance().profileStart(name);
-
+        client.field_71424_I.func_76320_a(name);
         try
         {
             if (!FMLClientHandler.instance().hasOptifine())
@@ -85,10 +84,10 @@ public class TextureFXManager
             {
                 ifx.setErrored(true);
             }
-            FMLClientHandler.instance().profileEnd();
+            client.field_71424_I.func_76319_b();
             return false;
         }
-        FMLClientHandler.instance().profileEnd();
+        client.field_71424_I.func_76319_b();
 
         if (ifx != null)
         {
diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java
index 1172332f2e..ff484d69ae 100644
--- a/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/common/cpw/mods/fml/common/FMLCommonHandler.java
@@ -91,9 +91,7 @@ public class FMLCommonHandler
 
     public void rescheduleTicks(Side side)
     {
-        sidedDelegate.profileStart("modTickScheduling");
         TickRegistry.updateTickQueue(side.isClient() ? scheduledClientTicks : scheduledServerTicks, side);
-        sidedDelegate.profileEnd();
     }
     public void tickStart(EnumSet<TickType> ticks, Side side, Object ... data)
     {
@@ -103,19 +101,15 @@ public class FMLCommonHandler
         {
             return;
         }
-        sidedDelegate.profileStart("modTickStart$"+ticks);
         for (IScheduledTickHandler ticker : scheduledTicks)
         {
             EnumSet<TickType> ticksToRun = EnumSet.copyOf(ticker.ticks());
             ticksToRun.removeAll(EnumSet.complementOf(ticks));
             if (!ticksToRun.isEmpty())
             {
-                sidedDelegate.profileStart(ticker.getLabel());
                 ticker.tickStart(ticksToRun, data);
-                sidedDelegate.profileEnd();
             }
         }
-        sidedDelegate.profileEnd();
     }
 
     public void tickEnd(EnumSet<TickType> ticks, Side side, Object ... data)
@@ -126,19 +120,15 @@ public class FMLCommonHandler
         {
             return;
         }
-        sidedDelegate.profileStart("modTickEnd$"+ticks);
         for (IScheduledTickHandler ticker : scheduledTicks)
         {
             EnumSet<TickType> ticksToRun = EnumSet.copyOf(ticker.ticks());
             ticksToRun.removeAll(EnumSet.complementOf(ticks));
             if (!ticksToRun.isEmpty())
             {
-                sidedDelegate.profileStart(ticker.getLabel());
                 ticker.tickEnd(ticksToRun, data);
-                sidedDelegate.profileEnd();
             }
         }
-        sidedDelegate.profileEnd();
     }
 
     /**
diff --git a/common/cpw/mods/fml/common/IFMLSidedHandler.java b/common/cpw/mods/fml/common/IFMLSidedHandler.java
index 83cc0f0688..2115e12ac6 100644
--- a/common/cpw/mods/fml/common/IFMLSidedHandler.java
+++ b/common/cpw/mods/fml/common/IFMLSidedHandler.java
@@ -18,10 +18,6 @@ import cpw.mods.fml.common.network.EntitySpawnPacket;
 
 public interface IFMLSidedHandler
 {
-    void profileStart(String profileLabel);
-
-    void profileEnd();
-
     List<String> getAdditionalBrandingInformation();
 
     Side getSide();
diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java
index 893bc7d3e2..1a1934ad55 100644
--- a/server/cpw/mods/fml/server/FMLServerHandler.java
+++ b/server/cpw/mods/fml/server/FMLServerHandler.java
@@ -139,24 +139,6 @@ public class FMLServerHandler implements IFMLSidedHandler
         return INSTANCE;
     }
 
-    /* (non-Javadoc)
-     * @see cpw.mods.fml.common.IFMLSidedHandler#profileStart(java.lang.String)
-     */
-    @Override
-    public void profileStart(String profileLabel)
-    {
-        server.field_71304_b.func_76320_a(profileLabel);
-    }
-
-    /* (non-Javadoc)
-     * @see cpw.mods.fml.common.IFMLSidedHandler#profileEnd()
-     */
-    @Override
-    public void profileEnd()
-    {
-        server.field_71304_b.func_76317_a();
-    }
-
     /* (non-Javadoc)
      * @see cpw.mods.fml.common.IFMLSidedHandler#getAdditionalBrandingInformation()
      */
@@ -178,7 +160,7 @@ public class FMLServerHandler implements IFMLSidedHandler
     @Override
     public void showGuiScreen(Object clientGuiElement)
     {
-        
+
     }
 
     @Override