Backport all 1.12+ changes to 1.11.2

Mumfrey
2 parents 53881326 a4937cc6
Showing 25 changed files with 720 additions and 343 deletions
build.gradle
gradle.properties
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderPanelManager.java
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelError.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelSettings.java
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModList.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
src/client/java/com/mumfrey/liteloader/modconfig/AbstractConfigPanel.java
src/client/resources/mixins.liteloader.client.json
src/main/java/com/mumfrey/liteloader/core/EnabledModsList.java
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderUpdateSite.java
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
src/main/java/com/mumfrey/liteloader/interfaces/PanelManager.java
src/main/java/com/mumfrey/liteloader/launch/LoaderProperties.java
@@ -60,8 +60,8 @@ archivesBaseName = &quot;liteloader&quot;
 version = buildVersion + (project.isReleaseBuild ? '' : '-' + project.classifier)
 // Minimum version of Java required
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
 repositories {
     mavenLocal()
@@ -72,7 +72,7 @@ repositories {
 }
 dependencies {
-    compile('org.spongepowered:mixin:0.6.8-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.7.1-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -89,11 +89,11 @@ minecraft {
 sourceSets {
     main {
-        refMap = "mixins.liteloader.core.refmap.json"
+        ext.refMap = "mixins.liteloader.core.refmap.json"
     }
     client {
         compileClasspath += main.compileClasspath + main.output
-        refMap = "mixins.liteloader.client.refmap.json"
+        ext.refMap = "mixins.liteloader.client.refmap.json"
     }
     debug {
         compileClasspath += client.compileClasspath + client.output
@@ -123,7 +123,7 @@ javadoc {
 afterEvaluate {
     logger.lifecycle '================================================='
     logger.lifecycle '  LiteLoader'
-    logger.lifecycle '  Copyright (C) 2011-2016 Adam Mummery-Smith'
+    logger.lifecycle '  Copyright (C) 2011-2017 Adam Mummery-Smith'
     logger.lifecycle '  Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT")
     logger.lifecycle '================================================='
@@ -7,4 +7,4 @@ organization=LiteLoader
 buildType=SNAPSHOT
 buildVersion=1.11.2
 mcVersion=1.11.2
-mcMappings=snapshot_20161224
 \ No newline at end of file
+mcMappings=snapshot_20161224
@@ -9,24 +9,9 @@ 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.ChatRenderListener;
-import com.mumfrey.liteloader.EntityRenderListener;
-import com.mumfrey.liteloader.FrameBufferListener;
-import com.mumfrey.liteloader.GameLoopListener;
-import com.mumfrey.liteloader.HUDRenderListener;
-import com.mumfrey.liteloader.InitCompleteListener;
-import com.mumfrey.liteloader.OutboundChatFilter;
-import com.mumfrey.liteloader.OutboundChatListener;
-import com.mumfrey.liteloader.PlayerClickListener;
+import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
-import com.mumfrey.liteloader.PostRenderListener;
-import com.mumfrey.liteloader.PreRenderListener;
-import com.mumfrey.liteloader.RenderListener;
-import com.mumfrey.liteloader.ScreenshotListener;
-import com.mumfrey.liteloader.Tickable;
-import com.mumfrey.liteloader.ViewportListener;
 import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
-import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
@@ -51,7 +36,6 @@ import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.play.client.CPacketChatMessage;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.Timer;
 import net.minecraft.util.text.ITextComponent;
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
@@ -427,14 +411,9 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback from the tick hook, ticks all tickable mods
      */
-    public void onTick()
+    public void onTick(boolean clock, float partialTicks)
     {
         this.profiler.endStartSection("litemods");
-
-        Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
-        float partialTicks = minecraftTimer.renderPartialTicks;
-        boolean clock = minecraftTimer.elapsedTicks > 0;
-
         Minecraft minecraft = this.engine.getClient();
         // Flag indicates whether we are in game at the moment
@@ -548,7 +527,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     }
     /**
-     * @param e
+     * @param ci
      * @param name
      * @param width
      * @param height
@@ -9,6 +9,7 @@ import org.lwjgl.input.Keyboard;
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
 import com.mumfrey.liteloader.common.GameEngine;
+import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
 import com.mumfrey.liteloader.core.LiteLoaderUpdateSite;
 import com.mumfrey.liteloader.core.LiteLoaderVersion;
@@ -32,6 +33,13 @@ import net.minecraft.client.resources.I18n;
  */
 public class LiteLoaderPanelManager implements PanelManager<GuiScreen>
 {
+    /**
+     * Number of launches required before an update check is forced when the
+     * "force update check" option is enabled. For snapshot versions this is
+     * ignored and an update check is always performed.
+     */
+    private static final int UPDATE_CHECK_INTERVAL = 10;
+
     private final LoaderEnvironment environment;
     /**
@@ -87,14 +95,14 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
         this.displayModInfoScreenTab = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_MOD_INFO_SCREEN, true);
         this.tabAlwaysExpanded = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_NO_HIDE_TAB, false);
-        if (this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, false))
+        if (this.shouldCheckForUpdates())
         {
             int updateCheckInterval = this.properties.getIntegerProperty(LoaderProperties.OPTION_UPDATE_CHECK_INTR) + 1;
-            LiteLoaderLogger.debug("Force update is TRUE, updateCheckInterval = %d", updateCheckInterval);
+            LiteLoaderLogger.debug("Regular update check enabled, updateCheckInterval = %d", updateCheckInterval);
-            if (updateCheckInterval > 10)
+            if (LiteLoader.isSnapshot() || updateCheckInterval > LiteLoaderPanelManager.UPDATE_CHECK_INTERVAL)
             {
-                LiteLoaderLogger.debug("Forcing update check!");
+                LiteLoaderLogger.debug("Checking for updates...");
                 this.checkForUpdate = true;
                 updateCheckInterval = 0;
             }
@@ -104,6 +112,16 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
         }
     }
+    private boolean shouldCheckForUpdates()
+    {
+        if (LiteLoader.isSnapshot() && this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_CHECK_SNAPSHOTS, true))
+        {
+            return true;
+        }
+        
+        return this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, false);
+    }
+
     @Override
     public void init(LiteLoaderMods mods, ConfigManager configManager)
     {
@@ -141,7 +159,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
                 this.checkForUpdate = false;
                 if (updateSite.isCheckSucceess() && updateSite.isUpdateAvailable())
                 {
-                    this.setNotification(I18n.format("gui.notifications.updateavailable"));
+                    this.setNotification(I18n.format("gui.notifications." + (LiteLoader.isSnapshot() ? "newsnapshotavailable" : "updateavailable"), 
+                        updateSite.getAvailableVersion(), updateSite.getAvailableVersionDate()));
                 }
             }
         }
@@ -251,6 +270,19 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     {
         return this.properties.getBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE);
     }
+    
+    @Override
+    public void setCheckForSnapshotsEnabled(boolean checkForSnapshots)
+    {
+        this.properties.setBooleanProperty(LoaderProperties.OPTION_CHECK_SNAPSHOTS, checkForSnapshots);
+        this.properties.writeProperties();
+    }
+    
+    @Override
+    public boolean isCheckForSnapshotsEnabled()
+    {
+        return this.properties.getBooleanProperty(LoaderProperties.OPTION_CHECK_SNAPSHOTS);
+    }
     /**
      * Display the liteloader panel over the specified GUI
@@ -42,7 +42,6 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     private static final String[] requiredDownstreamTransformers = {
             LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
-            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftTransformer",
             LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
     };
@@ -177,11 +177,10 @@ public class GuiLiteLoaderPanel extends GuiScreen
         this.startupErrorCount = mods.getStartupErrorCount();
         this.criticalErrorCount = mods.getCriticalErrorCount();
-        String branding = LiteLoader.getBranding();
-        if (branding != null && branding.contains("SNAPSHOT"))
+        this.isSnapshot = LiteLoader.isSnapshot();
+        if (this.isSnapshot)
         {
-            this.isSnapshot = true;
-            this.versionText = "\247c" + branding;
+            this.versionText = "\247c" + LiteLoader.getBranding();
         }
     }
@@ -524,6 +523,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
             if (annoyingTip)
             {
+                GuiLiteLoaderPanel.displayErrorToolTip = false;
                 this.drawNotificationTooltip(mouseX, mouseY - 13);
             }
         }
@@ -542,8 +542,11 @@ public class GuiLiteLoaderPanel extends GuiScreen
         }
         else if (this.notification != null)
         {
-            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.notification, left, top, this.width, this.height,
-                    GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_BACKGROUND);
+            boolean isCritical = this.notification.startsWith("!!");
+            String text = isCritical ? this.notification.substring(2) : this.notification;
+            int bgColour = isCritical ? GuiLiteLoaderPanel.ERROR_TOOLTIP_BACKGROUND : GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_BACKGROUND;
+            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, text, left, top, this.width, this.height,
+                    GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_FOREGROUND, bgColour);
         }
     }
@@ -739,21 +742,32 @@ public class GuiLiteLoaderPanel extends GuiScreen
      * 
      * @param fontRenderer
      * @param tooltipText
-     * @param mouseX
-     * @param mouseY
+     * @param left
+     * @param top
      * @param screenWidth
      * @param screenHeight
      * @param colour
      * @param backgroundColour
      */
-    public static void drawTooltip(FontRenderer fontRenderer, String tooltipText, int mouseX, int mouseY, int screenWidth, int screenHeight,
+    public static void drawTooltip(FontRenderer fontRenderer, String text, int left, int top, int screenWidth, int screenHeight,
             int colour, int backgroundColour)
     {
-        int textSize = fontRenderer.getStringWidth(tooltipText);
-        mouseX = Math.max(0, Math.min(screenWidth - 4, mouseX - 4));
-        mouseY = Math.max(0, Math.min(screenHeight - 16, mouseY));
-        drawRect(mouseX - textSize - 2, mouseY, mouseX + 2, mouseY + 12, backgroundColour);
-        fontRenderer.drawStringWithShadow(tooltipText, mouseX - textSize, mouseY + 2, colour);
+        String[] lines = text.trim().split("\\r?\\n");
+        int textWidth = 0;
+        int textHeight = 9 * lines.length;
+        for (String line : lines)
+        {
+            textWidth = Math.max(textWidth, fontRenderer.getStringWidth(line));
+            top -= 9;
+        }
+        
+        left = Math.max(0, Math.min(screenWidth - 4, left - 4));
+        top = Math.max(0, Math.min(screenHeight - 16, top + 9));
+        drawRect(left - textWidth - 2, top, left + 2, top + textHeight + 2, backgroundColour);
+        for (String line : lines)
+        {
+            fontRenderer.drawStringWithShadow(line, left - textWidth, (top += 9) - 7, colour);
+        }
     }
@@ -12,10 +12,12 @@ import java.util.List;
 import org.lwjgl.input.Keyboard;
+import com.google.common.base.Joiner;
 import com.mumfrey.liteloader.core.ModInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 public class GuiPanelError extends GuiPanel implements ScrollPanelContent
@@ -98,6 +100,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
         this.scrollPane.setSizeAndPosition(MARGIN, TOP, this.width - (MARGIN * 2), this.height - TOP - BOTTOM);
         this.controls.add(new GuiButton(0, this.width - 59 - MARGIN, this.height - BOTTOM + 9, 60, 20, I18n.format("gui.done")));
+        this.controls.add(new GuiButton(1, this.width - 204 - MARGIN, this.height - BOTTOM + 9, 140, 20, I18n.format("gui.error.copytoclipboard")));
     }
     @Override
@@ -131,7 +134,10 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
     @Override
     void keyPressed(char keyChar, int keyCode)
     {
-        if (keyCode == Keyboard.KEY_ESCAPE) this.close();
+        if (keyCode == Keyboard.KEY_ESCAPE)
+        {
+            this.close();
+        }
     }
     @Override
@@ -161,6 +167,14 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
     @Override
     void actionPerformed(GuiButton control)
     {
-        if (control.id == 0) this.close();
+        if (control.id == 0)
+        {
+            this.close();
+        }
+        
+        if (control.id == 1)
+        {
+            GuiScreen.setClipboardString(Joiner.on('\n').join(this.scrollPaneContent));
+        }
     }
 }
@@ -17,25 +17,29 @@ import net.minecraft.client.resources.I18n;
 class GuiPanelSettings extends GuiPanel
 {
-    private GuiLiteLoaderPanel parentScreen;
+    private final GuiLiteLoaderPanel parentScreen;
+    
+    private final boolean isSnapshot;
-    private GuiCheckbox chkShowTab, chkNoHide, chkForceUpdate;
+    private GuiCheckbox chkShowTab, chkNoHide, chkForceUpdate, chkCheckForSnapshots;
     private boolean hide;
     private String[] helpText = new String[5];
-
+    
     GuiPanelSettings(GuiLiteLoaderPanel parentScreen, Minecraft minecraft)
     {
         super(minecraft);
         this.parentScreen = parentScreen;
+        this.isSnapshot = LiteLoader.isSnapshot();
+        String helpKey = this.isSnapshot ? "checkforsnapshots" : "forceupdate"; 
         this.helpText[0] = I18n.format("gui.settings.showtab.help1");
         this.helpText[1] = I18n.format("gui.settings.showtab.help2");
         this.helpText[2] = I18n.format("gui.settings.notabhide.help1");
-        this.helpText[3] = I18n.format("gui.settings.forceupdate.help1");
-        this.helpText[4] = I18n.format("gui.settings.forceupdate.help2");
+        this.helpText[3] = I18n.format("gui.settings." + helpKey + ".help1");
+        this.helpText[4] = I18n.format("gui.settings." + helpKey + ".help2");
     }
     @Override
@@ -61,6 +65,10 @@ class GuiPanelSettings extends GuiPanel
         this.controls.add(this.chkShowTab = new GuiCheckbox(0, 34, 90, I18n.format("gui.settings.showtab.label")));
         this.controls.add(this.chkNoHide = new GuiCheckbox(1, 34, 128, I18n.format("gui.settings.notabhide.label")));
         this.controls.add(this.chkForceUpdate = new GuiCheckbox(2, 34, 158, I18n.format("gui.settings.forceupdate.label")));
+        this.controls.add(this.chkCheckForSnapshots = new GuiCheckbox(2, 34, 158, I18n.format("gui.settings.checkforsnapshots.label")));
+        
+        this.chkForceUpdate.visible = !this.isSnapshot;
+        this.chkCheckForSnapshots.visible = this.isSnapshot;
         this.updateCheckBoxes();
     }
@@ -72,6 +80,7 @@ class GuiPanelSettings extends GuiPanel
         this.chkShowTab.checked = panelManager.isTabVisible();
         this.chkNoHide.checked = panelManager.isTabAlwaysExpanded();
         this.chkForceUpdate.checked = panelManager.isForceUpdateEnabled();
+        this.chkCheckForSnapshots.checked = panelManager.isCheckForSnapshotsEnabled();
     }
     private void updateSettings()
@@ -81,6 +90,7 @@ class GuiPanelSettings extends GuiPanel
         panelManager.setTabVisible(this.chkShowTab.checked);
         panelManager.setTabAlwaysExpanded(this.chkNoHide.checked);
         panelManager.setForceUpdateEnabled(this.chkForceUpdate.checked);
+        panelManager.setCheckForSnapshotsEnabled(this.chkCheckForSnapshots.checked);
     }
     @Override
@@ -15,6 +15,7 @@ import org.lwjgl.input.Keyboard;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
+import com.mumfrey.liteloader.core.EnabledModsList.Enabled;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
 import com.mumfrey.liteloader.core.ModInfo;
 import com.mumfrey.liteloader.interfaces.Loadable;
@@ -75,9 +76,12 @@ public class ModList
         // Disabled mods
         for (ModInfo<?> disabledMod : mods.getDisabledMods())
         {
-            ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, disabledMod);
+            if (environment.getEnabledModsList().getEnabled(environment.getProfile(), disabledMod.getIdentifier()) != Enabled.FILTERED)
+            {
+                ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, disabledMod);
             sortedMods.put(modListEntry.getKey(), modListEntry);
         }
+        }
         // Show bad containers if no other containers are found, should help users realise they have the wrong mod version!
         if (sortedMods.size() == 0)
@@ -19,7 +19,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
 import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ducks.IFramebuffer;
+import com.mumfrey.liteloader.client.gui.startup.LoadingBar;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
+import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -35,6 +37,7 @@ public abstract class MixinMinecraft implements IMinecraft
     @Shadow @Final private List<IResourcePack> defaultResourcePacks;
     @Shadow private String serverName;
     @Shadow private int serverPort;
+    @Shadow private boolean isGamePaused;
     @Shadow abstract void resize(int width, int height);
     @Shadow private void clickMouse() {}
@@ -43,6 +46,25 @@ public abstract class MixinMinecraft implements IMinecraft
     private LiteLoaderEventBrokerClient broker;
+    @Inject(method = "init()V", at = @At(value = "NEW", target = "net/minecraft/client/renderer/EntityRenderer"))
+    private void init(CallbackInfo ci)
+    {
+        LiteLoaderTweaker.init();
+        LiteLoaderTweaker.postInit();
+    }
+    
+    @Inject(method = "init()V", at = @At(value = "NEW", target = "net/minecraft/client/renderer/texture/TextureMap"))
+    private void initTextures(CallbackInfo ci)
+    {
+        LoadingBar.initTextures();
+    }
+    
+    @Inject(method = "init()V", at = @At("INVOKE"))
+    private void progress(CallbackInfo ci)
+    {
+        LoadingBar.incrementProgress();
+    }
+    
     @Inject(method = "init()V", at = @At("RETURN"))
     private void onStartupComplete(CallbackInfo ci)
     {
@@ -79,7 +101,9 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onTick(CallbackInfo ci)
     {
-        this.broker.onTick();
+        boolean clock = this.timer.elapsedTicks > 0;
+        float partialTicks = this.timer.renderPartialTicks;
+        this.broker.onTick(clock, partialTicks);
     }
     @Redirect(method = "runGameLoop()V", at = @At(
-/*
- * This file is part of LiteLoader.
- * Copyright (C) 2012-16 Adam Mummery-Smith
- * All Rights Reserved.
- */
-package com.mumfrey.liteloader.client.transformers;
-
-import java.util.Iterator;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.LdcInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.TypeInsnNode;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.transformers.ClassTransformer;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
-public class MinecraftTransformer extends ClassTransformer
-{
-    private static final String TWEAKCLASS = LiteLoaderTweaker.class.getName().replace('.', '/');
-    
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass)
-    {
-        if ((Obf.Minecraft.name.equals(transformedName) || Obf.Minecraft.obf.equals(transformedName)))
-        {
-            ClassNode classNode = this.readClass(basicClass, true);
-            for (MethodNode method : classNode.methods)
-            {
-                if (Obf.startGame.obf.equals(method.name) || Obf.startGame.srg.equals(method.name) || Obf.startGame.name.equals(method.name))
-                {
-                    this.transformStartGame(method);
-                }
-            }
-            return this.writeClass(classNode);
-        }
-        return basicClass;
-    }
-
-
-    private void transformStartGame(MethodNode method)
-    {
-        InsnList insns = new InsnList(); 
-
-        boolean loadingBarEnabled = LiteLoaderTweaker.loadingBarEnabled();
-        boolean found = false;
-
-        Iterator<AbstractInsnNode> iter = method.instructions.iterator();
-        while (iter.hasNext())
-        {
-            AbstractInsnNode insn = iter.next();
-            if (loadingBarEnabled && insn instanceof MethodInsnNode)
-            {
-                insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "incrementProgress", "()V", false));
-            }
-            
-            insns.add(insn);
-
-            if (insn instanceof TypeInsnNode && insn.getOpcode() == Opcodes.NEW && insns.getLast() != null)
-            {
-                TypeInsnNode typeNode = (TypeInsnNode)insn;
-                if (!found && (Obf.EntityRenderer.obf.equals(typeNode.desc) || Obf.EntityRenderer.ref.equals(typeNode.desc)))
-                {
-                    LiteLoaderLogger.info("MinecraftTransformer found INIT injection point, this is good.");
-                    found = true;
-
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftTransformer.TWEAKCLASS, Obf.init.name, "()V", false));
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftTransformer.TWEAKCLASS, Obf.postInit.name, "()V", false));
-                }
-            }
-
-            if (loadingBarEnabled && insn instanceof LdcInsnNode)
-            {
-                LdcInsnNode ldcInsn = (LdcInsnNode)insn;
-                if ("textures/blocks".equals(ldcInsn.cst))
-                {
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V", false));
-                }
-            }
-        }
-
-        method.instructions = insns;
-
-        if (!found) LiteLoaderLogger.severe("MinecraftTransformer failed to find INIT injection point, the game will probably crash pretty soon.");
-    }
-}
@@ -7,15 +7,21 @@ package com.mumfrey.liteloader.modconfig;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 import org.lwjgl.input.Keyboard;
+import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
 import com.mumfrey.liteloader.client.mixin.IGuiButton;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiLabel;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.resources.I18n;
 /**
  * A general-purpose base class for mod config panels which implements a lot of
@@ -42,74 +48,361 @@ public abstract class AbstractConfigPanel implements ConfigPanel
     }
     /**
-     * Struct which keeps a control together with its callback object
+     * A handle to an option text field, used to get and retrieve text and set
+     * the max length. It is possible to obtain the native text field as well,
+     * however caution should be used when doing so to avoid breaking the
+     * contract of the text field wrapper used in the config panel itself.
+     */
+    public interface ConfigTextField
+    {
+        /**
+         * Get the inner text field
+         */
+        public abstract GuiTextField getNativeTextField();
+        
+        /**
+         * Get the text field's text
+         */
+        public abstract String getText();
+        
+        /**
+         * Set the text field's text
+         * 
+         * @param text text to set
+         * @return fluent interface
+         */
+        public abstract ConfigTextField setText(String text);
+        
+        /**
+         * Set a validation regex for this text box.
+         * 
+         * @param regex Validation regex to use for this text field
+         * @param force If set to <tt>false</tt>, invalid values will only cause
+         *      the text field to display an error when invalid text is present.
+         *      If set to <tt>true</tt>, invalid values will be forcibly
+         *      prohibited from being entered.
+         * @return fluent interfaces
+         */
+        public abstract ConfigTextField setRegex(String regex, boolean force);
+        
+        /**
+         * If the validation regex is not set, always returns true. Otherwise
+         * returns true if the current text value matches the validation regex.
+         * 
+         * @return validation state of the current text value
+         */
+        public abstract boolean isValid();
+        
+        /**
+         * Set the max allowed string length, defaults to 32
      * 
-     * @param <T> control type
+         * @param maxLength max string length to use
+         * @return fluent interface
+         */
+        public abstract ConfigTextField setMaxLength(int maxLength);
+    }
+    
+    /**
+     * Base for config option handle structs
      */
