diff --git a/fml/src/fml/stubs/mcp/BaseMod.java b/fml/src/fml/stubs/mcp/BaseMod.java
index d839cb115..84bfb6ce7 100644
--- a/fml/src/fml/stubs/mcp/BaseMod.java
+++ b/fml/src/fml/stubs/mcp/BaseMod.java
@@ -18,26 +18,47 @@ import net.minecraft.src.RenderBlocks;
 import net.minecraft.src.World;
 
 public interface BaseMod {
-	int addFuel(int id, int metadata);
-	void addRenderer(Map<Class<? extends Entity>, Render> renderers);
-	boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item);
-	void generateNether(World world, Random random, int chunkX, int chunkZ);
-	void generateSurface(World world, Random random, int chunkX, int chunkZ);
-	String getName();
-	String getPriorities();
-	abstract String getVersion();
-	void keyboardEvent(KeyBinding event);
-	abstract void load();
-	void modsLoaded();
-	void onItemPickup(EntityPlayer player, ItemStack item);
-	boolean onTickInGame(float tick, Minecraft game);
-	boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
-	void receiveChatPacket(String text);
-	void receiveCustomPacket(Packet250CustomPayload packet);
-	void registerAnimation(Minecraft game);
-	void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID);
-	boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID);
-	void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix);
-	void takenFromFurnace(EntityPlayer player, ItemStack item);
-	String toString();
+  int addFuel(int id, int metadata);
+
+  void addRenderer(Map<Class<? extends Entity>, Render> renderers);
+
+  boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item);
+
+  void generateNether(World world, Random random, int chunkX, int chunkZ);
+
+  void generateSurface(World world, Random random, int chunkX, int chunkZ);
+
+  String getName();
+
+  String getPriorities();
+
+  abstract String getVersion();
+
+  void keyboardEvent(KeyBinding event);
+
+  abstract void load();
+
+  void modsLoaded();
+
+  void onItemPickup(EntityPlayer player, ItemStack item);
+
+  boolean onTickInGame(float tick, Minecraft game);
+
+  boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
+
+  void receiveChatPacket(String text);
+
+  void receiveCustomPacket(Packet250CustomPayload packet);
+
+  void registerAnimation(Minecraft game);
+
+  void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID);
+
+  boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID);
+
+  void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix);
+
+  void takenFromFurnace(EntityPlayer player, ItemStack item);
+
+  String toString();
 }
diff --git a/fml/src/fml/stubs/mcp/ModLoader.java b/fml/src/fml/stubs/mcp/ModLoader.java
index fdc4fc549..b745ac648 100644
--- a/fml/src/fml/stubs/mcp/ModLoader.java
+++ b/fml/src/fml/stubs/mcp/ModLoader.java
@@ -32,219 +32,219 @@ import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
 
 public class ModLoader {
-	static void addAchievementDesc(Achievement achievement, String name, String description) {
-	}
+  static void addAchievementDesc(Achievement achievement, String name, String description) {
+  }
 
-	static int addAllFuel(int id, int metadata) {
-		return 0;
-	}
+  static int addAllFuel(int id, int metadata) {
+    return 0;
+  }
 
-	static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers) {
-	}
+  static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers) {
+  }
 
-	static void addAnimation(TextureFX anim) {
-	}
+  static void addAnimation(TextureFX anim) {
+  }
 
-	static int addArmor(String armor) {
-		return 0;
-	}
+  static int addArmor(String armor) {
+    return 0;
+  }
 
-	static void addBiome(BiomeGenBase biome) {
-	}
+  static void addBiome(BiomeGenBase biome) {
+  }
 
-	static void addLocalization(String key, String value) {
-	}
+  static void addLocalization(String key, String value) {
+  }
 
-	static void addLocalization(String key, String lang, String value) {
-	}
+  static void addLocalization(String key, String lang, String value) {
+  }
 
-	static void addName(Object instance, String name) {
-	}
+  static void addName(Object instance, String name) {
+  }
 
-	static void addName(Object instance, String lang, String name) {
-	}
+  static void addName(Object instance, String lang, String name) {
+  }
 
-	static int addOverride(String fileToOverride, String fileToAdd) {
-		return 0;
-	}
+  static int addOverride(String fileToOverride, String fileToAdd) {
+    return 0;
+  }
 
-	static void addOverride(String path, String overlayPath, int index) {
-	}
+  static void addOverride(String path, String overlayPath, int index) {
+  }
 
-	static void addRecipe(ItemStack output, Object... params) {
-	}
+  static void addRecipe(ItemStack output, Object... params) {
+  }
 
