Initial work to switch implemention to mixins

Mumfrey
1 parent 9eca984c
Showing 65 changed files with 2108 additions and 924 deletions
.gitignore
build.gradle
extra/formatter.xml
extra/liteloader.importorder
src/client/java/com/mumfrey/liteloader/client/CallbackProxyClient.java
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
src/client/java/com/mumfrey/liteloader/client/ClientProxy.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/PacketEventsClient.java
src/client/java/com/mumfrey/liteloader/client/SoundHandlerReloadInhibitor.java
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
src/client/java/com/mumfrey/liteloader/client/ducks/IClientNetLoginHandler.java
src/client/java/com/mumfrey/liteloader/client/ducks/IFramebuffer.java
src/client/java/com/mumfrey/liteloader/client/ducks/INamespacedRegistry.java
src/client/java/com/mumfrey/liteloader/client/ducks/IObjectIntIdentityMap.java
src/client/java/com/mumfrey/liteloader/client/ducks/IRegistrySimple.java
src/client/java/com/mumfrey/liteloader/client/ducks/IReloadable.java
src/client/java/com/mumfrey/liteloader/client/ducks/IRenderManager.java
src/client/java/com/mumfrey/liteloader/client/ducks/ITileEntityRendererDispatcher.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityPlayerSP.java
@@ -2,7 +2,6 @@
 #########
 MANIFEST.MF
 dependency-reduced-pom.xml
-.checkstyle
  
 # Compiled #
 ############
@@ -19,7 +18,6 @@ target
 *.exe
 *.o
 *.so
-*.launch
  
 # Databases #
 #############
@@ -55,9 +53,12 @@ target
 .DS_Store
 ehthumbs.db
 Thumbs.db
+*.bat
+*.sh
  
 # Project #
 ###########
+.checkstyle
 .classpath
 .externalToolBuilders
 .gradle
@@ -73,4 +74,5 @@ nb-configuration.xml
 *.iml
 *.ipr
 *.iws
+*.launch
  
@@ -15,6 +15,7 @@ buildscript {
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
+        classpath 'org.spongepowered:mixingradle:0.1-SNAPSHOT'
     }
 }
  
@@ -22,10 +23,15 @@ apply plugin: &#39;net.minecraftforge.gradle.tweaker-client&#39;
 apply plugin: 'checkstyle'
 apply plugin: 'maven'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'org.spongepowered.mixin'