-    class ConfigOption<T extends GuiButton>
+    static abstract class ConfigOption
     {
-        final GuiLabel label;
-        final T control;
-        final ConfigOptionListener<T> listener;
+        void onTick()
+        {
+        }
+        
+        abstract void draw(Minecraft minecraft, int mouseX, int mouseY, float partialTicks);
+        
+        void mouseReleased(Minecraft minecraft, int mouseX, int mouseY)
+        {
+        }
+        
+        boolean mousePressed(Minecraft minecraft, int mouseX, int mouseY)
+        {
+            return false;
+        }
-        ConfigOption(GuiLabel label)
+        boolean keyPressed(Minecraft minecraft, char keyChar, int keyCode)
+        {
+            return false;
+        }
+    }
+    
+    /**
+     * Struct for labels
+     */
+    static class ConfigOptionLabel extends ConfigOption
+    {
+        private final GuiLabel label;
+        
+        ConfigOptionLabel(GuiLabel label)
         {
             this.label = label;
-            this.control = null;
-            this.listener = null;
         }
-        ConfigOption(T control, ConfigOptionListener<T> listener)
+        @Override
+        void draw(Minecraft minecraft, int mouseX, int mouseY, float partialTicks)
+        {
+            this.label.drawLabel(minecraft, mouseX, mouseY);
+        }
+    }
+    
+    /**
+     * Struct which keeps a control together with its callback object
+     * 
+     * @param <T> control type
+     */
+    static class ConfigOptionButton<T extends GuiButton> extends ConfigOption
+    {
+        private final T control;
+        private final ConfigOptionListener<T> listener;
+        
+        ConfigOptionButton(T control, ConfigOptionListener<T> listener)
         {
-            this.label = null;
             this.control = control;
             this.listener = listener;
         }
+        @Override
         void draw(Minecraft minecraft, int mouseX, int mouseY, float partialTicks)
         {
-            if (this.label != null)
+            this.control.drawButton(minecraft, mouseX, mouseY);
+        }
+
+        @Override
+        boolean mousePressed(Minecraft minecraft, int mouseX, int mouseY)
+        {
+            if (this.control.mousePressed(minecraft, mouseX, mouseY))
+            {
+                this.control.playPressSound(minecraft.getSoundHandler());
+                if (this.listener != null)
+                {
+                    this.listener.actionPerformed(this.control);
+                }
+                return true;
+            }
+            
+            return false;
+        }
+
+        @Override
+        void mouseReleased(Minecraft minecraft, int mouseX, int mouseY)
+        {
+            this.control.mouseReleased(mouseX, mouseY);
+        }
+    }
+    
+    /**
+     * Struct for text fields
+     */
+    class ConfigOptionTextField extends ConfigOption implements ConfigTextField
+    {
+        /**
+         * List for accessing via tab order
+         */
+        private final List<GuiConfigTextField> tabOrder;
+        
+        /**
+         * Tab index
+         */
+        private final int tabIndex;
+        
+        /**
+         * Inner text field
+         */
+        private final GuiConfigTextField textField;
+        
+        ConfigOptionTextField(List<GuiConfigTextField> tabOrder, GuiConfigTextField textField)
+        {
+            this.tabOrder = tabOrder;
+            this.tabIndex = tabOrder.indexOf(textField);
+            this.textField = textField;
+            
+            if (this.tabIndex == 0)
             {
-                this.label.drawLabel(minecraft, mouseX, mouseY);
+                textField.setFocused(true);
+            }
             }
-            if (this.control != null)
+        @Override
+        void onTick()
             {
-                this.control.drawButton(minecraft, mouseX, mouseY);
+            this.textField.updateCursorCounter();
             }
+        
+        @Override
+        void draw(Minecraft minecraft, int mouseX, int mouseY, float partialTicks)
+        {
+            this.textField.drawTextBox(mouseX, mouseY);
         }
+        @Override
         boolean mousePressed(Minecraft minecraft, int mouseX, int mouseY)
         {
-            if (this.control != null && this.control.mousePressed(minecraft, mouseX, mouseY))
+            this.textField.mouseClicked(mouseX, mouseY, 0);
+            if (this.textField.isFocused())
             {
-                this.control.playPressSound(minecraft.getSoundHandler());
-                if (this.listener != null)
+                // Unfocus all other text fields
+                for (GuiTextField textField : this.tabOrder)
                 {
-                    this.listener.actionPerformed(this.control);
+                    if (textField != this.textField)
+                    {
+                        textField.setFocused(false);
+                    }
                 }
+            }
+            
+            return false;
+        }
+        
+        @Override
+        boolean keyPressed(Minecraft minecraft, char keyChar, int keyCode)
+        {
+            if (!this.textField.isFocused())
+            {
+                return false;
+            }
+            
+            if (keyCode == Keyboard.KEY_TAB)
+            {
+                this.textField.setFocused(false);
+                int tabOrderSize = this.tabOrder.size();
+                this.tabOrder.get((this.tabIndex + (GuiScreen.isShiftKeyDown() ? -1 : 1) + tabOrderSize) % tabOrderSize).setFocused(true);
                 return true;
             }
+            return this.textField.textboxKeyTyped(keyChar, keyCode);
+        }
+        
+        @Override
+        public GuiTextField getNativeTextField()
+        {
+            return this.textField;
+        }
+
+        @Override
+        public String getText()
+        {
+            return this.textField.getText();
+        }
+
+        @Override
+        public ConfigTextField setText(String text)
+        {
+            this.textField.setText(text);
+            return this;
+        }
+
+        @Override
+        public ConfigTextField setMaxLength(int maxLength)
+        {
+            this.textField.setMaxStringLength(maxLength);
+            return this;
+        }
+
+        @Override
+        public ConfigTextField setRegex(String regex, boolean force)
+        {
+            this.textField.setRegex(Pattern.compile(regex), force);;
+            return this;
+        }
+
+        @Override
+        public boolean isValid()
+        {
+            return this.textField.isValid();
+        }
+    }
+    
+    /**
+     * Custom text field which supports "soft" validation by regex (draws red
+     * border and error message when invalid)
+     */
+    class GuiConfigTextField extends GuiTextField
+    {
+        private final FontRenderer fontRenderer;
+        private final int width, height;
+        private Pattern regex;
+        private boolean valid, drawing;
+        
+        GuiConfigTextField(int id, FontRenderer fontRenderer, int x, int y, int width, int height)
+        {
+            super(id, fontRenderer, x, y, width, height);
+            this.fontRenderer = fontRenderer;
+            this.width = width;
+            this.height = height;
+            this.setRegex(null, false);
+        }
+
+        void setRegex(Pattern regex, boolean restrict)
+            {
+            if (restrict && regex != null)
+                {
+                this.setValidator((text) -> regex.matcher(text).matches());
+                this.regex = null;
+                }
+            else
+            {
+                this.setValidator((text) -> {
+                    this.validate(text);
+                return true;
+                });
+                this.regex = regex;
+                this.validate(this.getText());
+            }
+            }
+            
+        private boolean validate(String text)
+        {
+            this.valid = (this.regex == null || this.regex.matcher(text).matches());
+            return true;
+        }
+        
+        boolean isValid()
+        {
+            return this.valid;
+        }
+        
+        @Override
+        public boolean getEnableBackgroundDrawing()
+        {
+            boolean bg = super.getEnableBackgroundDrawing();
+            if (bg && this.drawing && !this.isValid())
+            {
+                drawRect(this.xPosition - 1, this.yPosition - 1, this.xPosition + this.width + 1, this.yPosition + this.height + 1, 0xFFFF5555);
+                drawRect(this.xPosition, this.yPosition, this.xPosition + this.width, this.yPosition + this.height, 0xFF000000);
             return false;
         }
-        void mouseReleased(Minecraft mc, int mouseX, int mouseY)
+            return bg;
+        }
+        
+        public void drawTextBox(int mouseX, int mouseY)
         {
-            if (this.control != null)
+            this.drawing = true;
+            super.drawTextBox();
+            if (!this.isValid())
+        {
+                drawRect(this.xPosition + this.width - 10, this.yPosition, this.xPosition + this.width, this.yPosition + this.height, 0x66000000);
+                this.fontRenderer.drawString("\247l!", this.xPosition + this.width - 6, this.yPosition + (this.height / 2) - 4, 0xFFFF5555);
+                if (mouseX >= this.xPosition && mouseX < this.xPosition + this.width && mouseY >= this.yPosition && mouseY < this.yPosition + this.height)
             {
-                this.control.mouseReleased(mouseX, mouseY);
+                    AbstractConfigPanel.this.drawHoveringText(I18n.format("gui.invalidvalue"), mouseX, mouseY);
+                }
             }
+            this.drawing = false;
         }
     }
     protected final Minecraft mc;