-	static void addShapelessRecipe(ItemStack output, Object... params) {
-	}
+  static void addShapelessRecipe(ItemStack output, Object... params) {
+  }
 
-	static void addSmelting(int input, ItemStack output) {
-	}
+  static void addSmelting(int input, ItemStack output) {
+  }
 
-	static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList) {
-	}
+  static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList) {
+  }
 
-	static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList) {
-	}
+  static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList) {
+  }
 
-	static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item) {
-		return false;
-	}
+  static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item) {
+    return false;
+  }
 
-	static void genericContainerRemoval(World world, int x, int y, int z) {
-	}
+  static void genericContainerRemoval(World world, int x, int y, int z) {
+  }
 
-	static List<BaseMod> getLoadedMods() {
-		return null;
-	}
+  static List<BaseMod> getLoadedMods() {
+    return null;
+  }
 
-	static Logger getLogger() {
-		return null;
-	}
+  static Logger getLogger() {
+    return null;
+  }
 
-	static Minecraft getMinecraftInstance() {
-		return null;
-	}
+  static Minecraft getMinecraftInstance() {
+    return null;
+  }
 
-	static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex) {
-		return null;
-	}
+  static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex) {
+    return null;
+  }
 
-	static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field) {
-		return null;
-	}
+  static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field) {
+    return null;
+  }
 
-	static int getUniqueBlockModelID(BaseMod mod, boolean full3DItem) {
-		return 0;
-	}
+  static int getUniqueBlockModelID(BaseMod mod, boolean full3DItem) {
+    return 0;
+  }
 
-	static int getUniqueEntityId() {
-		return 0;
-	}
+  static int getUniqueEntityId() {
+    return 0;
+  }
 
-	static int getUniqueSpriteIndex(String path) {
-		return 0;
-	}
+  static int getUniqueSpriteIndex(String path) {
+    return 0;
+  }
 
-	static boolean isGUIOpen(Class<? extends GuiScreen> gui) {
-		return false;
-	}
+  static boolean isGUIOpen(Class<? extends GuiScreen> gui) {
+    return false;
+  }
 
-	static boolean isModLoaded(String modname) {
-		return false;
-	}
+  static boolean isModLoaded(String modname) {
+    return false;
+  }
 
-	static void loadConfig() {
-	}
+  static void loadConfig() {
+  }
 
-	static BufferedImage loadImage(RenderEngine texCache, String path) {
-		return null;
-	}
+  static BufferedImage loadImage(RenderEngine texCache, String path) {
+    return null;
+  }
 
-	static void onItemPickup(EntityPlayer player, ItemStack item) {
-	}
+  static void onItemPickup(EntityPlayer player, ItemStack item) {
+  }
 
-	static void onTick(float tick, net.minecraft.client.Minecraft game) {
-	}
+  static void onTick(float tick, net.minecraft.client.Minecraft game) {
+  }
 
-	static void openGUI(EntityPlayer player, GuiScreen gui) {
-	}
+  static void openGUI(EntityPlayer player, GuiScreen gui) {
+  }
 
-	static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world) {
-	}
+  static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world) {
+  }
 
-	static void receivePacket(Packet250CustomPayload packet) {
-	}
+  static void receivePacket(Packet250CustomPayload packet) {
+  }
 
-	static KeyBinding[] registerAllKeys(KeyBinding[] keys) {
-		return keys;
-	}
+  static KeyBinding[] registerAllKeys(KeyBinding[] keys) {
+    return keys;
+  }
 
-	static void registerAllTextureOverrides(RenderEngine cache) {
-	}
+  static void registerAllTextureOverrides(RenderEngine cache) {
+  }
 
-	static void registerBlock(Block block) {
-	}
+  static void registerBlock(Block block) {
+  }
 
-	static void registerBlock(Block block, Class<? extends ItemBlock> itemclass) {
-	}
+  static void registerBlock(Block block, Class<? extends ItemBlock> itemclass) {
+  }
 
-	static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id) {
-	}
+  static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id) {
+  }
 
-	static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground) {
-	}
+  static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground) {
+  }
 
-	static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat) {
-	}
+  static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat) {
+  }
 
-	static void registerPacketChannel(BaseMod mod, String channel) {
-	}
+  static void registerPacketChannel(BaseMod mod, String channel) {
+  }
 
-	static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id) {
-	}
+  static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id) {
+  }
 
-	static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer) {
-	}
+  static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer) {
+  }
 
-	static void removeBiome(BiomeGenBase biome) {
-	}
+  static void removeBiome(BiomeGenBase biome) {
+  }
 
-	static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList) {
-	}
+  static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList) {
+  }
 
