internal reshuffling to support dedicated server

Mumfrey
1 parent 10c0f192
Showing 30 changed files with 900 additions and 566 deletions
debug/com/mumfrey/liteloader/debug/Start.java
java/client/com/mumfrey/liteloader/client/GameEngineClient.java
java/client/com/mumfrey/liteloader/client/LiteLoaderCoreProviderClient.java
java/client/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
java/client/com/mumfrey/liteloader/client/ResourceObserver.java
java/client/com/mumfrey/liteloader/client/ResourcesClient.java
java/client/com/mumfrey/liteloader/client/Translator.java
java/client/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
java/client/com/mumfrey/liteloader/client/api/ObjectFactoryClient.java
java/client/com/mumfrey/liteloader/client/transformers/LiteLoaderEventInjectionTransformer.java
java/common/com/mumfrey/liteloader/resources/InternalResourcePack.java → java/client/com/mumfrey/liteloader/resources/InternalResourcePack.java
java/common/com/mumfrey/liteloader/resources/ModResourcePack.java → java/client/com/mumfrey/liteloader/resources/ModResourcePack.java
java/common/com/mumfrey/liteloader/resources/ModResourcePackDir.java → java/client/com/mumfrey/liteloader/resources/ModResourcePackDir.java
java/client/com/mumfrey/liteloader/util/InputManager.java
java/common/com/mumfrey/liteloader/api/EnumerationObserver.java
java/common/com/mumfrey/liteloader/api/ModLoadObserver.java
java/common/com/mumfrey/liteloader/api/TranslationProvider.java
java/common/com/mumfrey/liteloader/common/GameEngine.java
java/common/com/mumfrey/liteloader/common/Resources.java
java/common/com/mumfrey/liteloader/common/transformers/LiteLoaderEventTransformer.java
@@ -14,6 +14,7 @@ import net.minecraft.launchwrapper.Launch;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
+import com.mumfrey.liteloader.launch.LiteLoaderTweakerServer;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -56,12 +57,32 @@ public abstract class Start
 		Map<String, Set<String>> qualifiedArgs = new HashMap<String, Set<String>>();
 		Start.parseArgs(args, unqualifiedArgs, qualifiedArgs);
-		Start.addRequiredArgs(args, unqualifiedArgs, qualifiedArgs);
+		
+		if (Start.hasArg(unqualifiedArgs, "server"))
+		{
+			Start.addRequiredArgsServer(args, unqualifiedArgs, qualifiedArgs);
+		}
+		else
+		{
+			Start.addRequiredArgsClient(args, unqualifiedArgs, qualifiedArgs);
+		}
+		
 		args = Start.combineArgs(args, unqualifiedArgs, qualifiedArgs);
 		return args; 
 	}
+	private static boolean hasArg(List<String> args, String target)
+	{
+		for (String arg : args)
+		{
+			if (target.equalsIgnoreCase(arg))
+				return true;
+		}
+		
+		return false;
+	}
+
 	/**
 	 * Read the args from the command line into the qualified and unqualified collections
 	 */
@@ -91,7 +112,7 @@ public abstract class Start
 		if (qualifier != null) unqualifiedArgs.add(qualifier);
 	}
-	private static void addRequiredArgs(String[] args, List<String> unqualifiedArgs, Map<String, Set<String>> qualifiedArgs)
+	private static void addRequiredArgsClient(String[] args, List<String> unqualifiedArgs, Map<String, Set<String>> qualifiedArgs)
 	{
 		LoginManager loginManager = Start.doLogin(qualifiedArgs);
@@ -109,6 +130,15 @@ public abstract class Start
 		Start.addArg(qualifiedArgs, "--assetIndex",     LiteLoaderTweaker.VERSION);
 		Start.addArg(qualifiedArgs, "--assetsDir",      assetsDir.getAbsolutePath());
 	}
+	
+	private static void addRequiredArgsServer(String[] args, List<String> unqualifiedArgs, Map<String, Set<String>> qualifiedArgs)
+	{
+		File gameDir = new File(System.getProperty("user.dir"));
+
+		Start.addArg(qualifiedArgs, "--tweakClass", LiteLoaderTweakerServer.class.getName());
+		Start.addArg(qualifiedArgs, "--version",    "mcp");
+		Start.addArg(qualifiedArgs, "--gameDir",    gameDir.getAbsolutePath());
+	}
 	private static LoginManager doLogin(Map<String, Set<String>> qualifiedArgs)
 	{
 package com.mumfrey.liteloader.client;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.profiler.Profiler;
@@ -20,7 +16,7 @@ import net.minecraft.server.integrated.IntegratedServer;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.GameEngine;
-import com.mumfrey.liteloader.common.LoadingProgress;
+import com.mumfrey.liteloader.common.Resources;
 /**
  *
@@ -30,15 +26,7 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
 {
 	private final Minecraft engine = Minecraft.getMinecraft();
-	/**
-	 * Registered resource packs 
-	 */
-	private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
-
-	/**
-	 * True while initialising mods if we need to do a resource manager reload once the process is completed
-	 */
-	private boolean pendingResourceReload;
+	private final Resources<?, ?> resources = new ResourcesClient();
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.common.GameEngine#getProfiler()
@@ -50,20 +38,6 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
 	}
 	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#refreshResources(boolean)
-	 */
-	@Override
-	public void refreshResources(boolean force)
-	{
-		if (this.pendingResourceReload || force)
-		{
-			LoadingProgress.setMessage("Reloading Resources...");
-			this.pendingResourceReload = false;
-			this.engine.refreshResources();
-		}
-	}
-
-	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.common.GameEngine#isClient()
 	 */
 	@Override
@@ -126,6 +100,12 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
 		return this.engine.getIntegratedServer();
 	}
+	@Override
+	public Resources<?, ?> getResources()
+	{
+		return this.resources;
+	}
+	
 	public GameSettings getGameSettings()
 	{
 		return this.engine.gameSettings;
@@ -151,61 +131,11 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
 		return this.engine.gameSettings.hideGUI;
 	}
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getResourceManager()
-	 */
-	@Override
-	public IResourceManager getResourceManager()
-	{
-		return this.engine.getResourceManager();
-	}
-
 	public SoundHandler getSoundHandler()
 	{
 		return this.engine.getSoundHandler();
 	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(net.minecraft.client.resources.IResourcePack)
-	 */
-	@Override
-	public boolean registerResourcePack(IResourcePack resourcePack)
-	{
-		if (!this.registeredResourcePacks.containsKey(resourcePack.getPackName()))
-		{
-			this.pendingResourceReload = true;
-
-			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
-			if (!defaultResourcePacks.contains(resourcePack))
-			{
-				defaultResourcePacks.add(resourcePack);
-				this.registeredResourcePacks.put(resourcePack.getPackName(), resourcePack);
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(net.minecraft.client.resources.IResourcePack)
-	 */
-	@Override
-	public boolean unRegisterResourcePack(IResourcePack resourcePack)
-	{
-		if (this.registeredResourcePacks.containsValue(resourcePack))
-		{
-			this.pendingResourceReload = true;
-			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
-			this.registeredResourcePacks.remove(resourcePack.getPackName());
-			defaultResourcePacks.remove(resourcePack);
-			return true;
-		}
-		
-		return false;
-	}
-	
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.common.GameEngine#getKeyBindings()
 	 */
 package com.mumfrey.liteloader.client;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.play.server.S01PacketJoinGame;
@@ -7,6 +9,7 @@ import net.minecraft.world.World;
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.common.GameEngine;
+import com.mumfrey.liteloader.common.Resources;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
 import com.mumfrey.liteloader.launch.LoaderProperties;
@@ -45,10 +48,11 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
 		this.inhibitSoundManagerReload = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SOUND_MANAGER_FIX, true);
 	}
+	@SuppressWarnings("unchecked")
 	@Override
 	public void onPostInit(GameEngine<?, ?> engine)
 	{
-		this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)engine.getResourceManager(), ((GameEngineClient)engine).getSoundHandler());
+		this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)engine.getResources().getResourceManager(), ((GameEngineClient)engine).getSoundHandler());
 		if (this.inhibitSoundManagerReload)
 		{
@@ -56,7 +60,8 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
 		}
 		// Add self as a resource pack for texture/lang resources