-    private final List<ConfigOption<?>> options = new ArrayList<ConfigOption<?>>();
+    private final List<ConfigOption> options = new ArrayList<ConfigOption>();
+    
+    private final List<GuiConfigTextField> textFields = new ArrayList<GuiConfigTextField>();
     private int contentHeight = 0;
-    private ConfigOption<?> selected;
+    private ConfigOption selected;
     public AbstractConfigPanel()
     {
@@ -170,7 +463,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
             label.addLine(line);
         }
         this.contentHeight = Math.max(y + height, this.contentHeight);
-        this.options.add(new ConfigOption<GuiButton>(label));
+        this.options.add(new ConfigOptionLabel(label));
     }
     /**
@@ -185,12 +478,33 @@ public abstract class AbstractConfigPanel implements ConfigPanel
         if (control != null)
         {
             this.contentHeight = Math.max(control.yPosition + ((IGuiButton)control).getButtonHeight(), this.contentHeight);
-            this.options.add(new ConfigOption<T>(control, listener));
+            this.options.add(new ConfigOptionButton<T>(control, listener));
         }
         return control;
     }
+    /**
+     * Add a text field to the panel, returns a handle through which the created
+     * text field can be accessed
+     * 
+     * @param id control id
+     * @param x text field x position
+     * @param y text field y position
+     * @param width text field width
+     * @param height text field height
+     * @return text field handle
+     */
+    protected ConfigTextField addTextField(int id, int x, int y, int width, int height)
+    {
+        GuiConfigTextField textField = new GuiConfigTextField(id, this.mc.fontRendererObj, x + 2, y, width, height);
+        this.textFields.add(textField);
+        
+        ConfigOptionTextField configOption = new ConfigOptionTextField(this.textFields, textField);
+        this.options.add(configOption);
+        return configOption;
+    }
+    
     @Override
     public void onPanelResize(ConfigPanelHost host)
     {
@@ -199,12 +513,16 @@ public abstract class AbstractConfigPanel implements ConfigPanel
     @Override
     public void onTick(ConfigPanelHost host)
     {
+        for (ConfigOption configOption : this.options)
+        {
+            configOption.onTick();
+        }
     }
     @Override
     public void drawPanel(ConfigPanelHost host, int mouseX, int mouseY, float partialTicks)
     {
-        for (ConfigOption<?> configOption : this.options)
+        for (ConfigOption configOption : this.options)
         {
             configOption.draw(this.mc, mouseX, mouseY, partialTicks);
         }
@@ -219,7 +537,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
             return;
         }
-        for (ConfigOption<?> configOption : this.options)
+        for (ConfigOption configOption : this.options)
         {
             if (configOption.mousePressed(this.mc, mouseX, mouseY))
             {
@@ -251,5 +569,22 @@ public abstract class AbstractConfigPanel implements ConfigPanel
             host.close();
             return;
         }
+        
+        for (ConfigOption configOption : this.options)
+        {
+            if (configOption.keyPressed(this.mc, keyChar, keyCode))
+            {
+                break;
+            }
+        }
+    }
+    
+    protected final void drawHoveringText(String text, int x, int y)
+    {
+        if (this.mc.currentScreen != null)
+        {
+            GuiLiteLoaderPanel.drawTooltip(this.mc.fontRendererObj, text, x, y, Integer.MAX_VALUE, Integer.MAX_VALUE, 0xFFFF5555, 0xB0000000);
+            RenderHelper.disableStandardItemLighting();
+        }
     }
 }    
 {
     "required": true,
-    "minVersion": "0.6",
+    "minVersion": "0.7",
+    "compatibilityLevel": "JAVA_8",
     "target": "@env(DEFAULT)",
     "package": "com.mumfrey.liteloader.client.mixin",
     "refmap": "mixins.liteloader.client.refmap.json",
@@ -24,6 +24,34 @@ import com.google.gson.GsonBuilder;
  */
 public final class EnabledModsList
 {
+    /**
+     * Tristate for enablement which allows us to determine whether mod is
+     * forcibly disabled by user or passively disabled by mod name filter
+     */
+    public enum Enabled
+    {
+        ENABLED(true),
+        DISABLED(false),
+        FILTERED(false);
+        
+        private final boolean value;
+
+        private Enabled(boolean value)
+        {
+            this.value = value;
+        }
+        
+        public boolean booleanValue()
+        {
+            return this.value;
+        }
+        
+        public static Enabled of(Boolean value)
+        {
+            return value == null ? Enabled.FILTERED : (value ? Enabled.ENABLED : Enabled.DISABLED);
+        }
+    }
+    
     @SuppressWarnings("unused")
     private static final transient long serialVersionUID = -6449451105617763769L;
@@ -45,7 +73,7 @@ public final class EnabledModsList
      * the mods list because the command line is supposed to be an override
      * rather than a new mask. These two values provide this behaviour. 
      */
-    private transient Boolean defaultEnabledValue = Boolean.TRUE;
+    private transient Enabled defaultEnabledValue = Enabled.ENABLED;
     private transient boolean allowSave = true;
     /**
@@ -59,22 +87,27 @@ public final class EnabledModsList
     }
     /**
-     * Check whether a particular mod is enabled
+     * Check whether a particular container is enabled
      * 
      * @param profileName
      * @param identifier
      */
     public boolean isEnabled(String profileName, String identifier)
     {
+        return this.getEnabled(profileName, identifier).booleanValue();
+    }
+    
+    public Enabled getEnabled(String profileName, String identifier)
+    {
         Map<String, Boolean> profile = this.getProfile(profileName);
         identifier = identifier.toLowerCase().trim();
-        if (!profile.containsKey(identifier))
+        if (!profile.containsKey(identifier) && this.defaultEnabledValue != Enabled.FILTERED)
         {
-            profile.put(identifier, this.defaultEnabledValue);
+            profile.put(identifier, this.defaultEnabledValue.booleanValue());
         }
-        return profile.get(identifier);
+        return Enabled.of(profile.get(identifier));
     }
     /**
@@ -87,7 +120,7 @@ public final class EnabledModsList
     public void setEnabled(String profileName, String identifier, boolean enabled)
     {
         Map<String, Boolean> profile = this.getProfile(profileName);
-        profile.put(identifier.toLowerCase().trim(), Boolean.valueOf(enabled));
+        profile.put(identifier.toLowerCase().trim(), enabled ? Boolean.TRUE : Boolean.FALSE);
         this.allowSave = true;
     }
@@ -106,12 +139,9 @@ public final class EnabledModsList
         {
             if (modNameFilter != null)
             {
-                for (String modName : profile.keySet())
-                {
-                    profile.put(modName, Boolean.FALSE);
-                }
+                profile.clear();
-                this.defaultEnabledValue = Boolean.FALSE;
+                this.defaultEnabledValue = Enabled.FILTERED;
                 this.allowSave = false;
                 for (String filterEntry : modNameFilter)
@@ -122,8 +152,8 @@ public final class EnabledModsList
         }
         catch (Exception ex)
         {
-            this.defaultEnabledValue = Boolean.TRUE;
-            this.allowSave = true;
+            this.defaultEnabledValue = Enabled.ENABLED;
+//            this.allowSave = true;
         }
     }
@@ -135,7 +165,7 @@ public final class EnabledModsList
     private Map<String, Boolean> getProfile(String profileName)
     {
         if (profileName == null) profileName = "default";
-        if (this.mods == null) this.mods = new TreeMap<String, TreeMap<String,Boolean>>();
+        if (this.mods == null) this.mods = new TreeMap<String, TreeMap<String, Boolean>>();
         if (!this.mods.containsKey(profileName))
         {
@@ -532,6 +532,15 @@ public final class LiteLoader
     {
         return "true".equals(System.getProperty("mcpenv"));
     }
+    
+    /**
+     * Get whether the current running version is a snapshot build
+     */
+    public static boolean isSnapshot()
+    {
+        String branding = LiteLoader.getBranding();
+        return branding != null && branding.contains("SNAPSHOT"); 
+    }
     /**
      * Dump debugging information to the console
@@ -8,6 +8,10 @@ package com.mumfrey.liteloader.core;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import com.google.common.io.ByteSink;
 import com.google.common.io.Files;
@@ -21,6 +25,8 @@ public class LiteLoaderUpdateSite extends UpdateSite
     private static final String UPDATE_SITE_URL = "http://dl.liteloader.com/versions/";
     private static final String UPDATE_SITE_VERSIONS_JSON = "versions.json";
     private static final String UPDATE_SITE_ARTEFACT_NAME = "com.mumfrey:liteloader";
+    
+    private static final Pattern SNAPSHOT_REGEX = Pattern.compile("^([0-9\\._]+)-SNAPSHOT-(r[0-9a-z]+)-(b([0-9]+))-(.*)$", Pattern.CASE_INSENSITIVE);
     private String mcVersion;
@@ -28,6 +34,10 @@ public class LiteLoaderUpdateSite extends UpdateSite
     private File jarFile = null;
     private boolean updateForced = false;
+    private boolean isSnapshot = false;
+    
+    private int currentBuild, availableBuild;
+    private String snapshotDate = null;
     public LiteLoaderUpdateSite(String targetVersion, long currentTimeStamp)
     {
@@ -36,6 +46,64 @@ public class LiteLoaderUpdateSite extends UpdateSite
         this.mcVersion = targetVersion; 
     }
+    
+    @Override
+    public void beginUpdateCheck()
+    {
+        this.isSnapshot = LiteLoader.isSnapshot();
+        super.beginUpdateCheck();
+    }
+    
+    @Override
+    public boolean isSnapshot()
+    {
+        return this.isSnapshot;
+    }
+    
+    @Override
+    public String getAvailableVersion()
+    {
+        if (this.isSnapshot() && this.availableBuild > 0)
+        {
+            return String.valueOf(this.availableBuild);
+        }
+        
+        return super.getAvailableVersion();
+    }
+    
+    @Override
+    public String getAvailableVersionDate()
+    {
+        if (this.snapshotDate != null)
+        {
+            return this.snapshotDate;
+        }
+        
+        return super.getAvailableVersionDate();
+    }
+    
+    @Override
+    protected boolean compareArtefact(Map<?, ?> artefact, long bestTimeStamp, Long remoteTimeStamp)
+    {
+        if (this.isSnapshot())
+        {
+            String remoteBuild = artefact.get("build").toString();
+            String myBuild = LiteLoader.getBranding();
+            
+            Matcher remoteMatcher = LiteLoaderUpdateSite.SNAPSHOT_REGEX.matcher(remoteBuild);
+            Matcher myMatcher = LiteLoaderUpdateSite.SNAPSHOT_REGEX.matcher(myBuild);
+            
+            if (remoteMatcher.matches() && myMatcher.matches())
+            {
+                this.currentBuild = Integer.parseInt(myMatcher.group(4));
+                this.availableBuild = Integer.parseInt(remoteMatcher.group(4));
+                this.snapshotDate = String.format("%1$tY-%1$tm-%1$td %1$tH:%1$tM", new Date(remoteTimeStamp * 1000L));
+                return this.availableBuild > this.currentBuild;
+            }
+        }
+        
+        return super.compareArtefact(artefact, bestTimeStamp, remoteTimeStamp);
+    }
     public boolean canForceUpdate(LoaderProperties properties)
     {
@@ -26,14 +26,11 @@ public class Obf
     public static final Obf    BakedProfilingHandlerList = new Obf("com.mumfrey.liteloader.core.event.ProfilingHandlerList$BakedList"  );
     public static final Obf                 PacketEvents = new Obf("com.mumfrey.liteloader.core.PacketEvents"                          );
     public static final Obf           PacketEventsClient = new Obf("com.mumfrey.liteloader.client.PacketEventsClient"                  );
-    public static final Obf                   LoadingBar = new Obf("com.mumfrey.liteloader.client.gui.startup.LoadingBar"              );
     public static final Obf                  GameProfile = new Obf("com.mojang.authlib.GameProfile"                                    );
     public static final Obf                MinecraftMain = new Obf("net.minecraft.client.main.Main"                                    );
     public static final Obf              MinecraftServer = new Obf("net.minecraft.server.MinecraftServer"                              );
     public static final Obf                         GL11 = new Obf("org.lwjgl.opengl.GL11"                                             );
     public static final Obf             RealmsMainScreen = new Obf("com.mojang.realmsclient.RealmsMainScreen"                          );
-    public static final Obf                         init = new Obf("init"                                                              );
-    public static final Obf                     postInit = new Obf("postInit"                                                          );
     public static final Obf                  constructor = new Obf("<init>"                                                            );
     // CHECKSTYLE:OFF
@@ -5,6 +5,7 @@
  */
 package com.mumfrey.liteloader.core.runtime;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
@@ -157,125 +158,7 @@ public final class Packets extends Obf
     // CHECKSTYLE:ON
-    public static final Packets[] packets = new Packets[] {
-            CPacketEncryptionResponse,
-            CPacketLoginStart,
-            SPacketDisconnectLogin,
-            SPacketEnableCompression,
-            SPacketEncryptionRequest,
-            SPacketLoginSuccess,
-            CPacketAnimation,
-            CPacketChatMessage,
-            CPacketClickWindow,
-            CPacketClientSettings,
-            CPacketClientStatus,
-            CPacketCloseWindow,
-            CPacketConfirmTeleport,
-            CPacketConfirmTransaction,
-            CPacketCreativeInventoryAction,
-            CPacketCustomPayload,
-            CPacketEnchantItem,
-            CPacketEntityAction,
-            CPacketHeldItemChange,
-            CPacketInput,
-            C00Handshake,
-            CPacketKeepAlive,
-            CPacketPlayer,
-            CPacketPlayerPosition,
-            CPacketPlayerPositionRotation,
-            CPacketPlayerRotation,
-            CPacketPlayerAbilities,
-            CPacketPlayerDigging,
-            CPacketPlayerTryUseItem,
-            CPacketPlayerTryUseItemOnBlock,
-            CPacketResourcePackStatus,
-            CPacketSpectate,
-            CPacketSteerBoat,
-            CPacketTabComplete,
-            CPacketUpdateSign,
-            CPacketUseEntity,
-            CPacketVehicleMove,
-            SPacketAnimation,
-            SPacketBlockAction,
-            SPacketBlockBreakAnim,
-            SPacketBlockChange,
-            SPacketCamera,
-            SPacketChangeGameState,
-            SPacketChat,
-            SPacketChunkData,
-            SPacketCloseWindow,
-            SPacketCollectItem,
-            SPacketCombatEvent,
-            SPacketConfirmTransaction,
-            SPacketCooldown,
-            SPacketCustomPayload,
-            SPacketCustomSound,
-            SPacketDestroyEntities,
-            SPacketDisconnect,
-            SPacketDisplayObjective,
-            SPacketEffect,
-            SPacketEntity,
-            S15PacketEntityRelMove,
-            S16PacketEntityLook,
-            S17PacketEntityLookMove,
-            SPacketEntityAttach,
-            SPacketEntityEffect,
-            SPacketEntityEquipment,
-            SPacketEntityHeadLook,
-            SPacketEntityMetadata,
-            SPacketEntityProperties,
-            SPacketEntityStatus,
-            SPacketEntityTeleport,
-            SPacketEntityVelocity,
-            SPacketExplosion,
-            SPacketHeldItemChange,
-            SPacketJoinGame,
-            SPacketKeepAlive,
-            SPacketMaps,
-            SPacketMoveVehicle,
-            SPacketMultiBlockChange,
-            SPacketOpenWindow,
-            SPacketParticles,
-            SPacketPlayerAbilities,
-            SPacketPlayerListHeaderFooter,
-            SPacketPlayerListItem,
-            SPacketPlayerPosLook,
-            SPacketRemoveEntityEffect,
-            SPacketResourcePackSend,
-            SPacketRespawn,
-            SPacketScoreboardObjective,
-            SPacketServerDifficulty,
-            SPacketSetExperience,
-            SPacketSetPassengers,
-            SPacketSetSlot,
-            SPacketSignEditorOpen,
-            SPacketSoundEffect,
-            SPacketSpawnExperienceOrb,
-            SPacketSpawnGlobalEntity,
-            SPacketSpawnMob,
-            SPacketSpawnObject,
-            SPacketSpawnPainting,
-            SPacketSpawnPlayer,
-            SPacketSpawnPosition,
-            SPacketStatistics,
-            SPacketTabComplete,
-            SPacketTeams,
-            SPacketTimeUpdate,
-            SPacketTitle,
-            SPacketUnloadChunk,
-            SPacketUpdateBossInfo,
-            SPacketUpdateHealth,
-            SPacketUpdateScore,
-            SPacketUpdateTileEntity,
-            SPacketUseBed,
-            SPacketWindowItems,
-            SPacketWindowProperty,
-            SPacketWorldBorder,
-            CPacketPing,
-            CPacketServerQuery,
-            SPacketPong,
-            SPacketServerInfo
-    };
+    public static final Packets[] packets = Packets.toArray();
     private static int nextPacketIndex;
@@ -295,6 +178,24 @@ public final class Packets extends Obf
         this.context = context;
     }
+    private static Packets[] toArray()
+    {
+        Field[] fields = Packets.class.getFields();
+        Packets[] packets = new Packets[Packets.nextPacketIndex];
+        for (int index = 0; index < Packets.nextPacketIndex; index++)
+        {
+            try
+            {
+                packets[index] = (Packets)fields[index].get(null);
+            }
+            catch (Exception ex)
+            {
+                throw new RuntimeException(ex);
+            }
+        }
+        return packets;
+    }
+
     public int getIndex()
     {
         return this.index;
@@ -88,4 +88,14 @@ public interface PanelManager&lt;TParentScreen&gt; extends TickObserver, PostRenderObs
      * Get whether "force update" is enabled
      */
     public abstract boolean isForceUpdateEnabled();
+
+    /**
+     * Set whether "check for new snapshots" is enabled
+     */
+    public abstract void setCheckForSnapshotsEnabled(boolean checkForSnapshots);
+
+    /**
+     * Get whether "check for new snapshots" is enabled
+     */
+    public abstract boolean isCheckForSnapshotsEnabled();
 }
@@ -99,6 +99,7 @@ public interface LoaderProperties
     public static final String OPTION_FORCE_UPDATE      = "allowForceUpdate";
     public static final String OPTION_UPDATE_CHECK_INTR = "updateCheckInterval";
     public static final String OPTION_JINPUT_DISABLE    = "disableJInput";
+    public static final String OPTION_CHECK_SNAPSHOTS   = "checkForNewSnapshots";
     // Enumerator properties
     public static final String OPTION_SEARCH_MODS       = "search.mods";
@@ -17,6 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.io.Files;
 import com.mumfrey.liteloader.Configurable;
 import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
  * Registry where we keep the mod config panel classes and config file writers
@@ -165,6 +166,10 @@ public class ConfigManager
             }
             catch (InstantiationException ex) {}
             catch (IllegalAccessException ex) {}