-	static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static void removeSpawn(String entityName, EnumCreatureType spawnList) {
-	}
+  static void removeSpawn(String entityName, EnumCreatureType spawnList) {
+  }
 
-	static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static boolean renderBlockIsItemFull3D(int modelID) {
-		return false;
-	}
+  static boolean renderBlockIsItemFull3D(int modelID) {
+    return false;
+  }
 
-	static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID) {
-	}
+  static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID) {
+  }
 
-	static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID) {
-		return false;
-	}
+  static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID) {
+    return false;
+  }
 
-	static void saveConfig() {
-	}
+  static void saveConfig() {
+  }
 
-	static void serverChat(String text) {
-	}
+  static void serverChat(String text) {
+  }
 
-	static void serverLogin(NetClientHandler handler, Packet1Login loginPacket) {
-	}
+  static void serverLogin(NetClientHandler handler, Packet1Login loginPacket) {
+  }
 
-	static void setInGameHook(BaseMod mod, boolean enable, boolean useClock) {
-	}
+  static void setInGameHook(BaseMod mod, boolean enable, boolean useClock) {
+  }
 
-	static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock) {
-	}
+  static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock) {
+  }
 
-	static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, int fieldindex, E value) {
-	}
+  static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, int fieldindex, E value) {
+  }
 
-	static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, String field, E value) {
-	}
+  static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, String field, E value) {
+  }
 
-	static void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix) {
-	}
+  static void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix) {
+  }
 
-	static void takenFromFurnace(EntityPlayer player, ItemStack item) {
-	}
+  static void takenFromFurnace(EntityPlayer player, ItemStack item) {
+  }
 
-	static void throwException(String message, Throwable e) {
-	}
+  static void throwException(String message, Throwable e) {
+  }
 }
diff --git a/fml/src/fml/stubs/mcpserver/BaseMod.java b/fml/src/fml/stubs/mcpserver/BaseMod.java
index 6153b4214..f0519c779 100644
--- a/fml/src/fml/stubs/mcpserver/BaseMod.java
+++ b/fml/src/fml/stubs/mcpserver/BaseMod.java
@@ -9,26 +9,42 @@ import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.World;
 
 public interface BaseMod {
-	int addFuel(int id, int metadata);
-//	void addRenderer(Map<Class<? extends Entity>, Render> renderers);
-	boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item);
-	void generateNether(World world, Random random, int chunkX, int chunkZ);
-	void generateSurface(World world, Random random, int chunkX, int chunkZ);
-	String getName();
-	String getPriorities();
-	abstract String getVersion();
-//	void keyboardEvent(KeyBinding event);
-	abstract void load();
-	void modsLoaded();
-	void onItemPickup(EntityPlayer player, ItemStack item);
-//	boolean onTickInGame(float tick, Minecraft game);
-//	boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
-	void receiveChatPacket(String text);
-	void receiveCustomPacket(Packet250CustomPayload packet);
-//	void registerAnimation(Minecraft game);
-//	void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID);
-//	boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID);
-	void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix);
-	void takenFromFurnace(EntityPlayer player, ItemStack item);
-	String toString();
+  int addFuel(int id, int metadata);
+
+  // void addRenderer(Map<Class<? extends Entity>, Render> renderers);
+  boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item);
+
+  void generateNether(World world, Random random, int chunkX, int chunkZ);
+
+  void generateSurface(World world, Random random, int chunkX, int chunkZ);
+
+  String getName();
+
+  String getPriorities();
+
+  abstract String getVersion();
+
+  // void keyboardEvent(KeyBinding event);
+  abstract void load();
+
+  void modsLoaded();
+
+  void onItemPickup(EntityPlayer player, ItemStack item);
+
+  // boolean onTickInGame(float tick, Minecraft game);
+  // boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
+  void receiveChatPacket(String text);
+
+  void receiveCustomPacket(Packet250CustomPayload packet);
+
+  // void registerAnimation(Minecraft game);
+  // void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int
+  // modelID);
+  // boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x,
+  // int y, int z, Block block, int modelID);
+  void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix);
+
+  void takenFromFurnace(EntityPlayer player, ItemStack item);
+
+  String toString();
 }