-		LiteLoader.getGameEngine().registerResourcePack(new InternalResourcePack("LiteLoader", LiteLoader.class, "liteloader"));
+		Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
+		resources.registerResourcePack(new InternalResourcePack("LiteLoader", LiteLoader.class, "liteloader"));
 	}
 	@Override
@@ -6,6 +6,8 @@ import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.play.client.C01PacketChatMessage;
@@ -19,9 +21,9 @@ import org.lwjgl.input.Mouse;
 import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
-import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
@@ -30,7 +32,7 @@ import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer>
+public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
 {	
 	private static LiteLoaderEventBrokerClient instance;
@@ -89,6 +91,12 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 		return LiteLoaderEventBrokerClient.instance;
 	}
+	@Override
+	public void onResourceManagerReload(IResourceManager resourceManager)
+	{
+		LoadingProgress.setMessage("Reloading Resources...");
+	}
+	
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.api.InterfaceProvider#registerInterfaces(com.mumfrey.liteloader.core.InterfaceRegistrationDelegate)
 	 */
@@ -230,7 +238,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 	@Override
 	protected void onStartupComplete()
 	{
-		this.engine.refreshResources(false);
+		this.engine.getResources().refreshResources(false);
 		for (InitCompleteListener initMod : this.initListeners)
 		{
+package com.mumfrey.liteloader.client;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.api.ModLoadObserver;
+import com.mumfrey.liteloader.common.Resources;
+import com.mumfrey.liteloader.core.LiteLoader;
+import com.mumfrey.liteloader.core.ModInfo;
+import com.mumfrey.liteloader.interfaces.LoadableMod;
+import com.mumfrey.liteloader.resources.ModResourcePack;
+import com.mumfrey.liteloader.resources.ModResourcePackDir;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Observer which handles registering mods on the client as resource packs
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class ResourceObserver implements ModLoadObserver
+{
+	private final Map<String, IResourcePack> resourcePacks = new HashMap<String, IResourcePack>();
+	
+	public ResourceObserver()
+	{
+	}
+
+	@Override
+	public void onModLoaded(LiteMod mod)
+	{
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public void onPostModLoaded(ModInfo<LoadableMod<?>> handle)
+	{
+		if (!handle.hasContainer()) return;
+		
+		LoadableMod<?> container = handle.getContainer();
+		String modName = handle.getMod().getName();
+		
+		if (modName == null) return;
+		
+		if (container.hasResources())
+		{
+			LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
+			IResourcePack resourcePack = this.initResourcePack(container, modName);
+			Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
+			if (resources.registerResourcePack(resourcePack))
+			{
+				LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
+			}
+		}
+	}
+	
+	public IResourcePack initResourcePack(LoadableMod<?> container, String name)
+	{
+		IResourcePack resourcePack = this.getResourcePack(container);
+		
+		if (resourcePack == null)
+		{
+			if (container.isDirectory())
+			{
+				LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", container.toFile().getParentFile().getName(), container.getName(), name);
+				resourcePack = new ModResourcePackDir(name, container.toFile());
+			}
+			else
+			{
+				LiteLoaderLogger.info("Setting up \"%s\" as mod resource pack with identifier \"%s\"", container.getName(), name);
+				resourcePack = new ModResourcePack(name, container.toFile());
+			}
+			
+			this.setResourcePack(container, resourcePack);
+		}
+		
+		return resourcePack;
+	}
+
+	private IResourcePack getResourcePack(LoadableMod<?> container)
+	{
+		String path = container.getLocation();
+		return this.resourcePacks.get(path);
+	}
+	
+	private void setResourcePack(LoadableMod<?> container, IResourcePack resourcePack)
+	{
+		String path = container.getLocation();
+		this.resourcePacks.put(path, resourcePack);
+	}
+
+	@Override
+	public void onModLoadFailed(LoadableMod<?> container, String identifier, String reason, Throwable th)
+	{
+	}
+
+	@Override
+	public void onPreInitMod(LiteMod mod)
+	{
+	}
+
+	@Override
+	public void onPostInitMod(LiteMod mod)
+	{
+	}
+
+	@Override
+	public void onMigrateModConfig(LiteMod mod, File newConfigPath, File oldConfigPath)
+	{
+	}
+}
+package com.mumfrey.liteloader.client;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+
+import com.mumfrey.liteloader.client.overlays.IMinecraft;
+import com.mumfrey.liteloader.common.LoadingProgress;
+import com.mumfrey.liteloader.common.Resources;
+
+public class ResourcesClient implements Resources<IResourceManager, IResourcePack>
+{
+	private final Minecraft engine = Minecraft.getMinecraft();
+	
+	/**
+	 * Registered resource packs 
+	 */
+	private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
+
+	/**
+	 * True while initialising mods if we need to do a resource manager reload once the process is completed
+	 */
+	private boolean pendingResourceReload;
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.common.GameEngine#refreshResources(boolean)
+	 */
+	@Override
+	public void refreshResources(boolean force)
+	{
+		if (this.pendingResourceReload || force)
+		{
+			LoadingProgress.setMessage("Reloading Resources...");
+			this.pendingResourceReload = false;
+			this.engine.refreshResources();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.common.GameEngine#getResourceManager()
+	 */
+	@Override
+	public IResourceManager getResourceManager()
+	{
+		return this.engine.getResourceManager();
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(net.minecraft.client.resources.IResourcePack)
+	 */
+	@Override
+	public boolean registerResourcePack(IResourcePack resourcePack)
+	{
+		if (!this.registeredResourcePacks.containsKey(resourcePack.getPackName()))
+		{
+			this.pendingResourceReload = true;
+
+			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
+			if (!defaultResourcePacks.contains(resourcePack))
+			{
+				defaultResourcePacks.add(resourcePack);
+				this.registeredResourcePacks.put(resourcePack.getPackName(), resourcePack);
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(net.minecraft.client.resources.IResourcePack)
+	 */
+	@Override
+	public boolean unRegisterResourcePack(IResourcePack resourcePack)
+	{
+		if (this.registeredResourcePacks.containsValue(resourcePack))
+		{
+			this.pendingResourceReload = true;
+
+			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
+			this.registeredResourcePacks.remove(resourcePack.getPackName());
+			defaultResourcePacks.remove(resourcePack);
+			return true;
+		}
+		
+		return false;
+	}
+}
+package com.mumfrey.liteloader.client;
+
+import net.minecraft.client.resources.I18n;
+
+import com.mumfrey.liteloader.api.TranslationProvider;
+
+public class Translator implements TranslationProvider
+{
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.Object[])
+	 */
+	@Override
+	public String translate(String key, Object... args)
+	{
+		// TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
+		return I18n.format(key, args);
+	}
+	
+}
@@ -11,6 +11,8 @@ import com.mumfrey.liteloader.api.CustomisationProvider;
 import com.mumfrey.liteloader.api.InterfaceProvider;
 import com.mumfrey.liteloader.api.Observer;
 import com.mumfrey.liteloader.client.LiteLoaderCoreProviderClient;
+import com.mumfrey.liteloader.client.ResourceObserver;
+import com.mumfrey.liteloader.client.Translator;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI;
 import com.mumfrey.liteloader.interfaces.ObjectFactory;
@@ -68,7 +70,8 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
 		return ImmutableList.<CustomisationProvider>of
 		(
 			new LiteLoaderBrandingProvider(),
-			new LiteLoaderModInfoDecorator()
+			new LiteLoaderModInfoDecorator(),
+			new Translator()
 		);
 	}
@@ -124,6 +127,7 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
 	{
 		return ImmutableList.<Observer>of
 		(
+			new ResourceObserver(),
 			this.getObjectFactory().getPanelManager()
 		);
 	}
@@ -22,6 +22,8 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
+import com.mumfrey.liteloader.util.Input;
+import com.mumfrey.liteloader.util.InputManager;
 /**
  * Factory for lifetime loader objects for the client side
@@ -34,6 +36,8 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	private LoaderProperties properties;
+	private Input input;
+	
 	private LiteLoaderEventBrokerClient clientEvents;
 	private PacketEventsClient clientPacketEvents;
@@ -53,6 +57,17 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	}
 	@Override
+	public Input getInput()
+	{
+		if (this.input == null)
+		{
+			this.input = new InputManager(this.environment, this.properties);
+		}
+		
+		return this.input;
+	}
+	
+	@Override
 	public LiteLoaderEventBroker<Minecraft, IntegratedServer> getEventBroker()
 	{
 		if (this.clientEvents == null)
@@ -3,11 +3,10 @@ package com.mumfrey.liteloader.client.transformers;
 import static com.mumfrey.liteloader.core.runtime.Methods.*;
 import static com.mumfrey.liteloader.transformers.event.InjectionPoint.*;
+import com.mumfrey.liteloader.common.transformers.LiteLoaderEventTransformer;
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.transformers.event.Event;
-import com.mumfrey.liteloader.transformers.event.EventInjectionTransformer;
 import com.mumfrey.liteloader.transformers.event.InjectionPoint;
-import com.mumfrey.liteloader.transformers.event.MethodInfo;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeInvoke;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeNew;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
@@ -19,11 +18,19 @@ import com.mumfrey.liteloader.transformers.event.inject.MethodHead;
  *
  * @author Adam Mummery-Smith
  */
-public class LiteLoaderEventInjectionTransformer extends EventInjectionTransformer
+public class LiteLoaderEventInjectionTransformer extends LiteLoaderEventTransformer
 {
 	@Override
+	protected Obf getProxy()
+	{
+		return Obf.CallbackProxyClient;
+	}
+	
+	@Override
 	protected void addEvents()
 	{
+		super.addEvents();
+
 		// Event declaraions
 		Event onOutboundChat                   = Event.getOrCreate("onOutboundChat",               true);
 		Event onResize                         = Event.getOrCreate("updateFramebufferSize",        false);
@@ -44,11 +51,6 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		Event onRenderChat                     = Event.getOrCreate("onRenderChat",                 false);
 		Event postRenderChat                   = Event.getOrCreate("postRenderChat",               false);
 		Event onCreateIntegratedServer         = Event.getOrCreate("onCreateIntegratedServer",     false);
-		Event onInitializePlayerConnection     = Event.getOrCreate("onInitializePlayerConnection", false);
-		Event onPlayerLogin                    = Event.getOrCreate("onPlayerLogin",                false);
-		Event onPlayerLogout                   = Event.getOrCreate("onPlayerLogout",               false);
-		Event onSpawnPlayer                    = Event.getOrCreate("onSpawnPlayer",                false);
-		Event onRespawnPlayer                  = Event.getOrCreate("onRespawnPlayer",              false);
 		Event onStartupComplete                = Event.getOrCreate("onStartupComplete",            false);
 		Event onSessionProfileBad              = Event.getOrCreate("onSessionProfileBad",          true);
 		Event onSaveScreenshot                 = Event.getOrCreate("onSaveScreenshot",             true);
@@ -96,11 +98,6 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		this.add(onRenderChat,                 renderGameOverlay,          (beforeDrawChat),          "onRenderChat");
 		this.add(postRenderChat,               renderGameOverlay,     after(beforeDrawChat),          "postRenderChat");
 		this.add(onCreateIntegratedServer,     integratedServerCtor,       (methodReturn),            "IntegratedServerCtor");
-		this.add(onInitializePlayerConnection, initPlayerConnection,       (methodReturn),            "onInitializePlayerConnection");
-		this.add(onPlayerLogin,                playerLoggedIn,             (methodReturn),            "onPlayerLogin");
-		this.add(onPlayerLogout,               playerLoggedOut,            (methodReturn),            "onPlayerLogout");
-		this.add(onSpawnPlayer,                spawnPlayer,                (methodReturn),            "onSpawnPlayer");
-		this.add(onRespawnPlayer,              respawnPlayer,              (methodReturn),            "onRespawnPlayer");
 		this.add(onStartupComplete,            startGame,                  (methodReturn),            "onStartupComplete");
 		this.add(onSaveScreenshot,             saveScreenshot,             (beforeIsFBOEnabled),      "onSaveScreenshot");
 		this.add(onRenderEntity,               doRenderEntity,             (beforeRenderEntity),      "onRenderEntity");
@@ -112,14 +109,4 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		// Protocol handlers
 		this.add(onJoinRealm,                  realmsPlay,                 (beforeStopRealsmFetcher), "onJoinRealm", Obf.PacketEventsClient);
 	}
-
-	protected final Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback)
-	{
-		return this.add(event, targetMethod, injectionPoint, callback, Obf.CallbackProxyClient);
-	}
-
-	private Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback, Obf proxy)
-	{
-		return this.addEvent(event, targetMethod, injectionPoint).addListener(new MethodInfo(proxy, callback));
-	}
 }
+package com.mumfrey.liteloader.util;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import net.java.games.input.Component;
+import net.java.games.input.Controller;
+import net.java.games.input.Event;
+import net.java.games.input.EventQueue;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.world.World;
+
+import com.mumfrey.liteloader.common.GameEngine;
+import com.mumfrey.liteloader.core.LiteLoader;
+import com.mumfrey.liteloader.core.LiteLoaderMods;
+import com.mumfrey.liteloader.launch.LoaderEnvironment;
+import com.mumfrey.liteloader.launch.LoaderProperties;
+import com.mumfrey.liteloader.util.Input;
+import com.mumfrey.liteloader.util.InputEvent;
+import com.mumfrey.liteloader.util.InputHandler;
+import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
+
+/**
+ * Mod input class, aggregates functionality from LiteLoader's mod key registration functions and JInputLib
+ *
+ * @author Adam Mummery-Smith
+ */
+public final class InputManager implements Input
+{
+	private GameEngine<?, ?> engine;
+	
+	/**
+	 * 
+	 */
+	private Profiler profiler;
+
+	/**
+	 * File in which we will store mod key mappings
+	 */
+	private final File keyMapSettingsFile;
+	
+	/**
+	 * Properties object which stores mod key mappings
+	 */
+	private final Properties keyMapSettings = new Properties();
+	
+	/**
+	 * List of all registered mod keys
+	 */
+	private final List<KeyBinding> modKeyBindings = new ArrayList<KeyBinding>();
+	
+	/**
+	 * Map of mod key bindings to their key codes, stored so that we don't need to cast from
+	 * string in the properties file every tick
+	 */
+	private final Map<KeyBinding, Integer> storedModKeyBindings = new HashMap<KeyBinding, Integer>();
+	
+	/**
+	 * JInput component registry 
+	 */
+	private final ComponentRegistry jInputComponentRegistry;
+	
+	/**
+	 * List of handlers for JInput components
+	 */
+	private final Map<Component, InputEvent> componentEvents = new HashMap<Component, InputEvent>();
+	
+	/**
+	 * JInput Controllers to poll
+	 */
+	private Controller[] pollControllers = new Controller[0];
+	
+	/**
+	 * 
+	 */
+	public InputManager(LoaderEnvironment environment, LoaderProperties properties)
+	{
+		if (LiteLoader.getInstance() != null && LiteLoader.getInput() != null)
+		{
+			throw new IllegalStateException("Only one instance of Input is allowed, use LiteLoader.getInput() to get the active instance");
+		}
+		
+		this.keyMapSettingsFile = new File(environment.getCommonConfigFolder(), "liteloader.keys.properties");
+		this.jInputComponentRegistry = new ComponentRegistry();
+		
+		if (!properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_JINPUT_DISABLE, false))
+		{
+			this.jInputComponentRegistry.enumerate();
+		}
+	}
+	
+	@Override
+	public void onInit()
+	{
+		if (this.keyMapSettingsFile.exists())
+		{
+			try
+			{
+				this.keyMapSettings.load(new FileReader(this.keyMapSettingsFile));
+			}
+			catch (Exception ex) {}
+		}
+	}
+	
+	@Override
+	public void onPostInit(GameEngine<?, ?> engine)
+	{
+		this.engine = engine;
+		this.profiler = engine.getProfiler();
+	}
+
+	@Override
+	public void onPostInitComplete(LiteLoaderMods mods)
+	{
+	}
+	
+	@Override
+	public void onStartupComplete()
+	{
+	}
+	
+	@Override
+	public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+	{
+	}
+	
+	@Override
+	public void onWorldChanged(World world)
+	{
+	}
+	
+	@Override
+	public void onPostRender(int mouseX, int mouseY, float partialTicks)
+	{
+	}
+	
+	/**
+	 * Register a key for a mod
+	 * 
+	 * @param binding
+	 */
+	@Override
+	public void registerKeyBinding(KeyBinding binding)
+	{
+		List<KeyBinding> keyBindings = this.engine.getKeyBindings();
+		
+		if (!keyBindings.contains(binding))
+		{
+			if (this.keyMapSettings.containsKey(binding.getKeyDescription()))
+			{
+				try
+				{
+					binding.setKeyCode(Integer.parseInt(this.keyMapSettings.getProperty(binding.getKeyDescription(), String.valueOf(binding.getKeyCode()))));
+				}
+				catch (NumberFormatException ex) {}
+			}
+
+			keyBindings.add(binding);
+			
+			this.engine.setKeyBindings(keyBindings);
+			this.modKeyBindings.add(binding);
+			
+			this.updateBinding(binding);
+			this.storeBindings();
+			
+			KeyBinding.resetKeyBindingArrayAndHash();
+		}
+	}
+	
+	/**
+	 * Unregisters a registered keybind with the game settings class, thus removing it from the "controls" screen
+	 * 
+	 * @param binding
+	 */
+	@Override
+	public void unRegisterKeyBinding(KeyBinding binding)
+	{
+		List<KeyBinding> keyBindings = this.engine.getKeyBindings();
+		
+		if (keyBindings.contains(binding))
+		{
+			keyBindings.remove(binding);
+			this.engine.setKeyBindings(keyBindings);
+
+			this.modKeyBindings.remove(binding);
+			
+			KeyBinding.resetKeyBindingArrayAndHash();
+		}
+	}
+	
+	/**
+	 * Checks for changed mod keybindings and stores any that have changed 
+	 */
+	@Override
+	public void onTick(boolean clock, float partialTicks, boolean inGame)
+	{
+		this.profiler.startSection("keybindings");
+		if (clock)
+		{
+			boolean updated = false;
+			
+			for (KeyBinding binding : this.modKeyBindings)
+			{
+				if (binding.getKeyCode() != this.storedModKeyBindings.get(binding))
+				{
+					this.updateBinding(binding);
+					updated = true;
+				}
+			}
+			
+			if (updated) this.storeBindings();
+		}
+		
+		this.pollControllers();
+		this.profiler.endSection();
+	}
+	
+	/**
+	 * @param binding
+	 */
+	private void updateBinding(KeyBinding binding)
+	{
+		this.keyMapSettings.setProperty(binding.getKeyDescription(), String.valueOf(binding.getKeyCode()));
+		this.storedModKeyBindings.put(binding, Integer.valueOf(binding.getKeyCode()));
+	}
+	
+	@Override
+	public void onShutDown()
+	{
+		this.storeBindings();
+	}
+
+	/**
+	 * Writes mod bindings to disk
+	 */
+	@Override
+	public void storeBindings()
+	{
+		try
+		{
+			this.keyMapSettings.store(new FileWriter(this.keyMapSettingsFile), "Mod key mappings for LiteLoader mods, stored here to avoid losing settings stored in options.txt");
+		}
+		catch (IOException ex) {}
+	}
+	
+	/**
+	 * Gets the underlying JInput component registry
+	 */
+	@Override
+	public ComponentRegistry getComponentRegistry()
+	{
+		return this.jInputComponentRegistry;
+	}
+
+	/**
+	 * Returns a handle to the event described by descriptor (or null if no component is found matching the
+	 * descriptor. Retrieving an event via this method adds the controller (if found) to the polling list and
+	 * causes it to raise events against the specified handler.
+	 * 
+	 * This method returns an {@link InputEvent} which is passed as an argument to the relevant callback on
+	 * the supplied handler in order to identify the event. For example:
+	 * 
+	 *    this.joystickButton = input.getEvent(descriptor, this);
+	 * 
+	 * then in onAxisEvent
+	 * 
+	 *   if (source == this.joystickButton) // do something with button
+	 * 
+	 * @param descriptor
+	 * @param handler
+	 */
+	@Override
+	public InputEvent getEvent(String descriptor, InputHandler handler)
+	{
+		if (handler == null) return null;
+		Component component = this.jInputComponentRegistry.getComponent(descriptor);
+		Controller controller = this.jInputComponentRegistry.getController(descriptor);
+		return this.addEventHandler(controller, component, handler);
+	}
+	
+	/**
+	 * Get events for all components which match the supplied descriptor 
+	 * 
+	 * @param descriptor
+	 * @param handler
+	 */
+	@Override
+	public InputEvent[] getEvents(String descriptor, InputHandler handler)
+	{
+		List<InputEvent> events = new ArrayList<InputEvent>();
+		Controller controller = this.jInputComponentRegistry.getController(descriptor);
+		if (controller != null)
+		{
+			for (Component component : controller.getComponents())
+			{
+				events.add(this.addEventHandler(controller, component, handler));
+			}
+		}
+		
+		return events.toArray(new InputEvent[0]);
+	}
+	
+	/**
+	 * @param controller
+	 * @param component
+	 * @param handler
+	 */
+	private InputEvent addEventHandler(Controller controller, Component component, InputHandler handler)
+	{
+		if (controller != null && component != null && handler != null)
+		{
+			this.addController(controller);
+			
+			InputEvent event = new InputEvent(controller, component, handler);
+			this.componentEvents.put(component, event.link(this.componentEvents.get(component)));
+			
+			return event;
+		}
+		
+		return null;
+	}
+
+	/**
+	 * @param controller
+	 */
+	private void addController(Controller controller)
+	{
+		Set<Controller> controllers = this.getActiveControllers();
+		controllers.add(controller);
+		this.setActiveControllers(controllers);
+	}
+
+	/**
+	 * 
+	 */
+	private Set<Controller> getActiveControllers()
+	{
+		Set<Controller> allControllers = new HashSet<Controller>();
+		for (Controller controller : this.pollControllers)
+			allControllers.add(controller);
+		return allControllers;
+	}
+	
+	/**
+	 * @param controllers
+	 */
+	private void setActiveControllers(Set<Controller> controllers)
+	{
+		this.pollControllers = controllers.toArray(new Controller[controllers.size()]);
+	}
+
+	/**
+	 * 
+	 */
+	private void pollControllers()
+	{
+		for (Controller controller : this.pollControllers)
+		{
+			controller.poll();
+			EventQueue controllerQueue = controller.getEventQueue();
+			
+			for (Event event = new Event(); controllerQueue.getNextEvent(event); )
+			{
+				Component cmp = event.getComponent();
+				
+				InputEvent inputEvent = this.componentEvents.get(cmp);
+				if (inputEvent != null)
+				{
+					inputEvent.onEvent(event);
+				}
+			}
+		}
+	}
+}
@@ -47,7 +47,7 @@ public interface EnumerationObserver extends Observer
 	/**
 	 * Called when a mod container is added to the pending mods list. This does not mean that the specific mod will actually be instanced since
 	 * the mod can still be disabled via the exclusion list (this is to allow entire containers to be disabled or just individual mods) and so
-	 * if you wish to observe actual mod instantiation you should still provide a {@link ModLoadObserver}. However this event expresses a
+	 * if you wish to observe actual mod instantiation you should still provide a {@link ResourceObserver}. However this event expresses a
 	 * declaration by the enumerator of an intention to load the specified mod. 
 	 * 
 	 * @param enumerator
@@ -3,6 +3,7 @@ package com.mumfrey.liteloader.api;
 import java.io.File;
 import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.core.ModInfo;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
 /**
@@ -22,6 +23,13 @@ public interface ModLoadObserver extends Observer
 	public abstract void onModLoaded(LiteMod mod);
 	/**
+	 * Called after a mod is instanced and has been successfully added to the active mods list 
+	 * 
+	 * @param handle Mod handle
+	 */
+	public abstract void onPostModLoaded(ModInfo<LoadableMod<?>> handle);
+
+	/**
 	 * Called if mod loading fails
 	 * 
 	 * @param container
+package com.mumfrey.liteloader.api;
+
+/**
+ * Interface for providers which can handle translation requests
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface TranslationProvider extends CustomisationProvider
+{
+	/**
+	 * Translate the supplied key or return NULL if the provider has no translation for the specified key
+	 */
+	public abstract String translate(String key, Object... args);
+}
@@ -2,8 +2,6 @@ package com.mumfrey.liteloader.common;
 import java.util.List;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
@@ -50,33 +48,16 @@ public interface GameEngine&lt;TClient, TServer extends MinecraftServer&gt;
 	 * Get the underlying server instance
 	 */
 	public abstract TServer getServer();
-
-	/**
-	 * Get the profiler instance
-	 */
-	public abstract Profiler getProfiler();
-
-	/**
-	 * Get the resource manager for the current environment, returns the SimpleReloadableResourceManager on client and ModResourceManager on the server
-	 */
-	public abstract IResourceManager getResourceManager();
-
-	/**
-	 * @param resourcePack
-	 */
-	public abstract boolean registerResourcePack(IResourcePack resourcePack);
-
+	
 	/**
-	 * @param resourcePack
+	 * @return
 	 */
-	public abstract boolean unRegisterResourcePack(IResourcePack resourcePack);
+	public abstract Resources<?, ?> getResources();
 	/**
-	 * Refresh resource pack list
-	 * 
-	 * @param force
+	 * Get the profiler instance
 	 */
-	public abstract void refreshResources(boolean force);
+	public abstract Profiler getProfiler();
 	/**
 	 * Get the keybinding list, only supported on client will throw an exception on the server
+package com.mumfrey.liteloader.common;
+
+public interface Resources<TResourceManager, TResourcePack>
+{
+	/**
+	 * Refresh resource pack list
+	 * 
+	 * @param force
+	 */
+	public abstract void refreshResources(boolean force);
+
+	/**
+	 * Get the resource manager for the current environment, returns the SimpleReloadableResourceManager on client and ModResourceManager on the server
+	 */
+	public abstract TResourceManager getResourceManager();
+
+	/**
+	 * @param resourcePack
+	 */
+	public abstract boolean registerResourcePack(TResourcePack resourcePack);
+
+	/**
+	 * @param resourcePack
+	 */
+	public abstract boolean unRegisterResourcePack(TResourcePack resourcePack);
+}
+package com.mumfrey.liteloader.common.transformers;
+
+import static com.mumfrey.liteloader.core.runtime.Methods.*;
+
+import com.mumfrey.liteloader.core.runtime.Obf;
+import com.mumfrey.liteloader.transformers.event.Event;
+import com.mumfrey.liteloader.transformers.event.EventInjectionTransformer;
+import com.mumfrey.liteloader.transformers.event.InjectionPoint;
+import com.mumfrey.liteloader.transformers.event.MethodInfo;
+import com.mumfrey.liteloader.transformers.event.inject.BeforeNew;
+import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
+
+/**
+ * Injector for LiteLoader's common events
+ *
+ * @author Adam Mummery-Smith
+ */
+public abstract class LiteLoaderEventTransformer extends EventInjectionTransformer
+{
+	protected abstract Obf getProxy();
+	
+	@Override
+	protected void addEvents()
+	{
+		// Event declaraions
+		Event onInitializePlayerConnection     = Event.getOrCreate("onInitializePlayerConnection", false);
+		Event onPlayerLogin                    = Event.getOrCreate("onPlayerLogin",                false);
+		Event onPlayerLogout                   = Event.getOrCreate("onPlayerLogout",               false);
+		Event onSpawnPlayer                    = Event.getOrCreate("onSpawnPlayer",                false);
+		Event onRespawnPlayer                  = Event.getOrCreate("onRespawnPlayer",              false);
+		Event onSessionProfileBad              = Event.getOrCreate("onSessionProfileBad",          true);
+		
+		// Injection Points
+		InjectionPoint methodReturn            = new BeforeReturn();
+		InjectionPoint beforeNewGameProfile    = new BeforeNew(1, Obf.GameProfile);
+		
+		// Hooks
+		this.add(onInitializePlayerConnection, initPlayerConnection, (methodReturn),         "onInitializePlayerConnection");
+		this.add(onPlayerLogin,                playerLoggedIn,       (methodReturn),         "onPlayerLogin");
+		this.add(onPlayerLogout,               playerLoggedOut,      (methodReturn),         "onPlayerLogout");
+		this.add(onSpawnPlayer,                spawnPlayer,          (methodReturn),         "onSpawnPlayer");
+		this.add(onRespawnPlayer,              respawnPlayer,        (methodReturn),         "onRespawnPlayer");
+
+		// Compatibility handlers
+		this.add(onSessionProfileBad,          getProfile,           (beforeNewGameProfile), "generateOfflineUUID");
+	}
+
+	protected final Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback)
+	{
+		return this.add(event, targetMethod, injectionPoint, callback, this.getProxy());
+	}
+
+	protected Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback, Obf proxy)
+	{
+		return this.addEvent(event, targetMethod, injectionPoint).addListener(new MethodInfo(proxy, callback));
+	}
+}
@@ -19,11 +19,13 @@ import net.minecraft.world.World;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.api.CustomisationProvider;
+import com.mumfrey.liteloader.api.Listener;
 import com.mumfrey.liteloader.api.LiteAPI;
 import com.mumfrey.liteloader.api.ModLoadObserver;
 import com.mumfrey.liteloader.api.PostRenderObserver;
 import com.mumfrey.liteloader.api.ShutdownObserver;
 import com.mumfrey.liteloader.api.TickObserver;