+            catch (Exception ex)
+            {
+                LiteLoaderLogger.severe("Error creating mod configuration panel <%s> for mod %s", this.configPanels.get(modClass), modClass);
+            }
             // If instantiation fails, remove the panel
             this.configPanels.remove(modClass);
@@ -47,37 +47,37 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
      * Permissions permissible which is a proxy for permissions that are common
      * to all mods.
      */
-    private static Permissible allMods = new PermissibleAllMods();
-
-    /**
-     * Minecraft instance 
-     */
-    private GameEngine<?, ?> engine;
+    private final static Permissible allMods = new PermissibleAllMods();
     /**
      * List of registered client mods supporting permissions
      */
-    private Map<String, Permissible> registeredClientMods = new HashMap<String, Permissible>();
+    private final Map<String, Permissible> registeredClientMods = new HashMap<String, Permissible>();
     /**
      * List of registered client permissions, grouped by mod
      */
-    private Map<Permissible, TreeSet<String>> registeredClientPermissions = new HashMap<Permissible, TreeSet<String>>();
+    private final Map<Permissible, TreeSet<String>> registeredClientPermissions = new HashMap<Permissible, TreeSet<String>>();
     /**
      * Objects which listen to events generated by this object
      */
-    private Set<Permissible> permissibles = new HashSet<Permissible>();
+    private final Set<Permissible> permissibles = new HashSet<Permissible>();
     /**
      * Local permissions, used when server permissions are not available
      */
