$ Cleaned up the entire project.

> Much neat, very nices.

3 files changed, 60 insertions, 64 deletions

diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
index 89ac13b697..c59d26a1fa 100644
--- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -4,38 +4,35 @@ import java.util.*;
 
 import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
-public class Gui_ID_Registry
-{
-	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap();
-	private static final Map<Integer, MU_GuiId> idMap = new HashMap();
-	private static int nextId = 0;
-
-	static
-	{
-		//registerGuiHandlers(Gui_Types.Tile, Arrays.asList(new Class[] {TileAlveary.class}));
-		//registerGuiHandlers(MU_GuiType.Item, Arrays.asList(new Class[] { ItemBackpack.class, ItemBackpackNaturalist.class, ItemBeealyzer.class, ItemCatalogue.class, ItemFlutterlyzer.class, ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class, ItemLetter.class, ItemSolderingIron.class, ItemTreealyzer.class }));
-		//registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] { EntityMinecartApiary.class, EntityMinecartBeehouse.class }));
+public class Gui_ID_Registry {
+	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>	classMap	= new HashMap();
+	private static final Map<Integer, MU_GuiId>									idMap		= new HashMap();
+	private static int															nextId		= 0;
+
+	static {
+		// registerGuiHandlers(Gui_Types.Tile, Arrays.asList(new Class[]
+		// {TileAlveary.class}));
+		// registerGuiHandlers(MU_GuiType.Item, Arrays.asList(new Class[] {
+		// ItemBackpack.class, ItemBackpackNaturalist.class,
+		// ItemBeealyzer.class, ItemCatalogue.class, ItemFlutterlyzer.class,
+		// ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class,
+		// ItemLetter.class, ItemSolderingIron.class, ItemTreealyzer.class }));
+		// registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] {
+		// EntityMinecartApiary.class, EntityMinecartBeehouse.class }));
 	}
 
-	private static void registerGuiHandlers(Gui_Types MU_GuiType, List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses)
-	{
-		for (Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses)
-		{
-			MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass);
-			classMap.put(tileGuiHandlerClass, guiId);
-			idMap.put(Integer.valueOf(guiId.getId()), guiId);
-		}
+	public static MU_GuiId getGuiId(final int id) {
+		return Gui_ID_Registry.idMap.get(Integer.valueOf(id));
 	}
 
-	public static MU_GuiId getGuiIdForGuiHandler(IGuiManagerMiscUtils guiHandler)
-	{
-		Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass();
-		MU_GuiId guiId = (MU_GuiId)classMap.get(guiHandlerClass);
+	public static MU_GuiId getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) {
+		final Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass();
+		MU_GuiId guiId = Gui_ID_Registry.classMap.get(guiHandlerClass);
 		if (guiId == null) {
-			for (Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap.entrySet()) {
-				if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass))
-				{
-					guiId = (MU_GuiId)classGuiIdEntry.getValue();
+			for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : Gui_ID_Registry.classMap
+					.entrySet()) {
+				if (((Class) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) {
+					guiId = classGuiIdEntry.getValue();
 					break;
 				}
 			}
@@ -46,9 +43,13 @@ public class Gui_ID_Registry
 		return guiId;
 	}
 
-	public static MU_GuiId getGuiId(int id)
-	{
-		return (MU_GuiId)idMap.get(Integer.valueOf(id));
+	private static void registerGuiHandlers(final Gui_Types MU_GuiType,
+			final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
+		for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) {
+			final MU_GuiId guiId = new MU_GuiId(Gui_ID_Registry.nextId++, MU_GuiType, tileGuiHandlerClass);
+			Gui_ID_Registry.classMap.put(tileGuiHandlerClass, guiId);
+			Gui_ID_Registry.idMap.put(Integer.valueOf(guiId.getId()), guiId);
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
index 428cae93d5..5bf5bc3018 100644
--- a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.gui.beta;
 
-public enum Gui_Types
-  {
-    Item,  Tile,  Entity;
-    
-    private Gui_Types() {}
-  }
\ No newline at end of file
+public enum Gui_Types {
+	Item, Tile, Entity;
+
+	private Gui_Types() {
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
index 7d17870743..0e1f47d456 100644
--- a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
@@ -1,32 +1,27 @@
 package gtPlusPlus.core.gui.beta;
+
 import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
-public class MU_GuiId
-  {
-    private final int id;
-    private final Gui_Types MU_GuiType;
-    private final Class<? extends IGuiManagerMiscUtils> guiHandlerClass;
-    
-    MU_GuiId(int id, Gui_Types MU_GuiType, Class<? extends IGuiManagerMiscUtils> guiHandlerClass)
-    {
-      this.id = id;
-      this.MU_GuiType = MU_GuiType;
-      this.guiHandlerClass = guiHandlerClass;
-    }
-    
-    public Gui_Types getGuiType()
-    {
-      return this.MU_GuiType;
-    }
-    
-    public Class<? extends IGuiManagerMiscUtils> getGuiHandlerClass()
-    {
-      return this.guiHandlerClass;
-    }
-    
-    public int getId()
-    {
-      return this.id;
-    }
-  }
+public class MU_GuiId {
+	private final int									id;
+	private final Gui_Types								MU_GuiType;
+	private final Class<? extends IGuiManagerMiscUtils>	guiHandlerClass;
+
+	MU_GuiId(final int id, final Gui_Types MU_GuiType, final Class<? extends IGuiManagerMiscUtils> guiHandlerClass) {
+		this.id = id;
+		this.MU_GuiType = MU_GuiType;
+		this.guiHandlerClass = guiHandlerClass;
+	}
+
+	public Class<? extends IGuiManagerMiscUtils> getGuiHandlerClass() {
+		return this.guiHandlerClass;
+	}
+
+	public Gui_Types getGuiType() {
+		return this.MU_GuiType;
+	}
 
+	public int getId() {
+		return this.id;
+	}
+}