LiteLoader 1.5.2

+ Added paginated "Controls" GUI based on the Macros one + Added new interfaces GameLoopListener and ChatRenderListener + Added sanity check for profiler hook + Added more descriptive exception for when mods screw up the profiler stack so that it's clearer that it's not LiteLoader's fault

LiteLoader 1.5.2
+ Added paginated "Controls" GUI based on the Macros one + Added new interfaces GameLoopListener and ChatRenderListener + Added sanity check for profiler hook + Added more descriptive exception for when mods screw up the profiler stack so that it's clearer that it's not LiteLoader's fault
Mumfrey
1 parent 95b3fc7d
Showing 8 changed files with 542 additions and 50 deletions
java/com/mumfrey/liteloader/ChatRenderListener.java
java/com/mumfrey/liteloader/GameLoopListener.java
java/com/mumfrey/liteloader/core/HookProfiler.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/ProfilerStackCorruptionException.java
java/com/mumfrey/liteloader/gui/GuiControlsPaginated.java
java/com/mumfrey/liteloader/util/PrivateFields.java
res/liteloader.properties
+package com.mumfrey.liteloader;
+
+import net.minecraft.src.GuiNewChat;
+
+/**
+ * Interface for mods which want to alter the chat display
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface ChatRenderListener extends LiteMod
+{
+	public abstract void onPreRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
+	
+	public abstract void onPostRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
+}
+package com.mumfrey.liteloader;
+
+import net.minecraft.client.Minecraft;
+
+/**
+ * Interface for mods which want a frame notification every single game loop
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface GameLoopListener
+{
+	/**
+	 * Called every frame, before the world is ticked
+	 * 
+	 * @param minecraft
+	 */
+	public abstract void onRunGameLoop(Minecraft minecraft);
+}
@@ -3,6 +3,7 @@ package com.mumfrey.liteloader.core;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
+import java.util.NoSuchElementException;
 import java.util.logging.Logger;
 import net.minecraft.client.Minecraft;
@@ -65,7 +66,7 @@ public class HookProfiler extends Profiler
 		this.logger = logger;
 		// Detect optifine (duh!)