+import com.mumfrey.liteloader.api.TranslationProvider;
 import com.mumfrey.liteloader.api.WorldObserver;
 import com.mumfrey.liteloader.api.manager.APIAdapter;
 import com.mumfrey.liteloader.api.manager.APIProvider;
@@ -178,6 +180,11 @@ public final class LiteLoader
 	private Input input;
 	/**
+	 * 
+	 */
+	private final List<TranslationProvider> translators = new ArrayList<TranslationProvider>();
+	
+	/**
 	 * ctor
 	 * 
 	 * @param environment
@@ -190,7 +197,6 @@ public final class LiteLoader
 		this.enumerator = environment.getEnumerator();
 		this.configManager = new ConfigManager();
-		this.input = new Input(environment, properties);
 		this.mods = new LiteLoaderMods(this, environment, properties, this.configManager);
@@ -205,11 +211,36 @@ public final class LiteLoader
 		this.objectFactory = this.api.getObjectFactory();
+		this.input = this.objectFactory.getInput();
+		
 		this.clientPluginChannels = this.objectFactory.getClientPluginChannels();
 		this.serverPluginChannels = this.objectFactory.getServerPluginChannels();
 		this.permissionsManagerClient = this.objectFactory.getClientPermissionManager();
 		this.permissionsManagerServer = this.objectFactory.getServerPermissionManager();
+		
+		this.initTranslators();
+	}
+
+	/**
+	 * 
+	 */
+	protected void initTranslators()
+	{
+		for (LiteAPI api : this.apiProvider.getAPIs())
+		{
+			List<CustomisationProvider> customisationProviders = api.getCustomisationProviders();
+			if (customisationProviders != null)
+			{
+				for (CustomisationProvider provider : customisationProviders)
+				{
+					if (provider instanceof TranslationProvider)
+					{
+						this.translators.add((TranslationProvider)provider);
+					}
+				}
+			}
+		}
 	}
 	/**
@@ -772,6 +803,14 @@ public final class LiteLoader
 		this.coreProviders.all().onPostInit(this.engine);
 		this.interfaceManager.registerInterfaces();
+		
+		for (CoreProvider provider : this.coreProviders)
+		{
+			if (provider instanceof Listener)
+			{
+				this.interfaceManager.registerListener((Listener)provider);
+			}
+		}
 	}
 	private void loadAndInitMods()
@@ -906,6 +945,20 @@ public final class LiteLoader
 		this.configManager.syncConfig();
 	}
+	
+	public static String translate(String key, Object... args)
+	{
+		for (TranslationProvider translator : LiteLoader.instance.translators)
+		{
+			String translated = translator.translate(key, args);
+			if (translated != null)
+			{
+				return translated;
+			}
+		}
+		
+		return key;
+	}
 	/**
 	 * @param objCrashReport This is an object so that we don't need to transform the obfuscated name in the transformer
 package com.mumfrey.liteloader.core;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -33,7 +31,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  * @param <TClient> Type of the client runtime, "Minecraft" on client and null on the server
  * @param <TServer> Type of the server runtime, "IntegratedServer" on the client, "MinecraftServer" on the server 
  */