diff --git a/fml/src/fml/stubs/mcpserver/ModLoader.java b/fml/src/fml/stubs/mcpserver/ModLoader.java
index 3ed0a1129..1013560f4 100644
--- a/fml/src/fml/stubs/mcpserver/ModLoader.java
+++ b/fml/src/fml/stubs/mcpserver/ModLoader.java
@@ -19,219 +19,225 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 
 public class ModLoader {
-	static void addAchievementDesc(Achievement achievement, String name, String description) {
-	}
+  static void addAchievementDesc(Achievement achievement, String name, String description) {
+  }
 
-	static int addAllFuel(int id, int metadata) {
-		return 0;
-	}
+  static int addAllFuel(int id, int metadata) {
+    return 0;
+  }
 
-//	static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers) {
-//	}
+  // static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers)
+  // {
+  // }
 
-//	static void addAnimation(TextureFX anim) {
-//	}
+  // static void addAnimation(TextureFX anim) {
+  // }
 
-	static int addArmor(String armor) {
-		return 0;
-	}
+  static int addArmor(String armor) {
+    return 0;
+  }
 
-	static void addBiome(BiomeGenBase biome) {
-	}
+  static void addBiome(BiomeGenBase biome) {
+  }
 
-	static void addLocalization(String key, String value) {
-	}
+  static void addLocalization(String key, String value) {
+  }
 
-	static void addLocalization(String key, String lang, String value) {
-	}
+  static void addLocalization(String key, String lang, String value) {
+  }
 
-	static void addName(Object instance, String name) {
-	}
+  static void addName(Object instance, String name) {
+  }
 
-	static void addName(Object instance, String lang, String name) {
-	}
+  static void addName(Object instance, String lang, String name) {
+  }
 
-	static int addOverride(String fileToOverride, String fileToAdd) {
-		return 0;
-	}
+  static int addOverride(String fileToOverride, String fileToAdd) {
+    return 0;
+  }
 
-	static void addOverride(String path, String overlayPath, int index) {
-	}
+  static void addOverride(String path, String overlayPath, int index) {
+  }
 
-	static void addRecipe(ItemStack output, Object... params) {
-	}
+  static void addRecipe(ItemStack output, Object... params) {
+  }
 
-	static void addShapelessRecipe(ItemStack output, Object... params) {
-	}
+  static void addShapelessRecipe(ItemStack output, Object... params) {
+  }
 
-	static void addSmelting(int input, ItemStack output) {
-	}
+  static void addSmelting(int input, ItemStack output) {
+  }
 
-	static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList) {
-	}
+  static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList) {
+  }
 
-	static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList) {
-	}
+  static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList) {
+  }
 
-	static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item) {
-		return false;
-	}
+  static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item) {
+    return false;
+  }
 
-	static void genericContainerRemoval(World world, int x, int y, int z) {
-	}
+  static void genericContainerRemoval(World world, int x, int y, int z) {
+  }
 
-	static List<BaseMod> getLoadedMods() {
-		return null;
-	}
+  static List<BaseMod> getLoadedMods() {
+    return null;
+  }
 
-	static Logger getLogger() {
-		return null;
-	}
+  static Logger getLogger() {
+    return null;
+  }
 
-//	static Minecraft getMinecraftInstance() {
-//		return null;
-//	}
+  // static Minecraft getMinecraftInstance() {
+  // return null;
+  // }
 
-	static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex) {
-		return null;
-	}
+  static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex) {
+    return null;
+  }
 
-	static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field) {
-		return null;
-	}
+  static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field) {
+    return null;
+  }
 
-	static int getUniqueBlockModelID(BaseMod mod, boolean full3DItem) {
-		return 0;
-	}
+  static int getUniqueBlockModelID(BaseMod mod, boolean full3DItem) {
+    return 0;
+  }
 
-	static int getUniqueEntityId() {
-		return 0;
-	}
+  static int getUniqueEntityId() {
+    return 0;
+  }
 
-	static int getUniqueSpriteIndex(String path) {
-		return 0;
-	}
+  static int getUniqueSpriteIndex(String path) {
+    return 0;
+  }
 
-//	static boolean isGUIOpen(Class<? extends GuiScreen> gui) {
-//		return false;
-//	}
+  // static boolean isGUIOpen(Class<? extends GuiScreen> gui) {
+  // return false;
+  // }
 
-	static boolean isModLoaded(String modname) {
-		return false;
-	}
+  static boolean isModLoaded(String modname) {
+    return false;
+  }
 
-	static void loadConfig() {
-	}
+  static void loadConfig() {
+  }
 
-//	static BufferedImage loadImage(RenderEngine texCache, String path) {
-//		return null;
-//	}
+  // static BufferedImage loadImage(RenderEngine texCache, String path) {
+  // return null;
+  // }
 
-	static void onItemPickup(EntityPlayer player, ItemStack item) {
-	}
+  static void onItemPickup(EntityPlayer player, ItemStack item) {
+  }
 
-//	static void onTick(float tick, net.minecraft.client.Minecraft game) {
-//	}
+  // static void onTick(float tick, net.minecraft.client.Minecraft game) {
+  // }
 