-    private LocalPermissions localPermissions = new LocalPermissions();
+    private final LocalPermissions localPermissions = new LocalPermissions();
     /**
      * Server permissions, indexed by mod
      */
-    private Map<String, ServerPermissions> serverPermissions = new HashMap<String, ServerPermissions>();
+    private final Map<String, ServerPermissions> serverPermissions = new HashMap<String, ServerPermissions>();
+
+    /**
+     * Minecraft instance 
+     */
+    private GameEngine<?, ?> engine;
     /**
      * Last time onTick was called, used to detect tamper condition if no ticks
@@ -124,8 +124,11 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         if (mod == null) mod = allMods;
         String modName = mod.getPermissibleModName();
-        ServerPermissions modPermissions = this.serverPermissions.get(modName);
-        return modPermissions != null ? modPermissions : this.localPermissions;
+        synchronized (this.serverPermissions)
+        {
+            ServerPermissions modPermissions = this.serverPermissions.get(modName);
+            return modPermissions != null ? modPermissions : this.localPermissions;
+        }
     }
     /* (non-Javadoc)
@@ -138,8 +141,11 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         if (mod == null) mod = allMods;
         String modName = mod.getPermissibleModName();
-        ServerPermissions modPermissions = this.serverPermissions.get(modName);
-        return modPermissions != null ? modPermissions.getReplicationTime() : 0;
+        synchronized (this.serverPermissions)
+        {
+            ServerPermissions modPermissions = this.serverPermissions.get(modName);
+            return modPermissions != null ? modPermissions.getReplicationTime() : 0;
+        }
     }
     /**
@@ -208,7 +214,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
      */
     protected void clearServerPermissions()
     {
-        this.serverPermissions.clear();
+        synchronized (this.serverPermissions)
+        {
+            this.serverPermissions.clear();
+        }
         for (Permissible permissible : this.permissibles)
         {
@@ -264,7 +273,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         }
         else
         {
-            this.serverPermissions.remove(modName);
+            synchronized (this.serverPermissions)
+            {
+                this.serverPermissions.remove(modName);
+            }
         }
     }
