squash all javadoc warnings

Mumfrey
1 parent fc0d1934
Showing 79 changed files with 161 additions and 408 deletions
ant/build_liteloader.xml
debug/com/mumfrey/liteloader/debug/LoginPanel.java
java/client/com/mumfrey/liteloader/client/GameEngineClient.java
java/client/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
java/client/com/mumfrey/liteloader/client/gui/GuiModListPanel.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelMods.java
java/client/com/mumfrey/liteloader/client/gui/ModListEntry.java
java/client/com/mumfrey/liteloader/client/util/render/IconTiled.java
java/client/com/mumfrey/liteloader/util/ModUtilities.java
java/common/com/mumfrey/liteloader/LiteMod.java
java/common/com/mumfrey/liteloader/api/ModInfoDecorator.java
java/common/com/mumfrey/liteloader/api/manager/APIAdapter.java
java/common/com/mumfrey/liteloader/api/manager/APIProvider.java
java/common/com/mumfrey/liteloader/api/manager/APIRegistry.java
java/common/com/mumfrey/liteloader/common/GameEngine.java
java/common/com/mumfrey/liteloader/core/ClientPluginChannels.java
java/common/com/mumfrey/liteloader/core/CommonPluginChannelListener.java
java/common/com/mumfrey/liteloader/core/EnabledModsList.java
java/common/com/mumfrey/liteloader/core/LiteLoader.java
java/common/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
@@ -309,6 +309,7 @@
 				</fileset>
 				<pathelement location="${mc.bin.dir}"/>
 			</classpath>
+			<arg value="-XDignore.symbol.file" />
 		</javadoc>
 		<jar destfile="${dist.dir}/${artefact.name}-javadoc.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
 			<manifest>
@@ -250,7 +250,6 @@ public class LoginPanel extends JPanel
 	/**
 	 * @param dialog
-	 * @param panel
 	 */
 	public void setDialog(JDialog dialog)
 	{
@@ -160,9 +160,6 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
 		return this.engine.getResourceManager();
 	}