-//	static void openGUI(EntityPlayer player, GuiScreen gui) {
-//	}
+  // static void openGUI(EntityPlayer player, GuiScreen gui) {
+  // }
 
-	static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world) {
-	}
+  static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world) {
+  }
 
-	static void receivePacket(Packet250CustomPayload packet) {
-	}
+  static void receivePacket(Packet250CustomPayload packet) {
+  }
 
-//	static KeyBinding[] registerAllKeys(KeyBinding[] keys) {
-//		return keys;
-//	}
+  // static KeyBinding[] registerAllKeys(KeyBinding[] keys) {
+  // return keys;
+  // }
 
-//	static void registerAllTextureOverrides(RenderEngine cache) {
-//	}
+  // static void registerAllTextureOverrides(RenderEngine cache) {
+  // }
 
-	static void registerBlock(Block block) {
-	}
+  static void registerBlock(Block block) {
+  }
 
-	static void registerBlock(Block block, Class<? extends ItemBlock> itemclass) {
-	}
+  static void registerBlock(Block block, Class<? extends ItemBlock> itemclass) {
+  }
 
-	static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id) {
-	}
+  static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id) {
+  }
 
-	static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground) {
-	}
+  static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground) {
+  }
 
-//	static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat) {
-//	}
+  // static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean
+  // allowRepeat) {
+  // }
 
-	static void registerPacketChannel(BaseMod mod, String channel) {
-	}
+  static void registerPacketChannel(BaseMod mod, String channel) {
+  }
 
-	static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id) {
-	}
+  static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id) {
+  }
 
-//	static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer) {
-//	}
+  // static void registerTileEntity(Class<? extends TileEntity> tileEntityClass,
+  // String id, TileEntitySpecialRenderer renderer) {
+  // }
 
-	static void removeBiome(BiomeGenBase biome) {
-	}
+  static void removeBiome(BiomeGenBase biome) {
+  }
 
-	static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList) {
-	}
+  static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList) {
+  }
 
-	static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static void removeSpawn(String entityName, EnumCreatureType spawnList) {
-	}
+  static void removeSpawn(String entityName, EnumCreatureType spawnList) {
+  }
 
-	static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) {
-	}
+  static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes) {
+  }
 
-	static boolean renderBlockIsItemFull3D(int modelID) {
-		return false;
-	}
+  static boolean renderBlockIsItemFull3D(int modelID) {
+    return false;
+  }
 
-//	static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID) {
-//	}
+  // static void renderInvBlock(RenderBlocks renderer, Block block, int
+  // metadata, int modelID) {
+  // }
 
-//	static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID) {
-//		return false;
-//	}
+  // static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world,
+  // int x, int y, int z, Block block, int modelID) {
+  // return false;
+  // }
 
-	static void saveConfig() {
-	}
+  static void saveConfig() {
+  }
 
-	static void serverChat(String text) {
-	}
+  static void serverChat(String text) {
+  }
 
-//	static void serverLogin(NetClientHandler handler, Packet1Login loginPacket) {
-//	}
+  // static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
+  // {
+  // }
 
-	static void setInGameHook(BaseMod mod, boolean enable, boolean useClock) {
-	}
+  static void setInGameHook(BaseMod mod, boolean enable, boolean useClock) {
+  }
 
-	static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock) {
-	}
+  static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock) {
+  }
 
-	static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, int fieldindex, E value) {
-	}
+  static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, int fieldindex, E value) {
+  }
 
-	static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, String field, E value) {
-	}
+  static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, String field, E value) {
+  }
 
-	static void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix) {
-	}
+  static void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix) {
+  }
 
-	static void takenFromFurnace(EntityPlayer player, ItemStack item) {
-	}
+  static void takenFromFurnace(EntityPlayer player, ItemStack item) {
+  }
 
-	static void throwException(String message, Throwable e) {
-	}
+  static void throwException(String message, Throwable e) {
+  }
 }
