Implemented RichardG's Paged Achivement list GUI modifications.

forge/forge_common/net/minecraft/src/forge/AchievementPage.java

@@ -0,0 +1,34 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import net.minecraft.src.Achievement;
+
+public class AchievementPage
+{
+    private String name;
+    private LinkedList<Achievement> achievements;
+
+    public AchievementPage(String name, Achievement... achievements)
+    {
+        this.name = name;
+        this.achievements = new LinkedList<Achievement>(Arrays.asList(achievements));
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public List<Achievement> getAchievements()
+    {
+        return achievements;
+    }
+}

forge/forge_common/net/minecraft/src/forge/MinecraftForge.java

@@ -5,6 +5,7 @@
 
 package net.minecraft.src.forge;
 
+import net.minecraft.src.Achievement;
 import net.minecraft.src.BaseMod;
 import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
@@ -749,6 +750,73 @@ public class MinecraftForge
         return null;
     }
 
+    //Achievement Pages ----------------------------------------
+    private static LinkedList<AchievementPage> achievementPages = new LinkedList<AchievementPage>();
+    
+    /**
+     * Registers an achievement page.
+     * @param page The page.
+     */
+    public static void registerAchievementPage(AchievementPage page)
+    {
+        if (getAchievementPage(page.getName()) != null)
+        {
+            throw new RuntimeException("Duplicate achievement page name \"" + page.getName() + "\"!");
+        }
+        achievementPages.add(page);
+    }
+    
+    /**
+     * Will return an achievement page by its index on the list.
+     * @param index The page's index.
+     * @return the achievement page corresponding to the index or null if invalid index
+     */
+    public static AchievementPage getAchievementPage(int index)
+    {
+        return achievementPages.get(index);
+    }
+    
+    /**
+     * Will return an achievement page by its name.
+     * @param name The page's name.
+     * @return the achievement page with the given name or null if no such page
+     */
+    public static AchievementPage getAchievementPage(String name)
+    {
+        for (AchievementPage page : achievementPages)
+        {
+            if (page.getName().equals(name))
+            {
+                return page;
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * Will return the list of achievement pages.
+     * @return the list's size
+     */
+    public static Set<AchievementPage> getAchievementPages()
+    {
+        return new HashSet<AchievementPage>(achievementPages);
+    }
+    
+    /**
+     * Will return whether an achievement is in any page or not.
+     * @param achievement The achievement.
+     */
+    public static boolean isAchievementInPages(Achievement achievement)
+    {
+        for (AchievementPage page : achievementPages)
+        {
+            if (page.getAchievements().contains(achievement)) 
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 
     //Minecart Dictionary --------------------------------------
     private static Map<MinecartKey, ItemStack> itemForMinecart = new HashMap<MinecartKey, ItemStack>();

forge/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch

@@ -0,0 +1,108 @@
+--- ../src_base/minecraft/net/minecraft/src/GuiAchievements.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/GuiAchievements.java	0000-00-00 00:00:00.000000000 -0000
+@@ -1,6 +1,11 @@
+ package net.minecraft.src;
+ 
++import java.util.LinkedList;
++import java.util.List;
+ import java.util.Random;
++
++import net.minecraft.src.forge.MinecraftForge;
++
+ import org.lwjgl.input.Mouse;
+ import org.lwjgl.opengl.GL11;
+ import org.lwjgl.opengl.GL12;
+@@ -40,6 +45,10 @@
+     /** Whether the Mouse Button is down or not */
+     private int isMouseButtonDown = 0;
+     private StatFileWriter statFileWriter;
++    
++    private int currentPage = -1;
++    private GuiSmallButton button;
++    private LinkedList<Achievement> minecraftAchievements = new LinkedList<Achievement>();
+ 
+     public GuiAchievements(StatFileWriter par1StatFileWriter)
+     {
+@@ -48,6 +57,15 @@
+         short var3 = 141;
+         this.field_27116_m = this.guiMapX = this.field_27112_q = (double)(AchievementList.openInventory.displayColumn * 24 - var2 / 2 - 12);
+         this.field_27115_n = this.guiMapY = this.field_27111_r = (double)(AchievementList.openInventory.displayRow * 24 - var3 / 2);
++
++        minecraftAchievements.clear();
++        for (Object achievement : AchievementList.achievementList)
++        {
++            if (!MinecraftForge.isAchievementInPages((Achievement)achievement))
++            {
++                minecraftAchievements.add((Achievement)achievement);
++            }
++        }
+     }
+ 
+     /**
+@@ -57,6 +75,8 @@
+     {
+         this.controlList.clear();
+         this.controlList.add(new GuiSmallButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, StatCollector.translateToLocal("gui.done")));
++        button = new GuiSmallButton(2, (width - achievementsPaneWidth) / 2 + 24, height / 2 + 74, 125, 20, getAchievementPageTitle(currentPage));
++        this.controlList.add(button);
+     }
+ 
+     /**
+@@ -69,6 +89,16 @@
+             this.mc.displayGuiScreen((GuiScreen)null);
+             this.mc.setIngameFocus();
+         }
++        
++        if (par1GuiButton.id == 2) 
++        {
++            currentPage++;
++            if (currentPage >= MinecraftForge.getAchievementPages().size())
++            {
++                currentPage = -1;
++            }
++            button.displayString = getAchievementPageTitle(currentPage);
++        }
+ 
+         super.actionPerformed(par1GuiButton);
+     }
+@@ -289,11 +319,12 @@
+         int var27;
+         int var30;
+ 
+-        for (var22 = 0; var22 < AchievementList.achievementList.size(); ++var22)
++        List<Achievement> achievementList = (currentPage == -1 ? minecraftAchievements : MinecraftForge.getAchievementPage(currentPage).getAchievements());
++        for (var22 = 0; var22 < achievementList.size(); ++var22)
+         {
+-            Achievement var33 = (Achievement)AchievementList.achievementList.get(var22);
++            Achievement var33 = achievementList.get(var22);
+ 
+-            if (var33.parentAchievement != null)
++            if (var33.parentAchievement != null && achievementList.contains(var33.parentAchievement))
+             {
+                 var24 = var33.displayColumn * 24 - var4 + 11 + var10;
+                 var25 = var33.displayRow * 24 - var5 + 11 + var11;
+@@ -327,9 +358,9 @@
+         int var42;
+         int var41;
+ 
+-        for (var24 = 0; var24 < AchievementList.achievementList.size(); ++var24)
++        for (var24 = 0; var24 < achievementList.size(); ++var24)
+         {
+-            Achievement var35 = (Achievement)AchievementList.achievementList.get(var24);
++            Achievement var35 = achievementList.get(var24);
+             var26 = var35.displayColumn * 24 - var4;
+             var27 = var35.displayRow * 24 - var5;
+ 
+@@ -453,4 +484,12 @@
+     {
+         return true;
+     }
++    
++    /**
++     * FORGE: Gets the name for an achievement page by its index
++     */
++    public static String getAchievementPageTitle(int index)
++    {
++        return index == -1 ? "Minecraft" : MinecraftForge.getAchievementPage(index).getName();
++    }
+ }