-	/**
-	 * @return
-	 */
 	public SoundHandler getSoundHandler()
 	{
 		return this.engine.getSoundHandler();
@@ -218,7 +218,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
 	}
 	/**
-	 * @return
+	 * Get the computed branding colour
 	 */
 	public int getBrandColour()
 	{
@@ -242,7 +242,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
 	}
 	/**
-	 * @return
+	 * Return true if the panel is not fully closed (tweening or open)
 	 */
 	public boolean isOpen()
 	{
@@ -86,7 +86,7 @@ public class GuiModListPanel extends Gui
 	 * @param yPosition
 	 * @param width
 	 * @param selected
-	 * @return
+	 * @return calculated height of this panel, used by the list view to calculate spacing
 	 */
 	public int draw(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
 	{
@@ -163,9 +163,7 @@ public class GuiModListPanel extends Gui
 	}
 	/**
-	 * @param external
 	 * @param selected
-	 * @return
 	 */
 	protected int getGradientColour(boolean selected)
 	{
@@ -173,11 +171,7 @@ public class GuiModListPanel extends Gui
 	}
 	/**
-	 * @param missingDependencies
-	 * @param enabled
-	 * @param external
 	 * @param selected
-	 * @return
 	 */
 	protected int getTitleColour(boolean selected)
 	{
@@ -189,9 +183,7 @@ public class GuiModListPanel extends Gui
 	}
 	/**
-	 * @param external
 	 * @param selected
-	 * @return
 	 */
 	protected int getStatusColour(boolean selected)
 	{
@@ -367,8 +367,7 @@ public class GuiPanelMods extends GuiPanel
 	}
 	/**
-	 * @param mod
-	 * @return
+	 * @param mod Mod list entry to select
 	 */
 	private void selectMod(ModListEntry mod)
 	{
@@ -104,25 +104,16 @@ public class ModListEntry
 		this.listPanel = new GuiModListPanel(this, fontRenderer, brandColour, modInfo, decorators);
 	}
-	/**
-	 * @return
-	 */
 	protected String getTitleText()
 	{
 		return this.modInfo.getDisplayName();
 	}
-	/**
-	 * @return
-	 */
 	protected String getVersionText()
 	{
 		return I18n.format("gui.about.versiontext", this.modInfo.getVersion());
 	}
-	/**
-	 * @return
-	 */
 	protected String getStatusText()
 	{
 		String statusText = this.isExternal ? I18n.format("gui.status.loaded") : I18n.format("gui.status.active");
@@ -55,14 +55,6 @@ public class IconTiled implements Icon
 		this.init(iconU, iconV);
 	}
-	/**
-	 * @param iconU
-	 * @param iconV
-	 * @param field_146120_f
-	 * @param field_146121_g
-	 * @param textureWidth
-	 * @param textureHeight
-	 */
 	protected void init(int iconU, int iconV)
 	{
 		this.iconU = iconU;
@@ -62,7 +62,7 @@ public abstract class ModUtilities
 	}
 	/**
-	 * @return
+	 * @return true if FML is present in the current environment
 	 */
 	public static boolean fmlIsPresent()
 	{
@@ -235,7 +235,7 @@ public abstract class ModUtilities
 	/**
 	 * Abstraction helper function
 	 * 
-	 * @param fieldName Name of field to get, returned unmodified if in debug mode
+	 * @param obf Field to get, returned unmodified if in debug mode
 	 * @return Obfuscated field name if present
 	 */
 	public static String getObfuscatedFieldName(Obf obf)
@@ -15,7 +15,7 @@ public interface LiteMod extends Exposable, Listener
 	/**
 	 * Get the mod version string
 	 * 
-	 * @return
+	 * @return the mod version as a string
 	 */
 	public abstract String getVersion();
@@ -26,7 +26,7 @@ public interface ModInfoDecorator extends CustomisationProvider
 	 * Allows this decorator to modify the status text for the specified mod, return null if no modification required
 	 * 
 	 * @param statusText
-	 * @return
+	 * @return new status text or NULL to indicate the text should remain default 
 	 */
 	public abstract String modifyStatusText(ModInfo<?> mod, String statusText);
@@ -62,13 +62,11 @@ public interface APIAdapter
 	/**
 	 * @param api
-	 * @return
 	 */
 	public abstract List<? extends Observer> getPreInitObservers(LiteAPI api);
 	/**
 	 * @param observerType
-	 * @return
 	 */
 	public abstract <T extends Observer> List<T> getPreInitObservers(Class<T> observerType);
 }
@@ -30,7 +30,6 @@ public interface APIProvider
 	 * 
 	 * @param identifier API identifier (case sensitive)
 	 * @param minRevision minimum required revision
-	 * @return
 	 */
 	public abstract boolean isAPIAvailable(String identifier, int minRevision);
@@ -38,7 +37,6 @@ public interface APIProvider
 	 * Gets a specific API by identifier
 	 * 
 	 * @param identifier API identifier (case sensitive)
-	 * @return
 	 */
 	public abstract LiteAPI getAPI(String identifier);
@@ -46,7 +44,6 @@ public interface APIProvider
 	 * Gets a specific API by class
 	 * 
 	 * @param apiClass
-	 * @return
 	 */
 	public abstract <T extends LiteAPI> T getAPI(Class<T> apiClass);
 }
 \ No newline at end of file
@@ -62,7 +62,7 @@ public final class APIRegistry
 	}
 	/**
-	 * @return
+	 * Get all currently registered API classes
 	 */
 	public String[] getRegisteredAPIs()
 	{
@@ -133,8 +133,8 @@ public final class APIRegistry
 	}
 	/**
-	 * @return
-	 * @throws InvalidAPIStateException
+	 * Bakes all currently registered API classes to a new APIProvider containing the API instances
+	 * @throws InvalidAPIStateException if the API list was already baked
 	 */
 	public APIProvider bake() throws InvalidAPIStateException
 	{
@@ -148,8 +148,8 @@ public final class APIRegistry
 	}
 	/**
-	 * @return
-	 * @throws InvalidAPIStateException
+	 * Gets the current APIProvider instance
+	 * @throws InvalidAPIStateException if the provider list was not yet baked
 	 */
 	public APIProvider getProvider() throws InvalidAPIStateException
 	{
@@ -162,14 +162,14 @@ public final class APIRegistry
 	}
 	/**
-	 * @return
-	 * @throws InvalidAPIStateException
+	 * Gets the current APIAdapter instance
+	 * @throws InvalidAPIStateException if the provider list was not yet baked
 	 */
 	public APIAdapter getAdapter() throws InvalidAPIStateException
 	{
 		if (this.baked == null)
 		{
-			throw new InvalidAPIStateException("Call to APIRegistry.getProvider() failed because the provider list has not been baked");
+			throw new InvalidAPIStateException("Call to APIRegistry.APIAdapter() failed because the provider list has not been baked");
 		}
 		return this.baked;
@@ -63,13 +63,11 @@ public interface GameEngine&lt;TClient, TServer extends MinecraftServer&gt;
 	/**
 	 * @param resourcePack
-	 * @return
 	 */
 	public abstract boolean registerResourcePack(IResourcePack resourcePack);
 	/**
 	 * @param resourcePack
-	 * @return
 	 */
 	public abstract boolean unRegisterResourcePack(IResourcePack resourcePack);
@@ -104,7 +104,6 @@ public abstract class ClientPluginChannels extends PluginChannels&lt;PluginChannelL
 	/**
 	 * @param channel
 	 * @param data
-	 * @param length
 	 */
 	protected void onModPacketReceived(String channel, PacketBuffer data)
 	{
@@ -14,7 +14,7 @@ public interface CommonPluginChannelListener extends Listener
 	/**
 	 * Return a list of the plugin channels the mod wants to register
 	 * 
-	 * @return
+	 * @return plugin channel names as a list, it is recommended to use {@link com.google.common.collect.ImmutableList#of} for this purpose
 	 */
 	public abstract List<String> getChannels();
 }
@@ -55,7 +55,6 @@ public class EnabledModsList
 	 * 
 	 * @param profileName
 	 * @param identifier
-	 * @return
 	 */
 	public boolean isEnabled(String profileName, String identifier)
 	{
@@ -143,8 +142,8 @@ public class EnabledModsList
 	 * Factory method which tries to deserialise the enablement list from the file or if failing creates
 	 * and returns a new instance.
 	 * 
-	 * @param file
-	 * @return
+	 * @param file JSON file to create the EnabledModsList from
+	 * @return a new EnabledModsList instance
 	 */
 	public static EnabledModsList createFrom(File file)
 	{
@@ -256,10 +256,8 @@ public final class LiteLoader
 	}
 	/**
-	 * Get the singleton instance of LiteLoader, initialises the loader if
-	 * necessary
+	 * Get the singleton instance of LiteLoader, initialises the loader if necessary
 	 * 
-	 * @param locationProvider
 	 * @return LiteLoader instance
 	 */
 	public static final LiteLoader getInstance()
@@ -269,8 +267,6 @@ public final class LiteLoader
 	/**
 	 * Get the tweak system classloader
-	 * 
-	 * @return
 	 */
 	public static LaunchClassLoader getClassLoader()
 	{
@@ -279,8 +275,6 @@ public final class LiteLoader
 	/**
 	 * Get LiteLoader version
-	 * 
-	 * @return
 	 */
 	public static final String getVersion()
 	{
@@ -289,8 +283,6 @@ public final class LiteLoader
 	/**
 	 * Get LiteLoader version
-	 * 
-	 * @return
 	 */
 	public static final String getVersionDisplayString()
 	{
@@ -299,8 +291,6 @@ public final class LiteLoader
 	/**
 	 * Get the loader revision
-	 * 
-	 * @return
 	 */
 	public static final int getRevision()
 	{
@@ -308,7 +298,7 @@ public final class LiteLoader
 	}
 	/**
-	 * @return
+	 * Get all active API instances
 	 */
 	public static final LiteAPI[] getAPIs()
 	{
@@ -319,14 +309,23 @@ public final class LiteLoader
 	}
 	/**
+	 * Get an API instance by identifier (returns null if no instance matching the supplied identifier exists)
+	 * 
 	 * @param identifier
-	 * @return
 	 */
 	public static final LiteAPI getAPI(String identifier)
 	{
 		return LiteLoader.instance.apiProvider.getAPI(identifier);
 	}
+	/**
+	 * @param identifier
+	 */
+	public static boolean isAPIAvailable(String identifier)
+	{
+		return LiteLoader.getAPI(identifier) != null;
+	}
+	
 	@SuppressWarnings("unchecked")
 	public static final <C extends CustomisationProvider> C getCustomisationProvider(LiteAPI api, Class<C> providerType)
 	{
@@ -339,33 +338,33 @@ public final class LiteLoader
 		return null;
 	}
-	
+
 	/**
-	 * @param identifier
-	 * @return
+	 * Get the client-side permissions manager
 	 */
-	public static boolean isAPIAvailable(String identifier)
-	{
-		return LiteLoader.getAPI(identifier) != null;
-	}
-	
 	public static PermissionsManagerClient getClientPermissionsManager()
 	{
 		return LiteLoader.instance.permissionsManagerClient;
 	}
+	/**
+	 * Get the server-side permissions manager
+	 */
 	public static PermissionsManagerServer getServerPermissionsManager()
 	{
 		return LiteLoader.instance.permissionsManagerServer;
 	}
+	/**
+	 * Get the current game engine wrapper
+	 */
 	public static GameEngine<?, ?> getGameEngine()
 	{
 		return LiteLoader.instance.engine;
 	}
 	/**
-	 * @return
+	 * Get the interface manager
 	 */
 	public static LiteLoaderInterfaceManager getInterfaceManager()
 	{
@@ -374,8 +373,6 @@ public final class LiteLoader
 	/**
 	 * Get the client-side plugin channel manager
-	 * 
-	 * @return
 	 */
 	public static ClientPluginChannels getClientPluginChannels()
 	{
@@ -384,8 +381,6 @@ public final class LiteLoader
 	/**
 	 * Get the server-side plugin channel manager
-	 * 
-	 * @return
 	 */
 	public static ServerPluginChannels getServerPluginChannels()
 	{
@@ -402,8 +397,6 @@ public final class LiteLoader
 	/**
 	 * Get the mod panel manager
-	 * 
-	 * @return
 	 */
 	@SuppressWarnings({ "cast", "unchecked" })
 	public static <T> PanelManager<T> getModPanelManager()
@@ -436,7 +429,7 @@ public final class LiteLoader
 	}
 	/**
-	 * @return
+	 * Get the game directory
 	 */
 	public static File getGameDirectory()
 	{
@@ -444,7 +437,7 @@ public final class LiteLoader
 	}
 	/**
-	 * @return
+	 * Get the "assets" root directory
 	 */
 	public static File getAssetsDirectory()
 	{
@@ -452,7 +445,7 @@ public final class LiteLoader
 	}
 	/**
-	 * @return
+	 * Get the name of the profile which launched the game
 	 */
 	public static String getProfile()
 	{
@@ -470,13 +463,16 @@ public final class LiteLoader
 	}
 	/**
-	 * @return
+	 * Get whether the current environment is MCP
 	 */
 	public static boolean isDevelopmentEnvironment()
 	{
 		return "true".equals(System.getProperty("mcpenv"));
 	}
+	/**
+	 * Dump debugging information to the console
+	 */
 	public static void dumpDebugInfo()
 	{
 		if (LiteLoaderLogger.DEBUG)
@@ -550,7 +546,6 @@ public final class LiteLoader
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
 	 * @param modName Mod's name, identifier or class name
-	 * @return
 	 * @throws InvalidActivityException
 	 */
 	public <T extends LiteMod> T getMod(String modName) throws InvalidActivityException, IllegalArgumentException
@@ -566,9 +561,7 @@ public final class LiteLoader
 	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
-	 * @param modName Mod's name or class name
-	 * @return
-	 * @throws InvalidActivityException
+	 * @param modClass Mod class
 	 */
 	public <T extends LiteMod> T getMod(Class<T> modClass)
 	{
@@ -584,7 +577,6 @@ public final class LiteLoader
 	 * Get whether the specified mod is installed
 	 *
 	 * @param modName
-	 * @return
 	 */
 	public boolean isModInstalled(String modName)
 	{
@@ -599,7 +591,6 @@ public final class LiteLoader
 	 * @param modNameOrId
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
 	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
@@ -614,7 +605,6 @@ public final class LiteLoader
 	 * @param mod
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	public String getModMetaData(LiteMod mod, String metaDataKey, String defaultValue)
 	{
@@ -627,7 +617,6 @@ public final class LiteLoader
 	 * @param modClass
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
 	{
@@ -638,7 +627,6 @@ public final class LiteLoader
 	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public String getModIdentifier(Class<? extends LiteMod> modClass)
 	{
@@ -648,8 +636,7 @@ public final class LiteLoader
 	/**
 	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
-	 * @param modClass
-	 * @return
+	 * @param mod
 	 */
 	public String getModIdentifier(LiteMod mod)
 	{
@@ -660,7 +647,6 @@ public final class LiteLoader
 	 * Get the container (mod file, classpath jar or folder) for the specified mod
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public LoadableMod<?> getModContainer(Class<? extends LiteMod> modClass)
 	{
@@ -670,8 +656,7 @@ public final class LiteLoader
 	/**
 	 * Get the container (mod file, classpath jar or folder) for the specified mod
 	 * 
-	 * @param modClass
-	 * @return
+	 * @param mod
 	 */
 	public LoadableMod<?> getModContainer(LiteMod mod)
 	{
@@ -682,7 +667,6 @@ public final class LiteLoader
 	 * Get the mod which matches the specified identifier
 	 * 
 	 * @param identifier
-	 * @return
 	 */
 	public Class<? extends LiteMod> getModFromIdentifier(String identifier)
 	{
@@ -716,7 +700,6 @@ public final class LiteLoader
 	/**
 	 * @param modName
-	 * @return
 	 */
 	public boolean isModEnabled(String modName)
 	{
@@ -725,7 +708,6 @@ public final class LiteLoader
 	/**
 	 * @param modName
-	 * @return
 	 */
 	public boolean isModActive(String modName)
 	{
@@ -182,7 +182,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	/**
 	 * @param version
-	 * @return
 	 */
 	@Override
 	public File inflectVersionedConfigPath(LiteLoaderVersion version)
@@ -196,7 +195,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	}
 	/**
-	 * @return 
 	 * 
 	 */
 	private void initAPIs(List<String> apisToLoad)
@@ -301,8 +299,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	/**
 	 * @param classLoader
-	 * @param loadTweaks
-	 * @return
 	 */
 	protected LiteLoaderEnumerator spawnEnumerator(LaunchClassLoader classLoader)
 	{
@@ -531,7 +527,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	}
 	/**
-	 * @return
+	 * Get the common configuration folder
 	 */
 	@Override
 	public File getCommonConfigFolder()
@@ -540,7 +536,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	}
 	/**
-	 * @return
+	 * Get the versioned configuration folder
 	 */
 	@Override
 	public File getVersionedConfigFolder()
@@ -553,7 +549,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * 
 	 * @param propertyName
 	 * @param defaultValue
-	 * @return
 	 */
 	@Override
 	public boolean getAndStoreBooleanProperty(String propertyName, boolean defaultValue)
@@ -567,8 +562,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * Get a boolean propery from the properties file and also write the new value back to the properties file
 	 * 
 	 * @param propertyName
-	 * @param defaultValue
-	 * @return
 	 */
 	@Override
 	public boolean getBooleanProperty(String propertyName)
@@ -627,7 +620,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * Get last know revision for mod from the config file 
 	 * 
 	 * @param modKey
-	 * @return
 	 */
 	@Override
 	public int getLastKnownModRevision(String modKey)
@@ -707,12 +699,18 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 		}
 	}
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.launch.LoaderBootstrap#getRequiredTransformers()
+	 */
 	@Override
 	public List<String> getRequiredTransformers()
 	{
 		return this.apiAdapter.getRequiredTransformers();
 	}
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.launch.LoaderBootstrap#getRequiredDownstreamTransformers()
+	 */
 	@Override
 	public List<String> getRequiredDownstreamTransformers()
 	{
@@ -122,10 +122,9 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	protected EnumeratorState state = EnumeratorState.INIT;
 	/**
+	 * @param environment
 	 * @param properties
 	 * @param classLoader
-	 * @param loadTweaks
-	 * @param gameFolder
 	 */
 	public LiteLoaderEnumerator(LoaderEnvironment environment, LoaderProperties properties, LaunchClassLoader classLoader)
 	{
@@ -190,7 +189,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	}
 	/**
-	 * @return
+	 * Get the loader environment
 	 */
 	public LoaderEnvironment getEnvironment()
 	{
@@ -199,7 +198,6 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	/**
 	 * Initialise the "shared" mod list if it's not already been created
-	 * @return 
 	 */
 	@Override
 	public Map<String, Map<String, String>> getSharedModList()
@@ -252,7 +250,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	}
 	/**
-	 * @return
+	 * Get the set of disabled containers
 	 */
 	@Override
 	public Collection<? extends ModInfo<Loadable<?>>> getDisabledContainers()
@@ -285,10 +283,9 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	/**
 	 * Get a metadata value for the specified mod
 	 * 
-	 * @param modClassName
+	 * @param modClass
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	@Override
 	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
@@ -299,8 +296,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	}
 	/**
-	 * @param mod
-	 * @return
+	 * @param identifier
 	 */
 	@Override
 	public LoadableMod<?> getContainer(String identifier)
@@ -321,8 +317,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	}
 	/**
-	 * @param mod
-	 * @return
+	 * @param modClass
 	 */
 	@Override
 	public LoadableMod<?> getContainer(Class<? extends LiteMod> modClass)
@@ -351,7 +346,6 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	 * Get the mod identifier (metadata key), this is used for versioning, exclusivity, and enablement checks
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	@Override
 	public String getIdentifier(Class<? extends LiteMod> modClass)
@@ -99,10 +99,11 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	private FastIterable<ServerPlayerListener> serverPlayerListeners = new HandlerList<ServerPlayerListener>(ServerPlayerListener.class);
 	/**
-	 * Package private ctor
+	 * ctor
 	 * 
 	 * @param loader
-	 * @param minecraft
+	 * @param engine
+	 * @param properties
 	 */
 	public LiteLoaderEventBroker(LiteLoader loader, GameEngine<TClient, TServer> engine, LoaderProperties properties)
 	{
@@ -241,7 +242,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	 * @param player
 	 * @param oldPlayer
 	 * @param dimension
-	 * @param copy
+	 * @param won
 	 */
 	public void onRespawnPlayer(ServerConfigurationManager scm, EntityPlayerMP player, EntityPlayerMP oldPlayer, int dimension, boolean won)
 	{
@@ -239,7 +239,6 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	/**
 	 * @param api
-	 * @param observers
 	 */
 	@Override
 	public void registerAPI(LiteAPI api)
@@ -275,7 +274,6 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	 * Register a new interface provider
 	 * 
 	 * @param provider
-	 * @return
 	 */
 	public boolean registerProvider(InterfaceProvider provider)
 	{
@@ -382,7 +380,6 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	/**
 	 * @param interfaceType
-	 * @return
 	 */
 	public List<InterfaceProvider> getProvidersFor(Class<? extends Listener> interfaceType)
 	{
@@ -433,7 +430,6 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	 * returns null
 	 * 
 	 * @param provider
-	 * @return
 	 */
 	public LiteAPI getAPIForProvider(InterfaceProvider provider)
 	{
@@ -192,7 +192,6 @@ public class LiteLoaderMods
 	 * Get whether the specified mod is installed
 	 *
 	 * @param modName
-	 * @return
 	 */
 	public boolean isModInstalled(String modName)
 	{
@@ -210,7 +209,6 @@ public class LiteLoaderMods
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
 	 * @param modName Mod's name, identifier or class name
-	 * @return
 	 */
 	@SuppressWarnings("unchecked")
 	public <T extends LiteMod> T getMod(String modName)
@@ -232,8 +230,7 @@ public class LiteLoaderMods
 	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
-	 * @param modName Mod's name or class name
-	 * @return
+	 * @param modClass Mod class
 	 */
 	@SuppressWarnings("unchecked")
 	public <T extends LiteMod> T getMod(Class<T> modClass)
@@ -251,7 +248,6 @@ public class LiteLoaderMods
 	 * Get the mod which matches the specified identifier
 	 * 
 	 * @param identifier
-	 * @return
 	 */
 	public Class<? extends LiteMod> getModFromIdentifier(String identifier)
 	{
@@ -272,7 +268,6 @@ public class LiteLoaderMods
 	 * @param modNameOrId
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
 	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
@@ -287,7 +282,6 @@ public class LiteLoaderMods
 	 * @param mod
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	public String getModMetaData(LiteMod mod, String metaDataKey, String defaultValue)
 	{
@@ -301,7 +295,6 @@ public class LiteLoaderMods
 	 * @param modClass
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
 	{
@@ -313,7 +306,6 @@ public class LiteLoaderMods
 	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public String getModIdentifier(Class<? extends LiteMod> modClass)
 	{
@@ -323,8 +315,7 @@ public class LiteLoaderMods
 	/**
 	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
-	 * @param modClass
-	 * @return
+	 * @param mod
 	 */
 	public String getModIdentifier(LiteMod mod)
 	{
@@ -335,7 +326,6 @@ public class LiteLoaderMods
 	 * Get the container (mod file, classpath jar or folder) for the specified mod
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public LoadableMod<?> getModContainer(Class<? extends LiteMod> modClass)
 	{
@@ -345,8 +335,7 @@ public class LiteLoaderMods
 	/**
 	 * Get the container (mod file, classpath jar or folder) for the specified mod
 	 * 
-	 * @param modClass
-	 * @return
+	 * @param mod
 	 */
 	public LoadableMod<?> getModContainer(LiteMod mod)
 	{
@@ -381,7 +370,6 @@ public class LiteLoaderMods
 	/**
 	 * @param identifier
-	 * @return
 	 */
 	public boolean isModEnabled(String identifier)
 	{
@@ -394,8 +382,7 @@ public class LiteLoaderMods
 	}
 	/**
-	 * @param modName
-	 * @return
+	 * @param identifier
 	 */
 	public boolean isModActive(String identifier)
 	{
@@ -166,7 +166,6 @@ class Mod extends ModInfo&lt;LoadableMod&lt;?&gt;&gt;
 	 * Get whether any of the valid identifiers match the supplied name
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public boolean matchesName(String name)
 	{
@@ -177,7 +176,6 @@ class Mod extends ModInfo&lt;LoadableMod&lt;?&gt;&gt;
 	 * Get whether ths mod identifier matches the supplied identifier 
 	 * 
 	 * @param identifier
-	 * @return
 	 */
 	public boolean matchesIdentifier(String identifier)
 	{
@@ -141,9 +141,7 @@ public abstract class PacketEvents implements InterfaceProvider
 	}
 	/**
-	 * 
 	 * @param context
-	 * @return
 	 */
 	protected abstract IThreadListener getPacketContextListener(Packets.Context context);
@@ -151,7 +149,6 @@ public abstract class PacketEvents implements InterfaceProvider
 	 * @param e
 	 * @param netHandler
 	 * @param packetId
-	 * @param packet
 	 * 
 	 * @return true if the packet was handled by a local handler and shouldn't be forwarded to later handlers
 	 */
@@ -63,7 +63,7 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	}
 	/**
-	 * @return
+	 * Spawn the handler list instance for this channel manager
 	 */
 	protected abstract FastIterableDeque<L> createHandlerList();
@@ -87,7 +87,7 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	 * Check whether a server plugin channel is registered
 	 * 
 	 * @param channel
-	 * @return
+	 * @return true if the channel is registered at the server side
 	 */
 	public boolean isRemoteChannelRegistered(String channel)
 	{
@@ -136,7 +136,6 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	}
 	/**
-	 * @return 
 	 * 
 	 */
 	protected PacketBuffer getRegistrationData()
@@ -215,7 +214,6 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 		 * True if this policy allows outbound traffic on the specified channel
 		 * 
 		 * @param channel
-		 * @return
 		 */
 		public boolean allows(PluginChannels<?> channels, String channel)
 		{
@@ -225,8 +223,6 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 		/**
 		 * True if this policy does not throw an exception for unregistered outbound channels
-		 * 
-		 * @return
 		 */
 		public boolean isSilent()
 		{
@@ -141,9 +141,9 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
 	}
 	/**
+	 * @param sender
 	 * @param channel
 	 * @param data
-	 * @param length
 	 */
 	protected void onModPacketReceived(EntityPlayerMP sender, String channel, PacketBuffer data)
 	{
@@ -33,12 +33,6 @@ public class EnumeratorModuleClassPath implements EnumeratorModule
 	private boolean loadTweaks;
-	/**
-	 * @param parent
-	 * @param searchProtectionDomain
-	 * @param searchClassPath
-	 * @param loadTweaks
-	 */
 	public EnumeratorModuleClassPath()
 	{
 		// Read the JVM class path into the local array
@@ -83,6 +83,9 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 		properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_JARFILES, this.readJarFiles);
 	}
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString()
 	{
@@ -90,7 +93,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	}
 	/**
-	 * @return
+	 * Get the directory this module will inspect
 	 */
 	public File getDirectory()
 	{
@@ -202,7 +205,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	}
 	/**
-	 * @return
+	 * Get the {@link FilenameFilter} to use to filter candidate files
 	 */
 	protected FilenameFilter getFilenameFilter()
 	{
@@ -212,7 +215,6 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	/**
 	 * @param modFile
-	 * @return
 	 */
 	protected boolean isFileSupported(LoadableModFile modFile)
 	{
@@ -22,12 +22,6 @@ public class EnumeratorModuleProtectionDomain implements EnumeratorModule
 {
 	private LoadableMod<File> codeSource;
-	/**
-	 * @param parent
-	 * @param searchProtectionDomain
-	 * @param searchClassPath
-	 * @param loadTweaks
-	 */
 	public EnumeratorModuleProtectionDomain(boolean loadTweaks)
 	{
 		this.initPackagePath();
@@ -148,7 +148,7 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
 	}
 	/**
-	 * @return
+	 * Get the ObjectFactory
 	 */
 	public abstract ObjectFactory<?, ?> getObjectFactory();
 }
@@ -384,12 +384,6 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 		}
 	}
-	/**
-	 * Registers this file as a minecraft resource pack 
-	 * 
-	 * @param name
-	 * @return true if the pack was added
-	 */
 	@Override
 	public boolean hasResourcePack()
 	{
@@ -490,16 +484,12 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	/**
 	 * @param name
 	 * @param charset
-	 * @return
 	 */
 	public String getFileContents(String name, Charset charset)
 	{
 		return LoadableModFile.getFileContents(this, name, charset);
 	}
-	/**
-	 * @return
-	 */
 	protected static List<String> enumerateZipFile(File file)
 	{
 		List<String> classes = new ArrayList<String>();
@@ -572,7 +562,6 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	/**
 	 * @param zip
 	 * @param entry
-	 * @return
 	 * @throws IOException
 	 */
 	public static String zipEntryToString(ZipFile zip, ZipEntry entry) throws IOException
@@ -616,7 +605,6 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	 * @param parent
 	 * @param name
 	 * @param charset
-	 * @return
 	 */
 	public static String getFileContents(File parent, String name, Charset charset)
 	{
@@ -217,10 +217,8 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
 		return 1000;
 	}
-	/**
-	 * Returns the baked list of all listeners
-	 * 
-	 * @return
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.interfaces.FastIterable#all()
 	 */
 	@Override
 	public T all()
@@ -165,7 +165,6 @@ public class Obf
 	}
 	/**
-	 * @param mcpName
 	 * @param seargeName
 	 * @param obfName
 	 */
@@ -191,7 +190,6 @@ public class Obf
 	/**
 	 * @param type
-	 * @return
 	 */
 	public String getDescriptor(int type)
 	{
@@ -200,7 +198,6 @@ public class Obf
 	/**
 	 * @param seargeName
-	 * @return
 	 */
 	protected String getDeobfuscatedName(String seargeName)
 	{
@@ -209,7 +206,6 @@ public class Obf
 	/**
 	 * @param seargeName
-	 * @return
 	 */
 	static String getDeobfName(String seargeName)
 	{
@@ -238,7 +234,6 @@ public class Obf
 	/**
 	 * @param name
-	 * @return
 	 */
 	public static Obf getByName(String name)
 	{
@@ -303,7 +303,6 @@ public class Packets extends Obf
 	/**
 	 * @param name
-	 * @return
 	 */
 	public static Packets getByName(String name)
 	{
@@ -26,7 +26,7 @@ public class CallableLaunchWrapper implements Callable&lt;String&gt;
 	}
 	/**
-	 * @return
+	 * Generates a list of active transformers to display in the crash report
 	 */
 	public static String generateTransformerList()
 	{
@@ -18,8 +18,6 @@ public interface FastIterable&lt;T&gt;
 	/**
 	 * Return the baked view of all entries
-	 * 
-	 * @return
 	 */
 	public T all();
@@ -28,13 +28,13 @@ public interface Injectable
 	/**
 	 * @param classLoader
 	 * @param injectIntoParent
-	 * @return
+	 * @return whether the injection was successful or not
 	 * @throws MalformedURLException
 	 */
 	public abstract boolean injectIntoClassPath(LaunchClassLoader classLoader, boolean injectIntoParent) throws MalformedURLException;
 	/**
-	 * @return
+	 * Get the injection strategy for this object
 	 */
 	public abstract InjectionStrategy getInjectionStrategy();
 }
@@ -67,7 +67,6 @@ public interface Loadable&lt;L&gt; extends Comparable&lt;L&gt;
 	 * Get whether this loadable is currently enabled in the context of the supplied mods list
 	 * 
 	 * @param environment
-	 * @return
 	 */
 	public abstract boolean isEnabled(LoaderEnvironment environment);
@@ -86,7 +86,6 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 	 * 
 	 * @param metaKey metadata key
 	 * @param defaultValue metadata value
-	 * @return
 	 */
 	public abstract String getMetaValue(String metaKey, String defaultValue);
@@ -36,7 +36,6 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * Check API requirements for the supplied container
 	 * 
 	 * @param container
-	 * @return
 	 */
 	public abstract boolean checkAPIRequirements(LoadableMod<?> container);
@@ -44,7 +43,6 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * Check intra-mod dependencies for the supplied container
 	 * 
 	 * @param base
-	 * @return
 	 */
 	public abstract boolean checkDependencies(LoadableMod<?> base);
@@ -52,7 +50,6 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * Inflect mod identifier from the supplied mod class
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public abstract String getIdentifier(Class<? extends LiteMod> modClass);
@@ -60,7 +57,6 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * Get the container which the specified mod is loaded from
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public abstract LoadableMod<?> getContainer(Class<? extends LiteMod> modClass);
@@ -68,14 +64,11 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * Get the container for the specified mod identifier
 	 * 
 	 * @param identifier
-	 * @return
 	 */
 	public abstract LoadableMod<?> getContainer(String identifier);
 	/**
 	 * Get all containers identified at discover-time as disabled
-	 * 
-	 * @return
 	 */
 	public abstract Collection<? extends ModInfo<Loadable<?>>> getDisabledContainers();
@@ -83,27 +76,26 @@ public interface LoaderEnumerator extends ModularEnumerator
 	 * @param modClass
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @return
 	 */
 	public abstract String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue);
 	/**
-	 * @return
+	 * Get the total number of mods to load
 	 */
 	public abstract int modsToLoadCount();
 	/**
-	 * @return
+	 * Get all mods to load
 	 */
 	public abstract Collection<? extends ModInfo<LoadableMod<?>>> getModsToLoad();
 	/**
-	 * @return
+	 * Get all tweakers which were injected
 	 */
 	public abstract List<? extends ModInfo<Loadable<?>>> getInjectedTweaks();
 	/**
-	 * @return
+	 * Get the shared modlist data
 	 */
 	public abstract Map<String, Map<String, String>> getSharedModList();
 }
@@ -21,13 +21,11 @@ public interface ModularEnumerator
 	/**
 	 * @param container
-	 * @return
 	 */
 	public abstract boolean registerModContainer(LoadableMod<?> container);
 	/**
 	 * @param container
-	 * @return
 	 */
 	public abstract boolean registerTweakContainer(TweakContainer<File> container);
@@ -26,57 +26,59 @@ public interface PanelManager&lt;TParentScreen&gt; extends TickObserver, PostRenderObs
 	public abstract void onStartupComplete();
 	/**
-	 * 
+	 * Hide the LiteLoader tab
 	 */
 	public abstract void hideTab();
 	/**
-	 * @param show
+	 * Set the LiteLoader tab's visibility
 	 */
 	public abstract void setTabVisible(boolean show);
 	/**
-	 * @return
+	 * Get whether the LiteLoader tab is visible
 	 */
 	public abstract boolean isTabVisible();
 	/**
-	 * @param show
+	 * Set whether the LiteLoader tab should remain expanded
 	 */
 	public abstract void setTabAlwaysExpanded(boolean expand);
 	/**
-	 * @return
+	 * Get whether the LiteLoader tab should remain expanded
 	 */
 	public abstract boolean isTabAlwaysExpanded();
 	/**
-	 * @param parentScreen
+	 * Display the LiteLoader panel
+	 * 
+	 * @param parentScreen Parent screen to display the panel on top of
 	 */
 	public abstract void displayLiteLoaderPanel(TParentScreen parentScreen);
 	/**
-	 * @return
+	 * Get the number of startup errors
 	 */
 	public abstract int getStartupErrorCount();
 	/**
-	 * @return
+	 * Get the number of critical startup errors
 	 */
 	public abstract int getCriticalErrorCount();
 	/**
-	 * @param notification
+	 * Set the current notification text
 	 */
 	public abstract void setNotification(String notification);
 	/**
-	 * @param forceUpdate
+	 * Set whether "force update" is enabled
 	 */
 	public abstract void setForceUpdateEnabled(boolean forceUpdate);
 	/**
-	 * @return
+	 * Get whether "force update" is enabled
 	 */
 	public abstract boolean isForceUpdateEnabled();
 }
@@ -229,7 +229,6 @@ public abstract class ClassPathUtilities
 	 * Is the specified jar on the game launch classpath
 	 * 
 	 * @param jarFile
-	 * @return
 	 */
 	public static boolean isJarOnClassPath(File jarFile)
 	{
@@ -257,7 +256,6 @@ public abstract class ClassPathUtilities
 	 * 
 	 * @param contextClass
 	 * @param resource
-	 * @return
 	 */
 	public static File getPathToResource(Class<?> contextClass, String resource)
 	{
@@ -288,7 +286,6 @@ public abstract class ClassPathUtilities
 	/**
 	 * @param contextClass
 	 * @param resource
-	 * @return
 	 */
 	public static boolean deleteClassPathJarContaining(Class<?> contextClass, String resource)
 	{
@@ -303,7 +300,6 @@ public abstract class ClassPathUtilities
 	/**
 	 * @param jarFileName
-	 * @return
 	 */
 	public static boolean deleteClassPathJar(String jarFileName)
 	{
@@ -94,7 +94,6 @@ public class ClassTransformerManager
 	/**
 	 * @param transformerClass
-	 * @return
 	 */
 	public boolean injectTransformer(String transformerClass)
 	{
@@ -109,7 +108,6 @@ public class ClassTransformerManager
 	/**
 	 * @param transformerClasses
-	 * @return
 	 */
 	public boolean injectTransformers(Collection<String> transformerClasses)
 	{
@@ -124,7 +122,6 @@ public class ClassTransformerManager
 	/**
 	 * @param transformerClasses
-	 * @return
 	 */
 	public boolean injectTransformers(String[] transformerClasses)
 	{
@@ -38,7 +38,6 @@ public class InjectionStrategy
 		 * Parse an InjectionPosition from the specified "injectAt" string
 		 * 
 		 * @param injectAt
-		 * @return
 		 */
 		public static InjectionPosition parsePosition(String injectAt)
 		{
@@ -52,7 +51,6 @@ public class InjectionStrategy
 		 * Parse InjectionPosition params from the specified "injectAt" string
 		 * 
 		 * @param injectAt
-		 * @return
 		 */
 		public String[] parseParams(String injectAt)
 		{
@@ -124,7 +122,6 @@ public class InjectionStrategy
 	 * Parse an injection strategy from the specified injectAt string
 	 * 
 	 * @param injectAt
-	 * @return
 	 */
 	public static InjectionStrategy parseStrategy(String injectAt)
 	{
@@ -135,7 +132,6 @@ public class InjectionStrategy
 	 * Parse an injection strategy from the specified injectAt string
 	 * 
 	 * @param injectAt
-	 * @return
 	 */
 	public static InjectionStrategy parseStrategy(String injectAt, InjectionStrategy defaultStrategy)
 	{
@@ -62,7 +62,7 @@ public class LiteLoaderTweaker implements ITweaker
 		private boolean completed;
 		/**
-		 * @return
+		 * Get whether this state is completed
 		 */
 		public boolean isCompleted()
 		{
@@ -70,7 +70,7 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 		/**
-		 * @return
+		 * Get whether the tweaker is currrently in this state
 		 */
 		public boolean isInState()
 		{
@@ -131,7 +131,7 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 		/**
-		 * @return
+		 * Get the state which follows this state
 		 */
 		private StartupState getNextState()
 		{
@@ -140,7 +140,6 @@ public class LiteLoaderTweaker implements ITweaker
 		/**
 		 * @param next
-		 * @return
 		 */
 		public boolean canGotoState(StartupState next)
 		{
@@ -153,7 +152,7 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 		/**
-		 * @return
+		 * Get the current state
 		 */
 		public static StartupState getCurrent()
 		{
@@ -449,7 +448,6 @@ public class LiteLoaderTweaker implements ITweaker
 	/**
 	 * @param tweakClass
 	 * @param priority
-	 * @return
 	 */
 	public boolean addCascadedTweaker(String tweakClass, int priority)
 	{
@@ -474,7 +472,6 @@ public class LiteLoaderTweaker implements ITweaker
 	 * 
 	 * @param bootstrapClassName
 	 * @param classLoader
-	 * @return
 	 */
 	protected LoaderBootstrap spawnBootstrap(String bootstrapClassName, ClassLoader classLoader)
 	{
@@ -503,7 +500,6 @@ public class LiteLoaderTweaker implements ITweaker
 	 * @param gameDirectory
 	 * @param assetsDirectory
 	 * @param profile
-	 * @return
 	 */
 	protected StartupEnvironment spawnStartupEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
@@ -524,7 +520,7 @@ public class LiteLoaderTweaker implements ITweaker
 	}
 	/**
-	 * @return
+	 * Get the game jar url (probably)
 	 */
 	public static URL getJarUrl()
 	{
@@ -586,7 +582,7 @@ public class LiteLoaderTweaker implements ITweaker
 	}
 	/**
-	 * @return
+	 * Get whether to enable the loading bar for minecraft startup
 	 */
 	public static boolean loadingBarEnabled()
 	{
@@ -72,7 +72,6 @@ public interface LoaderEnvironment extends GameEnvironment
 	 * Inflect a versioned configuration path for a specific version
 	 * 
 	 * @param version
-	 * @return
 	 */
 	public abstract File inflectVersionedConfigPath(LiteLoaderVersion version);
@@ -29,7 +29,6 @@ public interface LoaderProperties
 	 * Get a boolean property from the properties file
 	 * 
 	 * @param propertyName
-	 * @return
 	 */
 	public abstract boolean getBooleanProperty(String propertyName);
@@ -38,7 +37,6 @@ public interface LoaderProperties
 	 * 
 	 * @param propertyName
 	 * @param defaultValue
-	 * @return
 	 */
 	public abstract boolean getAndStoreBooleanProperty(String propertyName, boolean defaultValue);
@@ -54,7 +52,6 @@ public interface LoaderProperties
 	 * Get an integer property from the properties file
 	 * 
 	 * @param propertyName
-	 * @return
 	 */
 	public abstract int getIntegerProperty(String propertyName);
@@ -63,7 +60,6 @@ public interface LoaderProperties
 	 * 
 	 * @param propertyName
 	 * @param defaultValue
-	 * @return
 	 */
 	public abstract int getAndStoreIntegerProperty(String propertyName, int defaultValue);
@@ -71,7 +67,6 @@ public interface LoaderProperties
 	 * Get a stored mod revision number from the properties file
 	 * 
 	 * @param modKey
-	 * @return
 	 */
 	public abstract int getLastKnownModRevision(String modKey);
@@ -48,8 +48,6 @@ public abstract class StartupEnvironment implements GameEnvironment
 	/**
 	 * @param args
-	 * @param gameDirectory
-	 * @param assetsDirectory
 	 */
 	@SuppressWarnings("unchecked")
 	public void initArgs(List<String> args)
@@ -128,10 +126,6 @@ public abstract class StartupEnvironment implements GameEnvironment
 		this.launchArgs.put(classifiedArg, arg);
 	}
-	/**
-	 * @param gameDirectory
-	 * @param assetsDirectory
-	 */
 	public void provideRequiredArgs()
 	{
 		if (this.launchArgs.get("--version") == null)
@@ -164,7 +158,7 @@ public abstract class StartupEnvironment implements GameEnvironment
 	}
 	/**
-	 * @return
+	 * Get the mod filter list
 	 */
 	public List<String> getModFilterList()
 	{
@@ -172,7 +166,7 @@ public abstract class StartupEnvironment implements GameEnvironment
 	}
 	/**
-	 * @return
+	 * Get API classes to load
 	 */
 	public List<String> getAPIsToLoad()
 	{
@@ -96,7 +96,6 @@ public class Message
 	 * Check if this message is on the specified channel
 	 * 
 	 * @param channel Full name of the channel to check against (case sensitive)
-	 * @return
 	 */
 	public boolean isChannel(String channel)
 	{
@@ -107,7 +106,6 @@ public class Message
 	 * Check if this message has the specified category
 	 * 
 	 * @param category
-	 * @return
 	 */
 	public boolean isCategory(String category)
 	{
@@ -118,7 +116,6 @@ public class Message
 	 * Get (and implicit cast) a value from this message's payload
 	 * 
 	 * @param key
-	 * @return
 	 */
 	@SuppressWarnings("unchecked")
 	public <T> T get(String key)
@@ -167,7 +164,6 @@ public class Message
 	 * Build a KV map from interleaved keys and values, convenience function
 	 * 
 	 * @param args
-	 * @return
 	 */
 	public static Map<String, ?> buildMap(Object... args)
 	{
@@ -29,7 +29,7 @@ public interface AdvancedExposable extends Exposable
 	 * @param configFile Default config file, generated by the ExposableOptions for this Exposable
 	 * @param configFileLocation Default config file location, from the config strategy
 	 * @param defaultFileName Default config file name, from the ExposableOptions
-	 * @return
+	 * @return config file location to return, return null to use the default
 	 */
 	public abstract File getConfigFile(File configFile, File configFileLocation, String defaultFileName);
 }
@@ -133,7 +133,6 @@ public class ConfigManager
 	 * Check whether a config panel is available for the specified class
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public boolean hasPanel(Class<? extends LiteMod> modClass)
 	{
@@ -144,7 +143,6 @@ public class ConfigManager
 	 * Instance a new config panel for the specified mod class if one is available
 	 * 
 	 * @param modClass
-	 * @return
 	 */
 	public ConfigPanel getPanel(Class<? extends LiteMod> modClass)
 	{
@@ -215,7 +213,6 @@ public class ConfigManager
 	/**
 	 * @param exposable
-	 * @return
 	 */
 	public static ConfigStrategy getConfigStrategy(Exposable exposable)
 	{
@@ -72,8 +72,6 @@ public class Permission
 	/**
 	 * Get whether this node is a root node (read only)
-	 * 
-	 * @return
 	 */
 	public boolean isRoot()
 	{
@@ -82,8 +80,6 @@ public class Permission
 	/**
 	 * Get whether this node is a wildcard node 
-	 * 
-	 * @return
 	 */
 	public boolean isWildcard()
 	{
@@ -92,8 +88,6 @@ public class Permission
 	/**
 	 * Get the name of this permission node
-	 * 
-	 * @return
 	 */
 	public String getName()
 	{
@@ -102,8 +96,6 @@ public class Permission
 	/**
 	 * Get the value of this permission node
-	 * 
-	 * @return
 	 */
 	public boolean getValue()
 	{
@@ -124,7 +116,6 @@ public class Permission
 	 * Get the specified node name
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public Permission getPermission(String name)
 	{
@@ -162,7 +153,6 @@ public class Permission
 	 * Set the specified node name
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public Permission setPermission(String name)
 	{
@@ -174,7 +164,6 @@ public class Permission
 	 * 
 	 * @param name
 	 * @param value
-	 * @return
 	 */
 	public Permission setPermission(String name, boolean value)
 	{
@@ -207,7 +196,6 @@ public class Permission
 	 * 
 	 * @param name
 	 * @param value
-	 * @return
 	 */
 	public Permission setPermissionAndValue(String name, boolean value)
 	{
@@ -221,7 +209,6 @@ public class Permission
 	 * 
 	 * @param name
 	 * @param value
-	 * @return
 	 */
 	public boolean isSet(String name, boolean value)
 	{
@@ -19,7 +19,6 @@ public interface Permissions
 	 * Returns true if the authority says we have this permission or false if the permission is denied or not set
 	 * 
 	 * @param permission Name of the permission to test for
-	 * @return
 	 */
 	public abstract boolean getHasPermission(String permission);
@@ -13,8 +13,7 @@ public interface PermissionsManager
 	/**
 	 * Get the underlying permissions node for this manager for the specified mod
 	 * 
-	 * @param modName Mod to fetch permissions for
-	 * @return
+	 * @param mod Mod to fetch permissions for
 	 */
 	public abstract Permissions getPermissions(Permissible mod);
@@ -86,8 +86,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	/**
 	 * Get a reference to the singleton instance of the client permissions manager
-	 * 
-	 * @return
 	 */
 	public static PermissionsManagerClient getInstance()
 	{
@@ -205,8 +203,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	/**
 	 * Send permission query packets to the server for all registered mods
-	 * 
-	 * @param minecraft Minecraft instance
 	 */
 	protected void sendPermissionQueries()
 	{
@@ -219,7 +215,7 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * issued automatically by the client permissions manager when connecting to a new server. However you can call use this
 	 * method to "force" a refresh of permissions when needed.
 	 * 
-	 * @param modName name of the mod to send a query packet for
+	 * @param mod mod to send a query packet for
 	 */
 	public void sendPermissionQuery(Permissible mod)
 	{
@@ -378,7 +374,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * Get the value of the specified permission for all mods.
 	 * 
 	 * @param permission Permission to check for
-	 * @return
 	 */
 	public boolean getPermission(String permission)
 	{
@@ -390,7 +385,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * 
 	 * @param permission Permission to check for
 	 * @param defaultValue Value to return if the permission is not set
-	 * @return
 	 */
 	public boolean getPermission(String permission, boolean defaultValue)
 	{
@@ -403,7 +397,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * 
 	 * @param mod
 	 * @param permission
-	 * @return
 	 */
 	public boolean getModPermission(Permissible mod, String permission)
 	{
@@ -425,7 +418,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * 
 	 * @param modName
 	 * @param permission
-	 * @return
 	 */
 	public boolean getModPermission(String modName, String permission)
 	{
@@ -441,7 +433,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * @param mod
 	 * @param permission
 	 * @param defaultValue
-	 * @return
 	 */
 	public boolean getModPermission(Permissible mod, String permission, boolean defaultValue)
 	{
@@ -463,7 +454,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	 * 
 	 * @param modName
 	 * @param permission
-	 * @return
 	 */
 	public boolean getModPermission(String modName, String permission, boolean defaultValue)
 	{
@@ -474,7 +464,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	/**
 	 * @param modName
 	 * @param permission
-	 * @return
 	 */
 	protected static String formatModPermission(String modName, String permission)
 	{
@@ -9,15 +9,11 @@ public interface ReplicatedPermissions extends Permissions
 {
 	/**
 	 * Get the time that this object was received from the remote authority
-	 * 
-	 * @return
 	 */
 	public abstract long getReplicationTime();
 	/**
-	 * True if this permissions object is valid (within cache period)
-	 * 
-	 * @return
+	 * Return true if this permissions object is valid (within cache period)
 	 */
 	public abstract boolean isValid();
@@ -79,7 +79,7 @@ public class ServerPermissions implements ReplicatedPermissions
 	}
 	/**
-	 * @return
+	 * Get the permissible mod name
 	 */
 	public String getModName()
 	{
@@ -90,8 +90,8 @@ public abstract class ByteCodeUtilities
 	 * Get the first variable index in the supplied method which is not an argument or "this" reference, this corresponds
 	 * to the size of the arguments passed in to the method plus an extra spot for "this" if the method is non-static 
 	 * 
-	 * @param method
-	 * @return
+	 * @param method MethodNode to inspect
+	 * @return first available local index which is NOT used by a method argument or "this"
 	 */
 	public static int getFirstNonArgLocalIndex(MethodNode method)
 	{
@@ -102,9 +102,9 @@ public abstract class ByteCodeUtilities
 	 * Get the first non-arg variable index based on the supplied arg array and whether to include the "this" reference,
 	 * this corresponds to the size of the arguments passed in to the method plus an extra spot for "this" is specified 
-	 * @param args
-	 * @param includeThis
-	 * @return
+	 * @param args Method arguments
+	 * @param includeThis Whether to include a slot for "this" (generally true for all non-static methods)
+	 * @return first available local index which is NOT used by a method argument or "this"
 	 */
 	public static int getFirstNonArgLocalIndex(Type[] args, boolean includeThis)
 	{
@@ -114,8 +114,8 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Get the size of the specified args array in local variable terms (eg. doubles and longs take two spaces)
 	 * 
-	 * @param args
-	 * @return
+	 * @param args Method argument types as array
+	 * @return size of the specified arguments array in terms of stack slots
 	 */
 	public static int getArgsSize(Type[] args)
 	{
@@ -236,11 +236,11 @@ public abstract class ByteCodeUtilities
 	 * Attempts to locate the appropriate entry in the local variable table for the specified local variable index at the location
 	 * specified by node.
 	 * 
-	 * @param classNode
-	 * @param method
-	 * @param node
-	 * @param var
-	 * @return
+	 * @param classNode Containing class
+	 * @param method Method
+	 * @param node Instruction defining the location to get the local variable table at
+	 * @param var Local variable index
+	 * @return a LocalVariableNode containing information about the local variable at the specified location in the specified local slot
 	 */
 	public static LocalVariableNode getLocalVariableAt(ClassNode classNode, MethodNode method, AbstractInsnNode node, int var)
 	{
@@ -268,9 +268,8 @@ public abstract class ByteCodeUtilities
 	 * as part of the obfuscation process, we need to generate the local variable table when running obfuscated. We cache
 	 * the generated tables so that we only need to do the relatively expensive calculation once per method we encounter.
 	 * 
-	 * @param classNode
-	 * @param method
-	 * @return
+	 * @param classNode Containing class
+	 * @param method Method
 	 */
 	public static List<LocalVariableNode> getLocalVariableTable(ClassNode classNode, MethodNode method)
 	{
@@ -295,9 +294,8 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Use ASM Analyzer to generate the local variable table for the specified method
 	 * 
-	 * @param classNode
-	 * @param method
-	 * @return
+	 * @param classNode Containing class
+	 * @param method Method
 	 */
 	public static List<LocalVariableNode> generateLocalVariableTable(ClassNode classNode, MethodNode method)
 	{
@@ -399,8 +397,8 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Get the source code name for the specified type
 	 * 
-	 * @param type
-	 * @return
+	 * @param type Type to generate a friendly name for
+	 * @return String representation of the specified type, eg "int" for an integer primitive or "String" for java.lang.String
 	 */
 	public static String getTypeName(Type type)
 	{
@@ -427,9 +425,8 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Finds a method in the target class, uses names specified in the {@link Obfuscated} annotation if present
 	 * 
-	 * @param targetClass
-	 * @param searchFor
-	 * @return
+	 * @param targetClass Class to search in
+	 * @param searchFor Method to search for
 	 */
 	public static MethodNode findTargetMethod(ClassNode targetClass, MethodNode searchFor)
 	{
@@ -458,9 +455,8 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Finds a field in the target class, uses names specified in the {@link Obfuscated} annotation if present
 	 * 
-	 * @param targetClass
-	 * @param searchFor
-	 * @return
+	 * @param targetClass Class to search in
+	 * @param searchFor Field to search for
 	 */
 	public static FieldNode findTargetField(ClassNode targetClass, FieldNode searchFor)
 	{
@@ -488,10 +484,6 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Get an annotation of the specified class from the supplied field node
-	 * 
-	 * @param field
-	 * @param annotationType
-	 * @return
 	 */
 	public static AnnotationNode getAnnotation(FieldNode field, Class<? extends Annotation> annotationClass)
 	{
@@ -500,10 +492,6 @@ public abstract class ByteCodeUtilities
 	/**
 	 * Get an annotation of the specified class from the supplied method node
-	 * 
-	 * @param method
-	 * @param annotationType
-	 * @return
 	 */
 	public static AnnotationNode getAnnotation(MethodNode method, Class<? extends Annotation> annotationClass)
 	{
@@ -511,9 +499,7 @@ public abstract class ByteCodeUtilities
 	}
 	/**
-	 * @param annotations
-	 * @param annotationType
-	 * @return
+	 * Get an annotation of the specified class from the supplied list of annotations, returns null if no matching annotation was found
 	 */
 	public static AnnotationNode getAnnotation(List<AnnotationNode> annotations, String annotationType)
 	{
@@ -530,10 +516,9 @@ public abstract class ByteCodeUtilities
 	}
 	/**
-	 * Get the value of an annotation node
+	 * Get the value of an annotation node (the value at key "value")
 	 * 
-	 * @param annotation
-	 * @return
+	 * @param annotation Annotation node to inspect
 	 */
 	public static <T> T getAnnotationValue(AnnotationNode annotation)
 	{
@@ -541,9 +526,10 @@ public abstract class ByteCodeUtilities
 	}
 	/**
+	 * Get the value of an annotation node
+	 * 
 	 * @param annotation
 	 * @param key
-	 * @return
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T getAnnotationValue(AnnotationNode annotation, String key)
@@ -277,7 +277,6 @@ public class Callback
 	/**
 	 * @param returnType
 	 * @param args
-	 * @return
 	 */
 	public static String generateDescriptor(Type returnType, Object... args)
 	{
@@ -287,7 +286,6 @@ public class Callback
 	/**
 	 * @param returnType
 	 * @param args
-	 * @return
 	 */
 	public static String generateDescriptor(Obf returnType, Object... args)
 	{
@@ -297,7 +295,6 @@ public class Callback
 	/**
 	 * @param returnType
 	 * @param args
-	 * @return
 	 */
 	public static String generateDescriptor(String returnType, Object... args)
 	{
@@ -308,7 +305,6 @@ public class Callback
 	 * @param obfType
 	 * @param returnType
 	 * @param args
-	 * @return
 	 */
 	public static String generateDescriptor(int obfType, Object returnType, Object... args)
 	{
@@ -31,7 +31,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
  * This transformer applies one class to another as an "overlay". This works by merging down and replacing all
  * methods and fields from the "overlay" class into the "target" class being transformed. Fields and methods
- * marked with the {@link Obfuscate} annotation will search through the list of provided names to find a
+ * marked with the {@link Obfuscated} annotation will search through the list of provided names to find a
  * matching member in the target class, this allows methods and fields in the target class to be referenced
  * even if they have different names after obfuscation.
  * 
@@ -110,8 +110,6 @@ public abstract class ClassOverlayTransformer extends ClassTransformer
 	protected boolean setSourceFile = true;
 	/**
-	 * @param targetClassName
-	 * @param targetClassNameObf
 	 * @param overlayClassName
 	 */
 	protected ClassOverlayTransformer(String overlayClassName)
@@ -197,7 +195,6 @@ public abstract class ClassOverlayTransformer extends ClassTransformer
 	 * 
 	 * @param transformedName
 	 * @param classBytes
-	 * @return
 	 */
 	protected byte[] applyOverlay(String transformedName, byte[] classBytes)
 	{
@@ -379,7 +376,6 @@ public abstract class ClassOverlayTransformer extends ClassTransformer
 	 * @param method
 	 * @param fromClass
 	 * @param toClass
-	 * @return
 	 */
 	private void transformMethod(MethodNode method, String fromClass, String toClass)
 	{
@@ -20,7 +20,6 @@ public abstract class ClassTransformer implements IClassTransformer
 	/**
 	 * @param basicClass
-	 * @return
 	 */
 	protected final ClassNode readClass(byte[] basicClass, boolean cacheReader)
 	{
@@ -34,7 +33,6 @@ public abstract class ClassTransformer implements IClassTransformer
 	/**
 	 * @param classNode
-	 * @return
 	 */
 	protected final byte[] writeClass(ClassNode classNode)
 	{
@@ -118,7 +118,7 @@ public class Event implements Comparable&lt;Event&gt;
 	 * the existing event is returned instead.
 	 * 
 	 * @param name Event name (case insensitive)
-	 * @return
+	 * @return new Event instance or existing Event instance
 	 */
 	public static Event getOrCreate(String name)
 	{
@@ -131,7 +131,7 @@ public class Event implements Comparable&lt;Event&gt;
 	 * 
 	 * @param name Event name (case insensitive)
 	 * @param cancellable True if the event should be created as cancellable
-	 * @return
+	 * @return new Event instance or existing Event instance
 	 */
 	public static Event getOrCreate(String name, boolean cancellable)
 	{
@@ -145,7 +145,7 @@ public class Event implements Comparable&lt;Event&gt;
 	 * @param name Event name (case insensitive)
 	 * @param cancellable True if the event should be created as cancellable
 	 * @param priority Priority for the event, only used when multiple events are being injected at the same instruction
-	 * @return
+	 * @return new Event instance or existing Event instance
 	 */
 	public static Event getOrCreate(String name, boolean cancellable, int priority)
 	{
@@ -92,9 +92,7 @@ public class EventInfo&lt;S&gt; implements Cancellable
 	}
 	/**
-	 * @param returnsVoid
-	 * @param isStatic
-	 * @return
+	 * @param returnType
 	 */
 	protected static String getEventInfoClassName(Type returnType)
 	{
@@ -43,7 +43,7 @@ public abstract class InjectionPoint
 	 * @param insns Insn list to search in, the strategy MUST ONLY add nodes from this list to the {@code nodes} collection
 	 * @param nodes Collection of nodes to populate. Injectors should NOT make any assumptions about the state of this collection and should only call add()
 	 * @param event Event being injected here, supplied to allow alteration of behaviour for specific event configurations (eg. cancellable)
-	 * @return
+	 * @return true if one or more injection points were found
 	 */
 	public abstract boolean find(String desc, InsnList insns, Collection<AbstractInsnNode> nodes, Event event);
@@ -51,7 +51,7 @@ public abstract class InjectionPoint
 	 * Set whether this injection point should capture local variables as well as method arguments
 	 * 
 	 * @param captureLocals
-	 * @return
+	 * @return this, for fluent interface
 	 */
 	public InjectionPoint setCaptureLocals(boolean captureLocals)
 	{
@@ -72,7 +72,7 @@ public abstract class InjectionPoint
 	 * injection point to dump the locals to the debug log at injection time.
 	 * 
 	 * @param logLocals
-	 * @return
+	 * @return this, for fluent interface
 	 */
 	public InjectionPoint setLogLocals(boolean logLocals)
 	{
@@ -81,7 +81,7 @@ public abstract class InjectionPoint
 	}
 	/**
-	 * @return
+	 * Get whether log locals is enabled 
 	 */
 	public boolean logLocals()
 	{
@@ -263,7 +263,6 @@ public abstract class InjectionPoint
 	 * injection points 
 	 * 
 	 * @param operands
-	 * @return
 	 */
 	public static InjectionPoint and(InjectionPoint... operands)
 	{
@@ -275,7 +274,6 @@ public abstract class InjectionPoint
 	 * injection points 
 	 * 
 	 * @param operands
-	 * @return
 	 */
 	public static InjectionPoint or(InjectionPoint... operands)
 	{
@@ -286,7 +284,6 @@ public abstract class InjectionPoint
 	 * Returns an injection point which returns all insns immediately following insns from the supplied injection point
 	 * 
 	 * @param point
-	 * @return
 	 */
 	public static InjectionPoint after(InjectionPoint point)
 	{
@@ -297,7 +294,6 @@ public abstract class InjectionPoint
 	 * Returns an injection point which returns all insns immediately prior to insns from the supplied injection point
 	 * 
 	 * @param point
-	 * @return
 	 */
 	public static InjectionPoint before(InjectionPoint point)
 	{
@@ -308,7 +304,6 @@ public abstract class InjectionPoint
 	 * Returns an injection point which returns all insns offset by the specified "count" from insns from the supplied injection point
 	 * 
 	 * @param point
-	 * @return
 	 */
 	public static InjectionPoint shift(InjectionPoint point, int count)
 	{
@@ -285,7 +285,6 @@ public class MethodInfo
 	 * Get the signature (combined method name and descriptor) for the method represented by this methodInfo
 	 * 
 	 * @param type Obfuscation type to use 
-	 * @return
 	 */
 	public String getSignature(int type)
 	{
@@ -95,7 +95,7 @@ public class BeforeInvoke extends InjectionPoint
 	/**
 	 * Match the specified invokation of the specified method
 	 * 
-	 * @param methodNames Method names to search for
+	 * @param methodName Method name to search for
 	 * @param ordinal ID of the invokation to hook, or -1 to hook all invokations
 	 */
 	public BeforeInvoke(String methodName, int ordinal)
@@ -61,7 +61,7 @@ public class JsonDescriptor implements Serializable
 	/**
 	 * @param obfTable
-	 * @return
+	 * @return MethodInfo for this descriptor
 	 */
 	public MethodInfo parse(JsonObfuscationTable obfTable)
 	{
@@ -134,8 +134,8 @@ public class JsonEvent implements Serializable
 	}
 	/**
-	 * @param transformer
-	 * @return
+	 * @param transformer Transformer to register events with
+	 * @return Event which was registered
 	 */
 	public Event register(ModEventInjectionTransformer transformer)
 	{
@@ -128,7 +128,7 @@ public class JsonEvents implements Serializable
 	 * Parse a new JsonEvents object from the supplied JSON string
 	 * 
 	 * @param json
-	 * @return
+	 * @return new JsonEvents instance
 	 * @throws InvalidEventJsonException if the JSON ins invalid
 	 */
 	public static JsonEvents parse(String json) throws InvalidEventJsonException
@@ -59,7 +59,6 @@ public class JsonMethods
 	 * Fetches a method descriptor by token
 	 * 
 	 * @param token
-	 * @return
 	 */
 	public MethodInfo get(String token)
 	{
@@ -91,7 +91,6 @@ public class JsonObfuscationTable implements Serializable
 	/**
 	 * @param token
-	 * @return
 	 */
 	public Obf parseClass(String token)
 	{
@@ -100,7 +99,6 @@ public class JsonObfuscationTable implements Serializable
 	/**
 	 * @param token
-	 * @return
 	 */
 	public Obf parseMethod(String token)
 	{
@@ -109,7 +107,6 @@ public class JsonObfuscationTable implements Serializable
 	/**
 	 * @param token
-	 * @return
 	 */
 	public Obf parseField(String token)
 	{
@@ -119,7 +116,6 @@ public class JsonObfuscationTable implements Serializable
 	/**
 	 * @param token
 	 * @param obfs
-	 * @return
 	 */
 	private Obf parseObf(String token, Map<String, Obf> obfs)
 	{
@@ -274,7 +274,6 @@ public final class Input implements CoreProvider
 	 * 
 	 * @param descriptor
 	 * @param handler
-	 * @return
 	 */
 	public InputEvent getEvent(String descriptor, InputHandler handler)
 	{
@@ -289,7 +288,6 @@ public final class Input implements CoreProvider
 	 * 
 	 * @param descriptor
 	 * @param handler
-	 * @return
 	 */
 	public InputEvent[] getEvents(String descriptor, InputHandler handler)
 	{
@@ -122,17 +122,11 @@ public class InputEvent
 		if (this.next != null) this.next.onButtonEvent(pressed);
 	}
-	/**
-	 * @return
-	 */
 	public Controller getController()
 	{
 		return this.controller;
 	}
-	/**
-	 * @return
-	 */
 	public Component getComponent()
 	{
 		return this.component;
@@ -187,8 +187,8 @@ public class ComponentRegistry
 	 * @param name
 	 * @param portType
 	 * @param portNumber
-	 * @param componentA
-	 * @return
+	 * @param component
+	 * @param index
 	 */
 	public static String getDescriptor(String type, String name, String portType, int portNumber, String component, int index)
 	{
@@ -200,7 +200,6 @@ public class ComponentRegistry
 	 * @param controller
 	 * @param component
 	 * @param index 
-	 * @return
 	 */
 	private static String getDescriptor(String controller, String component, int index)
 	{
@@ -210,9 +209,8 @@ public class ComponentRegistry
 	/**
 	 * @param controller
-	 * @return
 	 */
-	private  static String getControllerPath(Controller controller)
+	private static String getControllerPath(Controller controller)
 	{
 		return ComponentRegistry.getControllerPath(
 			controller.getType().toString().toLowerCase(),
@@ -227,7 +225,6 @@ public class ComponentRegistry
 	 * @param name
 	 * @param portType
 	 * @param portNumber
-	 * @return
 	 */
 	public static String getControllerPath(String type, String name, String portType, int portNumber)
 	{
@@ -94,8 +94,6 @@ public class HttpStringRetriever extends Thread
 	/**
 	 * Create a new string retriever to be used synchronously
-	 * 
-	 * @param url URL to download from
 	 */
 	public HttpStringRetriever()
 	{
@@ -74,8 +74,6 @@ public class ReplicatedPermissionsContainer implements Serializable
 	/**
 	 * Serialise this container to a byte array for transmission to a remote host
-	 * 
-	 * @return
 	 */
 	public byte[] getBytes()
 	{