diff --git a/fml/src/fml/stubs/obf/BaseMod.java b/fml/src/fml/stubs/obf/BaseMod.java
index f9a7c1ee4..4272306b8 100644
--- a/fml/src/fml/stubs/obf/BaseMod.java
+++ b/fml/src/fml/stubs/obf/BaseMod.java
@@ -1,26 +1,47 @@
 package fml.stubs.obf;
 
 public interface BaseMod {
-	 int	addFuel(int id, int metadata);
-	 void	addRenderer(java.util.Map<java.lang.Class<? extends nn>,um> renderers); 
-	 boolean	dispenseEntity(xd world, double x, double y, double z, int xVel, int zVel, aan item); 
-	 void	generateNether(xd world, java.util.Random random, int chunkX, int chunkZ); 
-	 void	generateSurface(xd world, java.util.Random random, int chunkX, int chunkZ); 
-	 java.lang.String	getName(); 
-	 java.lang.String	getPriorities(); 
-	 abstract  java.lang.String	getVersion(); 
-	 void	keyboardEvent(afu event); 
-	 abstract  void	load(); 
-	 void	modsLoaded(); 
-	 void	onItemPickup(yw player, aan item) 
-	 boolean	onTickInGame(float tick, net.minecraft.client.Minecraft game); 
-	 boolean	onTickInGUI(float tick, net.minecraft.client.Minecraft game, vp gui); 
-	 void	receiveChatPacket(java.lang.String text); 
-	 void	receiveCustomPacket(ee packet); 
-	 void	registerAnimation(net.minecraft.client.Minecraft game); 
-	 void	renderInvBlock(vl renderer, pb block, int metadata, int modelID); 
-	 boolean	renderWorldBlock(vl renderer, ali world, int x, int y, int z, pb block, int modelID); 
-	 void	takenFromCrafting(yw player, aan item, io matrix); 
-	 void	takenFromFurnace(yw player, aan item);
-	 java.lang.String	toString();    
+  int addFuel(int id, int metadata);
+
+  void addRenderer(java.util.Map<java.lang.Class<? extends nn>, um> renderers);
+
+  boolean dispenseEntity(xd world, double x, double y, double z, int xVel, int zVel, aan item);
+
+  void generateNether(xd world, java.util.Random random, int chunkX, int chunkZ);
+
+  void generateSurface(xd world, java.util.Random random, int chunkX, int chunkZ);
+
+  java.lang.String getName();
+
+  java.lang.String getPriorities();
+
+  abstract java.lang.String getVersion();
+
+  void keyboardEvent(afu event);
+
+  abstract void load();
+
+  void modsLoaded();
+
+  void onItemPickup(yw player, aan item);
+
+  boolean onTickInGame(float tick, net.minecraft.client.Minecraft game);
+
+  boolean onTickInGUI(float tick, net.minecraft.client.Minecraft game, vp gui);
+
+  void receiveChatPacket(java.lang.String text);
+
+  void receiveCustomPacket(ee packet);
+
+  void registerAnimation(net.minecraft.client.Minecraft game);
+
+  void renderInvBlock(vl renderer, pb block, int metadata, int modelID);
+
+  boolean renderWorldBlock(vl renderer, ali world, int x, int y, int z, pb block, int modelID);
+
+  void takenFromCrafting(yw player, aan item, io matrix);
+
+  void takenFromFurnace(yw player, aan item);
+
+  java.lang.String toString();
 }