+
+// Default tasks
+defaultTasks 'build'
  
 ext {
     // Artefact details
     buildNumber = project.hasProperty("buildNumber") ? buildNumber : '0'
+    buildVersion = project.hasProperty("buildVersion") ? buildVersion : '0.0'
     ciSystem = project.hasProperty("ciSystem") ? ciSystem : 'unknown'
     commit = project.hasProperty("commit") ? commit : 'unknown'
     classifier = project.hasProperty("buildType") ? buildType : 'SNAPSHOT'
@@ -39,9 +45,6 @@ ext {
  
     startClass = 'com.mumfrey.liteloader.debug.Start'
     tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker'
-
-    mixinSrg = new File(project.buildDir, 'tmp/mixins.liteloader/mixins.srg')
-    mixinRefMap = new File(project.buildDir, "tmp/mixins.liteloader/mixins.liteloader.refmap.json")
 }
  
 // Basic project information
@@ -61,7 +64,7 @@ repositories {
 }
  
 dependencies {
-    compile('org.spongepowered:mixin:0.4.7-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.4.10-SNAPSHOT') {
         exclude module: 'launchwrapper'
         exclude module: 'guava'
     }
@@ -75,20 +78,28 @@ minecraft {
 }
  
 sourceSets {
+    main {
+        refMap = "mixins.liteloader.core.refmap.json"
+    }
     client {
         compileClasspath += main.compileClasspath + main.output
+        refMap = "mixins.liteloader.client.refmap.json"
     }
     debug {
         compileClasspath += client.compileClasspath + client.output
     }
 }
  
+mixin {
+    defaultObfuscationEnv notch
+}
+
 checkstyle {
     configProperties = [
-            "name"        : project.name,
-            "organization": project.organization,
-            "url"         : project.url,
-            "year"        : project.inceptionYear
+        "name"        : project.name,
+        "organization": project.organization,
+        "url"         : project.url,
+        "year"        : project.inceptionYear
     ]
     configFile = file("checkstyle.xml")
     toolVersion = '6.13'
@@ -99,8 +110,19 @@ javadoc {
     source sourceSets.debug.allJava
 }
  
-// hacks for run configs
 afterEvaluate {
+    logger.lifecycle '================================================='
+    logger.lifecycle '  LiteLoader'
+    logger.lifecycle '  Copyright (C) 2011-2015 Adam Mummery-Smith'
+    logger.lifecycle '  Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT")
+    logger.lifecycle '================================================='
+    
+    makeEclipseCleanRunClient {
+        arguments = ""
+        jvmArguments = "-Dliteloader.debug=true -Dmixin.debug.verbose=true -Dmixin.debug.verify=true"
+    }
+    
+    // hacks for run configs
     def mc = plugins.getPlugin 'net.minecraftforge.gradle.tweaker-client'
     mc.replacer.putReplacement '{RUN_CLIENT_MAIN}', project.startClass
     mc.replacer.putReplacement '{RUN_CLIENT_TWEAKER}', minecraft.tweakClass
@@ -118,6 +140,14 @@ def jarManifest = {
 }
  
 jar {
+    doFirst {
+        // Seriously forge?
+        ant.replace(
+            file: sourceSets.main.refMapFile,
+            token: "func_72355_a(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;)V",
+            value: "initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V"
+        )
+    }
     from sourceSets.client.output
     from sourceSets.debug.output
     manifest jarManifest
@@ -126,7 +156,6 @@ jar {
 task releaseJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.client.output
-    from project.mixinRefMap
  
     manifest jarManifest
     classifier = 'staging'
@@ -138,7 +167,6 @@ shadowJar {
  
     from sourceSets.main.output
     from sourceSets.client.output
-    from project.mixinRefMap
  
     exclude 'META-INF/*.DSA'
     exclude 'META-INF/*.RSA'
@@ -170,10 +198,7 @@ tasks.withType(JavaCompile) {
         '-Xlint:all',
         '-Xlint:-path',
         '-Xlint:-rawtypes',
-        '-Xlint:-processing',
-        "-AoutSrgFile=${project.mixinSrg.canonicalPath}",
-        "-AoutRefMapFile=${project.mixinRefMap.canonicalPath}",
-        "-AreobfSrgFile=${genSrgs.mcpToNotch.canonicalPath}"
+        '-Xlint:-processing'
     ]
     options.deprecation = true
     options.encoding = 'utf8'
@@ -188,35 +213,22 @@ if (JavaVersion.current().isJava8Compatible()) {
  
 reobf {
     jar {
-        useSrgSrg()
+        mappingType = 'SEARGE'
     }
     releaseJar {
-        useNotchSrg()
+        mappingType = 'NOTCH'
         classpath = sourceSets.main.compileClasspath
-        extraFiles([
-            project.mixinSrg
-        ])
     }
     shadowJar {
-        useNotchSrg()
+        mappingType = 'NOTCH'
         classpath = sourceSets.main.compileClasspath
-        extraFiles([
-            project.mixinSrg
-        ])
     }
 }
  
-compileJava.doFirst {
-    println '------------------------------------------------------------'
-    println 'Running ' + (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT") + ' build'
-    println '------------------------------------------------------------'
-}
-
 build.dependsOn {[
     'reobfReleaseJar',
     'reobfShadowJar'
-    ]
-}
+]}
  
 artifacts {
     if (project.isReleaseBuild) {
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="LiteLoader" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="150"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+</profile>
+</profiles>
+#Organize Import Order
+#Wed Dec 02 11:57:04 GMT 2015
+4=com
+3=org
+2=javax
+1=java
+0=\#
-package com.mumfrey.liteloader.client;
-
-import java.io.File;
-import java.util.UUID;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiIngame;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.ScreenShotHelper;
-import net.minecraft.util.Session;
-import net.minecraft.world.WorldSettings;
-
-import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.core.CallbackProxyCommon;
-import com.mumfrey.liteloader.transformers.event.EventInfo;
-import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
-
-/**
- * Proxy class which handles the redirected calls from the injected callbacks
- * and routes them to the relevant liteloader handler classes. We do this rather
- * than patching a bunch of bytecode into the packet classes themselves because
- * this is easier to maintain.
- * 
- * @author Adam Mummery-Smith
- */
-public abstract class CallbackProxyClient extends CallbackProxyCommon
-{
-    private static LiteLoaderEventBrokerClient clientEventBroker;
-
-    private static boolean fboEnabled;
-
-    private static boolean renderingFBO;
-
-    private CallbackProxyClient() {}
-
-    public static void onStartupComplete(EventInfo<Minecraft> e)
-    {
-        CallbackProxyCommon.onStartupComplete();
-
-        CallbackProxyClient.clientEventBroker = LiteLoaderEventBrokerClient.getInstance();
-
-        if (CallbackProxyClient.clientEventBroker == null)
-        {
-            throw new RuntimeException("LiteLoader failed to start up properly."
-                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
-        }
-
-        CallbackProxyClient.clientEventBroker.onStartupComplete();
-    }
-
-    public static void onTimerUpdate(EventInfo<Minecraft> e)
-    {
-        CallbackProxyClient.clientEventBroker.onTimerUpdate();
-    }
-
-    public static void newTick(EventInfo<Minecraft> e)
-    {
-    }
-
-    public static void onTick(EventInfo<Minecraft> e)
-    {
-        CallbackProxyClient.clientEventBroker.onTick();
-    }
-
-    public static void onRender(EventInfo<Minecraft> e)
-    {
-        CallbackProxyClient.clientEventBroker.onRender();
-    }
-
-    public static void preRenderGUI(EventInfo<EntityRenderer> e, float partialTicks)
-    {
-        CallbackProxyClient.clientEventBroker.preRenderGUI(partialTicks);
-    }
-
-    public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.onSetupCameraTransform(pass, partialTicks, timeSlice);
-    }
-
-    public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.postRenderEntities(partialTicks, timeSlice);
-    }
-
-    public static void postRender(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.postRender(partialTicks, timeSlice);
-    }
-
-    public static void onRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderHUD(partialTicks);
-    }
-
-    public static void onRenderChat(EventInfo<GuiIngame> e, float partialTicks)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
-    }
-
-    public static void postRenderChat(EventInfo<GuiIngame> e, float partialTicks)
-    {
-        CallbackProxyClient.clientEventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
-    }
-
-    public static void postRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
-    {
-        CallbackProxyClient.clientEventBroker.postRenderHUD(partialTicks);
-    }
-
-    public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName,
-            WorldSettings worldSettings)
-    {
-        CallbackProxyClient.clientEventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
-    }
-
-    public static void onOutboundChat(EventInfo<EntityPlayerSP> e, String message)
-    {
-        CallbackProxyClient.clientEventBroker.onSendChatMessage(e, message);
-    }
-
-    public static void onResize(EventInfo<Minecraft> e)
-    {
-        if (CallbackProxyClient.clientEventBroker == null) return;
-        CallbackProxyClient.clientEventBroker.onResize(e.getSource());
-    }
-
-    public static void preRenderFBO(EventInfo<Minecraft> e)
-    {
-        if (CallbackProxyClient.clientEventBroker == null) return;
-        CallbackProxyClient.fboEnabled = OpenGlHelper.isFramebufferEnabled();
-
-        if (CallbackProxyClient.fboEnabled)
-        {
-            CallbackProxyClient.renderingFBO = true;
-            CallbackProxyClient.clientEventBroker.preRenderFBO(e.getSource().getFramebuffer());
-        }
-    }
-
-    public static void postRenderFBO(EventInfo<Minecraft> e)
-    {
-        if (CallbackProxyClient.clientEventBroker == null) return;
-        CallbackProxyClient.renderingFBO = false;
-
-        if (CallbackProxyClient.fboEnabled)
-        {
-            CallbackProxyClient.clientEventBroker.postRenderFBO(e.getSource().getFramebuffer());
-        }
-    }
-
-    public static void renderFBO(EventInfo<Framebuffer> e, int width, int height, boolean flag)
-    {
-        if (CallbackProxyClient.clientEventBroker == null) return;
-        if (CallbackProxyClient.renderingFBO)
-        {
-            CallbackProxyClient.clientEventBroker.onRenderFBO(e.getSource(), width, height);
-        }
-
-        CallbackProxyClient.renderingFBO = false;
-    }
-
-    public static void onRenderWorld(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderWorld(partialTicks, timeSlice);
-    }
-
-    public static void onRenderSky(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderSky(partialTicks, pass, timeSlice);
-    }
-
-    public static void onRenderClouds(EventInfo<EntityRenderer> e, RenderGlobal renderGlobalIn, float partialTicks, int pass)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderClouds(partialTicks, pass, renderGlobalIn);
-    }
-
-    public static void onRenderTerrain(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderTerrain(partialTicks, pass, timeSlice);
-    }
-
-    public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height,
-            Framebuffer fbo)
-    {
-        CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
-    }
-
-    public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw,
-            float partialTicks, boolean hideBoundingBox, Render render)
-    {
-        CallbackProxyClient.clientEventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
-    }
-
-    public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw,
-            float partialTicks, boolean hideBoundingBox, Render render)
-    {
-        CallbackProxyClient.clientEventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
-    }
-
-    /**
-     * Compatiblbe behaviour with FML, this method is called to generate a
-     * consistent offline UUID between client and server for a given username.
-     */
-    public static void generateOfflineUUID(ReturnEventInfo<Session, GameProfile> e)
-    {
-        Session session = e.getSource();
-        UUID uuid = EntityPlayer.getUUID(new GameProfile((UUID)null, session.getUsername()));
-        e.setReturnValue(new GameProfile(uuid, session.getUsername()));
-    }
-}
 package com.mumfrey.liteloader.client;
  
+import com.mumfrey.liteloader.client.ducks.IClientNetLoginHandler;
+import com.mumfrey.liteloader.core.ClientPluginChannels;
+import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.network.NetHandlerLoginClient;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.PacketBuffer;
@@ -12,10 +15,6 @@ import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.network.play.server.S01PacketJoinGame;
 import net.minecraft.network.play.server.S3FPacketCustomPayload;
  
-import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
-import com.mumfrey.liteloader.core.ClientPluginChannels;
-import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
-
 /**
  * Handler for client plugin channels
  * 
@@ -67,7 +66,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
     {
         if (netHandler instanceof INetHandlerLoginClient)
         {
-            NetworkManager networkManager = PrivateFieldsClient.netManager.get(((NetHandlerLoginClient)netHandler));
+            NetworkManager networkManager = ((IClientNetLoginHandler)netHandler).getNetMgr();
             networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
         }
         else if (netHandler instanceof INetHandlerPlayClient)
+package com.mumfrey.liteloader.client;
+
+import java.io.File;
+
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mumfrey.liteloader.client.ducks.IFramebuffer;
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.WorldSettings;
+
+/**
+ * Proxy class which handles the redirected calls from the injected callbacks
+ * and routes them to the relevant liteloader handler classes. We do this rather
+ * than patching a bunch of bytecode into the packet classes themselves because
+ * this is easier to maintain.
+ * 
+ * @author Adam Mummery-Smith
+ */
+public abstract class ClientProxy extends Proxy
+{
+    private static LiteLoaderEventBrokerClient broker;
+
+    private ClientProxy() {}
+
+    public static void onStartupComplete()
+    {
+        Proxy.onStartupComplete();
+
+        ClientProxy.broker = LiteLoaderEventBrokerClient.getInstance();
+
+        if (ClientProxy.broker == null)
+        {
+            throw new RuntimeException("LiteLoader failed to start up properly."
+                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
+        }
+
+        ClientProxy.broker.onStartupComplete();
+    }
+
+    public static void onTimerUpdate()
+    {
+        ClientProxy.broker.onTimerUpdate();
+    }
+
+    public static void newTick()
+    {
+    }
+
+    public static void onTick()
+    {
+        ClientProxy.broker.onTick();
+    }
+
+    public static void onRender()
+    {
+        ClientProxy.broker.onRender();
+    }
+
+    public static void preRenderGUI(float partialTicks)
+    {
+        ClientProxy.broker.preRenderGUI(partialTicks);
+    }
+
+    public static void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.onSetupCameraTransform(pass, partialTicks, timeSlice);
+    }
+
+    public static void postRenderEntities(int pass, float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.postRenderEntities(partialTicks, timeSlice);
+    }
+
+    public static void postRender(float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.postRender(partialTicks, timeSlice);
+    }
+
+    public static void onRenderHUD(float partialTicks)
+    {
+        ClientProxy.broker.onRenderHUD(partialTicks);
+    }
+
+    public static void onRenderChat(GuiNewChat chatGui, float partialTicks)
+    {
+        ClientProxy.broker.onRenderChat(chatGui, partialTicks);
+    }
+
+    public static void postRenderChat(GuiNewChat chatGui, float partialTicks)
+    {
+        ClientProxy.broker.postRenderChat(chatGui, partialTicks);
+    }
+
+    public static void postRenderHUD(float partialTicks)
+    {
+        ClientProxy.broker.postRenderHUD(partialTicks);
+    }
+
+    public static void onCreateIntegratedServer(IntegratedServer server, String folderName, String worldName, WorldSettings worldSettings)
+    {
+        ClientProxy.broker.onStartServer(server, folderName, worldName, worldSettings);
+    }
+
+    public static void onOutboundChat(CallbackInfo e, String message)
+    {
+        ClientProxy.broker.onSendChatMessage(e, message);
+    }
+
+    public static void onResize(Minecraft mc)
+    {
+        if (ClientProxy.broker == null) return;
+        ClientProxy.broker.onResize(mc);
+    }
+
+    public static void preRenderFBO(Framebuffer frameBufferMc)
+    {
+        if (ClientProxy.broker == null) return;
+        if (frameBufferMc instanceof IFramebuffer)
+        {
+            ((IFramebuffer)frameBufferMc).setDispatchRenderEvent(true);            
+        }
+        ClientProxy.broker.preRenderFBO(frameBufferMc);
+    }
+
+    public static void postRenderFBO(Framebuffer frameBufferMc)
+    {
+        if (ClientProxy.broker == null) return;
+        ClientProxy.broker.postRenderFBO(frameBufferMc);
+    }
+
+    public static void renderFBO(Framebuffer frameBufferMc, int width, int height, boolean flag)
+    {
+        if (ClientProxy.broker == null) return;
+        ClientProxy.broker.onRenderFBO(frameBufferMc, width, height);
+    }
+
+    public static void onRenderWorld(float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.onRenderWorld(partialTicks, timeSlice);
+    }
+
+    public static void onRenderSky(int pass, float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.onRenderSky(partialTicks, pass, timeSlice);
+    }
+
+    public static void onRenderClouds(RenderGlobal renderGlobalIn, float partialTicks, int pass)
+    {
+        ClientProxy.broker.onRenderClouds(partialTicks, pass, renderGlobalIn);
+    }
+
+    public static void onRenderTerrain(int pass, float partialTicks, long timeSlice)
+    {
+        ClientProxy.broker.onRenderTerrain(partialTicks, pass, timeSlice);
+    }
+
+    public static void onSaveScreenshot(CallbackInfoReturnable<IChatComponent> ci, File gameDir, String name, int width, int height,
+            Framebuffer fbo)
+    {
+        ClientProxy.broker.onScreenshot(ci, name, width, height, fbo);
+    }
+
+    public static void onRenderEntity(RenderManager source, Render render, Entity entity, double x, double y, double z, float yaw, float pTicks)
+    {
+        ClientProxy.broker.onRenderEntity(source, entity, x, y, z, yaw, pTicks, render);
+    }
+
+    public static void onPostRenderEntity(RenderManager source, Render render, Entity entity, double x, double y, double z, float yaw, float pTicks)
+    {
+        ClientProxy.broker.onPostRenderEntity(source, entity, x, y, z, yaw, pTicks, render);
+    }
+}
 package com.mumfrey.liteloader.client;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiNewChat;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.RenderGlobal;
-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;
-import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.ScreenShotHelper;
-import net.minecraft.util.Timer;
-
 import org.lwjgl.input.Mouse;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
  
 import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
@@ -31,12 +16,28 @@ import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.core.event.ProfilingHandlerList;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.launch.LoaderProperties;
-import com.mumfrey.liteloader.transformers.event.EventInfo;
-import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.RenderGlobal;
+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;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Timer;
+
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
 {
+    /**
+     * Singleton 
+     */
     private static LiteLoaderEventBrokerClient instance;
  
     /**
@@ -93,7 +94,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
         this.tickListeners = new ProfilingHandlerList<Tickable>(Tickable.class, this.engineClient.getProfiler());
     }
  
-    static LiteLoaderEventBrokerClient getInstance()
+    public static LiteLoaderEventBrokerClient getInstance()
     {
         return LiteLoaderEventBrokerClient.instance;
     }
@@ -363,8 +364,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      */
     void postRenderChat(GuiNewChat chatGui, float partialTicks)
     {
-        GuiNewChat chat = this.engineClient.getChatGUI();
-        this.chatRenderListeners.all().onPostRenderChat(this.screenWidth, this.screenHeight, chat);
+        this.chatRenderListeners.all().onPostRenderChat(this.screenWidth, this.screenHeight, chatGui);
     }
  
     /**
@@ -442,7 +442,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * @param message
      */
-    void onSendChatMessage(EventInfo<EntityPlayerSP> e, String message)
+    void onSendChatMessage(CallbackInfo e, String message)
     {
         if (!this.outboundChatFilters.all().onSendChatMessage(message))
         {
@@ -523,13 +523,13 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param height
      * @param fbo
      */
-    void onScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, String name, int width, int height, Framebuffer fbo)
+    void onScreenshot(CallbackInfoReturnable<IChatComponent> ci, String name, int width, int height, Framebuffer fbo)
     {
-        ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(e.getReturnValue());
+        ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(ci.getReturnValue());
  
         if (!this.screenshotListeners.all().onSaveScreenshot(name, width, height, fbo, ret))
         {
-            e.setReturnValue(ret.get());
+            ci.setReturnValue(ret.get());
         }
     }
  
 package com.mumfrey.liteloader.client;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.Packet;
-import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
-import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.IThreadListener;
-
-import com.mojang.realmsclient.RealmsMainScreen;
 import com.mojang.realmsclient.dto.RealmsServer;
-import com.mumfrey.liteloader.ChatFilter;
-import com.mumfrey.liteloader.ChatListener;
-import com.mumfrey.liteloader.JoinGameListener;
-import com.mumfrey.liteloader.PostLoginListener;
-import com.mumfrey.liteloader.PreJoinGameListener;
-import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
+import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.common.ducks.IChatPacket;
 import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
@@ -32,10 +14,22 @@ import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.core.runtime.Packets;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
-import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.util.ChatUtilities;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IThreadListener;
+
 /**
  * Client-side packet event handlers
  * 
@@ -113,7 +107,7 @@ public class PacketEventsClient extends PacketEvents
         this.postLoginListeners.add(postLoginListener);
     }
  
-    public static void onJoinRealm(EventInfo<RealmsMainScreen> e, long arg1, RealmsServer server)
+    public static void onJoinRealm(long serverId, RealmsServer server)
     {
         PacketEventsClient.joiningRealm = server;
     }
@@ -254,7 +248,7 @@ public class PacketEventsClient extends PacketEvents
             try
             {
                 chat = ChatUtilities.convertLegacyCodes(chat);
-                PrivateFieldsClient.chatMessage.set(packet, chat);
+                ((IChatPacket)packet).setChatComponent(chat);
             }
             catch (Exception ex)
             {
@@ -2,13 +2,13 @@ package com.mumfrey.liteloader.client;
  
 import java.util.List;
  
+import com.mumfrey.liteloader.client.ducks.IReloadable;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
 import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
  
-import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
 /**
  * Manager object which handles inhibiting the sound handler's reload
  * notification at startup.
@@ -55,7 +55,7 @@ public class SoundHandlerReloadInhibitor
         {
             if (!this.inhibited)
             {
-                List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
+                List<IResourceManagerReloadListener> reloadListeners = ((IReloadable)this.resourceManager).getReloadListeners();
                 if (reloadListeners != null)
                 {
                     this.storedIndex = reloadListeners.indexOf(this.soundHandler);
@@ -89,7 +89,7 @@ public class SoundHandlerReloadInhibitor
         {
             if (this.inhibited)
             {
-                List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
+                List<IResourceManagerReloadListener> reloadListeners = ((IReloadable)this.resourceManager).getReloadListeners();
                 if (reloadListeners != null)
                 {
                     if (this.storedIndex > -1)
@@ -6,6 +6,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.server.integrated.IntegratedServer;
  
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ObjectArrays;
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.api.CustomisationProvider;
 import com.mumfrey.liteloader.api.InterfaceProvider;
@@ -36,12 +37,20 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
  
     private static final String[] requiredDownstreamTransformers = {
             LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
-            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.LiteLoaderEventInjectionTransformer",
             LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftTransformer",
             LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
     };
  
     private ObjectFactory<Minecraft, IntegratedServer> objectFactory;
+    
+    @Override
+    public String[] getMixinConfigs()
+    {
+        String[] commonConfigs = super.getMixinConfigs();
+        return ObjectArrays.concat(commonConfigs, new String[] {
+            "mixins.liteloader.client.json"
+        }, String.class);
+    }
  
     /* (non-Javadoc)
      * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredTransformers()
@@ -69,11 +78,11 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     public List<CustomisationProvider> getCustomisationProviders()
     {
         return ImmutableList.<CustomisationProvider>of
-                (
-                        new LiteLoaderBrandingProvider(),
-                        new LiteLoaderModInfoDecorator(),
-                        new Translator()
-                        );
+        (
+            new LiteLoaderBrandingProvider(),
+            new LiteLoaderModInfoDecorator(),
+            new Translator()
+        );
     }
  
     /* (non-Javadoc)
@@ -83,10 +92,10 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     public List<CoreProvider> getCoreProviders()
     {
         return ImmutableList.<CoreProvider>of
-                (
-                        new LiteLoaderCoreProviderClient(this.properties),
-                        LiteLoader.getInput()
-                        );
+        (
+            new LiteLoaderCoreProviderClient(this.properties),
+            LiteLoader.getInput()
+        );
     }
  
  
@@ -99,13 +108,13 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
         ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
  
         return ImmutableList.<InterfaceProvider>of
-                (
-                        objectFactory.getEventBroker(),
-                        objectFactory.getPacketEventBroker(),
-                        objectFactory.getClientPluginChannels(),
-                        objectFactory.getServerPluginChannels(),
-                        MessageBus.getInstance()
-                        );
+        (
+            objectFactory.getEventBroker(),
+            objectFactory.getPacketEventBroker(),
+            objectFactory.getClientPluginChannels(),
+            objectFactory.getServerPluginChannels(),
+            MessageBus.getInstance()
+        );
     }
  
     /* (non-Javadoc)
@@ -115,9 +124,9 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     public List<Observer> getPreInitObservers()
     {
         return ImmutableList.<Observer>of
-                (
-                        new ModEvents()
-                        );
+        (
+            new ModEvents()
+        );
     }
  
     /* (non-Javadoc)
@@ -129,11 +138,11 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
         ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
  
         return ImmutableList.<Observer>of
-                (
-                        new ResourceObserver(),
-                        objectFactory.getPanelManager(),
-                        objectFactory.getEventBroker()
-                        );
+        (
+            new ResourceObserver(),
+            objectFactory.getPanelManager(),
+            objectFactory.getEventBroker()
+        );
     }
  
     /* (non-Javadoc)
+package com.mumfrey.liteloader.client.ducks;
+
+import net.minecraft.network.NetworkManager;
+
+public interface IClientNetLoginHandler
+{
+    public abstract NetworkManager getNetMgr();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+public interface IFramebuffer
+{
+    public abstract IFramebuffer setDispatchRenderEvent(boolean dispatchRenderEvent);
+
+    public abstract boolean isDispatchRenderEvent();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+public interface INamespacedRegistry
+{
+    public abstract IObjectIntIdentityMap getUnderlyingMap();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+import java.util.IdentityHashMap;
+import java.util.List;
+
+public interface IObjectIntIdentityMap
+{
+    public abstract <V> IdentityHashMap<V, Integer> getIdentityMap();
+
+    public abstract <V> List<V> getObjectList();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+import java.util.Map;
+
+public interface IRegistrySimple
+{
+    public abstract <K, V> Map<K, V> getRegistryObjects();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+import java.util.List;
+
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+
+public interface IReloadable
+{
+    public abstract List<IResourceManagerReloadListener> getReloadListeners();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+import java.util.Map;
+
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.entity.Entity;
+
+public interface IRenderManager
+{
+    public abstract Map<Class<? extends Entity>, Render> getRenderMap();
+}
+package com.mumfrey.liteloader.client.ducks;
+
+import java.util.Map;
+
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+
+public interface ITileEntityRendererDispatcher
+{
+    public abstract Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> getSpecialRenderMap();
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+@Mixin(EntityPlayerSP.class)
+public abstract class MixinEntityPlayerSP extends AbstractClientPlayer
+{
+    public MixinEntityPlayerSP()
+    {
+        super(null, null);
+    }
+    
+    @Inject(method = "sendChatMessage(Ljava/lang/String;)V", at = { @At("HEAD") }, cancellable = true)
+    public void onSendChatMessage(String message, CallbackInfo ci)
+    {
+        ClientProxy.onOutboundChat(ci, message);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.RenderGlobal;
+
+@Mixin(EntityRenderer.class)
+public abstract class MixinEntityRenderer
+{
+    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+        value = "INVOKE",
+        shift = Shift.AFTER,
+        target = "Lnet/minecraft/client/renderer/GlStateManager;clear(I)V"
+    ))
+    private void onPreRenderGUI(float partialTicks, CallbackInfo ci)
+    {
+        ClientProxy.preRenderGUI(partialTicks);
+    }
+
+    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/gui/GuiIngame;renderGameOverlay(F)V"
+    ))
+    private void onRenderHUD(float partialTicks, CallbackInfo ci)
+    {
+        ClientProxy.onRenderHUD(partialTicks);
+    }
+    
+    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+        value = "INVOKE",
+        shift = Shift.AFTER,
+        target = "Lnet/minecraft/client/gui/GuiIngame;renderGameOverlay(F)V"
+    ))
+    private void onPostRenderHUD(float partialTicks, CallbackInfo ci)
+    {
+        ClientProxy.postRenderHUD(partialTicks);
+    }
+    
+    @Inject(method = "renderWorld(FJ)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/profiler/Profiler;startSection(Ljava/lang/String;)V",
+        ordinal = 0
+    ))
+    private void onRenderWorld(float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.onRenderWorld(partialTicks, timeSlice);
+    }
+    
+    @Inject(method = "renderWorld(FJ)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/profiler/Profiler;endSection()V",
+        ordinal = 0
+    ))
+    private void onPostRender(float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.postRender(partialTicks, timeSlice);
+    }
+    
+    @Inject(method = "renderWorldPass(IFJ)V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
+        args = "ldc=frustum"
+    ))
+    private void onSetupCameraTransform(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.onSetupCameraTransform(pass, partialTicks, timeSlice);
+    }
+    
+    @Inject(method = "renderWorldPass(IFJ)V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
+        args = "ldc=sky"
+    ))
+    private void onRenderSky(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.onRenderSky(pass, partialTicks, timeSlice);
+    }
+    
+    @Inject(method = "renderWorldPass(IFJ)V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
+        args = "ldc=terrain"
+    ))
+    private void onRenderTerrain(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.onRenderTerrain(pass, partialTicks, timeSlice);
+        
+    }
+    
+    @Inject(method = "renderWorldPass(IFJ)V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
+        args = "ldc=litParticles"
+    ))
+    private void onPostRenderEntities(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
+    {
+        ClientProxy.postRenderEntities(pass, partialTicks, timeSlice);
+    }
+    
+    @Inject(method = "renderCloudsCheck(Lnet/minecraft/client/renderer/RenderGlobal;FI)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V"
+    ))
+    private void onRenderClouds(RenderGlobal renderGlobalIn, float partialTicks, int pass, CallbackInfo ci)
+    {
+        ClientProxy.onRenderClouds(renderGlobalIn, partialTicks, pass);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.ducks.IFramebuffer;
+
+import net.minecraft.client.shader.Framebuffer;
+
+@Mixin(Framebuffer.class)
+public abstract class MixinFramebuffer implements IFramebuffer
+{
+    private boolean dispatchRenderEvent;
+    
+    @Override
+    public IFramebuffer setDispatchRenderEvent(boolean dispatchRenderEvent)
+    {
+        this.dispatchRenderEvent = dispatchRenderEvent;
+        return this;
+    }
+    
+    @Override
+    public boolean isDispatchRenderEvent()
+    {
+        return this.dispatchRenderEvent;
+    }
+    
+    @Inject(method = "framebufferRenderExt(IIZ)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/shader/Framebuffer;bindFramebufferTexture()V"
+    ))
+    private void onRenderFBO(int width, int height, boolean flag, CallbackInfo ci)
+    {
+        if (this.dispatchRenderEvent)
+        {
+            ClientProxy.renderFBO((Framebuffer)(Object)this, width, height, flag);
+            this.dispatchRenderEvent = false;
+        }
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiNewChat;
+
+@Mixin(GuiIngame.class)
+public abstract class MixinGuiIngame extends Gui
+{
+    @Shadow private GuiNewChat persistantChatGUI;
+    
+    @Inject(method = "renderGameOverlay(F)V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/gui/GuiNewChat;drawChat(I)V"
+    ))
+    private void onRenderChat(float partialTicks, CallbackInfo ci)
+    {
+        ClientProxy.onRenderChat(this.persistantChatGUI, partialTicks);
+    }
+
+    @Inject(method = "renderGameOverlay(F)V", at = @At(
+        value = "INVOKE",
+        shift = Shift.AFTER,
+        target = "Lnet/minecraft/client/gui/GuiNewChat;drawChat(I)V"
+    ))
+    private void postRenderChat(float partialTicks, CallbackInfo ci)
+    {
+        ClientProxy.postRenderChat(this.persistantChatGUI, partialTicks);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Surrogate;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.world.WorldSettings;
+
+@Mixin(IntegratedServer.class)
+public abstract class MixinIntegratedServer extends MinecraftServer
+{
+    public MixinIntegratedServer()
+    {
+        super(null, null);
+    }
+    
+    @Inject(
+        method = "<init>*", //(Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/world/WorldSettings;)V",
+        at = @At("RETURN"),
+        remap = false
+    )
+    private void onConstructed(Minecraft mcIn, String folderName, String worldName, WorldSettings settings, CallbackInfo ci)
+    {
+        ClientProxy.onCreateIntegratedServer((IntegratedServer)(Object)this, folderName, worldName, settings);
+    }
+
+    @Surrogate
+    private void onConstructed(Minecraft mcIn, CallbackInfo ci)
+    {
+//        ClientProxy.onCreateIntegratedServer((IntegratedServer)(Object)this, folderName, worldName, settings);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.shader.Framebuffer;
+
+@Mixin(Minecraft.class)
+public abstract class MixinMinecraft
+{
+    @Inject(method = "startGame()V", at = @At("RETURN"))
+    private void onStartupComplete(CallbackInfo ci)
+    {
+        ClientProxy.onStartupComplete();
+    }
+    
+    @Inject(method = "updateFramebufferSize()V", at = @At("HEAD"))
+    private void onResize(CallbackInfo ci)
+    {
+        ClientProxy.onResize((Minecraft)(Object)this);
+    }
+    
+    @Inject(method = "runTick()V", at = @At("HEAD"))
+    private void newTick(CallbackInfo ci)
+    {
+        ClientProxy.newTick();
+    }
+    
+    @Inject(method = "runGameLoop()V", at = @At(
+        value = "INVOKE",
+        shift = Shift.AFTER,
+        target = "Lnet/minecraft/client/renderer/EntityRenderer;updateCameraAndRender(F)V"
+    ))
+    private void onTick(CallbackInfo ci)
+    {
+        ClientProxy.onTick();
+    }
+    
+    @Redirect(method = "runGameLoop()V", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/shader/Framebuffer;framebufferRender(II)V"
+    ))
+    private void renderFBO(Framebuffer framebufferMc, int width, int height)
+    {
+        boolean fboEnabled = OpenGlHelper.isFramebufferEnabled();
+        if (fboEnabled)
+        {
+            ClientProxy.preRenderFBO(framebufferMc);
+            framebufferMc.framebufferRender(width, height);
+            ClientProxy.preRenderFBO(framebufferMc);
+        }
+        else
+        {
+            framebufferMc.framebufferRender(width, height);
+        }
+    }
+    
+    @Inject(method = "runGameLoop()V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;startSection(Ljava/lang/String;)V",
+        args = "ldc=tick"
+    ))
+    private void onTimerUpdate(CallbackInfo ci)
+    {
+        ClientProxy.onTimerUpdate();
+    }
+    
+    @Inject (method = "runGameLoop()V", at = @At(
+        value = "INVOKE_STRING",
+        target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
+        args = "ldc=gameRenderer"
+    ))
+    private void onRender(CallbackInfo ci)
+    {
+        ClientProxy.onRender();
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IClientNetLoginHandler;
+
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.network.NetworkManager;
+
+@Mixin(NetHandlerLoginClient.class)
+public abstract class MixinNetHandlerLoginClient implements IClientNetLoginHandler
+{
+    @Shadow private NetworkManager networkManager;
+    
+    @Override
+    public NetworkManager getNetMgr()
+    {
+        return this.networkManager;
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.IdentityHashMap;
+import java.util.List;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
+
+import net.minecraft.util.ObjectIntIdentityMap;
+
+@Mixin(ObjectIntIdentityMap.class)
+public abstract class MixinObjectIntIdentityMap implements IObjectIntIdentityMap
+{
+    @Shadow private IdentityHashMap<?, Integer> identityMap;
+    @Shadow private List<?> objectList;
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public <V> IdentityHashMap<V, Integer> getIdentityMap()
+    {
+        return (IdentityHashMap<V, Integer>)this.identityMap;
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public <V> List<V> getObjectList()
+    {
+        return (List<V>)this.objectList;
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mumfrey.liteloader.client.PacketEventsClient;
+
+import net.minecraft.realms.RealmsScreen;
+
+@Mixin(value = RealmsMainScreen.class, remap = false)
+public abstract class MixinRealmsMainScreen extends RealmsScreen
+{
+    @Inject(method = "play(J)V", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At(
+        value = "INVOKE",
+        target = "Lcom/mojang/realmsclient/RealmsMainScreen;stopRealmsFetcherAndPinger()V"
+    ))
+    private void onJoinRealm(long serverId, CallbackInfo ci, RealmsServer server)
+    {
+        PacketEventsClient.onJoinRealm(serverId, server);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.INamespacedRegistry;
+import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
+
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistrySimple;
+
+@Mixin(RegistryNamespaced.class)
+public abstract class MixinRegistryNamespaced extends RegistrySimple implements INamespacedRegistry
+{
+    @Shadow protected ObjectIntIdentityMap underlyingIntegerMap;
+    
+    @Override
+    public IObjectIntIdentityMap getUnderlyingMap()
+    {
+        return (IObjectIntIdentityMap)this.underlyingIntegerMap;
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.Map;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IRegistrySimple;
+
+import net.minecraft.util.RegistrySimple;
+
+@Mixin(RegistrySimple.class)
+public abstract class MixinRegistrySimple implements IRegistrySimple
+{
+    @Shadow protected Map<?, ?> registryObjects;
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public <K, V> Map<K, V> getRegistryObjects()
+    {
+        return (Map<K, V>)this.registryObjects;
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.Map;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.ducks.IRenderManager;
+
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+
+@Mixin(RenderManager.class)
+public abstract class MixinRenderManager implements IRenderManager
+{
+    @Shadow private Map<Class<? extends Entity>, Render> entityRenderMap;
+    
+    @Override
+    public Map<Class<? extends Entity>, Render> getRenderMap()
+    {
+        return this.entityRenderMap;
+    }
+    
+    @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)Z", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V"
+    ))
+    private void onRenderEntity(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks)
+    {
+        RenderManager source = (RenderManager)(Object)this;
+        ClientProxy.onRenderEntity(source, render, entity, x, y, z, entityYaw, partialTicks);
+        render.doRender(entity, x, y, z, entityYaw, partialTicks);
+        ClientProxy.onPostRenderEntity(source, render, entity, x, y, z, entityYaw, partialTicks);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.io.File;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mumfrey.liteloader.client.ClientProxy;
+
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ScreenShotHelper;
+
+@Mixin(ScreenShotHelper.class)
+public abstract class MixinScreenShotHelper
+{
+    @Inject(
+        method = "saveScreenshot(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/shader/Framebuffer;)Lnet/minecraft/util/IChatComponent;",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/client/renderer/OpenGlHelper;isFramebufferEnabled()Z",
+            ordinal = 0
+        ),
+        cancellable = true
+    )
+    private static void onSaveScreenshot(File gameDir, String name, int width, int height, Framebuffer fbo, CallbackInfoReturnable<IChatComponent> ci)
+    {
+        ClientProxy.onSaveScreenshot(ci, gameDir, name, width, height, fbo);
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.UUID;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mojang.authlib.GameProfile;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.Session;
+
+@Mixin(Session.class)
+public abstract class MixinSession
+{
+    @Shadow public abstract String getUsername();
+
+    @Inject(method = "getProfile()Lcom/mojang/authlib/GameProfile;", cancellable = true, at = @At(
+        value = "NEW",
+        args = "class=com/mojang/authlib/GameProfile",
+        ordinal = 1
+    ))
+    private void generateGameProfile(CallbackInfoReturnable<GameProfile> ci)
+    {
+        UUID uuid = EntityPlayer.getUUID(new GameProfile((UUID)null, this.getUsername()));
+        ci.setReturnValue(new GameProfile(uuid, this.getUsername()));
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.List;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IReloadable;
+
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+
+@Mixin(SimpleReloadableResourceManager.class)
+public abstract class MixinSimpleReloadableResourceManager implements IReloadable
+{
+    @Shadow private List<IResourceManagerReloadListener> reloadListeners;
+    
+    @Override
+    public List<IResourceManagerReloadListener> getReloadListeners()
+    {
+        return this.reloadListeners;
+    }
+}
+package com.mumfrey.liteloader.client.mixin;
+
+import java.util.Map;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.ITileEntityRendererDispatcher;
+
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+
+@Mixin(TileEntityRendererDispatcher.class)
+public abstract class MixinTileEntityRendererDispatcher implements ITileEntityRendererDispatcher
+{
+    @Shadow private Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> mapSpecialRenderers;
+    
+    @Override
+    public Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> getSpecialRenderMap()
+    {
+        return this.mapSpecialRenderers;
+    }
+}
-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.InjectionPoint;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeInvoke;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeNew;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeStringInvoke;
-import com.mumfrey.liteloader.transformers.event.inject.MethodHead;
-
-/**
- * Injector for LiteLoader's main events
- *
- * @author Adam Mummery-Smith
- */
-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);
-        Event preRenderFBO                     = Event.getOrCreate("preRenderFBO",                 false);
-        Event renderFBO                        = Event.getOrCreate("renderFBO",                    false);
-        Event postRenderFBO                    = Event.getOrCreate("postRenderFBO",                false);
-        Event onRenderWorld                    = Event.getOrCreate("onRenderWorld",                false);
-        Event onRenderSky                      = Event.getOrCreate("onRenderSky",                  false);
-        Event onRenderClouds                   = Event.getOrCreate("onRenderClouds",               false);
-        Event onRenderTerrain                  = Event.getOrCreate("onRenderTerrain",              false);
-        Event onTimerUpdate                    = Event.getOrCreate("onTimerUpdate",                false);
-        Event onRender                         = Event.getOrCreate("onRender",                     false);
-        Event newTick                          = Event.getOrCreate("newTick",                      false);
-        Event onTick                           = Event.getOrCreate("onTick",                       false);
-        Event preRenderGUI                     = Event.getOrCreate("preRenderGUI",                 false);
-        Event onRenderHUD                      = Event.getOrCreate("onRenderHUD",                  false);
-        Event postRenderHUD                    = Event.getOrCreate("postRenderHUD",                false);
-        Event onSetupCameraTransform           = Event.getOrCreate("onSetupCameraTransform",       false);
-        Event postRenderEntities               = Event.getOrCreate("postRenderEntities",           false);
-        Event postRender                       = Event.getOrCreate("postRender",                   false);
-        Event onRenderChat                     = Event.getOrCreate("onRenderChat",                 false);
-        Event postRenderChat                   = Event.getOrCreate("postRenderChat",               false);
-        Event onCreateIntegratedServer         = Event.getOrCreate("onCreateIntegratedServer",     false);
-        Event onStartupComplete                = Event.getOrCreate("onStartupComplete",            false);
-        Event onSessionProfileBad              = Event.getOrCreate("onSessionProfileBad",          true);
-        Event onSaveScreenshot                 = Event.getOrCreate("onSaveScreenshot",             true);
-        Event onRenderEntity                   = Event.getOrCreate("onRenderEntity",               false);
-        Event onPostRenderEntity               = Event.getOrCreate("onPostRenderEntity",           false);
-        Event onJoinRealm                      = Event.getOrCreate("onJoinRealm",                  false);
-
-        // Injection Points
-        InjectionPoint methodHead              = new MethodHead();
-        InjectionPoint methodReturn            = new BeforeReturn();
-        InjectionPoint beforeGlClear           = new BeforeInvoke(glClear);
-        InjectionPoint beforeFBORender         = new BeforeInvoke(framebufferRender);
-        InjectionPoint beforeRenderHUD         = new BeforeInvoke(renderGameOverlay);
-        InjectionPoint beforeBindFBOTex        = new BeforeInvoke(bindFramebufferTexture);
-        InjectionPoint beforeRender            = new BeforeInvoke(updateCameraAndRender);
-        InjectionPoint beforeDrawChat          = new BeforeInvoke(drawChat);
-        InjectionPoint beforeEndProfiler       = new BeforeInvoke(endSection);
-        InjectionPoint beforeIsFBOEnabled      = new BeforeInvoke(isFramebufferEnabled);
-        InjectionPoint beforeRenderEntity      = new BeforeInvoke(doRender).setCaptureLocals(true);
-        InjectionPoint beforeStopRealsmFetcher = new BeforeInvoke(realmsStopFetcher).setCaptureLocals(true);
-        InjectionPoint beforeTickProfiler      = new BeforeStringInvoke("tick",         startSection);
-        InjectionPoint beforeCenterProfiler    = new BeforeStringInvoke("center",       startSection);
-        InjectionPoint beforeSkyProfiler       = new BeforeStringInvoke("sky",          endStartSection);
-        InjectionPoint beforeCloudsProfiler    = new BeforeStringInvoke("clouds",       endStartSection);
-        InjectionPoint beforeTerrainProfiler   = new BeforeStringInvoke("terrain",      endStartSection);
-        InjectionPoint beforeRenderProfiler    = new BeforeStringInvoke("gameRenderer", endStartSection);
-        InjectionPoint beforeFrustumProfiler   = new BeforeStringInvoke("frustum",      endStartSection);
-        InjectionPoint beforeParticlesProfiler = new BeforeStringInvoke("litParticles", endStartSection);
-        InjectionPoint beforeNewGameProfile    = new BeforeNew(1, Obf.GameProfile);
-
-        // Hooks
-        this.add(onOutboundChat,               sendChatMessage,            (methodHead),              "onOutboundChat");
-        this.add(onResize,                     updateFramebufferSize,      (methodHead),              "onResize");
-        this.add(preRenderFBO,                 runGameLoop,                (beforeFBORender),         "preRenderFBO");
-        this.add(renderFBO,                    framebufferRenderExt,       (beforeBindFBOTex),        "renderFBO");
-        this.add(postRenderFBO,                runGameLoop,           after(beforeFBORender),         "postRenderFBO");
-        this.add(onRenderWorld,                renderWorld,                (beforeCenterProfiler),    "onRenderWorld");
-        this.add(onRenderSky,                  renderWorldPass,            (beforeSkyProfiler),       "onRenderSky");
-        this.add(onRenderClouds,               renderCloudsCheck,          (beforeCloudsProfiler),    "onRenderClouds");
-        this.add(onRenderTerrain,              renderWorldPass,            (beforeTerrainProfiler),   "onRenderTerrain");
-        this.add(onTimerUpdate,                runGameLoop,                (beforeTickProfiler),      "onTimerUpdate");
-        this.add(onRender,                     runGameLoop,                (beforeRenderProfiler),    "onRender");
-        this.add(newTick,                      runTick,                    (methodHead),              "newTick");
-        this.add(onTick,                       runGameLoop,           after(beforeRender),            "onTick");
-        this.add(preRenderGUI,                 updateCameraAndRender, after(beforeGlClear),           "preRenderGUI");
-        this.add(onRenderHUD,                  updateCameraAndRender,      (beforeRenderHUD),         "onRenderHUD");
-        this.add(postRenderHUD,                updateCameraAndRender, after(beforeRenderHUD),         "postRenderHUD");
-        this.add(onSetupCameraTransform,       renderWorldPass,            (beforeFrustumProfiler),   "onSetupCameraTransform");
-        this.add(postRenderEntities,           renderWorldPass,            (beforeParticlesProfiler), "postRenderEntities");
-        this.add(postRender,                   renderWorld,                (beforeEndProfiler),       "postRender");
-        this.add(onRenderChat,                 renderGameOverlay,          (beforeDrawChat),          "onRenderChat");
-        this.add(postRenderChat,               renderGameOverlay,     after(beforeDrawChat),          "postRenderChat");
-        this.add(onCreateIntegratedServer,     integratedServerCtor,       (methodReturn),            "IntegratedServerCtor");
-        this.add(onStartupComplete,            startGame,                  (methodReturn),            "onStartupComplete");
-        this.add(onSaveScreenshot,             saveScreenshot,             (beforeIsFBOEnabled),      "onSaveScreenshot");
-        this.add(onRenderEntity,               doRenderEntity,             (beforeRenderEntity),      "onRenderEntity");
-        this.add(onPostRenderEntity,           doRenderEntity,        after(beforeRenderEntity),      "onPostRenderEntity");
-
-        // Compatibility handlers
-        this.add(onSessionProfileBad,          getProfile,                 (beforeNewGameProfile),    "generateOfflineUUID");
-
-        // Protocol handlers
-        this.add(onJoinRealm,                  realmsPlay,                 (beforeStopRealsmFetcher), "onJoinRealm", Obf.PacketEventsClient);
-    }
-}
 package com.mumfrey.liteloader.client.util;
  