-		detectOptifine();
+		this.detectOptifine();
 	}
 	/**
@@ -77,18 +78,18 @@ public class HookProfiler extends Profiler
 	{
 		try
 		{
-			ofProfiler = GameSettings.class.getDeclaredField("ofProfiler");
+			this.ofProfiler = GameSettings.class.getDeclaredField("ofProfiler");
 		}
 		catch (SecurityException ex) {}
 		catch (NoSuchFieldException ex)
 		{
-			logger.info("Optifine not detected");
+			this.logger.info("Optifine not detected");
 		}
 		finally
 		{
-			if (ofProfiler != null)
+			if (this.ofProfiler != null)
 			{
-				logger.info(String.format("Optifine version %s detected, enabling compatibility check", getOptifineVersion()));
+				this.logger.info(String.format("Optifine version %s detected, enabling compatibility check", this.getOptifineVersion()));
 			}
 		}
 	}
@@ -125,44 +126,54 @@ public class HookProfiler extends Profiler
 	@Override
 	public void startSection(String sectionName)
 	{
-		if (!initDone)
+		if (!this.initDone)
 		{
-			initDone = true;
-			loader.onInit();
+			this.initDone = true;
+			this.loader.onInit();
 		}
-		if ("gameRenderer".equals(sectionName) && "root".equals(sectionStack.getLast()))
+		if ("gameRenderer".equals(sectionName) && "root".equals(this.sectionStack.getLast()))
 		{
-			loader.onRender();
+			this.loader.onRender();
 		}
-		if ("frustrum".equals(sectionName) && "level".equals(sectionStack.getLast()))
+		if ("frustrum".equals(sectionName) && "level".equals(this.sectionStack.getLast()))
 		{
-			loader.onSetupCameraTransform();
+			this.loader.onSetupCameraTransform();
 		}
 		if ("litParticles".equals(sectionName))
 		{
-			loader.postRenderEntities();
+			this.loader.postRenderEntities();
 		}
-		if ("animateTick".equals(sectionName)) tick = true;
-		sectionStack.add(sectionName);
+		if ("tick".equals(sectionName) && "root".equals(this.sectionStack.getLast()))
+		{
+			this.loader.onTimerUpdate();
+		}
+		
+		if ("chat".equals(sectionName))
+		{
+			this.loader.onBeforeChatRender();
+		}
+		
+		if ("animateTick".equals(sectionName)) this.tick = true;
+		this.sectionStack.add(sectionName);
 		super.startSection(sectionName);
-		if (ofProfiler != null)
+		if (this.ofProfiler != null)
 		{
 			try
 			{
-				ofProfiler.set(mc.gameSettings, true);
+				this.ofProfiler.set(this.mc.gameSettings, true);
 			}
 			catch (IllegalArgumentException ex)
 			{
-				ofProfiler = null;
+				this.ofProfiler = null;
 			}
 			catch (IllegalAccessException ex)
 			{
-				ofProfiler = null;
+				this.ofProfiler = null;
 			}
 		}
 	}
@@ -175,25 +186,37 @@ public class HookProfiler extends Profiler
 	{
 		super.endSection();
-		String endingSection = sectionStack.size() > 0 ? sectionStack.removeLast() : null;
-		String nextSection = sectionStack.size() > 0 ? sectionStack.getLast() : null;
-		
-		if ("gameRenderer".equals(endingSection) && "root".equals(sectionStack.getLast()))
+		try
 		{
-			super.startSection("litetick");
-
-			loader.onTick(this, tick);
-			tick = false;
+			String endingSection = this.sectionStack.size() > 0 ? this.sectionStack.removeLast() : null;
+			String nextSection = this.sectionStack.size() > 0 ? this.sectionStack.getLast() : null;
-			super.endSection();
-		}
-		else if (("mouse".equals(endingSection) && "gameRenderer".equals(nextSection) && (mc.skipRenderWorld || mc.theWorld == null)) || ("gui".equals(endingSection) && "gameRenderer".equals(nextSection) && mc.theWorld != null))
-		{
-			loader.onBeforeGuiRender();
+			if ("gameRenderer".equals(endingSection) && "root".equals(this.sectionStack.getLast()))
+			{
+				super.startSection("litetick");
+				
+				this.loader.onTick(this, this.tick);
+				this.tick = false;
+				
+				super.endSection();
+			}
+			else if (("mouse".equals(endingSection) && "gameRenderer".equals(nextSection) && (this.mc.skipRenderWorld || this.mc.theWorld == null)) || ("gui".equals(endingSection) && "gameRenderer".equals(nextSection) && this.mc.theWorld != null))
+			{
+				this.loader.onBeforeGuiRender();
+			}
+			else if ("hand".equals(endingSection) && "level".equals(this.sectionStack.getLast()))
+			{
+				this.loader.postRender();
+			}
+			else if ("chat".equals(endingSection))
+			{
+				this.loader.onAfterChatRender();
+			}
 		}
-		else if ("hand".equals(endingSection) && "level".equals(sectionStack.getLast()))
+		catch (NoSuchElementException ex)
 		{
-			loader.postRender();
+			this.logger.severe("Corrupted Profiler stack detected, this indicates an error with one of your mods.");
+			throw new ProfilerStackCorruptionException("Corrupted Profiler stack detected");
 		}
 	}
 }
@@ -34,14 +34,23 @@ import java.util.zip.ZipInputStream;
 import javax.activity.InvalidActivityException;
 import net.minecraft.client.Minecraft;
+import net.minecraft.src.GuiControls;
+import net.minecraft.src.GuiNewChat;
+import net.minecraft.src.GuiScreen;
+import net.minecraft.src.ILogAgent;
+import net.minecraft.src.IPlayerUsage;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.Packet1Login;
 import net.minecraft.src.Packet3Chat;
+import net.minecraft.src.PlayerUsageSnooper;
 import net.minecraft.src.Profiler;
+import net.minecraft.src.ScaledResolution;
 import net.minecraft.src.Timer;
 import com.mumfrey.liteloader.ChatFilter;
 import com.mumfrey.liteloader.ChatListener;
+import com.mumfrey.liteloader.ChatRenderListener;
+import com.mumfrey.liteloader.GameLoopListener;
 import com.mumfrey.liteloader.InitCompleteListener;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.LoginListener;
@@ -50,34 +59,35 @@ import com.mumfrey.liteloader.PostRenderListener;
 import com.mumfrey.liteloader.PreLoginListener;
 import com.mumfrey.liteloader.RenderListener;
 import com.mumfrey.liteloader.Tickable;
+import com.mumfrey.liteloader.gui.GuiControlsPaginated;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.mumfrey.liteloader.util.PrivateFields;
 /**
- * LiteLoader is a simple loader which provides tick events to loaded mods 
+ * LiteLoader is a simple loader which loads and provides useful callbacks to lightweight mods 
  *
  * @author Adam Mummery-Smith
- * @version 1.5.1
+ * @version 1.5.2
  */
 @SuppressWarnings("rawtypes")