@@ -289,12 +301,15 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
             }
         }
-        for (Map.Entry<String, ServerPermissions> modPermissions : this.serverPermissions.entrySet())
+        synchronized (this.serverPermissions)
         {
-            if (!modPermissions.getValue().isValid())
+            for (Map.Entry<String, ServerPermissions> modPermissions : this.serverPermissions.entrySet())
             {
-                modPermissions.getValue().notifyRefreshPending();
-                this.sendPermissionQuery(this.registeredClientMods.get(modPermissions.getKey()));
+                if (!modPermissions.getValue().isValid())
+                {
+                    modPermissions.getValue().notifyRefreshPending();
+                    this.sendPermissionQuery(this.registeredClientMods.get(modPermissions.getKey()));
+                }
             }
         }
@@ -336,7 +351,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
             if (modPermissions != null && modPermissions.getModName() != null)
             {
-                this.serverPermissions.put(modPermissions.getModName(), modPermissions);
+                synchronized (this.serverPermissions)
+                {
+                    this.serverPermissions.put(modPermissions.getModName(), modPermissions);
+                }
                 Permissible permissible = this.registeredClientMods.get(modPermissions.getModName());
                 if (permissible != null) permissible.onPermissionsChanged(this);
@@ -160,6 +160,11 @@ public class UpdateSite implements Comparator&lt;Long&gt;
             }
         }
     }