-import java.util.IdentityHashMap;
-import java.util.List;
 import java.util.Map;
  
-import net.minecraft.client.network.NetHandlerLoginClient;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
-import net.minecraft.client.resources.IResourceManagerReloadListener;
-import net.minecraft.client.resources.SimpleReloadableResourceManager;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.ObjectIntIdentityMap;
-import net.minecraft.util.RegistryNamespaced;
-import net.minecraft.util.RegistrySimple;
-
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.util.PrivateFields;
  
+import net.minecraft.tileentity.TileEntity;
+
 @SuppressWarnings("rawtypes")
 public final class PrivateFieldsClient<P, T> extends PrivateFields<P, T>
 {
@@ -30,17 +17,6 @@ public final class PrivateFieldsClient&lt;P, T&gt; extends PrivateFields&lt;P, T&gt;
  
     // CHECKSTYLE:OFF
  
-    public static final PrivateFieldsClient<RenderManager, Map>                            entityRenderMap = new PrivateFieldsClient<RenderManager, Map>                      (RenderManager.class,                Obf.entityRenderMap);
-    public static final PrivateFieldsClient<NetHandlerLoginClient, NetworkManager>              netManager = new PrivateFieldsClient<NetHandlerLoginClient, NetworkManager>   (NetHandlerLoginClient.class,        Obf.networkManager);
-    public static final PrivateFieldsClient<RegistrySimple, Map>                           registryObjects = new PrivateFieldsClient<RegistrySimple, Map>                     (RegistrySimple.class,               Obf.registryObjects);
-    public static final PrivateFieldsClient<RegistryNamespaced, ObjectIntIdentityMap> underlyingIntegerMap = new PrivateFieldsClient<RegistryNamespaced, ObjectIntIdentityMap>(RegistryNamespaced.class,           Obf.underlyingIntegerMap);
-    public static final PrivateFieldsClient<ObjectIntIdentityMap, IdentityHashMap>             identityMap = new PrivateFieldsClient<ObjectIntIdentityMap, IdentityHashMap>   (ObjectIntIdentityMap.class,         Obf.identityMap);
-    public static final PrivateFieldsClient<ObjectIntIdentityMap, List>                         objectList = new PrivateFieldsClient<ObjectIntIdentityMap, List>              (ObjectIntIdentityMap.class,         Obf.objectList);
-    public static final PrivateFieldsClient<TileEntityRendererDispatcher, Map>          specialRendererMap = new PrivateFieldsClient<TileEntityRendererDispatcher, Map>       (TileEntityRendererDispatcher.class, Obf.mapSpecialRenderers);
-    public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityNameToClassMap);
-    public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityClassToNameMap);
-    public static final PrivateFieldsClient<S02PacketChat, IChatComponent>                     chatMessage = new PrivateFieldsClient<S02PacketChat, IChatComponent>           (S02PacketChat.class,                Obf.chatComponent);
-
-    public static final PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>> reloadListeners =
-            new PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>>(SimpleReloadableResourceManager.class, Obf.reloadListeners);
+    public static final PrivateFieldsClient<TileEntity, Map> tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityNameToClassMap);
+    public static final PrivateFieldsClient<TileEntity, Map> tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityClassToNameMap);
 }
 \ No newline at end of file