-public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftServer> implements InterfaceProvider, IResourceManagerReloadListener
+public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftServer> implements InterfaceProvider
 {
 	/**
 	 * @author Adam Mummery-Smith
@@ -182,12 +180,6 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	{
 		this.serverPlayerListeners.add(serverPlayerListener);
 	}
-	
-	@Override
-	public void onResourceManagerReload(IResourceManager resourceManager)
-	{
-		LoadingProgress.setMessage("Reloading Resources...");
-	}
 	/**
 	 * @param instance
@@ -9,8 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.minecraft.client.resources.IResourcePack;
-
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.ModLoadObserver;
 import com.mumfrey.liteloader.common.LoadingProgress;
@@ -455,6 +453,8 @@ public class LiteLoaderMods
 				this.onModLoadFailed(container, mod.getModClassName(), "an error occurred", th);
 				this.registerModStartupError(mod, th);
 			}
+
+			this.observers.all().onPostModLoaded(mod);
 		}
 	}
@@ -486,22 +486,6 @@ public class LiteLoaderMods
 		String modName = mod.getDisplayName();
 		LiteLoaderLogger.info("Successfully added mod %s version %s", modName, newMod.getVersion());
-		
-		// Register the mod as a resource pack if the container exists
-		if (mod.hasContainer())
-		{
-			LoadableMod<?> container = mod.getContainer();
-			LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
-			if (modName != null)
-			{
-				container.initResourcePack(modName);
-				
-				if (container.hasResourcePack() && LiteLoader.getGameEngine().registerResourcePack((IResourcePack)container.getResourcePack()))
-				{
-					LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
-				}
-			}
-		}
 	}
 	/**
@@ -6,9 +6,6 @@ import java.net.MalformedURLException;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import com.mumfrey.liteloader.core.LiteLoaderVersion;
-import com.mumfrey.liteloader.resources.ModResourcePack;
-import com.mumfrey.liteloader.resources.ModResourcePackDir;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
  * Mod file reference for a file loaded from class path
@@ -67,24 +64,6 @@ public class LoadableModClassPath extends LoadableModFile
 	{
 		return this.getModName();
 	}
-
-	@Override
-	public void initResourcePack(String name)
-	{
-		if (this.resourcePack == null)
-		{
-			if (this.isDirectory())
-			{
-				LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", this.getParentFile().getName(), this.getName(), name);
-				this.resourcePack = new ModResourcePackDir(name, this);
-			}
-			else
-			{
-				LiteLoaderLogger.info("Setting up \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name);
-				this.resourcePack = new ModResourcePack(name, this);
-			}
-		}
-	}
 	@Override
 	public boolean injectIntoClassPath(LaunchClassLoader classLoader, boolean injectIntoParent) throws MalformedURLException
@@ -18,18 +18,17 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import joptsimple.internal.Strings;
-import net.minecraft.client.resources.I18n;
 import com.google.common.base.Charsets;
 import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.mumfrey.liteloader.api.manager.APIProvider;
+import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.interfaces.LoadableFile;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.launch.InjectionStrategy;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
-import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -89,11 +88,6 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	protected boolean hasRevision = false;
 	/**
-	 * Resource pack we have registered with minecraft
-	 */
-	protected Object resourcePack = null;
-	
-	/**
 	 * ALL of the parsed metadata from the file, associated with the mod later on for retrieval via the loader
 	 */
 	protected Map<String, Object> metaData = new HashMap<String, Object>();
@@ -241,12 +235,12 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	{
 		if (this.missingAPIs.size() > 0)
 		{
-			return I18n.format("gui.description.missingapis", "\n" + compileMissingAPIList());
+			return LiteLoader.translate("gui.description.missingapis", "\n" + compileMissingAPIList());
 		}
 		if (this.missingDependencies.size() > 0)
 		{
-			return I18n.format("gui.description.missingdeps", "\n" + this.missingDependencies.toString());
+			return LiteLoader.translate("gui.description.missingdeps", "\n" + this.missingDependencies.toString());
 		}
 		String descriptionKey = "description";
@@ -374,33 +368,11 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	{
 		return this.classTransformerClassNames;
 	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T getResourcePack()
-	{
-		return (T)this.resourcePack;
-	}
-	
-	/**
-	 * Initialise the mod resource pack
-	 * 
-	 * @param name
-	 */
-	@Override
-	public void initResourcePack(String name)
-	{
-		if (this.resourcePack == null)
-		{
-			LiteLoaderLogger.info("Setting up \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name);
-			this.resourcePack = new ModResourcePack(name, this);
-		}
-	}
 	@Override
-	public boolean hasResourcePack()
+	public boolean hasResources()
 	{
-		return (this.resourcePack != null);
+		return true;
 	}
 	@Override
@@ -13,6 +13,7 @@ import com.mumfrey.liteloader.transformers.event.MethodInfo;
  */
 public abstract class Methods
 {
+	// Client & General
 	public static final MethodInfo startGame              = new MethodInfo(Obf.Minecraft,                  Obf.startGame,                    Void.TYPE);
 	public static final MethodInfo runGameLoop            = new MethodInfo(Obf.Minecraft,                  Obf.runGameLoop,                  Void.TYPE);
 	public static final MethodInfo runTick                = new MethodInfo(Obf.Minecraft,                  Obf.runTick,                      Void.TYPE);
@@ -42,9 +43,14 @@ public abstract class Methods
 	public static final MethodInfo realmsPlay             = new MethodInfo(Obf.RealmsMainScreen,           "play",                           Void.TYPE, Long.TYPE);
 	public static final MethodInfo realmsStopFetcher      = new MethodInfo(Obf.RealmsMainScreen,           "stopRealmsFetcherAndPinger",     Void.TYPE);
+	// Profiler
 	public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
 	public static final MethodInfo endSection             = new MethodInfo(Obf.Profiler,                   Obf.endSection,                   Void.TYPE);
 	public static final MethodInfo endStartSection        = new MethodInfo(Obf.Profiler,                   Obf.endStartSection,              Void.TYPE, String.class);
+
+	// Dedicated Server
+	public static final MethodInfo startServer            = new MethodInfo(Obf.DedicatedServer,            Obf.startServer,                  Boolean.TYPE);
+	public static final MethodInfo startServerThread      = new MethodInfo(Obf.MinecraftServer,            Obf.startServerThread,            Void.TYPE);
 	private Methods() {}
@@ -101,17 +101,7 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 	/**
 	 * Returns true if this mod can be added as a resource pack
 	 */
-	public abstract boolean hasResourcePack();
-
-	/**
-	 * Returns the resource pack for this mod, duck typed via generic to avoid ResourcePack being in the method signature
-	 */
-	public abstract <T> T getResourcePack();
-	
-	/**
-	 * Initialise the resource pack with the specified name
-	 */
-	public abstract void initResourcePack(String name);
+	public abstract boolean hasResources();
 	/**
 	 * Get all class names in this container
@@ -297,21 +287,10 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 		}
 		@Override
-		public boolean hasResourcePack()
+		public boolean hasResources()
 		{
 			return false;
 		}
-
-		@Override
-		public <T> T getResourcePack()
-		{
-			return null;
-		}
-
-		@Override
-		public void initResourcePack(String name)
-		{
-		}
 		@Override
 		public boolean hasDependencies()
@@ -9,6 +9,7 @@ import com.mumfrey.liteloader.core.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
+import com.mumfrey.liteloader.util.Input;
 /**
  * Factory for generating loader managament objects based on the environment
@@ -24,6 +25,8 @@ public interface ObjectFactory&lt;TClient, TServer extends MinecraftServer&gt;
 	public abstract PacketEvents getPacketEventBroker();
+	public abstract Input getInput();
+	
 	public abstract GameEngine<TClient, TServer> getGameEngine();
 	public abstract PanelManager<?> getPanelManager();
@@ -14,6 +14,7 @@ import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
+import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -617,4 +618,10 @@ public class LiteLoaderTweaker implements ITweaker
 	{
 		LiteLoaderTweaker.instance.onPostInit();
 	}
+	
+	public static void dedicatedServerInit(EventInfo<?> e)
+	{
+		LiteLoaderTweaker.instance.onInit();
+		LiteLoaderTweaker.instance.onPostInit();
+	}
 }
 \ No newline at end of file
 package com.mumfrey.liteloader.util;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import net.java.games.input.Component;
-import net.java.games.input.Controller;
-import net.java.games.input.Event;
-import net.java.games.input.EventQueue;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.profiler.Profiler;
-import net.minecraft.world.World;
 import com.mumfrey.liteloader.api.CoreProvider;
-import com.mumfrey.liteloader.common.GameEngine;
-import com.mumfrey.liteloader.core.LiteLoader;
-import com.mumfrey.liteloader.core.LiteLoaderMods;
-import com.mumfrey.liteloader.launch.LoaderEnvironment;
-import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
-/**
- * Mod input class, aggregates functionality from LiteLoader's mod key registration functions and JInputLib
- *
- * @author Adam Mummery-Smith
- */
-public final class Input implements CoreProvider
+public interface Input extends CoreProvider
 {
-	private GameEngine<?, ?> engine;
-	
-	/**
-	 * 
-	 */
-	private Profiler profiler;
-
-	/**
-	 * File in which we will store mod key mappings
-	 */
-	private final File keyMapSettingsFile;
-	
-	/**
-	 * Properties object which stores mod key mappings
-	 */
-	private final Properties keyMapSettings = new Properties();
-	
-	/**
-	 * List of all registered mod keys
-	 */
-	private final List<KeyBinding> modKeyBindings = new ArrayList<KeyBinding>();
-	
-	/**
-	 * Map of mod key bindings to their key codes, stored so that we don't need to cast from
-	 * string in the properties file every tick
-	 */
-	private final Map<KeyBinding, Integer> storedModKeyBindings = new HashMap<KeyBinding, Integer>();
-	
-	/**
-	 * JInput component registry 
-	 */
-	private final ComponentRegistry jInputComponentRegistry;
-	
-	/**
-	 * List of handlers for JInput components
-	 */
-	private final Map<Component, InputEvent> componentEvents = new HashMap<Component, InputEvent>();
-	
-	/**
-	 * JInput Controllers to poll
-	 */
-	private Controller[] pollControllers = new Controller[0];
-	
-	/**
-	 * 
-	 */
-	public Input(LoaderEnvironment environment, LoaderProperties properties)
-	{
-		if (LiteLoader.getInstance() != null && LiteLoader.getInput() != null)
-		{
-			throw new IllegalStateException("Only one instance of Input is allowed, use LiteLoader.getInput() to get the active instance");
-		}
-		
-		this.keyMapSettingsFile = new File(environment.getCommonConfigFolder(), "liteloader.keys.properties");
-		this.jInputComponentRegistry = new ComponentRegistry();
-		
-		if (!properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_JINPUT_DISABLE, false))
-		{
-			this.jInputComponentRegistry.enumerate();
-		}
-	}
-	
-	@Override
-	public void onInit()
-	{
-		if (this.keyMapSettingsFile.exists())
-		{
-			try
-			{
-				this.keyMapSettings.load(new FileReader(this.keyMapSettingsFile));
-			}
-			catch (Exception ex) {}
-		}
-	}
-	
-	@Override
-	public void onPostInit(GameEngine<?, ?> engine)
-	{
-		this.engine = engine;
-		this.profiler = engine.getProfiler();
-	}
-
-	@Override
-	public void onPostInitComplete(LiteLoaderMods mods)
-	{
-	}
-	
-	@Override
-	public void onStartupComplete()
-	{
-	}
-	
-	@Override
-	public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-	}
-	
-	@Override
-	public void onWorldChanged(World world)
-	{
-	}
-	
-	@Override
-	public void onPostRender(int mouseX, int mouseY, float partialTicks)
-	{
-	}
-	
 	/**
 	 * Register a key for a mod
 	 * 
 	 * @param binding
 	 */
-	public void registerKeyBinding(KeyBinding binding)
-	{
-		List<KeyBinding> keyBindings = this.engine.getKeyBindings();
-		
-		if (!keyBindings.contains(binding))
-		{
-			if (this.keyMapSettings.containsKey(binding.getKeyDescription()))
-			{
-				try
-				{
-					binding.setKeyCode(Integer.parseInt(this.keyMapSettings.getProperty(binding.getKeyDescription(), String.valueOf(binding.getKeyCode()))));
-				}
-				catch (NumberFormatException ex) {}
-			}
-
-			keyBindings.add(binding);
-			
-			this.engine.setKeyBindings(keyBindings);
-			this.modKeyBindings.add(binding);
-			
-			this.updateBinding(binding);
-			this.storeBindings();
-			
-			KeyBinding.resetKeyBindingArrayAndHash();
-		}
-	}
+	public abstract void registerKeyBinding(KeyBinding binding);
 	/**
 	 * Unregisters a registered keybind with the game settings class, thus removing it from the "controls" screen
 	 * 
 	 * @param binding
 	 */
-	public void unRegisterKeyBinding(KeyBinding binding)
-	{
-		List<KeyBinding> keyBindings = this.engine.getKeyBindings();
-		
-		if (keyBindings.contains(binding))
-		{
-			keyBindings.remove(binding);
-			this.engine.setKeyBindings(keyBindings);
-
-			this.modKeyBindings.remove(binding);
-			
-			KeyBinding.resetKeyBindingArrayAndHash();
-		}
-	}
-	
-	/**
-	 * Checks for changed mod keybindings and stores any that have changed 
-	 */
-	@Override
-	public void onTick(boolean clock, float partialTicks, boolean inGame)
-	{
-		this.profiler.startSection("keybindings");
-		if (clock)
-		{
-			boolean updated = false;
-			
-			for (KeyBinding binding : this.modKeyBindings)
-			{
-				if (binding.getKeyCode() != this.storedModKeyBindings.get(binding))
-				{
-					this.updateBinding(binding);
-					updated = true;
-				}
-			}
-			
-			if (updated) this.storeBindings();
-		}
-		
-		this.pollControllers();
-		this.profiler.endSection();
-	}
+	public abstract void unRegisterKeyBinding(KeyBinding binding);
 	/**
-	 * @param binding
-	 */
-	private void updateBinding(KeyBinding binding)
-	{
-		this.keyMapSettings.setProperty(binding.getKeyDescription(), String.valueOf(binding.getKeyCode()));
-		this.storedModKeyBindings.put(binding, Integer.valueOf(binding.getKeyCode()));
-	}
-	
-	@Override
-	public void onShutDown()
-	{
-		this.storeBindings();
-	}
-
-	/**
 	 * Writes mod bindings to disk
 	 */
-	public void storeBindings()
-	{
-		try
-		{
-			this.keyMapSettings.store(new FileWriter(this.keyMapSettingsFile), "Mod key mappings for LiteLoader mods, stored here to avoid losing settings stored in options.txt");
-		}
-		catch (IOException ex) {}
-	}
+	public abstract void storeBindings();
 	/**
 	 * Gets the underlying JInput component registry
 	 */
-	public ComponentRegistry getComponentRegistry()
-	{
-		return this.jInputComponentRegistry;
-	}
-
+	public abstract ComponentRegistry getComponentRegistry();
+	
 	/**
 	 * Returns a handle to the event described by descriptor (or null if no component is found matching the
 	 * descriptor. Retrieving an event via this method adds the controller (if found) to the polling list and
@@ -275,13 +48,7 @@ public final class Input implements CoreProvider
 	 * @param descriptor
 	 * @param handler
 	 */
-	public InputEvent getEvent(String descriptor, InputHandler handler)
-	{
-		if (handler == null) return null;
-		Component component = this.jInputComponentRegistry.getComponent(descriptor);
-		Controller controller = this.jInputComponentRegistry.getController(descriptor);
-		return this.addEventHandler(controller, component, handler);
-	}
+	public abstract InputEvent getEvent(String descriptor, InputHandler handler);
 	/**
 	 * Get events for all components which match the supplied descriptor 
@@ -289,90 +56,5 @@ public final class Input implements CoreProvider
 	 * @param descriptor
 	 * @param handler
 	 */
-	public InputEvent[] getEvents(String descriptor, InputHandler handler)
-	{
-		List<InputEvent> events = new ArrayList<InputEvent>();
-		Controller controller = this.jInputComponentRegistry.getController(descriptor);
-		if (controller != null)
-		{
-			for (Component component : controller.getComponents())
-			{
-				events.add(this.addEventHandler(controller, component, handler));
-			}
-		}
-		
-		return events.toArray(new InputEvent[0]);
-	}
-	
-	/**
-	 * @param controller
-	 * @param component
-	 * @param handler
-	 */
-	private InputEvent addEventHandler(Controller controller, Component component, InputHandler handler)
-	{
-		if (controller != null && component != null && handler != null)
-		{
-			this.addController(controller);
-			
-			InputEvent event = new InputEvent(controller, component, handler);
-			this.componentEvents.put(component, event.link(this.componentEvents.get(component)));
-			
-			return event;
-		}
-		
-		return null;
-	}
-
-	/**
-	 * @param controller
-	 */
-	private void addController(Controller controller)
-	{
-		Set<Controller> controllers = this.getActiveControllers();
-		controllers.add(controller);
-		this.setActiveControllers(controllers);
-	}
-
-	/**
-	 * 
-	 */
-	private Set<Controller> getActiveControllers()
-	{
-		Set<Controller> allControllers = new HashSet<Controller>();
-		for (Controller controller : this.pollControllers)
-			allControllers.add(controller);
-		return allControllers;
-	}
-	
-	/**
-	 * @param controllers
-	 */
-	private void setActiveControllers(Set<Controller> controllers)
-	{
-		this.pollControllers = controllers.toArray(new Controller[controllers.size()]);
-	}
-
-	/**
-	 * 
-	 */
-	private void pollControllers()
-	{
-		for (Controller controller : this.pollControllers)
-		{
-			controller.poll();
-			EventQueue controllerQueue = controller.getEventQueue();
-			
-			for (Event event = new Event(); controllerQueue.getNextEvent(event); )
-			{
-				Component cmp = event.getComponent();
-				
-				InputEvent inputEvent = this.componentEvents.get(cmp);
-				if (inputEvent != null)
-				{
-					inputEvent.onEvent(event);
-				}
-			}
-		}
-	}
-}
+	public abstract InputEvent[] getEvents(String descriptor, InputHandler handler);
+}
 \ No newline at end of file