-public final class LiteLoader implements FilenameFilter
+public final class LiteLoader implements FilenameFilter, IPlayerUsage
 {
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.5.1";
+	private static final String LOADER_VERSION = "1.5.2";
 	/**
 	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
 	 */
-	private static final int LOADER_REVISION = 8;
+	private static final int LOADER_REVISION = 9;
 	/**
 	 * Minecraft versions that we will load mods for, this will be compared
 	 * against the version.txt value in mod files to prevent outdated mods being
 	 * loaded!!!
 	 */
-	private static final String[] SUPPORTED_VERSIONS = { "1.5.1", "1.5.r2" };
+	private static final String[] SUPPORTED_VERSIONS = { "1.5.2", "1.5.r1" };
 	/**
 	 * Maximum recursion depth for mod discovery
@@ -130,6 +140,11 @@ public final class LiteLoader implements FilenameFilter
 	private String branding = null;
 	/**
+	 * Setting value, if true we will swap out the MC "Controls" GUI for our custom, paginated one 
+	 */
+	private boolean paginateControls = true;
+	
+	/**
 	 * Reference to the minecraft timer
 	 */
 	private Timer minecraftTimer;
@@ -151,6 +166,11 @@ public final class LiteLoader implements FilenameFilter
 	private LinkedList<Tickable> tickListeners = new LinkedList<Tickable>();
 	/**
+	 * List of mods which implement the GameLoopListener interface and will receive loop events
+	 */
+	private LinkedList<GameLoopListener> loopListeners = new LinkedList<GameLoopListener>();
+	
+	/**
 	 * 
 	 */
 	private LinkedList<InitCompleteListener> initListeners = new LinkedList<InitCompleteListener>();
@@ -167,6 +187,11 @@ public final class LiteLoader implements FilenameFilter
 	private LinkedList<PostRenderListener> postRenderListeners = new LinkedList<PostRenderListener>();
 	/**
+	 * List of mods which implement ChatRenderListener and want to know when chat is rendered
+	 */
+	private LinkedList<ChatRenderListener> chatRenderListeners = new LinkedList<ChatRenderListener>();
+	
+	/**
 	 * List of mods which implement ChatListener interface and will receive chat
 	 * events
 	 */
@@ -212,6 +237,16 @@ public final class LiteLoader implements FilenameFilter
 	 * Flags which keep track of whether hooks have been applied
 	 */
 	private boolean chatHooked, loginHooked, pluginChannelHooked, tickHooked;
+
+	/**
+	 * Profiler hook objects
+	 */
+	private HookProfiler profilerHook = new HookProfiler(this, logger);
+
+	/**
+	 * ScaledResolution used by the pre-chat and post-chat render callbacks
+	 */
+	private ScaledResolution currentResolution;
 	/**
 	 * Get the singleton instance of LiteLoader, initialises the loader if necessary
@@ -399,6 +434,9 @@ public final class LiteLoader implements FilenameFilter
 			// Prepare the log writer
 			this.prepareLogger();
+			this.paginateControls = this.localProperties.getProperty("controls.pages", "true").equalsIgnoreCase("true");
+			this.localProperties.setProperty("controls.pages", String.valueOf(this.paginateControls));
+			
 			this.branding = this.internalProperties.getProperty("brand", null);
 			if (this.branding != null && this.branding.length() < 1) this.branding = null;
@@ -652,7 +690,7 @@ public final class LiteLoader implements FilenameFilter
 					versionReader.close();
 					// Only add the mod if the version matches and we were able to successfully add it to the class path
-					if (supportedVerions.contains(strVersion) && addURLToClassPath(modFile.toURI().toURL()))
+					if (supportedVerions.contains(strVersion) && this.addURLToClassPath(modFile.toURI().toURL()))
 					{
 						modFiles.add(modFile);
 					}
@@ -834,7 +872,7 @@ public final class LiteLoader implements FilenameFilter
 		this.loadedModsList = "";
 		int loadedModsCount = 0;
-		for (Iterator<LiteMod> iter = mods.iterator(); iter.hasNext();)
+		for (Iterator<LiteMod> iter = this.mods.iterator(); iter.hasNext();)
 		{
 			LiteMod mod = iter.next();
@@ -848,6 +886,11 @@ public final class LiteLoader implements FilenameFilter
 				{
 					this.addTickListener((Tickable)mod);
 				}
+				
+				if (mod instanceof GameLoopListener)
+				{
+					this.addLoopListener((GameLoopListener)mod);
+				}
 				if (mod instanceof InitCompleteListener)
 				{
@@ -881,6 +924,11 @@ public final class LiteLoader implements FilenameFilter
 					}
 				}
+				if (mod instanceof ChatRenderListener)
+				{
+					this.addChatRenderListener((ChatRenderListener)mod);
+				}
+				
 				if (mod instanceof PreLoginListener)
 				{
 					this.addPreLoginListener((PreLoginListener)mod);
@@ -944,8 +992,12 @@ public final class LiteLoader implements FilenameFilter
 			if (!this.tickHooked)
 			{
 				this.tickHooked = true;
-				PrivateFields.minecraftProfiler.setFinal(this.minecraft, new HookProfiler(this, logger));
+				PrivateFields.minecraftProfiler.setFinal(this.minecraft, this.profilerHook);
 			}
+			
+			// Sanity hook
+			PlayerUsageSnooper snooper = this.minecraft.getPlayerUsageSnooper();
+			PrivateFields.playerStatsCollector.setFinal(snooper, this);
 		}
 		catch (Exception ex)
 		{
@@ -967,6 +1019,18 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * @param loopListener
+	 */
+	public void addLoopListener(GameLoopListener loopListener)
+	{
+		if (!this.loopListeners.contains(loopListener))
+		{
+			this.loopListeners.add(loopListener);
+			if (this.loaderStartupComplete) this.initHooks();
+		}
+	}
+	
+	/**
 	 * @param initCompleteListener
 	 */
 	public void addInitListener(InitCompleteListener initCompleteListener)
@@ -1025,6 +1089,18 @@ public final class LiteLoader implements FilenameFilter
 			if (this.loaderStartupComplete) this.initHooks();
 		}
 	}