@@ -6,6 +6,15 @@ import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
  
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+
+import com.mumfrey.liteloader.client.ducks.*;
+import com.mumfrey.liteloader.client.overlays.IMinecraft;
+import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.Render;
@@ -17,20 +26,9 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ObjectIntIdentityMap;
-import net.minecraft.util.RegistryNamespaced;
 import net.minecraft.util.RegistrySimple;
 import net.minecraft.util.ResourceLocation;
  
-import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
-
-import com.mumfrey.liteloader.client.overlays.IMinecraft;
-import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
 /**
  * A small collection of useful functions for mods
  * 
@@ -67,12 +65,11 @@ public abstract class ModUtilities
      * @param entityClass
      * @param renderer
      */
-    @SuppressWarnings("unchecked")
     public static void addRenderer(Class<? extends Entity> entityClass, Render renderer)
     {
         RenderManager renderManager = Minecraft.getMinecraft().getRenderManager();
  
-        Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFieldsClient.entityRenderMap.get(renderManager);
+        Map<Class<? extends Entity>, Render> entityRenderMap = ((IRenderManager)renderManager).getRenderMap();
         if (entityRenderMap != null)
         {
             entityRenderMap.put(entityClass, renderer);
@@ -84,7 +81,6 @@ public abstract class ModUtilities
         }
     }
  
-    @SuppressWarnings("unchecked")
     public static void addRenderer(Class<? extends TileEntity> tileEntityClass, TileEntitySpecialRenderer renderer)
     {
         TileEntityRendererDispatcher tileEntityRenderer = TileEntityRendererDispatcher.instance;
@@ -92,7 +88,7 @@ public abstract class ModUtilities
         try
         {
             Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> specialRendererMap
-                    = PrivateFieldsClient.specialRendererMap.get(tileEntityRenderer);
+                    = ((ITileEntityRendererDispatcher)tileEntityRenderer).getSpecialRenderMap();
             specialRendererMap.put(tileEntityClass, renderer);
             renderer.setRendererDispatcher(tileEntityRenderer);
         }
@@ -203,7 +199,6 @@ public abstract class ModUtilities
         {
             Map<String, Class<? extends TileEntity>> nameToClassMap = PrivateFieldsClient.tileEntityNameToClassMap.get(null);
             Map<Class<? extends TileEntity>, String> classToNameMap = PrivateFieldsClient.tileEntityClassToNameMap.get(null);
-
             nameToClassMap.put(entityName, tileEntityClass);
             classToNameMap.put(tileEntityClass, entityName);
         }
@@ -213,47 +208,18 @@ public abstract class ModUtilities
         }
     }
  
-    /**
-     * Abstraction helper function
-     * 
-     * @param fieldName Name of field to get, returned unmodified if in debug
-     *      mode
-     * @return Obfuscated field name if present
-     * @deprecated use ObfuscationUtilities.getObfuscatedFieldName instead
-     */
-    @Deprecated
-    public static String getObfuscatedFieldName(String fieldName, String obfuscatedFieldName, String seargeFieldName)
-    {
-        return ObfuscationUtilities.getObfuscatedFieldName(fieldName, obfuscatedFieldName, seargeFieldName);
-    }
-
-    /**
-     * Abstraction helper function
-     * 
-     * @param obf Field to get, returned unmodified if in debug mode
-     * @return Obfuscated field name if present
-     * @deprecated use ObfuscationUtilities.getObfuscatedFieldName instead
-     */
-    @Deprecated
-    public static String getObfuscatedFieldName(Obf obf)
-    {
-        return ObfuscationUtilities.getObfuscatedFieldName(obf);
-    }
-
-    @SuppressWarnings("unchecked")
     private static <K, V> V removeObjectFromRegistry(RegistrySimple registry, K key)
     {
         if (registry == null) return null;
  
-        ObjectIntIdentityMap underlyingIntegerMap = null;
+        IObjectIntIdentityMap underlyingIntegerMap = null;
  
-        if (registry instanceof RegistryNamespaced)
+        if (registry instanceof INamespacedRegistry)
         {
-            RegistryNamespaced rns = (RegistryNamespaced)registry;
-            underlyingIntegerMap = PrivateFieldsClient.underlyingIntegerMap.get(rns); 
+            underlyingIntegerMap = ((INamespacedRegistry)registry).getUnderlyingMap(); 
         }
  
-        Map<K, V> registryObjects = PrivateFieldsClient.registryObjects.get(registry);
+        Map<K, V> registryObjects = ((IRegistrySimple)registry).<K, V>getRegistryObjects();
         if (registryObjects != null)
         {
             V existingValue = registryObjects.get(key);
@@ -263,8 +229,8 @@ public abstract class ModUtilities
  
                 if (underlyingIntegerMap != null)
                 {
-                    IdentityHashMap<V, Integer> identityMap = PrivateFieldsClient.identityMap.get(underlyingIntegerMap);
-                    List<V> objectList = PrivateFieldsClient.objectList.get(underlyingIntegerMap);
+                    IdentityHashMap<V, Integer> identityMap = underlyingIntegerMap.<V>getIdentityMap();
+                    List<V> objectList = underlyingIntegerMap.<V>getObjectList();
                     if (identityMap != null) identityMap.remove(existingValue);
                     if (objectList != null) objectList.remove(existingValue);
                 }
+{
+    "required": true,
+    "minVersion": "0.4.10",
+    "package": "com.mumfrey.liteloader.client.mixin",
+    "refmap": "mixins.liteloader.client.refmap.json",
+    "mixins": [
+        "MixinMinecraft",
+        "MixinSession",
+        "MixinEntityRenderer",
+        "MixinRenderManager",
+        "MixinGuiIngame",
+        "MixinEntityPlayerSP",
+        "MixinFramebuffer",
+        "MixinIntegratedServer",
+        "MixinScreenShotHelper",
+        "MixinRealmsMainScreen",
+        "MixinNetHandlerLoginClient",
+        "MixinRegistrySimple",
+        "MixinRegistryNamespaced",
+        "MixinTileEntityRendererDispatcher",
+        "MixinSimpleReloadableResourceManager"
+    ]
+}
 \ No newline at end of file
@@ -53,7 +53,13 @@ public interface LiteAPI
      * dependency using the api@revision syntax.
      */
     public abstract int getRevision();
-
+    
+    /**
+     * Get mixin environment configuration provider for this API, can return
+     * null.
+     */
+    public abstract MixinConfigProvider getMixins();
+    
     /**
      * Should return an array of required transformer names, these transformers
      * will be injected UPSTREAM. Can return null.
+package com.mumfrey.liteloader.api;
+
+import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel;
+
+/**
+ * Container for all of an API's mixin environment configuration 
+ */
+public interface MixinConfigProvider
+{
+    /**
+     * Get the minimum required mixin operating compatibility level for this
+     * API, can return null.
+     */
+    public abstract CompatibilityLevel getCompatibilityLevel();
+    
+    /**
+     * Get mixin configuration files for this API, all returned configs will be
+     * added to the DEFAULT environment. Can return null.
+     */
+    public abstract String[] getMixinConfigs();
+
+    /**
+     * Get mixin error handler classes to register for this API. Can return
+     * null.
+     */
+    public abstract String[] getErrorHandlers();
+}
@@ -16,6 +16,12 @@ import com.mumfrey.liteloader.interfaces.InterfaceRegistry;
 public interface APIAdapter
 {
     /**
+     * APIs should register their mixin configs and set up the mixin environment
+     * here. 
+     */
+    public abstract void initMixins();
+    
+    /**
      * Aggregate and return required transformers from all registered APIs
      */
     public abstract List<String> getRequiredTransformers();
@@ -8,8 +8,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
  
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel;
+
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.api.LiteAPI;
+import com.mumfrey.liteloader.api.MixinConfigProvider;
 import com.mumfrey.liteloader.api.Observer;
 import com.mumfrey.liteloader.interfaces.InterfaceRegistry;
  
@@ -54,6 +58,44 @@ class APIProviderBasic implements APIProvider, APIAdapter
             this.apiMap.put(api.getIdentifier(), api);
         }
     }
+    
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.manager.APIAdapter#initMixins()
+     */
+    @Override
+    public void initMixins()
+    {
+        for (LiteAPI api : this.apis)
+        {
+            MixinConfigProvider mixins = api.getMixins();
+            if (mixins != null)
+            {
+                CompatibilityLevel level = mixins.getCompatibilityLevel();
+                if (level != null)
+                {
+                    MixinEnvironment.setCompatibilityLevel(level);
+                }
+                
+                String[] configs = mixins.getMixinConfigs();
+                if (configs != null)
+                {
+                    for (String config : configs)
+                    {
+                        MixinEnvironment.getDefaultEnvironment().addConfiguration(config);
+                    }
+                }
+                
+                String[] errorHandlers = mixins.getErrorHandlers();
+                if (errorHandlers != null)
+                {
+                    for (String handlerName : errorHandlers)
+                    {
+                        MixinEnvironment.getDefaultEnvironment().registerErrorHandlerClass(handlerName);
+                    }
+                }
+            }
+        }
+    }
  
     /* (non-Javadoc)
      * @see com.mumfrey.liteloader.api.manager.APIProvider
+package com.mumfrey.liteloader.common.ducks;
+
+import net.minecraft.util.IChatComponent;
+
+public interface IChatPacket
+{
+    public abstract IChatComponent getChatComponent();
+
+    public abstract void setChatComponent(IChatComponent chatComponent);
+}
+package com.mumfrey.liteloader.common.ducks;
+
+public interface IPacketClientSettings
+{
+    public abstract int getViewDistance();
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.common.ducks.IPacketClientSettings;
+
+import net.minecraft.network.play.client.C15PacketClientSettings;
+
+@Mixin(C15PacketClientSettings.class)
+public abstract class MixinC15PacketClientSettings implements IPacketClientSettings
+{
+    @Shadow private int view;
+    
+    @Override
+    public int getViewDistance()
+    {
+        return this.view;
+    }
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+@Mixin(ItemInWorldManager.class)
+public abstract class MixinItemInWorldManager
+{
+    @Inject(
+        method = "onBlockClicked(Lnet/minecraft/util/BlockPos;Lnet/minecraft/util/EnumFacing;)V",
+        cancellable = true,
+        at = @At("HEAD")
+    )
+    private void onBlockClicked(BlockPos pos, EnumFacing side, CallbackInfo ci)
+    {
+        Proxy.onBlockClicked(ci, (ItemInWorldManager)(Object)this, pos, side);
+    }
+    
+    @Inject(
+        method = "activateBlockOrUseItem(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;"
+                + "Lnet/minecraft/util/BlockPos;Lnet/minecraft/util/EnumFacing;FFF)Z",
+        cancellable = true,
+        at = @At("HEAD")
+    )
+    private void onUseItem(EntityPlayer player, World worldIn, ItemStack stack, BlockPos pos, EnumFacing side, float offsetX, float offsetY,
+            float offsetZ, CallbackInfoReturnable<Boolean> cir)
+    {
+        Proxy.onUseItem(cir, player, worldIn, stack, pos, side, offsetX, offsetY, offsetZ);
+    }
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.server.MinecraftServer;
+
+@Mixin(MinecraftServer.class)
+public abstract class MixinMinecraftServer
+{
+    @Inject(method = "updateTimeLightAndEntities()V", at = @At("HEAD"))
+    private void onServerTick(CallbackInfo ci)
+    {
+        Proxy.onServerTick((MinecraftServer)(Object)this);
+    }
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Surrogate;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.world.WorldServer;
+
+@Mixin(NetHandlerPlayServer.class)
+public abstract class MixinNetHandlerPlayServer
+{
+    @Inject(
+        method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/C08PacketPlayerBlockPlacement;)V",
+        cancellable = true,
+        at = @At(
+            value = "INVOKE",
+            shift = Shift.AFTER,
+            target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue"
+                    + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
+        )
+    )
+    private void onPlaceBlock(C08PacketPlayerBlockPlacement packetIn, CallbackInfo ci)
+    {
+        Proxy.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+    }
+    
+    @Inject(
+        method = "handleAnimation(Lnet/minecraft/network/play/client/C0APacketAnimation;)V",
+        cancellable = true,
+        at = @At(
+            value = "INVOKE",
+            shift = Shift.AFTER,
+            target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue"
+                    + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
+        )
+    )
+    private void onClickedAir(C0APacketAnimation packetIn, CallbackInfo ci)
+    {
+        Proxy.onClickedAir(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+    }
+    
+    @Inject(
+        method = "processPlayerDigging(Lnet/minecraft/network/play/client/C07PacketPlayerDigging;)V",
+        cancellable = true,
+        at = @At(
+            value = "INVOKE",
+            shift = Shift.AFTER,
+            target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue"
+                    + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
+        )
+    )
+    private void onPlayerDigging(C07PacketPlayerDigging packetIn, CallbackInfo ci)
+    {
+        Proxy.onPlayerDigging(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+    }
+    
+    @Inject(
+        method = "processPlayer(Lnet/minecraft/network/play/client/C03PacketPlayer;)V",
+        cancellable = true,
+        locals = LocalCapture.CAPTURE_FAILHARD,
+        at = @At(
+            value = "FIELD",
+            opcode = Opcodes.GETFIELD,
+            target = "Lnet/minecraft/entity/player/EntityPlayerMP;posY:D",
+            ordinal = 4
+        )
+    )
+    private void onPlayerMoved(C03PacketPlayer packetIn, CallbackInfo ci, WorldServer world, double oldPosX, double oldPosY, double oldPosZ,
+            double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
+    {
+        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world, oldPosX, oldPosY, oldPosZ, deltaMoveSq, deltaX, deltaY, deltaZ);
+    }
+    
+    @Surrogate
+    private void onPlayerMoved(C03PacketPlayer packetIn, CallbackInfo ci, WorldServer world, double oldPosX, double oldPosY, double oldPosZ)
+    {
+        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world, oldPosX, oldPosY, oldPosZ);
+    }
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.common.ducks.IChatPacket;
+
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.util.IChatComponent;
+
+@Mixin(S02PacketChat.class)
+public abstract class MixinS02PacketChat implements IChatPacket
+{
+    @Shadow private IChatComponent chatComponent;
+    
+    @Override
+    public IChatComponent getChatComponent()
+    {
+        return this.chatComponent;
+    }
+    
+    @Override
+    public void setChatComponent(IChatComponent chatComponent)
+    {
+        this.chatComponent = chatComponent;
+    }
+}
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Surrogate;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mojang.authlib.GameProfile;
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+
+@Mixin(ServerConfigurationManager.class)
+public abstract class MixinServerConfigurationManager
+{
+    @Inject(
+        method = "initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;)V",
+        at = @At("RETURN")
+    )
+    private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, CallbackInfo ci)
+    {
+        Proxy.onInitializePlayerConnection((ServerConfigurationManager)(Object)this, netManager, player);
+    }
+
+    // Because, forge
+    @Surrogate
+    private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, NetHandlerPlayServer nhps, CallbackInfo ci)
+    {
+        Proxy.onInitializePlayerConnection((ServerConfigurationManager)(Object)this, netManager, player);
+    }
+    
+    @Inject(method = "playerLoggedIn(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
+    private void onPlayerLogin(EntityPlayerMP player, CallbackInfo ci)
+    {
+        Proxy.onPlayerLogin((ServerConfigurationManager)(Object)this, player);
+    }
+    
+    @Inject(method = "playerLoggedOut(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
+    private void onPlayerLogout(EntityPlayerMP player, CallbackInfo ci)
+    {
+        Proxy.onPlayerLogout((ServerConfigurationManager)(Object)this, player);
+    }
+    
+    @Inject(
+        method = "createPlayerForUser(Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/entity/player/EntityPlayerMP;",
+        cancellable = true,
+        at = @At("RETURN")
+    )
+    private void onSpawnPlayer(GameProfile profile, CallbackInfoReturnable<EntityPlayerMP> cir)
+    {
+        Proxy.onSpawnPlayer(cir, (ServerConfigurationManager)(Object)this, profile);
+    }
+    
+    @Inject(
+        method = "recreatePlayerEntity(Lnet/minecraft/entity/player/EntityPlayerMP;IZ)Lnet/minecraft/entity/player/EntityPlayerMP;",
+        cancellable = true,
+        at = @At("RETURN")
+    )
+    private void onRespawnPlayer(EntityPlayerMP player, int dimension, boolean conqueredEnd, CallbackInfoReturnable<EntityPlayerMP> cir)
+    {
+        Proxy.onRespawnPlayer(cir, (ServerConfigurationManager)(Object)this, player, dimension, conqueredEnd);
+    }
+}
-package com.mumfrey.liteloader.common.transformers;
-
-import static com.mumfrey.liteloader.core.runtime.Methods.*;
-import static com.mumfrey.liteloader.transformers.event.InjectionPoint.*;
-
-import org.objectweb.asm.Opcodes;
-
-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.BeforeFieldAccess;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeInvoke;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeNew;
-import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
-import com.mumfrey.liteloader.transformers.event.inject.MethodHead;
-
-/**
- * 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 declarations
-        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 onServerTick                  = Event.getOrCreate("onServerTick",                 false);
-        Event onBlockClickedEvent           = Event.getOrCreate("onBlockClicked",               true);
-        Event onActivateBlockOrUseItem      = Event.getOrCreate("onActivateBlockOrUseItem",     true);
-        Event onPlayerDigging               = Event.getOrCreate("onPlayerDigging",              true);
-        Event onPlaceBlock                  = Event.getOrCreate("onPlaceBlock",                 true);
-        Event onClickedAir                  = Event.getOrCreate("onClickedAir",                 true);
-        Event onSessionProfileBad           = Event.getOrCreate("onSessionProfileBad",          true);
-        Event onPlayerMoved                 = Event.getOrCreate("onPlayerMoved",                true);
-
-        // Injection Points
-        InjectionPoint methodHead           = new MethodHead();
-        InjectionPoint methodReturn         = new BeforeReturn();
-        InjectionPoint beforeNewGameProfile = new BeforeNew(1, Obf.GameProfile);
-        InjectionPoint beforeThreadMarshall = new BeforeInvoke(checkThreadAndEnqueue);
-        InjectionPoint beforeGetPosY        = new BeforeFieldAccess(Opcodes.GETFIELD, Obf.entityPosY, Obf.EntityPlayerMP, 4).setCaptureLocals(true);
-
-        // 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");
-        this.add(onServerTick,                 serverJobs,                  (methodHead),            "onServerTick");
-        this.add(onBlockClickedEvent,          onBlockClicked,              (methodHead),            "onBlockClicked");
-        this.add(onActivateBlockOrUseItem,     activateBlockOrUseItem,      (methodHead),            "onUseItem");
-        this.add(onPlaceBlock,                 processBlockPlacement,  after(beforeThreadMarshall) , "onPlaceBlock");
-        this.add(onClickedAir,                 handleAnimation,        after(beforeThreadMarshall),  "onClickedAir");
-        this.add(onPlayerDigging,              processPlayerDigging,   after(beforeThreadMarshall),  "onPlayerDigging");
-        this.add(onPlayerMoved,                processPlayer,               (beforeGetPosY),         "onPlayerMoved");
-
-        // 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));
-    }
-}
@@ -7,26 +7,10 @@ import java.util.List;
  
 import javax.activity.InvalidActivityException;
  
-import net.minecraft.crash.CrashReport;
-import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.launchwrapper.LaunchClassLoader;
-import net.minecraft.network.EnumConnectionState;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.profiler.Profiler;
-import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.MixinEnvironment;
  
 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.*;
 import com.mumfrey.liteloader.api.manager.APIAdapter;
 import com.mumfrey.liteloader.api.manager.APIProvider;
 import com.mumfrey.liteloader.common.GameEngine;
@@ -37,12 +21,7 @@ import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.crashreport.CallableLaunchWrapper;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
-import com.mumfrey.liteloader.interfaces.FastIterableDeque;
-import com.mumfrey.liteloader.interfaces.Loadable;
-import com.mumfrey.liteloader.interfaces.LoadableMod;
-import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
-import com.mumfrey.liteloader.interfaces.ObjectFactory;
-import com.mumfrey.liteloader.interfaces.PanelManager;
+import com.mumfrey.liteloader.interfaces.*;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType;
 import com.mumfrey.liteloader.launch.LoaderProperties;
@@ -56,6 +35,15 @@ import com.mumfrey.liteloader.util.Input;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity;
  
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.world.World;
+
 /**
  * LiteLoader is a simple loader which loads and provides useful callbacks to
  * lightweight mods
@@ -524,6 +512,7 @@ public final class LiteLoader
         if (LiteLoaderLogger.DEBUG)
         {
             EventTransformer.dumpInjectionState();
+            MixinEnvironment.getCurrentEnvironment().audit();
             LiteLoaderLogger.info("Debug info dumped to console");
         }
         else
 package com.mumfrey.liteloader.core;
  
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.Serializable;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -15,10 +10,7 @@ import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.appender.FileAppender;
 import org.apache.logging.log4j.core.layout.PatternLayout;
-
-import net.minecraft.launchwrapper.ITweaker;
-import net.minecraft.launchwrapper.Launch;
-import net.minecraft.launchwrapper.LaunchClassLoader;
+import org.spongepowered.asm.mixin.MixinEnvironment;
  
 import com.mumfrey.liteloader.api.LiteAPI;
 import com.mumfrey.liteloader.api.manager.APIAdapter;
@@ -27,15 +19,15 @@ import com.mumfrey.liteloader.api.manager.APIRegistry;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI;
 import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
-import com.mumfrey.liteloader.launch.ClassTransformerManager;
-import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.launch.LoaderBootstrap;
-import com.mumfrey.liteloader.launch.LoaderEnvironment;
-import com.mumfrey.liteloader.launch.LoaderProperties;
-import com.mumfrey.liteloader.launch.StartupEnvironment;
+import com.mumfrey.liteloader.launch.*;
+import com.mumfrey.liteloader.util.ObfuscationUtilities;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity;
  
+import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
 /**
  * LiteLoaderBootstrap is responsible for managing the early part of the
  * LiteLoader startup process, this is to ensure that NONE of the Minecraft
@@ -316,10 +308,18 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
  
         this.enumerator = this.spawnEnumerator(classLoader);
         this.enumerator.onPreInit();
+        
+        this.initMixins();
  
         LiteLoaderLogger.info(Verbosity.REDUCED, "LiteLoader PREINIT complete");
     }
  
+    private void initMixins()
+    {
+        LiteLoaderLogger.info(Verbosity.REDUCED, "Initialising LiteLoader Mixins");
+        this.getAPIAdapter().initMixins();
+    }
+
     /**
      * @param classLoader
      */
@@ -341,6 +341,12 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
         }
  
         LoadingProgress.setEnabled(this.getAndStoreBooleanProperty(LoaderProperties.OPTION_LOADING_BAR, true));
