upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove profiler stuff - it's been deeply reorged. I'll look at re-adding it later

Browse Source
This commit is contained in:
Christian committed 2012-08-11 14:12:39 -04:00
1 parent 28096abea5
commit 204f73cb05
5 files changed
+6 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/cpw/mods/fml/client/FMLClientHandler.java
-10
View File
@@ -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
*/
client/cpw/mods/fml/client/TextureFXManager.java
+5 -6
View File
@@ -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)
{
common/cpw/mods/fml/common/FMLCommonHandler.java
-10
View File
@@ -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();
}
/**
common/cpw/mods/fml/common/IFMLSidedHandler.java
-4
View File
@@ -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();
server/cpw/mods/fml/server/FMLServerHandler.java
+1 -19
View File
@@ -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