diff --git a/autobuilder/assets/launchwrapper.jar b/autobuilder/assets/launchwrapper.jar
new file mode 100644
index 0000000..3bc832a
Binary files /dev/null and b/autobuilder/assets/launchwrapper.jar differ
diff --git a/autobuilder/index.js b/autobuilder/index.js
index c2acd66..f93654d 100644
--- a/autobuilder/index.js
+++ b/autobuilder/index.js
@@ -64,6 +64,9 @@ async function build() {
 
 	console.log("Extracting JAR");
 	await unzip(`../build/libs/client-${version}.jar`, tempPaths.jar);
+	console.log("Extracting Wrapper");
+    await unzip(assetsPaths.wrapper, tempPaths.jar);
+
 	const libs = await fs.promises.readdir(assetsPaths.libs);
 	for (const lib of libs) {
 		console.log(`Extracting ${lib}`);
diff --git a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java
index b13420f..129edf3 100644
--- a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java
+++ b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java
@@ -478,6 +478,22 @@ public class RenderUtil {
           setColor(-1);
         }
 
+    public static void drawImage(float x, float y, float width, float height) {
+        GL11.glPushMatrix();
+        GL11.glDisable(2929);
+        GL11.glEnable(3042);
+        GL11.glDepthMask(false);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(1f, 1f, 1f, 1);
+        Gui.drawModalRectWithCustomSizedTexture((int) x, (int) y, 0.0f, 0.0f, (int) width, (int) height, width, height);
+        GL11.glDepthMask(true);
+        GL11.glDisable(3042);
+        GL11.glEnable(2929);
+        GL11.glPopMatrix();
+
+        GL11.glColor4f(1f, 1f, 1f, 1f);
+    }
+
     public static void drawImage(ResourceLocation image, float x, float y, float width, float height, float alpha) {
         GL11.glPushMatrix();
         GL11.glDisable(2929);
diff --git a/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java b/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java
index d7170ab..a3587dc 100644
--- a/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java
+++ b/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java
@@ -54,6 +54,9 @@ public class SilentClientTweaker implements ITweaker {
     @Override
     public final void injectIntoClassLoader(LaunchClassLoader classLoader)
     {
+        if(hasOptifine) {
+            classLoader.registerTransformer("optifine.OptiFineClassTransformer");
+        }
         MixinBootstrap.init();
 
         // Retrieve the default mixin environment and register the config file
diff --git a/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java b/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java
deleted file mode 100644
index 514dd3f..0000000
--- a/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.silentclient.client.mixin.accessors;
-
-import net.minecraft.client.resources.ResourcePackRepository;
-import net.minecraft.util.ResourceLocation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(ResourcePackRepository.Entry.class)
-public interface ResourcePackRepositoryEntryAccessor {
-    @Accessor
-    ResourceLocation getLocationTexturePackIcon();
-}
diff --git a/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java b/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java
index 8bab9cc..672e251 100644
--- a/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java
+++ b/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java
@@ -14,7 +14,6 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.silentclient.client.Client;
 import net.silentclient.client.gui.util.RenderUtil;
-import net.silentclient.client.mixin.accessors.ResourcePackRepositoryEntryAccessor;
 import net.silentclient.client.mods.CustomFontRenderer;
 import net.silentclient.client.mods.HudMod;
 import net.silentclient.client.mods.ModCategory;
@@ -82,7 +81,8 @@ public class PackDisplayMod extends HudMod {
 			ResourcePackRepository.Entry entry = rps.get(order == "First Pack" ? 0 : count - 1);
 			entry.bindTexturePackIcon(Minecraft.getMinecraft().getTextureManager());
 			GlStateManager.disableLighting();
-			RenderUtil.drawImage(((ResourcePackRepositoryEntryAccessor) entry).getLocationTexturePackIcon(), 0, 0, getIconHeight(), getIconHeight(), false);
+			entry.bindTexturePackIcon(mc.getTextureManager());
+			RenderUtil.drawImage(0, 0, getIconHeight(), getIconHeight());
 		} else {
 			if(defaultIcon == null) {
 				try {
diff --git a/src/main/resources/mixins.SilentClient.json b/src/main/resources/mixins.SilentClient.json
index 7a51103..6fdcc48 100644
--- a/src/main/resources/mixins.SilentClient.json
+++ b/src/main/resources/mixins.SilentClient.json
@@ -11,7 +11,6 @@
     "accessors.GuiChatAccessor",
     "accessors.GuiAccessor",
     "accessors.RenderItemAccessor",
-    "accessors.ResourcePackRepositoryEntryAccessor",
     "accessors.SimpleReloadableResourceManagerAccessor",
     "accessors.TextureManagerAccessor",
     "mixins.EntityRendererMixin",