+	
+	/**
+	 * @param chatRenderListener
+	 */
+	public void addChatRenderListener(ChatRenderListener chatRenderListener)
+	{
+		if (!this.chatRenderListeners.contains(chatRenderListener))
+		{
+			this.chatRenderListeners.add(chatRenderListener);
+			if (this.loaderStartupComplete) this.initHooks();
+		}
+	}
 	/**
 	 * @param loginListener
@@ -1261,6 +1337,17 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public void onRender()
 	{
+		if (this.paginateControls && this.minecraft.currentScreen != null && this.minecraft.currentScreen.getClass().equals(GuiControls.class))
+		{
+			try
+			{
+				// Try to get the parent screen entry from the existing screen
+				GuiScreen parentScreen = PrivateFields.guiControlsParentScreen.get((GuiControls)this.minecraft.currentScreen);
+				this.minecraft.displayGuiScreen(new GuiControlsPaginated(parentScreen, this.minecraft.gameSettings));
+			}
+			catch (Exception ex) { }
+		}
+		
 		for (RenderListener renderListener : this.renderListeners)
 			renderListener.onRender();
 	}
@@ -1304,6 +1391,44 @@ public final class LiteLoader implements FilenameFilter
 		for (RenderListener renderListener : this.renderListeners)
 			renderListener.onSetupCameraTransform();
 	}
+	
+	/**
+	 * Called immediately before the chat log is rendered
+	 */
+	public void onBeforeChatRender()
+	{
+        this.currentResolution = new ScaledResolution(this.minecraft.gameSettings, this.minecraft.displayWidth, this.minecraft.displayHeight);
+        int screenWidth = this.currentResolution.getScaledWidth();
+        int screenHeight = this.currentResolution.getScaledHeight();
+
+        GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
+		
+		for (ChatRenderListener chatRenderListener : this.chatRenderListeners)
+			chatRenderListener.onPreRenderChat(screenWidth, screenHeight, chat);
+	}
+
+	/**
+	 * Called immediately after the chat log is rendered
+	 */
+	public void onAfterChatRender()
+	{
+        int screenWidth = this.currentResolution.getScaledWidth();
+        int screenHeight = this.currentResolution.getScaledHeight();
+
+        GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
+		
+		for (ChatRenderListener chatRenderListener : this.chatRenderListeners)
+			chatRenderListener.onPostRenderChat(screenWidth, screenHeight, chat);
+	}
+
+	/**
+	 * Callback from the tick hook, called every frame when the timer is updated 
+	 */
+	public void onTimerUpdate()
+	{
+		for (GameLoopListener loopListener : this.loopListeners)
+			loopListener.onRunGameLoop(this.minecraft);
+	}
 	/**
 	 * Callback from the tick hook, ticks all tickable mods
@@ -1323,7 +1448,7 @@ public final class LiteLoader implements FilenameFilter
 		// Hooray, we got the timer reference
 		if (this.minecraftTimer != null)
 		{
-			partialTicks = this.minecraftTimer.elapsedPartialTicks;
+			partialTicks = this.minecraftTimer.renderPartialTicks;
 			tick = this.minecraftTimer.elapsedTicks > 0;
 		}
@@ -1389,7 +1514,7 @@ public final class LiteLoader implements FilenameFilter
 		for (LoginListener loginListener : this.loginListeners)
 			loginListener.onLogin(netHandler, loginPacket);
-		setupPluginChannels();
+		this.setupPluginChannels();
 	}
 	/**
@@ -1468,7 +1593,55 @@ public final class LiteLoader implements FilenameFilter
 			byte[] registrationData = channelList.toString().getBytes(Charset.forName("UTF8"));
-			sendPluginChannelMessage("REGISTER", registrationData);
+			this.sendPluginChannelMessage("REGISTER", registrationData);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.src.IPlayerUsage#addServerStatsToSnooper(net.minecraft.src.PlayerUsageSnooper)
+	 */
+	@Override
+	public void addServerStatsToSnooper(PlayerUsageSnooper var1)
+	{
+		this.minecraft.addServerStatsToSnooper(var1);
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.src.IPlayerUsage#addServerTypeToSnooper(net.minecraft.src.PlayerUsageSnooper)
+	 */
+	@Override
+	public void addServerTypeToSnooper(PlayerUsageSnooper var1)
+	{
+		this.sanityCheck();
+		this.minecraft.addServerTypeToSnooper(var1);
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.src.IPlayerUsage#isSnooperEnabled()
+	 */
+	@Override
+	public boolean isSnooperEnabled()
+	{
+		return this.minecraft.isSnooperEnabled();
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.src.IPlayerUsage#getLogAgent()
+	 */
+	@Override
+	public ILogAgent getLogAgent()
+	{
+		return this.minecraft.getLogAgent();
+	}
+	
+	/**
+	 * Check that the profiler hook hasn't been overridden by something else
+	 */
+	private void sanityCheck()
+	{
+		if (this.tickHooked && this.minecraft.mcProfiler != this.profilerHook)
+		{
+			PrivateFields.minecraftProfiler.setFinal(this.minecraft, this.profilerHook);
 		}
 	}
 }
 \ No newline at end of file
+package com.mumfrey.liteloader.core;
+
+/**
+ * Exception to throw when a mod corrupts the profiler stack, this avoids throwing a
+ * (somewhat cryptic) NoSuchElementException inside HookProfiler
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ProfilerStackCorruptionException extends RuntimeException
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7745831270297368169L;
+
+	public ProfilerStackCorruptionException(String message)
+	{
+		super(message);
+	}
+}
+package com.mumfrey.liteloader.gui;
+
+import java.util.List;
+
+import net.minecraft.src.GameSettings;
+import net.minecraft.src.GuiButton;
+import net.minecraft.src.GuiScreen;
+import net.minecraft.src.GuiSmallButton;
+import net.minecraft.src.KeyBinding;
+import net.minecraft.src.StringTranslate;
+
+/**
+ * Extended "Controls" screen with pages
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class GuiControlsPaginated extends GuiScreen
+{
+	/**
+	 * Pagination variables
+	 */
+	protected int controlsPerPage, startIndex, endIndex;
+
+	/**
+	 * Parent screen which will be displayed when this screen is closed
+	 */
+	protected GuiScreen parentScreen;
+    
+    /**
+     * Game settings
+     */
+	protected GameSettings gameSettings;
+    
+    /**
+     * Additional buttons
+     */
+	protected GuiButton btnNext, btnPrevious;
+
+    /**
+     * Title to display
+     */
+    protected String screenTitle = "Controls";
+    
+    /**
+     * ID of the button currently being edited
+     */
+    protected int activeButtonId = -1;
+    
+    public GuiControlsPaginated(GuiScreen parentScreen, GameSettings gameSettings)
+    {
+        this.parentScreen = parentScreen;
+        this.gameSettings = gameSettings;
+        
+        // Pagination defaults
+        this.controlsPerPage = 14; 
+        this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage); 
+    }
+    
+    @SuppressWarnings("unchecked")
+	protected List<GuiButton> getLegacyControlList()
+    {
+    	return this.buttonList;
+    }
+    
+    protected final int getHeight()
+    {
+    	return this.height;
+    }
+    
+    protected final int getWidth()
+    {
+    	return this.width;
+    }
+
+	public GuiScreen getParentScreen()
+	{
+		return this.parentScreen;
+	}
+
+	/**
+	 * Initialise this GUI, called when the GUI is created  
+	 */
+	@Override
+	public void initGui()
+	{
+		StringTranslate stringtranslate = StringTranslate.getInstance();
+		this.getLegacyControlList().clear();
+        
+		int oldControlsPerPage = this.controlsPerPage;
+		this.controlsPerPage = ((this.getHeight() - 70) / 24) * 2;
+        this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage);
+        if (oldControlsPerPage != this.controlsPerPage) this.startIndex = 0;
+        
+        for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
+        {
+            boolean buttonVisible = controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage;
+			int left = buttonVisible ? this.getWidth() / 2 - 155 : this.getWidth() + 10000;
+            int top = this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1);
+			this.getLegacyControlList().add(new GuiSmallButton(controlId, left + ((controlId - this.startIndex) % 2) * 160, top, 70, 20, this.gameSettings.getOptionDisplayString(controlId)));
+        }
+        
+        int buttonY = this.getHeight() / 6 + (this.controlsPerPage >> 1) * 24;
+        
+        // Only bother paginating if there are too many controls to display
+		if (this.gameSettings.keyBindings.length > this.controlsPerPage)
+        {
+	        this.getLegacyControlList().add(this.btnNext = new GuiButton(201, this.getWidth() / 2 - 51, buttonY, 50, 20, ">>"));
+	        this.getLegacyControlList().add(this.btnPrevious = new GuiButton(202, this.getWidth() / 2 - 103, buttonY, 50, 20, "<<"));
+	        this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 + 1, buttonY, 100, 20, stringtranslate.translateKey("gui.done")));
+
+	        this.btnNext.enabled = this.startIndex < this.endIndex;
+	        this.btnPrevious.enabled = this.startIndex > 0;
+        }
+        else
+        {
+        	this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 - 100, buttonY, stringtranslate.translateKey("gui.done")));
+        }
+        
+        this.screenTitle = stringtranslate.translateKey("controls.title");
+	}
+
+	/**
+	 * @param controlId
+	 * @return
+	 */
+	protected String getKeybindDescription(int controlId)
+	{
+		return this.gameSettings.getKeyBindingDescription(controlId);
+	}
+
+	/**
+	 * A button was clicked, deal with it
+	 * 
+	 * @param guibutton Button which was clicked
+	 */
+	@Override
+	protected void actionPerformed(GuiButton guibutton)
+	{
+		// Update the button labels with the appropriate key names
+        for(int i = 0; i < this.gameSettings.keyBindings.length; i++)
+        {
+        	this.getLegacyControlList().get(i).displayString = this.gameSettings.getOptionDisplayString(i);
+        }
+
+        if (guibutton.id == 200) // Done button
+        {
+        	this.mc.displayGuiScreen(this.parentScreen);
+        }
+        else if (guibutton.id == 201) // Next button
+        {
+        	this.startIndex += this.controlsPerPage;
+        	this.startIndex = Math.min(this.endIndex, this.startIndex);
+        	this.initGui();
+        }
+        else if (guibutton.id == 202) // Previous button
+        {
+        	this.startIndex -= this.controlsPerPage;
+        	this.startIndex = Math.max(0, this.startIndex);
+        	this.initGui();
+        }
+        else
+        {
+            this.activeButtonId = guibutton.id;
+            guibutton.displayString = String.format("> %s <", this.gameSettings.getOptionDisplayString(guibutton.id));
+        }
+	}
+
+	@Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    {
+        if (this.activeButtonId >= 0)
+        {
+            this.gameSettings.setKeyBinding(this.activeButtonId, -100 + mouseButton);
+            this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
+            this.activeButtonId = -1;
+            KeyBinding.resetKeyBindingArrayAndHash();
+        }
+        else
+        {
+            super.mouseClicked(mouseX, mouseY, mouseButton);
+        }
+    }
+
+	@Override
+    protected void keyTyped(char keyChar, int keyCode)
+    {
+        if (this.activeButtonId >= 0)
+        {
+            this.gameSettings.setKeyBinding(this.activeButtonId, keyCode);
+            this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
+            this.activeButtonId = -1;
+            KeyBinding.resetKeyBindingArrayAndHash();
+        }
+        else
+        {
+            super.keyTyped(keyChar, keyCode);
+        }
+    }
+
+	@Override
+    public void drawScreen(int mouseX, int mouseY, float partialTick)
+    {
+        this.drawDefaultBackground();
+        this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 20, 0xffffff);
+
+        // Draw key labels
+        for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
+        {
+            boolean conflict = false;
+
+            for (int id = 0; id < this.gameSettings.keyBindings.length; id++)
+            {
+                if (id != controlId && this.gameSettings.keyBindings[controlId].keyCode == this.gameSettings.keyBindings[id].keyCode)
+                {
+                    conflict = true;
+                    break;
+                }
+            }
+
+            if (this.activeButtonId == controlId)
+            {
+            	this.getLegacyControlList().get(controlId).displayString = "\247f> \247e??? \247f<";
+            }
+            else if (conflict)
+            {
+            	this.getLegacyControlList().get(controlId).displayString = "\247c" + this.gameSettings.getOptionDisplayString(controlId);
+            }
+            else
+            {
+            	this.getLegacyControlList().get(controlId).displayString = this.gameSettings.getOptionDisplayString(controlId);
+            }
+
+            int left = (controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage) ? this.getWidth() / 2 - 155 : this.getWidth() + 10000;
+            this.drawString(this.fontRenderer, this.getKeybindDescription(controlId), left + ((controlId - this.startIndex) % 2) * 160 + 70 + 6, this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1) + 7, 0xFFFFFF);
+        }
+        
+        super.drawScreen(mouseX, mouseY, partialTick);
+    }
+}
 \ No newline at end of file