+        
+        if (ObfuscationUtilities.fmlIsPresent())
+        {
+            LiteLoaderLogger.info("FML detected, switching to searge mappings");
+            MixinEnvironment.getDefaultEnvironment().setObfuscationContext("searge");
+        }
     }
  
     /* (non-Javadoc)
@@ -740,7 +746,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
     @Override
     public List<String> getRequiredTransformers()
     {
-        return this.apiAdapter.getRequiredTransformers();
+        return this.getAPIAdapter().getRequiredTransformers();
     }
  
     /* (non-Javadoc)
@@ -750,7 +756,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
     @Override
     public List<String> getRequiredDownstreamTransformers()
     {
-        List<String> requiredDownstreamTransformers = this.apiAdapter.getRequiredDownstreamTransformers();
+        List<String> requiredDownstreamTransformers = this.getAPIAdapter().getRequiredDownstreamTransformers();
         requiredDownstreamTransformers.add(0, "com.mumfrey.liteloader.transformers.event.EventTransformer");
         return requiredDownstreamTransformers;
     }
@@ -5,6 +5,23 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
  
+import com.mojang.authlib.GameProfile;
+import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
+import com.mumfrey.liteloader.api.InterfaceProvider;
+import com.mumfrey.liteloader.api.Listener;
+import com.mumfrey.liteloader.api.ShutdownObserver;
+import com.mumfrey.liteloader.common.GameEngine;
+import com.mumfrey.liteloader.common.LoadingProgress;
+import com.mumfrey.liteloader.common.ducks.IPacketClientSettings;
+import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
+import com.mumfrey.liteloader.interfaces.FastIterable;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
+import com.mumfrey.liteloader.launch.LoaderProperties;
+import com.mumfrey.liteloader.util.Position;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -25,31 +42,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings;
  
-import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.LiteMod;
-import com.mumfrey.liteloader.PlayerInteractionListener;
-import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
-import com.mumfrey.liteloader.PlayerMoveListener;
-import com.mumfrey.liteloader.PluginChannelListener;
-import com.mumfrey.liteloader.ServerCommandProvider;
-import com.mumfrey.liteloader.ServerPlayerListener;
-import com.mumfrey.liteloader.ServerPluginChannelListener;
-import com.mumfrey.liteloader.ServerTickable;
-import com.mumfrey.liteloader.ShutdownListener;
-import com.mumfrey.liteloader.api.InterfaceProvider;
-import com.mumfrey.liteloader.api.Listener;
-import com.mumfrey.liteloader.api.ShutdownObserver;
-import com.mumfrey.liteloader.common.GameEngine;
-import com.mumfrey.liteloader.common.LoadingProgress;
-import com.mumfrey.liteloader.core.event.HandlerList;
-import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
-import com.mumfrey.liteloader.interfaces.FastIterable;
-import com.mumfrey.liteloader.interfaces.FastIterableDeque;
-import com.mumfrey.liteloader.launch.LoaderProperties;
-import com.mumfrey.liteloader.util.Position;
-import com.mumfrey.liteloader.util.PrivateFields;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
 /**
  * @author Adam Mummery-Smith
  *
@@ -513,7 +505,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
     void onPlayerSettingsReceived(EntityPlayerMP player, C15PacketClientSettings packet)
     {
         PlayerEventState playerState = this.getPlayerState(player);
-        playerState.setTraceDistance(PrivateFields.viewDistance.get(packet));
+        playerState.setTraceDistance(((IPacketClientSettings)packet).getViewDistance());
         playerState.setLocale(packet.getLang());
     }
  
 package com.mumfrey.liteloader.core;
  
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mojang.authlib.GameProfile;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -17,89 +22,83 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
  
-import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.transformers.event.EventInfo;
-import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
-
-public abstract class CallbackProxyCommon
+public abstract class Proxy
 {
-    private static LiteLoaderEventBroker<?, ?> eventBroker;
+    private static LiteLoaderEventBroker<?, ?> broker;
  
-    protected CallbackProxyCommon() {}
+    protected Proxy() {}
  
     protected static void onStartupComplete()
     {
-        CallbackProxyCommon.eventBroker = LiteLoaderEventBroker.broker;
+        Proxy.broker = LiteLoaderEventBroker.broker;
  
-        if (CallbackProxyCommon.eventBroker == null)
+        if (Proxy.broker == null)
         {
             throw new RuntimeException("LiteLoader failed to start up properly."
                     + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
         }
     }
  
-    public static void onInitializePlayerConnection(EventInfo<ServerConfigurationManager> e, NetworkManager netManager, EntityPlayerMP player)
+    public static void onInitializePlayerConnection(ServerConfigurationManager source, NetworkManager netManager, EntityPlayerMP player)
     {
-        CallbackProxyCommon.eventBroker.onInitializePlayerConnection(e.getSource(), netManager, player);
+        Proxy.broker.onInitializePlayerConnection(source, netManager, player);
     }
  
-    public static void onPlayerLogin(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
+    public static void onPlayerLogin(ServerConfigurationManager source, EntityPlayerMP player)
     {
-        CallbackProxyCommon.eventBroker.onPlayerLogin(e.getSource(), player);
+        Proxy.broker.onPlayerLogin(source, player);
     }
  
-    public static void onPlayerLogout(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
+    public static void onPlayerLogout(ServerConfigurationManager source, EntityPlayerMP player)
     {
-        CallbackProxyCommon.eventBroker.onPlayerLogout(e.getSource(), player);
+        Proxy.broker.onPlayerLogout(source, player);
     }
  
-    public static void onSpawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, GameProfile profile)
+    public static void onSpawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, ServerConfigurationManager source, GameProfile profile)
     {
-        CallbackProxyCommon.eventBroker.onSpawnPlayer(e.getSource(), e.getReturnValue(), profile);
+        Proxy.broker.onSpawnPlayer(source, cir.getReturnValue(), profile);
     }
  
-    public static void onRespawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, EntityPlayerMP oldPlayer, int dimension,
-            boolean won)
+    public static void onRespawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, ServerConfigurationManager source, EntityPlayerMP oldPlayer,
+            int dimension, boolean won)
     {
-        CallbackProxyCommon.eventBroker.onRespawnPlayer(e.getSource(), e.getReturnValue(), oldPlayer, dimension, won);
+        Proxy.broker.onRespawnPlayer(source, cir.getReturnValue(), oldPlayer, dimension, won);
     }
  
-    public static void onServerTick(EventInfo<MinecraftServer> e)
+    public static void onServerTick(MinecraftServer mcServer)
     {
-        CallbackProxyCommon.eventBroker.onServerTick(e.getSource());
+        Proxy.broker.onServerTick(mcServer);
     }
  
-    public static void onPlaceBlock(EventInfo<NetHandlerPlayServer> e, C08PacketPlayerBlockPlacement packet)
+    public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, C08PacketPlayerBlockPlacement packet)
     {
-        NetHandlerPlayServer netHandler = e.getSource();
-        if (!CallbackProxyCommon.eventBroker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(),
+        if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(),
                 EnumFacing.getFront(packet.getPlacedBlockDirection())))
         {
-            e.cancel();
+            ci.cancel();
         }
     }
  
-    public static void onClickedAir(EventInfo<NetHandlerPlayServer> e, C0APacketAnimation packet)
+    public static void onClickedAir(CallbackInfo ci, NetHandlerPlayServer netHandler, C0APacketAnimation packet)
     {
-        if (!CallbackProxyCommon.eventBroker.onClickedAir(e.getSource()))
+        if (!Proxy.broker.onClickedAir(netHandler))
         {
-            e.cancel();
+            ci.cancel();
         }
     }
  
-    public static void onPlayerDigging(EventInfo<NetHandlerPlayServer> e, C07PacketPlayerDigging packet)
+    public static void onPlayerDigging(CallbackInfo ci, NetHandlerPlayServer netHandler, C07PacketPlayerDigging packet)
     {
         if (packet.getStatus() == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK)
         {
-            NetHandlerPlayServer netHandler = e.getSource();
-            if (!CallbackProxyCommon.eventBroker.onPlayerDigging(netHandler, packet.getPosition(), netHandler.playerEntity))
+            if (!Proxy.broker.onPlayerDigging(netHandler, packet.getPosition(), netHandler.playerEntity))
             {
-                e.cancel();
+                ci.cancel();
             }
         }
     }
  
-    public static void onUseItem(ReturnEventInfo<ItemInWorldManager, Boolean> e, EntityPlayer player, World world, ItemStack itemStack, BlockPos pos,
+    public static void onUseItem(CallbackInfoReturnable<Boolean> ci, EntityPlayer player, World world, ItemStack itemStack, BlockPos pos,
             EnumFacing side, float par8, float par9, float par10)
     {
         if (!(player instanceof EntityPlayerMP))
@@ -107,39 +106,35 @@ public abstract class CallbackProxyCommon
             return;
         }
  
-        if (!CallbackProxyCommon.eventBroker.onUseItem(pos, side, (EntityPlayerMP)player))
+        if (!Proxy.broker.onUseItem(pos, side, (EntityPlayerMP)player))
         {
-            e.setReturnValue(false);
+            ci.setReturnValue(false);
         }
     }
  
-    public static void onBlockClicked(EventInfo<ItemInWorldManager> e, BlockPos pos, EnumFacing side)
+    public static void onBlockClicked(CallbackInfo ci, ItemInWorldManager manager, BlockPos pos, EnumFacing side)
     {
-        ItemInWorldManager manager = e.getSource();
-
-        if (!CallbackProxyCommon.eventBroker.onBlockClicked(pos, side, manager))
+        if (!Proxy.broker.onBlockClicked(pos, side, manager))
         {
-            e.cancel();
+            ci.cancel();
         }
     }
  
-    public static void onPlayerMoved(EventInfo<NetHandlerPlayServer> e, C03PacketPlayer packet, WorldServer world, double oldPosX, double oldPosY,
-            double oldPosZ)
+    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, C03PacketPlayer packet, WorldServer world, double oldPosX,
+            double oldPosY, double oldPosZ)
     {
-        NetHandlerPlayServer netHandler = e.getSource();
-        if (!CallbackProxyCommon.eventBroker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
+        if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
         {
-            e.cancel();
+            ci.cancel();
         }
     }
  
-    public static void onPlayerMoved(EventInfo<NetHandlerPlayServer> e, C03PacketPlayer packet, WorldServer world, double oldPosX, double oldPosY,
-            double oldPosZ, double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
+    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, C03PacketPlayer packet, WorldServer world, double oldPosX,
+            double oldPosY, double oldPosZ, double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
     {
-        NetHandlerPlayServer netHandler = e.getSource();
-        if (!CallbackProxyCommon.eventBroker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
+        if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
         {
-            e.cancel();
+            ci.cancel();
         }
     }
 }
@@ -5,8 +5,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
  
+import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel;
+
 import com.mumfrey.liteloader.api.EnumeratorModule;
 import com.mumfrey.liteloader.api.LiteAPI;
+import com.mumfrey.liteloader.api.MixinConfigProvider;
 import com.mumfrey.liteloader.core.LiteLoaderVersion;
 import com.mumfrey.liteloader.interfaces.ObjectFactory;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
@@ -18,7 +21,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  * 
  * @author Adam Mummery-Smith
  */