+    
+    public boolean isSnapshot()
+    {
+        return false;
+    }
     /**
      * Gets whether a check is in progress
@@ -319,7 +324,7 @@ public class UpdateSite implements Comparator&lt;Long&gt;
      */
     private void handleVersionData(Object key, Map<?, ?> value)
     {
-        if ("artefacts".equals(key))
+        if ((this.isSnapshot() && "snapshots".equals(key)) || (!this.isSnapshot() && "artefacts".equals(key)))
         {
             if (value.containsKey(this.artefact))
             {
@@ -387,7 +392,7 @@ public class UpdateSite implements Comparator&lt;Long&gt;
             this.availableVersion = artefact.get("version").toString();
             this.availableVersionDate = DateFormat.getDateTimeInstance().format(new Date(remoteTimeStamp * 1000L));
             this.availableVersionURL = this.createArtefactURL(artefact.get("file").toString());
-            this.updateAvailable = this.compareTimeStamps(bestTimeStamp, remoteTimeStamp);
+            this.updateAvailable = this.compareArtefact(artefact, bestTimeStamp, remoteTimeStamp);
             return true;
         }
@@ -395,6 +400,11 @@ public class UpdateSite implements Comparator&lt;Long&gt;
         return false;
     }
+    protected boolean compareArtefact(Map<?, ?> artefact, long bestTimeStamp, Long remoteTimeStamp)
+    {
+        return this.compareTimeStamps(bestTimeStamp, remoteTimeStamp);
+    }
+
     /**
      * @param bestTimeStamp
      * @param remoteTimeStamp
@@ -16,6 +16,9 @@ gui.settings.notabhide.help1=Only applies if the above option is also checked
 gui.settings.forceupdate.label=Periodically Check For Updates
 gui.settings.forceupdate.help1=This option is §cexperimental§r and may not work properly 
 gui.settings.forceupdate.help2=yet, it also enables the "force update" capability. 
+gui.settings.checkforsnapshots.label=Check For New Snapshots
+gui.settings.checkforsnapshots.help1=If this option is enabled, LiteLoader will check
+gui.settings.checkforsnapshots.help2=for new SNAPSHOT releases each time it it launched
 gui.about.taboptions=§nLiteLoader Panel Options
@@ -83,7 +86,11 @@ gui.log.uploadsuccess=Upload succeeded, log available at
 gui.log.closedialog=Close
 gui.error.title=Startup errors for %s
+gui.error.copytoclipboard=Copy error to clipboard
 gui.error.tooltip=%d mod startup error(s) detected (%d critical)
-gui.notifications.updateavailable=LiteLoader Update Available!
 \ No newline at end of file
+gui.notifications.updateavailable=LiteLoader Update Available!
+gui.notifications.newsnapshotavailable=!!New Snapshot Available:%nBuild #%s (%s)
+
+gui.invalidvalue=§cInvalid value!
 \ No newline at end of file
 {
     "required": true,
-    "minVersion": "0.5.3",
+    "minVersion": "0.7",
+    "compatibilityLevel": "JAVA_8",
     "target": "@env(DEFAULT)",
     "package": "com.mumfrey.liteloader.common.mixin",
     "refmap": "mixins.liteloader.core.refmap.json",