@@ -15,7 +15,7 @@ import net.minecraft.src.*;
  * @param <P> Parent class type, the type of the class that owns the field
  * @param <T> Field type, the type of the field value
  * 
- * TODO Obfuscation - updated 1.5.1
+ * TODO Obfuscation - updated 1.5.2
  */
 @SuppressWarnings("rawtypes")
 public class PrivateFields<P, T>
@@ -132,6 +132,7 @@ public class PrivateFields&lt;P, T&gt;
 	 */
 	public static final class StaticFields<P, T> extends PrivateFields<P, T>
 	{
+		@SuppressWarnings("synthetic-access")
 		public StaticFields(Class<P> owner, String mcpName, String name, String fmlName) { super(owner, mcpName, name, fmlName); }
 		public T get() { return get(null); }
 		public void set(T value) { set(null, value); }
@@ -140,8 +141,10 @@ public class PrivateFields&lt;P, T&gt;
 		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a", "field_70326_a"); // TileEntity/nameToClassMap
 	}
-	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "V", "field_71428_T");  // Minecraft/timer
-	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "J", "field_71424_I");  // Minecraft/mcProfiler
-	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "q", "field_78729_o");  // RenderManager/entityRenderMap
+	public static final PrivateFields<Minecraft, Timer>                       minecraftTimer = new PrivateFields<Minecraft, Timer>                (Minecraft.class,          "timer",                "V", "field_71428_T");  // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler>                 minecraftProfiler = new PrivateFields<Minecraft, Profiler>             (Minecraft.class,          "mcProfiler",           "J", "field_71424_I");  // Minecraft/mcProfiler
+	public static final PrivateFields<RenderManager, Map>                    entityRenderMap = new PrivateFields<RenderManager, Map>              (RenderManager.class,      "entityRenderMap",      "q", "field_78729_o");  // RenderManager/entityRenderMap
+	public static final PrivateFields<GuiControls, GuiScreen>        guiControlsParentScreen = new PrivateFields<GuiControls, GuiScreen>          (GuiControls.class,        "parentScreen",         "b", "field_73909_b");  // GuiControls/parentScreen
+	public static final PrivateFields<PlayerUsageSnooper, IPlayerUsage> playerStatsCollector = new PrivateFields<PlayerUsageSnooper, IPlayerUsage>(PlayerUsageSnooper.class, "playerStatsCollector", "d", "field_76478_d");  // PlayerUsageSnooper/playerStatsCollector
 }
@@ -2,5 +2,6 @@ search.mods=true
 search.jar=true
 search.classpath=true
 log=stderr
+controls.pages=true
 brand=The Voxel Modpack