-public abstract class LiteLoaderCoreAPI implements LiteAPI
+public abstract class LiteLoaderCoreAPI implements LiteAPI, MixinConfigProvider
 {
     protected static final String PKG_LITELOADER = "com.mumfrey.liteloader";
     protected static final String PKG_LITELOADER_COMMON = LiteLoaderCoreAPI.PKG_LITELOADER + ".common";
@@ -144,4 +147,30 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
      * Get the ObjectFactory
      */
     public abstract ObjectFactory<?, ?> getObjectFactory();
+    
+    @Override
+    public MixinConfigProvider getMixins()
+    {
+        return this;
+    }
+    
+    @Override
+    public CompatibilityLevel getCompatibilityLevel()
+    {
+        return null;
+    }
+    
+    @Override
+    public String[] getMixinConfigs()
+    {
+        return new String[] {
+            "mixins.liteloader.core.json"
+        };
+    }
+    
+    @Override
+    public String[] getErrorHandlers()
+    {
+        return null;
+    }
 }
@@ -16,54 +16,54 @@ public abstract class Methods
     // CHECKSTYLE:OFF
  
     // 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);
-    public static final MethodInfo updateFramebufferSize  = new MethodInfo(Obf.Minecraft,                  Obf.updateFramebufferSize,        Void.TYPE);
-    public static final MethodInfo framebufferRender      = new MethodInfo(Obf.FrameBuffer,                Obf.framebufferRender,            Void.TYPE, Integer.TYPE, Integer.TYPE);
-    public static final MethodInfo framebufferRenderExt   = new MethodInfo(Obf.FrameBuffer,                Obf.framebufferRenderExt,         Void.TYPE, Integer.TYPE, Integer.TYPE, Boolean.TYPE);
-    public static final MethodInfo bindFramebufferTexture = new MethodInfo(Obf.FrameBuffer,                Obf.bindFramebufferTexture,       Void.TYPE);
-    public static final MethodInfo sendChatMessage        = new MethodInfo(Obf.EntityPlayerSP,             Obf.sendChatMessage,              Void.TYPE, String.class);
-    public static final MethodInfo renderWorld            = new MethodInfo(Obf.EntityRenderer,             Obf.renderWorld,                  Void.TYPE, Float.TYPE, Long.TYPE);
-    public static final MethodInfo renderWorldPass        = new MethodInfo(Obf.EntityRenderer,             Obf.renderWorldPass,              Void.TYPE, Integer.TYPE, Float.TYPE, Long.TYPE);
-    public static final MethodInfo updateCameraAndRender  = new MethodInfo(Obf.EntityRenderer,             Obf.updateCameraAndRender,        Void.TYPE, Float.TYPE);
-    public static final MethodInfo renderGameOverlay      = new MethodInfo(Obf.GuiIngame,                  Obf.renderGameOverlay,            Void.TYPE, Float.TYPE);
-    public static final MethodInfo drawChat               = new MethodInfo(Obf.GuiNewChat,                 Obf.drawChat,                     Void.TYPE, Integer.TYPE);
-    public static final MethodInfo integratedServerCtor   = new MethodInfo(Obf.IntegratedServer,           Obf.constructor,                  Void.TYPE, Obf.Minecraft, String.class, String.class, Obf.WorldSettings);
-    public static final MethodInfo initPlayerConnection   = new MethodInfo(Obf.ServerConfigurationManager, Obf.initializeConnectionToPlayer, Void.TYPE, Obf.NetworkManager, Obf.EntityPlayerMP);
-    public static final MethodInfo playerLoggedIn         = new MethodInfo(Obf.ServerConfigurationManager, Obf.playerLoggedIn,               Void.TYPE, Obf.EntityPlayerMP);
-    public static final MethodInfo playerLoggedOut        = new MethodInfo(Obf.ServerConfigurationManager, Obf.playerLoggedOut,              Void.TYPE, Obf.EntityPlayerMP);
-    public static final MethodInfo spawnPlayer            = new MethodInfo(Obf.ServerConfigurationManager, Obf.spawnPlayer,                  Obf.EntityPlayerMP, Obf.GameProfile);
-    public static final MethodInfo respawnPlayer          = new MethodInfo(Obf.ServerConfigurationManager, Obf.respawnPlayer,                Obf.EntityPlayerMP, Obf.EntityPlayerMP, Integer.TYPE, Boolean.TYPE);
-    public static final MethodInfo glClear                = new MethodInfo(Obf.GlStateManager,             Obf.clear,                        Void.TYPE, Integer.TYPE);
-    public static final MethodInfo getProfile             = new MethodInfo(Obf.Session,                    Obf.getProfile,                   Obf.GameProfile);
-    public static final MethodInfo saveScreenshot         = new MethodInfo(Obf.ScreenShotHelper,           Obf.saveScreenshot,               Obf.IChatComponent, File.class, String.class, Integer.TYPE, Integer.TYPE, Obf.FrameBuffer);
-    public static final MethodInfo isFramebufferEnabled   = new MethodInfo(Obf.OpenGlHelper,               Obf.isFramebufferEnabled,         Boolean.TYPE);
-    public static final MethodInfo doRenderEntity         = new MethodInfo(Obf.RenderManager,              Obf.doRenderEntity,               Boolean.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE, Boolean.TYPE);
-    public static final MethodInfo doRender               = new MethodInfo(Obf.Render,                     Obf.doRender,                     Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
-    public static final MethodInfo doRenderShadowAndFire  = new MethodInfo(Obf.Render,                     Obf.doRenderShadowAndFire,        Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
-    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);
-    public static final MethodInfo onBlockClicked         = new MethodInfo(Obf.ItemInWorldManager,         Obf.onBlockClicked,               Void.TYPE, Obf.BlockPos, Obf.EnumFacing);
-    public static final MethodInfo activateBlockOrUseItem = new MethodInfo(Obf.ItemInWorldManager,         Obf.activateBlockOrUseItem,       Boolean.TYPE, Obf.EntityPlayer, Obf.World, Obf.ItemStack, Obf.BlockPos, Obf.EnumFacing, Float.TYPE, Float.TYPE, Float.TYPE);
-    public static final MethodInfo processBlockPlacement  = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayerBlockPlacement,  Void.TYPE, Packets.C08PacketPlayerBlockPlacement);
-    public static final MethodInfo handleAnimation        = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.handleAnimation,              Void.TYPE, Packets.C0APacketAnimation);
-    public static final MethodInfo processPlayerDigging   = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayerDigging,         Void.TYPE, Packets.C07PacketPlayerDigging);
-    public static final MethodInfo serverJobs             = new MethodInfo(Obf.MinecraftServer,            Obf.updateTimeLightAndEntities,   Void.TYPE);
-    public static final MethodInfo checkThreadAndEnqueue  = new MethodInfo(Obf.PacketThreadUtil,           Obf.checkThreadAndEnqueue);
-    public static final MethodInfo processPlayer          = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayer,                Void.TYPE, Packets.C03PacketPlayer);
-    public static final MethodInfo renderSky              = new MethodInfo(Obf.RenderGlobal,               Obf.renderSky,                    Void.TYPE, Float.TYPE, Integer.TYPE);
-    public static final MethodInfo renderCloudsCheck      = new MethodInfo(Obf.EntityRenderer,             Obf.renderCloudsCheck,            Void.TYPE, Obf.RenderGlobal, Float.TYPE, Integer.TYPE);
-    public static final MethodInfo setupFog               = new MethodInfo(Obf.EntityRenderer,             Obf.setupFog,                     Void.TYPE, Integer.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo startGame              = new MethodInfo(Obf.Minecraft,                  Obf.startGame,                    Void.TYPE);
+    @Deprecated public static final MethodInfo runGameLoop            = new MethodInfo(Obf.Minecraft,                  Obf.runGameLoop,                  Void.TYPE);
+    @Deprecated public static final MethodInfo runTick                = new MethodInfo(Obf.Minecraft,                  Obf.runTick,                      Void.TYPE);
+    @Deprecated public static final MethodInfo updateFramebufferSize  = new MethodInfo(Obf.Minecraft,                  Obf.updateFramebufferSize,        Void.TYPE);
+    @Deprecated public static final MethodInfo framebufferRender      = new MethodInfo(Obf.FrameBuffer,                Obf.framebufferRender,            Void.TYPE, Integer.TYPE, Integer.TYPE);
+    @Deprecated public static final MethodInfo framebufferRenderExt   = new MethodInfo(Obf.FrameBuffer,                Obf.framebufferRenderExt,         Void.TYPE, Integer.TYPE, Integer.TYPE, Boolean.TYPE);
+    @Deprecated public static final MethodInfo bindFramebufferTexture = new MethodInfo(Obf.FrameBuffer,                Obf.bindFramebufferTexture,       Void.TYPE);
+    @Deprecated public static final MethodInfo sendChatMessage        = new MethodInfo(Obf.EntityPlayerSP,             Obf.sendChatMessage,              Void.TYPE, String.class);
+    @Deprecated public static final MethodInfo renderWorld            = new MethodInfo(Obf.EntityRenderer,             Obf.renderWorld,                  Void.TYPE, Float.TYPE, Long.TYPE);
+    @Deprecated public static final MethodInfo renderWorldPass        = new MethodInfo(Obf.EntityRenderer,             Obf.renderWorldPass,              Void.TYPE, Integer.TYPE, Float.TYPE, Long.TYPE);
+    @Deprecated public static final MethodInfo updateCameraAndRender  = new MethodInfo(Obf.EntityRenderer,             Obf.updateCameraAndRender,        Void.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo renderGameOverlay      = new MethodInfo(Obf.GuiIngame,                  Obf.renderGameOverlay,            Void.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo drawChat               = new MethodInfo(Obf.GuiNewChat,                 Obf.drawChat,                     Void.TYPE, Integer.TYPE);
+    @Deprecated public static final MethodInfo integratedServerCtor   = new MethodInfo(Obf.IntegratedServer,           Obf.constructor,                  Void.TYPE, Obf.Minecraft, String.class, String.class, Obf.WorldSettings);
+    @Deprecated public static final MethodInfo initPlayerConnection   = new MethodInfo(Obf.ServerConfigurationManager, Obf.initializeConnectionToPlayer, Void.TYPE, Obf.NetworkManager, Obf.EntityPlayerMP);
+    @Deprecated public static final MethodInfo playerLoggedIn         = new MethodInfo(Obf.ServerConfigurationManager, Obf.playerLoggedIn,               Void.TYPE, Obf.EntityPlayerMP);
+    @Deprecated public static final MethodInfo playerLoggedOut        = new MethodInfo(Obf.ServerConfigurationManager, Obf.playerLoggedOut,              Void.TYPE, Obf.EntityPlayerMP);
+    @Deprecated public static final MethodInfo spawnPlayer            = new MethodInfo(Obf.ServerConfigurationManager, Obf.spawnPlayer,                  Obf.EntityPlayerMP, Obf.GameProfile);
+    @Deprecated public static final MethodInfo respawnPlayer          = new MethodInfo(Obf.ServerConfigurationManager, Obf.respawnPlayer,                Obf.EntityPlayerMP, Obf.EntityPlayerMP, Integer.TYPE, Boolean.TYPE);
+    @Deprecated public static final MethodInfo glClear                = new MethodInfo(Obf.GlStateManager,             Obf.clear,                        Void.TYPE, Integer.TYPE);
+    @Deprecated public static final MethodInfo getProfile             = new MethodInfo(Obf.Session,                    Obf.getProfile,                   Obf.GameProfile);
+    @Deprecated public static final MethodInfo saveScreenshot         = new MethodInfo(Obf.ScreenShotHelper,           Obf.saveScreenshot,               Obf.IChatComponent, File.class, String.class, Integer.TYPE, Integer.TYPE, Obf.FrameBuffer);
+    @Deprecated public static final MethodInfo isFramebufferEnabled   = new MethodInfo(Obf.OpenGlHelper,               Obf.isFramebufferEnabled,         Boolean.TYPE);
+    @Deprecated public static final MethodInfo doRenderEntity         = new MethodInfo(Obf.RenderManager,              Obf.doRenderEntity,               Boolean.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE, Boolean.TYPE);
+    @Deprecated public static final MethodInfo doRender               = new MethodInfo(Obf.Render,                     Obf.doRender,                     Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo doRenderShadowAndFire  = new MethodInfo(Obf.Render,                     Obf.doRenderShadowAndFire,        Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo realmsPlay             = new MethodInfo(Obf.RealmsMainScreen,           "play",                           Void.TYPE, Long.TYPE);
+    @Deprecated public static final MethodInfo realmsStopFetcher      = new MethodInfo(Obf.RealmsMainScreen,           "stopRealmsFetcherAndPinger",     Void.TYPE);
+    @Deprecated public static final MethodInfo onBlockClicked         = new MethodInfo(Obf.ItemInWorldManager,         Obf.onBlockClicked,               Void.TYPE, Obf.BlockPos, Obf.EnumFacing);
+    @Deprecated public static final MethodInfo activateBlockOrUseItem = new MethodInfo(Obf.ItemInWorldManager,         Obf.activateBlockOrUseItem,       Boolean.TYPE, Obf.EntityPlayer, Obf.World, Obf.ItemStack, Obf.BlockPos, Obf.EnumFacing, Float.TYPE, Float.TYPE, Float.TYPE);
+    @Deprecated public static final MethodInfo processBlockPlacement  = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayerBlockPlacement,  Void.TYPE, Packets.C08PacketPlayerBlockPlacement);
+    @Deprecated public static final MethodInfo handleAnimation        = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.handleAnimation,              Void.TYPE, Packets.C0APacketAnimation);
+    @Deprecated public static final MethodInfo processPlayerDigging   = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayerDigging,         Void.TYPE, Packets.C07PacketPlayerDigging);
+    @Deprecated public static final MethodInfo serverJobs             = new MethodInfo(Obf.MinecraftServer,            Obf.updateTimeLightAndEntities,   Void.TYPE);
+    @Deprecated public static final MethodInfo checkThreadAndEnqueue  = new MethodInfo(Obf.PacketThreadUtil,           Obf.checkThreadAndEnqueue);
+    @Deprecated public static final MethodInfo processPlayer          = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayer,                Void.TYPE, Packets.C03PacketPlayer);
+    @Deprecated public static final MethodInfo renderSky              = new MethodInfo(Obf.RenderGlobal,               Obf.renderSky,                    Void.TYPE, Float.TYPE, Integer.TYPE);
+    @Deprecated public static final MethodInfo renderCloudsCheck      = new MethodInfo(Obf.EntityRenderer,             Obf.renderCloudsCheck,            Void.TYPE, Obf.RenderGlobal, Float.TYPE, Integer.TYPE);
+    @Deprecated public static final MethodInfo setupFog               = new MethodInfo(Obf.EntityRenderer,             Obf.setupFog,                     Void.TYPE, Integer.TYPE, Float.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);
+    @Deprecated public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
+    @Deprecated public static final MethodInfo endSection             = new MethodInfo(Obf.Profiler,                   Obf.endSection,                   Void.TYPE);
+    @Deprecated 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);
+    @Deprecated public static final MethodInfo startServer            = new MethodInfo(Obf.DedicatedServer,            Obf.startServer,                  Boolean.TYPE);
+    @Deprecated public static final MethodInfo startServerThread      = new MethodInfo(Obf.MinecraftServer,            Obf.startServerThread,            Void.TYPE);
  
     private Methods() {}
  