diff --git a/fml/src/fml/stubs/obf/ModLoader.java b/fml/src/fml/stubs/obf/ModLoader.java
index dc5aba555..dd8e73634 100644
--- a/fml/src/fml/stubs/obf/ModLoader.java
+++ b/fml/src/fml/stubs/obf/ModLoader.java
@@ -1,70 +1,135 @@
 package fml.stubs.obf;
 
 public interface ModLoader {
-	static void	addAchievementDesc(aeb achievement, java.lang.String name, java.lang.String description); 
-	static int	addAllFuel(int id, int metadata); 
-	static void	addAllRenderers(java.util.Map<java.lang.Class<? extends nn>,um> renderers); 
-	static void	addAnimation(tt anim); 
-	static int	addArmor(java.lang.String armor); 
-	static void	addBiome(abn biome); 
-	static void	addLocalization(java.lang.String key, java.lang.String value); 
-	static void	addLocalization(java.lang.String key, java.lang.String lang, java.lang.String value); 
-	static void	addName(java.lang.Object instance, java.lang.String name); 
-	static void	addName(java.lang.Object instance, java.lang.String lang, java.lang.String name); 
-	static int	addOverride(java.lang.String fileToOverride, java.lang.String fileToAdd); 
-	static void	addOverride(java.lang.String path, java.lang.String overlayPath, int index); 
-	static void	addRecipe(aan output, java.lang.Object... params); 
-	static void	addShapelessRecipe(aan output, java.lang.Object... params); 
-	static void	addSmelting(int input, aan output); 
-	static void	addSpawn(java.lang.Class<? extends acq> entityClass, int weightedProb, int min, int max, acf spawnList); 
-	static void	addSpawn(java.lang.Class<? extends acq> entityClass, int weightedProb, int min, int max, acf spawnList, abn... biomes); 
-	static void	addSpawn(java.lang.String entityName, int weightedProb, int min, int max, acf spawnList); 
-	static void	addSpawn(java.lang.String entityName, int weightedProb, int min, int max, acf spawnList, abn... biomes); 
-	static boolean	dispenseEntity(xd world, double x, double y, double z, int xVel, int zVel, aan item); 
-	static void	genericContainerRemoval(xd world, int x, int y, int z); 
-	static java.util.List<BaseMod>	getLoadedMods(); 
-	static java.util.logging.Logger	getLogger(); 
-	static net.minecraft.client.Minecraft	getMinecraftInstance(); 
-	static<T,E> T getPrivateValue(java.lang.Class<? super E> instanceclass, E instance, int fieldindex); 
-	static<T,E> T getPrivateValue(java.lang.Class<? super E> instanceclass, E instance, java.lang.String field); 
-	static int	getUniqueBlockModelID(BaseMod mod, boolean full3DItem); 
-	static int	getUniqueEntityId(); 
-	static int	getUniqueSpriteIndex(java.lang.String path); 
-	static boolean	isGUIOpen(java.lang.Class<? extends vp> gui); 
-	static boolean	isModLoaded(java.lang.String modname); 
-	static void	loadConfig(); 
-	static java.awt.image.BufferedImage	loadImage(aaw texCache, java.lang.String path); 
-	static void	onItemPickup(yw player, aan item); 
-	static void	onTick(float tick, net.minecraft.client.Minecraft game); 
-	static void	openGUI(yw player, vp gui); 
-	static void	populateChunk(ca generator, int chunkX, int chunkZ, xd world); 
-	static void	receivePacket(ee packet); 
-	static afu[]	registerAllKeys(afu[] keys);
-	static void	registerAllTextureOverrides(aaw cache); 
-	static void	registerBlock(pb block);
-	static void	registerBlock(pb block, java.lang.Class<? extends vd> itemclass); 
-	static void	registerEntityID(java.lang.Class<? extends nn> entityClass, java.lang.String entityName, int id); 
-	static void	registerEntityID(java.lang.Class<? extends nn> entityClass, java.lang.String entityName, int id, int background, int foreground); 
-	static void	registerKey(BaseMod mod, afu keyHandler, boolean allowRepeat); 
-	static void	registerPacketChannel(BaseMod mod, java.lang.String channel); 
-	static void	registerTileEntity(java.lang.Class<? extends kw> tileEntityClass, java.lang.String id); 
-	static void	registerTileEntity(java.lang.Class<? extends kw> tileEntityClass, java.lang.String id, aar renderer); 
-	static void	removeBiome(abn biome); 
-	static void	removeSpawn(java.lang.Class<? extends acq> entityClass, acf spawnList); 
-	static void	removeSpawn(java.lang.Class<? extends acq> entityClass, acf spawnList, abn... biomes); 
-	static void	removeSpawn(java.lang.String entityName, acf spawnList); 
-	static void	removeSpawn(java.lang.String entityName, acf spawnList, abn... biomes); 
-	static boolean	renderBlockIsItemFull3D(int modelID); 
-	static void	renderInvBlock(vl renderer, pb block, int metadata, int modelID); 
-	static boolean	renderWorldBlock(vl renderer, ali world, int x, int y, int z, pb block, int modelID); 
-	static void	saveConfig(); 
-	static void	serverChat(java.lang.String text); 
-	static void	serverLogin(adl handler, aec loginPacket); 
-	static void	setInGameHook(BaseMod mod, boolean enable, boolean useClock); 
-	static void	setInGUIHook(BaseMod mod, boolean enable, boolean useClock); 
-	static<T,E> void setPrivateValue(java.lang.Class<? super T> instanceclass, T instance, int fieldindex, E value); 
-	static<T,E> void setPrivateValue(java.lang.Class<? super T> instanceclass, T instance, java.lang.String field, E value); 
-	static void	takenFromCrafting(yw player, aan item, io matrix);
-	static void	takenFromFurnace(yw player, aan item); 
-	static void	throwException(java.lang.String message, java.lang.Throwable e); 
+  static void addAchievementDesc(aeb achievement, java.lang.String name, java.lang.String description);
+
+  static int addAllFuel(int id, int metadata);
+
+  static void addAllRenderers(java.util.Map<java.lang.Class<? extends nn>, um> renderers);
+
+  static void addAnimation(tt anim);
+
+  static int addArmor(java.lang.String armor);
+
+  static void addBiome(abn biome);
+
+  static void addLocalization(java.lang.String key, java.lang.String value);
+
+  static void addLocalization(java.lang.String key, java.lang.String lang, java.lang.String value);
+
+  static void addName(java.lang.Object instance, java.lang.String name);
+
+  static void addName(java.lang.Object instance, java.lang.String lang, java.lang.String name);
+
+  static int addOverride(java.lang.String fileToOverride, java.lang.String fileToAdd);
+
+  static void addOverride(java.lang.String path, java.lang.String overlayPath, int index);
+
+  static void addRecipe(aan output, java.lang.Object... params);
+
+  static void addShapelessRecipe(aan output, java.lang.Object... params);
+
+  static void addSmelting(int input, aan output);
+
+  static void addSpawn(java.lang.Class<? extends acq> entityClass, int weightedProb, int min, int max, acf spawnList);
+
+  static void addSpawn(java.lang.Class<? extends acq> entityClass, int weightedProb, int min, int max, acf spawnList, abn... biomes);
+
+  static void addSpawn(java.lang.String entityName, int weightedProb, int min, int max, acf spawnList);
+
+  static void addSpawn(java.lang.String entityName, int weightedProb, int min, int max, acf spawnList, abn... biomes);
+
+  static boolean dispenseEntity(xd world, double x, double y, double z, int xVel, int zVel, aan item);
+
+  static void genericContainerRemoval(xd world, int x, int y, int z);
+
+  static java.util.List<BaseMod> getLoadedMods();
+
+  static java.util.logging.Logger getLogger();
+
+  static net.minecraft.client.Minecraft getMinecraftInstance();
+
+  static <T, E> T getPrivateValue(java.lang.Class<? super E> instanceclass, E instance, int fieldindex);
+
+  static <T, E> T getPrivateValue(java.lang.Class<? super E> instanceclass, E instance, java.lang.String field);
+
+  static int getUniqueBlockModelID(BaseMod mod, boolean full3DItem);
+
+  static int getUniqueEntityId();
+
+  static int getUniqueSpriteIndex(java.lang.String path);
+
+  static boolean isGUIOpen(java.lang.Class<? extends vp> gui);
+
+  static boolean isModLoaded(java.lang.String modname);
+
+  static void loadConfig();
+
+  static java.awt.image.BufferedImage loadImage(aaw texCache, java.lang.String path);
+
+  static void onItemPickup(yw player, aan item);
+
+  static void onTick(float tick, net.minecraft.client.Minecraft game);
+
+  static void openGUI(yw player, vp gui);
+
+  static void populateChunk(ca generator, int chunkX, int chunkZ, xd world);
+
+  static void receivePacket(ee packet);
+
+  static afu[] registerAllKeys(afu[] keys);
+
+  static void registerAllTextureOverrides(aaw cache);
+
+  static void registerBlock(pb block);
+
+  static void registerBlock(pb block, java.lang.Class<? extends vd> itemclass);
+
+  static void registerEntityID(java.lang.Class<? extends nn> entityClass, java.lang.String entityName, int id);
+
+  static void registerEntityID(java.lang.Class<? extends nn> entityClass, java.lang.String entityName, int id, int background, int foreground);
+
+  static void registerKey(BaseMod mod, afu keyHandler, boolean allowRepeat);
+
+  static void registerPacketChannel(BaseMod mod, java.lang.String channel);
+
+  static void registerTileEntity(java.lang.Class<? extends kw> tileEntityClass, java.lang.String id);
+
+  static void registerTileEntity(java.lang.Class<? extends kw> tileEntityClass, java.lang.String id, aar renderer);
+
+  static void removeBiome(abn biome);
+
+  static void removeSpawn(java.lang.Class<? extends acq> entityClass, acf spawnList);
+
+  static void removeSpawn(java.lang.Class<? extends acq> entityClass, acf spawnList, abn... biomes);
+
+  static void removeSpawn(java.lang.String entityName, acf spawnList);
+
+  static void removeSpawn(java.lang.String entityName, acf spawnList, abn... biomes);
+
+  static boolean renderBlockIsItemFull3D(int modelID);
+
+  static void renderInvBlock(vl renderer, pb block, int metadata, int modelID);
+
+  static boolean renderWorldBlock(vl renderer, ali world, int x, int y, int z, pb block, int modelID);
+
+  static void saveConfig();
+
+  static void serverChat(java.lang.String text);
+
+  static void serverLogin(adl handler, aec loginPacket);
+
+  static void setInGameHook(BaseMod mod, boolean enable, boolean useClock);
+
+  static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock);
+
+  static <T, E> void setPrivateValue(java.lang.Class<? super T> instanceclass, T instance, int fieldindex, E value);
+
+  static <T, E> void setPrivateValue(java.lang.Class<? super T> instanceclass, T instance, java.lang.String field, E value);
+
+  static void takenFromCrafting(yw player, aan item, io matrix);
+
+  static void takenFromFurnace(yw player, aan item);
+
+  static void throwException(java.lang.String message, java.lang.Throwable e);
 }