@@ -17,8 +17,6 @@ public class Obf
 {
     // Non-obfuscated references, here for convenience
     // -----------------------------------------------------------------------------------------
-    public static final Obf          CallbackProxyClient = new Obf("com.mumfrey.liteloader.client.CallbackProxyClient"                 );
-    public static final Obf          CallbackProxyServer = new Obf("com.mumfrey.liteloader.server.CallbackProxyServer"                 );
     public static final Obf                   EventProxy = new Obf("com.mumfrey.liteloader.core.event.EventProxy"                      );
     public static final Obf                  HandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList"                     );
     public static final Obf             BakedHandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList$BakedHandlerList"    );
@@ -41,121 +39,128 @@ public class Obf
     public static final Obf                IGuiTextField = new Obf("com.mumfrey.liteloader.client.overlays.IGuiTextField"              );
     public static final Obf              IEntityRenderer = new Obf("com.mumfrey.liteloader.client.overlays.IEntityRenderer"            );
     public static final Obf                ISoundHandler = new Obf("com.mumfrey.liteloader.client.overlays.ISoundHandler"              );
+    
+    // CHECKSTYLE:OFF
  
     // Classes
     // -----------------------------------------------------------------------------------------
     public static final Obf                    Minecraft = new Obf("net.minecraft.client.Minecraft",                             "bsu" );
     public static final Obf               EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer",               "cji" );
-    public static final Obf                    GuiIngame = new Obf("net.minecraft.client.gui.GuiIngame",                         "btz" );
-    public static final Obf                     Profiler = new Obf("net.minecraft.profiler.Profiler",                            "uw"  );
+    public static final Obf                       Blocks = new Obf("net.minecraft.init.Blocks",                                  "aty" );
     public static final Obf                CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6",                          "h"   );
     public static final Obf                  INetHandler = new Obf("net.minecraft.network.INetHandler",                          "hg"  );
-    public static final Obf             IntegratedServer = new Obf("net.minecraft.server.integrated.IntegratedServer",           "cyk" );
-    public static final Obf                WorldSettings = new Obf("net.minecraft.world.WorldSettings",                          "arb" );
-    public static final Obf   ServerConfigurationManager = new Obf("net.minecraft.server.management.ServerConfigurationManager", "sn"  );
-    public static final Obf               EntityPlayerMP = new Obf("net.minecraft.entity.player.EntityPlayerMP",                 "qw"  );
-    public static final Obf               NetworkManager = new Obf("net.minecraft.network.NetworkManager",                       "gr"  );
-    public static final Obf              DedicatedServer = new Obf("net.minecraft.server.dedicated.DedicatedServer",             "po"  );
-    public static final Obf               EntityPlayerSP = new Obf("net.minecraft.client.entity.EntityPlayerSP",                 "cio" );
-    public static final Obf                       Blocks = new Obf("net.minecraft.init.Blocks",                                  "aty" );
     public static final Obf                        Items = new Obf("net.minecraft.init.Items",                                   "amk" );
-    public static final Obf                  FrameBuffer = new Obf("net.minecraft.client.shader.Framebuffer",                    "ckw" );
-    public static final Obf                   GuiNewChat = new Obf("net.minecraft.client.gui.GuiNewChat",                        "buh" );
-    public static final Obf               GlStateManager = new Obf("net.minecraft.client.renderer.GlStateManager",               "cjm" );
-    public static final Obf                      Session = new Obf("net.minecraft.util.Session",                                 "btw" );
-    public static final Obf               IChatComponent = new Obf("net.minecraft.util.IChatComponent",                          "ho"  );
-    public static final Obf             ScreenShotHelper = new Obf("net.minecraft.util.ScreenShotHelper",                        "btt" );
-    public static final Obf                 OpenGlHelper = new Obf("net.minecraft.client.renderer.OpenGlHelper",                 "dax" );
-    public static final Obf                       Entity = new Obf("net.minecraft.entity.Entity",                                "wv"  );
-    public static final Obf                RenderManager = new Obf("net.minecraft.client.renderer.entity.RenderManager",         "cpt" );
-    public static final Obf                       Render = new Obf("net.minecraft.client.renderer.entity.Render",                "cpu" );
-    public static final Obf                 GuiTextField = new Obf("net.minecraft.client.gui.GuiTextField",                      "bul" );
-    public static final Obf                 SoundHandler = new Obf("net.minecraft.client.audio.SoundHandler",                    "czh" );
-    public static final Obf                     BlockPos = new Obf("net.minecraft.util.BlockPos",                                "dt"  );
-    public static final Obf                   EnumFacing = new Obf("net.minecraft.util.EnumFacing",                              "ej"  );
-    public static final Obf           ItemInWorldManager = new Obf("net.minecraft.server.management.ItemInWorldManager",         "qx"  );
-    public static final Obf         NetHandlerPlayServer = new Obf("net.minecraft.network.NetHandlerPlayServer",                 "rj"  );
-    public static final Obf                 EntityPlayer = new Obf("net.minecraft.entity.player.EntityPlayer",                   "ahd" );
-    public static final Obf                        World = new Obf("net.minecraft.world.World",                                  "aqu" );
-    public static final Obf                    ItemStack = new Obf("net.minecraft.item.ItemStack",                               "amj" );
-    public static final Obf             PacketThreadUtil = new Obf("net.minecraft.network.PacketThreadUtil",                     "ig"  );
-    public static final Obf                 RenderGlobal = new Obf("net.minecraft.client.renderer.RenderGlobal",                 "ckn" );
  
     // Fields
     // -----------------------------------------------------------------------------------------
-    public static final Obf            minecraftProfiler = new Obf("field_71424_I",                                              "y"   );
-    public static final Obf              entityRenderMap = new Obf("field_78729_o",                                              "k"   );
-    public static final Obf              reloadListeners = new Obf("field_110546_b",                                             "d"   );
-    public static final Obf               networkManager = new Obf("field_147393_d",                                             "d"   );
-    public static final Obf              registryObjects = new Obf("field_82596_a",                                              "c"   );
-    public static final Obf         underlyingIntegerMap = new Obf("field_148759_a",                                             "a"   );
-    public static final Obf                  identityMap = new Obf("field_148749_a",                                             "a"   );
-    public static final Obf                   objectList = new Obf("field_148748_b",                                             "b"   );
-    public static final Obf          mapSpecialRenderers = new Obf("field_147559_m",                                             "m"   );
     public static final Obf     tileEntityNameToClassMap = new Obf("field_145855_i",                                             "f"   );
     public static final Obf     tileEntityClassToNameMap = new Obf("field_145853_j",                                             "g"   );
-    public static final Obf                        timer = new Obf("field_71428_T",                                              "U"   );
-    public static final Obf                   mcProfiler = new Obf("field_71424_I",                                              "y"   ); 
-    public static final Obf                      running = new Obf("field_71425_J",                                              "z"   ); 
-    public static final Obf         defaultResourcePacks = new Obf("field_110449_ao",                                            "aw"  );
-    public static final Obf                   serverName = new Obf("field_71475_ae",                                             "am"  );
-    public static final Obf                   serverPort = new Obf("field_71477_af",                                             "an"  );
-    public static final Obf      shaderResourceLocations = new Obf("field_147712_ad",                                            "ab"  );
-    public static final Obf                  shaderIndex = new Obf("field_147713_ae",                                            "ac"  );
-    public static final Obf                    useShader = new Obf("field_175083_ad",                                            "ad"  );
-    public static final Obf                 viewDistance = new Obf("field_149528_b",                                             "b"   );
-    public static final Obf                   entityPosY = new Obf("field_70163_u",                                              "t"   );
-    public static final Obf                chatComponent = new Obf("field_148919_a",                                             "a"   );
  
     // Methods
     // -----------------------------------------------------------------------------------------
-    public static final Obf                processPacket = new Obf("func_148833_a",                                              "a"   );
-    public static final Obf                  runGameLoop = new Obf("func_71411_J",                                               "as"  );
-    public static final Obf                      runTick = new Obf("func_71407_l",                                               "r"   );
-    public static final Obf        updateCameraAndRender = new Obf("func_78480_b",                                               "b"   );
-    public static final Obf                  renderWorld = new Obf("func_78471_a",                                               "a"   );
-    public static final Obf            renderGameOverlay = new Obf("func_175180_a",                                              "a"   );
+    public static final Obf                    startGame = new Obf("func_71384_a",                                               "aj"  );
     public static final Obf                 startSection = new Obf("func_76320_a",                                               "a"   );
     public static final Obf                   endSection = new Obf("func_76319_b",                                               "b"   );
     public static final Obf              endStartSection = new Obf("func_76318_c",                                               "c"   );
-    public static final Obf                  spawnPlayer = new Obf("func_148545_a",                                              "f"   );
-    public static final Obf                respawnPlayer = new Obf("func_72368_a",                                               "a"   );
-    public static final Obf initializeConnectionToPlayer = new Obf("func_72355_a",                                               "a"   );
-    public static final Obf               playerLoggedIn = new Obf("func_72377_c",                                               "c"   );
-    public static final Obf              playerLoggedOut = new Obf("func_72367_e",                                               "e"   );
-    public static final Obf                    startGame = new Obf("func_71384_a",                                               "aj"  );
-    public static final Obf                  startServer = new Obf("func_71197_b",                                               "i"   );
-    public static final Obf            startServerThread = new Obf("func_71256_s",                                               "B"   );
-    public static final Obf              sendChatMessage = new Obf("func_71165_d",                                               "e"   );
-    public static final Obf        updateFramebufferSize = new Obf("func_147119_ah",                                             "av"  );
-    public static final Obf            framebufferRender = new Obf("func_147615_c",                                              "c"   );
-    public static final Obf         framebufferRenderExt = new Obf("func_178038_a",                                              "a"   );
-    public static final Obf       bindFramebufferTexture = new Obf("func_147612_c",                                              "c"   );
-    public static final Obf                     drawChat = new Obf("func_146230_a",                                              "a"   );
-    public static final Obf                        clear = new Obf("func_179086_m",                                              "m"   );
-    public static final Obf              renderWorldPass = new Obf("func_175068_a",                                              "a"   );
-    public static final Obf                   getProfile = new Obf("func_148256_e",                                              "a"   );
-    public static final Obf               saveScreenshot = new Obf("func_148260_a",                                              "a"   );
-    public static final Obf         isFramebufferEnabled = new Obf("func_148822_b",                                              "i"   );
-    public static final Obf               doRenderEntity = new Obf("func_147939_a",                                              "a"   );
-    public static final Obf                     doRender = new Obf("func_76986_a",                                               "a"   );
-    public static final Obf        doRenderShadowAndFire = new Obf("func_76979_b",                                               "b"   );
-    public static final Obf                       resize = new Obf("func_71370_a",                                               "a"   );
-    public static final Obf                   loadShader = new Obf("func_175069_a",                                              "a"   );
-    public static final Obf               getFOVModifier = new Obf("func_78481_a",                                               "a"   );
-    public static final Obf         setupCameraTransform = new Obf("func_78479_a",                                               "a"   );
-    public static final Obf            loadSoundResource = new Obf("func_147693_a",                                              "a"   );
-    public static final Obf               onBlockClicked = new Obf("func_180784_a",                                              "a"   );
-    public static final Obf       activateBlockOrUseItem = new Obf("func_180236_a",                                              "a"   );
-    public static final Obf  processPlayerBlockPlacement = new Obf("func_147346_a",                                              "a"   );
-    public static final Obf              handleAnimation = new Obf("func_175087_a",                                              "a"   );
-    public static final Obf         processPlayerDigging = new Obf("func_147345_a",                                              "a"   );
-    public static final Obf   updateTimeLightAndEntities = new Obf("func_71190_q",                                               "z"   );
-    public static final Obf        checkThreadAndEnqueue = new Obf("func_180031_a",                                              "a"   );
-    public static final Obf                processPlayer = new Obf("func_147347_a",                                              "a"   );
-    public static final Obf                    renderSky = new Obf("func_174976_a",                                              "a"   );
-    public static final Obf            renderCloudsCheck = new Obf("func_180437_a",                                              "a"   );
-    public static final Obf                     setupFog = new Obf("func_78468_a",                                               "a"   );
+    public static final Obf                processPacket = new Obf("func_148833_a",                                              "a"   );
+
+    // Legacy
+    // -----------------------------------------------------------------------------------------
+    @Deprecated public static final Obf                    GuiIngame = new Obf("net.minecraft.client.gui.GuiIngame",                         "btz" );
+    @Deprecated public static final Obf                     Profiler = new Obf("net.minecraft.profiler.Profiler",                            "uw"  );
+    @Deprecated public static final Obf             IntegratedServer = new Obf("net.minecraft.server.integrated.IntegratedServer",           "cyk" );
+    @Deprecated public static final Obf                WorldSettings = new Obf("net.minecraft.world.WorldSettings",                          "arb" );
+    @Deprecated public static final Obf   ServerConfigurationManager = new Obf("net.minecraft.server.management.ServerConfigurationManager", "sn"  );
+    @Deprecated public static final Obf               EntityPlayerMP = new Obf("net.minecraft.entity.player.EntityPlayerMP",                 "qw"  );
+    @Deprecated public static final Obf               NetworkManager = new Obf("net.minecraft.network.NetworkManager",                       "gr"  );
+    @Deprecated public static final Obf              DedicatedServer = new Obf("net.minecraft.server.dedicated.DedicatedServer",             "po"  );
+    @Deprecated public static final Obf               EntityPlayerSP = new Obf("net.minecraft.client.entity.EntityPlayerSP",                 "cio" );
+    @Deprecated public static final Obf                  FrameBuffer = new Obf("net.minecraft.client.shader.Framebuffer",                    "ckw" );
+    @Deprecated public static final Obf                   GuiNewChat = new Obf("net.minecraft.client.gui.GuiNewChat",                        "buh" );
+    @Deprecated public static final Obf               GlStateManager = new Obf("net.minecraft.client.renderer.GlStateManager",               "cjm" );
+    @Deprecated public static final Obf                      Session = new Obf("net.minecraft.util.Session",                                 "btw" );
+    @Deprecated public static final Obf               IChatComponent = new Obf("net.minecraft.util.IChatComponent",                          "ho"  );
+    @Deprecated public static final Obf             ScreenShotHelper = new Obf("net.minecraft.util.ScreenShotHelper",                        "btt" );
+    @Deprecated public static final Obf                 OpenGlHelper = new Obf("net.minecraft.client.renderer.OpenGlHelper",                 "dax" );
+    @Deprecated public static final Obf                       Entity = new Obf("net.minecraft.entity.Entity",                                "wv"  );
+    @Deprecated public static final Obf                RenderManager = new Obf("net.minecraft.client.renderer.entity.RenderManager",         "cpt" );
+    @Deprecated public static final Obf                       Render = new Obf("net.minecraft.client.renderer.entity.Render",                "cpu" );
+    @Deprecated public static final Obf                 GuiTextField = new Obf("net.minecraft.client.gui.GuiTextField",                      "bul" );
+    @Deprecated public static final Obf                 SoundHandler = new Obf("net.minecraft.client.audio.SoundHandler",                    "czh" );
+    @Deprecated public static final Obf                     BlockPos = new Obf("net.minecraft.util.BlockPos",                                "dt"  );
+    @Deprecated public static final Obf                   EnumFacing = new Obf("net.minecraft.util.EnumFacing",                              "ej"  );
+    @Deprecated public static final Obf           ItemInWorldManager = new Obf("net.minecraft.server.management.ItemInWorldManager",         "qx"  );
+    @Deprecated public static final Obf         NetHandlerPlayServer = new Obf("net.minecraft.network.NetHandlerPlayServer",                 "rj"  );
+    @Deprecated public static final Obf                 EntityPlayer = new Obf("net.minecraft.entity.player.EntityPlayer",                   "ahd" );
+    @Deprecated public static final Obf                        World = new Obf("net.minecraft.world.World",                                  "aqu" );
+    @Deprecated public static final Obf                    ItemStack = new Obf("net.minecraft.item.ItemStack",                               "amj" );
+    @Deprecated public static final Obf             PacketThreadUtil = new Obf("net.minecraft.network.PacketThreadUtil",                     "ig"  );
+    @Deprecated public static final Obf                 RenderGlobal = new Obf("net.minecraft.client.renderer.RenderGlobal",                 "ckn" );
+    @Deprecated public static final Obf            minecraftProfiler = new Obf("field_71424_I",                                              "y"   );
+    @Deprecated public static final Obf              entityRenderMap = new Obf("field_78729_o",                                              "k"   );
+    @Deprecated public static final Obf              reloadListeners = new Obf("field_110546_b",                                             "d"   );
+    @Deprecated public static final Obf               networkManager = new Obf("field_147393_d",                                             "d"   );
+    @Deprecated public static final Obf              registryObjects = new Obf("field_82596_a",                                              "c"   );
+    @Deprecated public static final Obf         underlyingIntegerMap = new Obf("field_148759_a",                                             "a"   );
+    @Deprecated public static final Obf                  identityMap = new Obf("field_148749_a",                                             "a"   );
+    @Deprecated public static final Obf                   objectList = new Obf("field_148748_b",                                             "b"   );
+    @Deprecated public static final Obf          mapSpecialRenderers = new Obf("field_147559_m",                                             "m"   );
+    @Deprecated public static final Obf                        timer = new Obf("field_71428_T",                                              "U"   );
+    @Deprecated public static final Obf                   mcProfiler = new Obf("field_71424_I",                                              "y"   ); 
+    @Deprecated public static final Obf                      running = new Obf("field_71425_J",                                              "z"   ); 
+    @Deprecated public static final Obf         defaultResourcePacks = new Obf("field_110449_ao",                                            "aw"  );
+    @Deprecated public static final Obf                   serverName = new Obf("field_71475_ae",                                             "am"  );
+    @Deprecated public static final Obf                   serverPort = new Obf("field_71477_af",                                             "an"  );
+    @Deprecated public static final Obf      shaderResourceLocations = new Obf("field_147712_ad",                                            "ab"  );
+    @Deprecated public static final Obf                  shaderIndex = new Obf("field_147713_ae",                                            "ac"  );
+    @Deprecated public static final Obf                    useShader = new Obf("field_175083_ad",                                            "ad"  );
+    @Deprecated public static final Obf                 viewDistance = new Obf("field_149528_b",                                             "b"   );
+    @Deprecated public static final Obf                   entityPosY = new Obf("field_70163_u",                                              "t"   );
+    @Deprecated public static final Obf                chatComponent = new Obf("field_148919_a",                                             "a"   );
+    @Deprecated public static final Obf                  runGameLoop = new Obf("func_71411_J",                                               "as"  );
+    @Deprecated public static final Obf                      runTick = new Obf("func_71407_l",                                               "r"   );
+    @Deprecated public static final Obf        updateCameraAndRender = new Obf("func_78480_b",                                               "b"   );
+    @Deprecated public static final Obf                  renderWorld = new Obf("func_78471_a",                                               "a"   );
+    @Deprecated public static final Obf            renderGameOverlay = new Obf("func_175180_a",                                              "a"   );
+    @Deprecated public static final Obf                  spawnPlayer = new Obf("func_148545_a",                                              "f"   );
+    @Deprecated public static final Obf                respawnPlayer = new Obf("func_72368_a",                                               "a"   );
+    @Deprecated public static final Obf initializeConnectionToPlayer = new Obf("func_72355_a",                                               "a"   );
+    @Deprecated public static final Obf               playerLoggedIn = new Obf("func_72377_c",                                               "c"   );
+    @Deprecated public static final Obf              playerLoggedOut = new Obf("func_72367_e",                                               "e"   );
+    @Deprecated public static final Obf                  startServer = new Obf("func_71197_b",                                               "i"   );
+    @Deprecated public static final Obf            startServerThread = new Obf("func_71256_s",                                               "B"   );
+    @Deprecated public static final Obf              sendChatMessage = new Obf("func_71165_d",                                               "e"   );
+    @Deprecated public static final Obf        updateFramebufferSize = new Obf("func_147119_ah",                                             "av"  );
+    @Deprecated public static final Obf            framebufferRender = new Obf("func_147615_c",                                              "c"   );
+    @Deprecated public static final Obf         framebufferRenderExt = new Obf("func_178038_a",                                              "a"   );
+    @Deprecated public static final Obf       bindFramebufferTexture = new Obf("func_147612_c",                                              "c"   );
+    @Deprecated public static final Obf                     drawChat = new Obf("func_146230_a",                                              "a"   );
+    @Deprecated public static final Obf                        clear = new Obf("func_179086_m",                                              "m"   );
+    @Deprecated public static final Obf              renderWorldPass = new Obf("func_175068_a",                                              "a"   );
+    @Deprecated public static final Obf                   getProfile = new Obf("func_148256_e",                                              "a"   );
+    @Deprecated public static final Obf               saveScreenshot = new Obf("func_148260_a",                                              "a"   );
+    @Deprecated public static final Obf         isFramebufferEnabled = new Obf("func_148822_b",                                              "i"   );
+    @Deprecated public static final Obf               doRenderEntity = new Obf("func_147939_a",                                              "a"   );
+    @Deprecated public static final Obf                     doRender = new Obf("func_76986_a",                                               "a"   );
+    @Deprecated public static final Obf        doRenderShadowAndFire = new Obf("func_76979_b",                                               "b"   );
+    @Deprecated public static final Obf                       resize = new Obf("func_71370_a",                                               "a"   );
+    @Deprecated public static final Obf                   loadShader = new Obf("func_175069_a",                                              "a"   );
+    @Deprecated public static final Obf               getFOVModifier = new Obf("func_78481_a",                                               "a"   );
+    @Deprecated public static final Obf         setupCameraTransform = new Obf("func_78479_a",                                               "a"   );
+    @Deprecated public static final Obf            loadSoundResource = new Obf("func_147693_a",                                              "a"   );
+    @Deprecated public static final Obf               onBlockClicked = new Obf("func_180784_a",                                              "a"   );
+    @Deprecated public static final Obf       activateBlockOrUseItem = new Obf("func_180236_a",                                              "a"   );
+    @Deprecated public static final Obf  processPlayerBlockPlacement = new Obf("func_147346_a",                                              "a"   );
+    @Deprecated public static final Obf              handleAnimation = new Obf("func_175087_a",                                              "a"   );
+    @Deprecated public static final Obf         processPlayerDigging = new Obf("func_147345_a",                                              "a"   );
+    @Deprecated public static final Obf   updateTimeLightAndEntities = new Obf("func_71190_q",                                               "z"   );
+    @Deprecated public static final Obf        checkThreadAndEnqueue = new Obf("func_180031_a",                                              "a"   );
+    @Deprecated public static final Obf                processPlayer = new Obf("func_147347_a",                                              "a"   );
+    @Deprecated public static final Obf                    renderSky = new Obf("func_174976_a",                                              "a"   );
+    @Deprecated public static final Obf            renderCloudsCheck = new Obf("func_180437_a",                                              "a"   );
+    @Deprecated public static final Obf                     setupFog = new Obf("func_78468_a",                                               "a"   );
+
+    // CHECKSTYLE:ON
  
     public static final int MCP = 0;
     public static final int SRG = 1;
@@ -10,10 +10,14 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
  
+import org.spongepowered.asm.launch.MixinBootstrap;
+
 import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
  
+import com.google.common.base.Preconditions;
+import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -231,6 +235,8 @@ public class LiteLoaderTweaker implements ITweaker
     @Override
     public void acceptOptions(List<String> args, File gameDirectory, File assetsDirectory, String profile)
     {
+        LiteLoaderTweaker.injectTweakClass("org.spongepowered.asm.launch.MixinTweaker");
+        
         Launch.classLoader.addClassLoaderExclusion("org.apache.");
         Launch.classLoader.addClassLoaderExclusion("com.google.common.");
         Launch.classLoader.addClassLoaderExclusion("org.objectweb.asm.");
@@ -334,6 +340,8 @@ public class LiteLoaderTweaker implements ITweaker
  
         try
         {
+            MixinBootstrap.init();
+            
             this.bootstrap.preInit(Launch.classLoader, true, this.env.getModFilterList());
  
             this.injectDiscoveredTweakClasses();
@@ -360,6 +368,7 @@ public class LiteLoaderTweaker implements ITweaker
         {
             this.transformerManager.injectDownstreamTransformers(Launch.classLoader);
             this.bootstrap.preBeginGame();
+            MixinBootstrap.addProxy();
             StartupState.BEGINGAME.completed();
         }
         catch (Throwable th)
@@ -437,17 +446,15 @@ public class LiteLoaderTweaker implements ITweaker
  
             LiteLoaderLogger.info("Injecting cascaded tweakers...");
  
-            @SuppressWarnings("unchecked")
-            List<String> tweakClasses = (List<String>)Launch.blackboard.get("TweakClasses");
-            @SuppressWarnings("unchecked")
-            List<ITweaker> tweakers = (List<ITweaker>)Launch.blackboard.get("Tweaks");
+            List<String> tweakClasses = LiteLoaderTweaker.getTweakClasses();
+            List<ITweaker> tweakers = LiteLoaderTweaker.getTweakers();
             if (tweakClasses != null && tweakers != null)
             {
                 for (SortableValue<String> tweak : this.sortedCascadingTweaks)
                 {
                     String tweakClass = tweak.getValue();
                     LiteLoaderLogger.info(Verbosity.REDUCED, "Injecting tweak class %s with priority %d", tweakClass, tweak.getPriority());
-                    this.injectTweakClass(tweakClass, tweakClasses, tweakers);
+                    LiteLoaderTweaker.injectTweakClass(tweakClass, tweakClasses, tweakers);
                 }
             }
  
@@ -455,26 +462,36 @@ public class LiteLoaderTweaker implements ITweaker
             this.sortedCascadingTweaks.clear();
         }
     }
+    
+    private static boolean injectTweakClass(String tweakClass)
+    {
+        List<String> tweakClasses = LiteLoaderTweaker.getTweakClasses();
+        List<ITweaker> tweakers = LiteLoaderTweaker.getTweakers();
+        return LiteLoaderTweaker.injectTweakClass(tweakClass, tweakClasses, tweakers);
+    }
  
     /**
      * @param tweakClass
      * @param tweakClasses
      * @param tweakers
      */
-    private void injectTweakClass(String tweakClass, List<String> tweakClasses, List<ITweaker> tweakers)
+    private static boolean injectTweakClass(String tweakClass, List<String> tweakClasses, List<ITweaker> tweakers)
     {
-        if (!tweakClasses.contains(tweakClass))
+        if (tweakClasses.contains(tweakClass))
+        {
+            return false;
+        }
+            
+        for (ITweaker existingTweaker : tweakers)
         {
-            for (ITweaker existingTweaker : tweakers)
+            if (tweakClass.equals(existingTweaker.getClass().getName()))
             {
-                if (tweakClass.equals(existingTweaker.getClass().getName()))
-                {
-                    return;
-                }
+                return false;
             }
-
-            tweakClasses.add(tweakClass);
         }
+
+        tweakClasses.add(tweakClass);
+        return true;
     }
  
     /**
@@ -592,11 +609,10 @@ public class LiteLoaderTweaker implements ITweaker
     /**
      * @param clazz
      */
-    @SuppressWarnings("unchecked")
     private static boolean isTweakAlreadyEnqueued(String clazz)
     {
-        List<String> tweakClasses = (List<String>)Launch.blackboard.get("TweakClasses");
-        List<ITweaker> tweakers = (List<ITweaker>)Launch.blackboard.get("Tweaks");
+        List<String> tweakClasses = LiteLoaderTweaker.getTweakClasses();
+        List<ITweaker> tweakers = LiteLoaderTweaker.getTweakers();
  
         if (tweakClasses != null)
         {
@@ -617,6 +633,18 @@ public class LiteLoaderTweaker implements ITweaker
         return false;
     }
  
+    @SuppressWarnings("unchecked")
+    private static List<String> getTweakClasses()
+    {
+        return Preconditions.<List<String>>checkNotNull((List<String>)Launch.blackboard.get("TweakClasses"), "TweakClasses");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<ITweaker> getTweakers()
+    {
+        return Preconditions.<List<ITweaker>>checkNotNull((List<ITweaker>)Launch.blackboard.get("Tweaks"), "Tweaks");
+    }
+
     /**
      * Get whether to enable the loading bar for minecraft startup
      */
@@ -656,4 +684,9 @@ public class LiteLoaderTweaker implements ITweaker
         LiteLoaderTweaker.instance.onInit();
         LiteLoaderTweaker.instance.onPostInit();
     }
+    
+    public static EnvironmentType getEnvironmentType()
+    {
+        return LiteLoaderTweaker.instance.bootstrap.getEnvironment().getType();
+    }
 }
 \ No newline at end of file
@@ -76,7 +76,9 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  * </ul>
  * 
  * @author Adam Mummery-Smith
+ * @deprecated Use mixins instead!
  */
+@Deprecated
 public abstract class ClassOverlayTransformer extends ClassTransformer
 {
     /**
@@ -42,6 +42,11 @@ public class Event implements Comparable&lt;Event&gt;
     private static final List<Map<MethodNode, List<Event>>> proxyHandlerMethods = new ArrayList<Map<MethodNode, List<Event>>>();
  
     private static int proxyInnerClassIndex = 1;
+    
+    static
+    {
+        Event.resizeProxyList();
+    }
  
     /**
      * The name of this event
@@ -657,16 +662,21 @@ public class Event implements Comparable&lt;Event&gt;
  
     private static List<Event> addMethodToActiveProxy(MethodNode handlerMethod)
     {
-        while (Event.proxyHandlerMethods.size() < Event.proxyInnerClassIndex + 1)
-        {
-            Event.proxyHandlerMethods.add(new LinkedHashMap<MethodNode, List<Event>>());
-        }
+        Event.resizeProxyList();
  
         ArrayList<Event> events = new ArrayList<Event>();
         Event.proxyHandlerMethods.get(Event.proxyInnerClassIndex).put(handlerMethod, events);
         return events;
     }
  
+    private static void resizeProxyList()
+    {
+        while (Event.proxyHandlerMethods.size() < Event.proxyInnerClassIndex + 1)
+        {
+            Event.proxyHandlerMethods.add(new LinkedHashMap<MethodNode, List<Event>>());
+        }
+    }
+
     private static List<Event> getEventsForHandlerMethod(MethodNode handlerMethod)
     {
         for (Map<MethodNode, List<Event>> handlers : Event.proxyHandlerMethods)
@@ -14,25 +14,14 @@ public class ObfuscationUtilities
      * raw field/method names.
      */
     private static boolean fmlDetected = false;
-
+    
+    private static boolean checkedObfEnv = false;
     private static boolean seargeNames = false;
  
     static
     {
         // Check for FML
         ObfuscationUtilities.fmlDetected = ObfuscationUtilities.fmlIsPresent();
-
-        try
-        {
-            MinecraftServer.class.getDeclaredField("serverRunning");
-        }
-        catch (SecurityException ex)
-        {
-        }
-        catch (NoSuchFieldException ex)
-        {
-            ObfuscationUtilities.seargeNames = true;
-        }
     }
  
     public static boolean fmlIsPresent()
@@ -47,6 +36,28 @@ public class ObfuscationUtilities
  
         return false;
     }
+    
+    public static boolean useSeargeNames()
+    {
+        if (!ObfuscationUtilities.checkedObfEnv)
+        {
+            ObfuscationUtilities.checkedObfEnv = true;
+            
+            try
+            {
+                MinecraftServer.class.getDeclaredField("serverRunning");
+            }
+            catch (SecurityException ex)
+            {
+            }
+            catch (NoSuchFieldException ex)
+            {
+                ObfuscationUtilities.seargeNames = true;
+            }
+        }
+        
+        return ObfuscationUtilities.seargeNames;
+    }
  
     /**
      * Abstraction helper function
@@ -58,7 +69,7 @@ public class ObfuscationUtilities
     public static String getObfuscatedFieldName(String fieldName, String obfuscatedFieldName, String seargeFieldName)
     {
         boolean deobfuscated = BlockPos.class.getSimpleName().equals("BlockPos");
-        return deobfuscated ? (ObfuscationUtilities.seargeNames ? seargeFieldName : fieldName)
+        return deobfuscated ? (ObfuscationUtilities.useSeargeNames() ? seargeFieldName : fieldName)
                 : (ObfuscationUtilities.fmlDetected ? seargeFieldName : obfuscatedFieldName);
     }
  
@@ -71,6 +82,6 @@ public class ObfuscationUtilities
     public static String getObfuscatedFieldName(Obf obf)
     {
         boolean deobfuscated = BlockPos.class.getSimpleName().equals("BlockPos");
-        return deobfuscated ? (ObfuscationUtilities.seargeNames ? obf.srg : obf.name) : (ObfuscationUtilities.fmlDetected ? obf.srg : obf.obf);
+        return deobfuscated ? (ObfuscationUtilities.useSeargeNames() ? obf.srg : obf.name) : (ObfuscationUtilities.fmlDetected ? obf.srg : obf.obf);
     }
 }
@@ -3,8 +3,6 @@ package com.mumfrey.liteloader.util;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
  
-import net.minecraft.network.play.client.C15PacketClientSettings;
-
 import com.mumfrey.liteloader.core.runtime.Obf;
  
 /**
@@ -124,9 +122,4 @@ public class PrivateFields&lt;P, T&gt;
  
         return value;
     }
-    
-    // CHECKSTYLE:OFF
-
-    public static final PrivateFields<C15PacketClientSettings, Integer> viewDistance = new PrivateFields<C15PacketClientSettings, Integer>(C15PacketClientSettings.class, Obf.viewDistance);
-
 }
 \ No newline at end of file
+{
+    "required": true,
+    "minVersion": "0.4.10",
+    "package": "com.mumfrey.liteloader.common.mixin",
+    "refmap": "mixins.liteloader.core.refmap.json",
+    "mixins": [
+        "MixinMinecraftServer",
+        "MixinServerConfigurationManager",
+        "MixinNetHandlerPlayServer",
+        "MixinItemInWorldManager",
+        "MixinC15PacketClientSettings",
+        "MixinS02PacketChat"
+    ]
+}
 \ No newline at end of file