please dont die

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/.name

@@ -0,0 +1 @@
+eaglercraft-workspace

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/jarRepositories.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="zulu-11" project-jdk-type="JavaSDK" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

src/main/java/dev/resent/module/base/Mod.java

@@ -18,8 +18,6 @@ public abstract class Mod {
     private Category category;
     private boolean enabled;
     private boolean hasSetting;
-    public boolean expanded;
-	public int index;
 	public SimpleAnimation toggleAnimation = new SimpleAnimation(0);
 
     public List<Setting> settings = new ArrayList<>();
@@ -39,7 +37,6 @@ public abstract class Mod {
     }
 
     public void onEnable() {}
-
     public void onDisable() {}
 
     public void toggle() {
@@ -60,11 +57,11 @@ public abstract class Mod {
         RenderUtils.drawRoundedRect(left, top, right, bottom, 4, color);
     }
 
-    protected int drawString(final String text, final int x, final int y, final int color, final boolean idk) {
+    protected int drawString(final String text, final int x, final int y) {
-        if (Theme.getFontColor(Theme.getFontId()) == 6942069) {
+        if (Theme.getFontColor() == 6942069) {
-            RenderUtils.drawChromaString(text, x, y, idk);
+            RenderUtils.drawChromaString(text, x, y, Theme.getTextShadow());
         } else {
-            Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, Theme.getFontColor());
         }
 
         return x;
@@ -75,38 +72,19 @@ public abstract class Mod {
         MISC("Misc");
 
         public final String name;
-        public int i;
 
         Category(final String name) {
             this.name = name;
         }
     }
 
-    public boolean isEnabled() {
+    public boolean isEnabled() { return enabled; }
-        return enabled;
+    public boolean isHasSetting() { return hasSetting; }
-    }
+    public String gdoeoetveavee() { return name; }
+    public Category getCategory() { return category; }
 
-    public boolean isHasSetting() {
+    public void setName(String name) { this.name = name; }
-        return hasSetting;
+    public void setCategory(Category category) { this.category = category; }
-    }
+    public void setHasSetting(boolean hasSetting) { this.hasSetting = hasSetting; }
 
-    public String getName() {
-        return name;
-    }
-
-    public Category getCategory() {
-        return category;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setCategory(Category category) {
-        this.category = category;
-    }
-
-    public void setHasSetting(boolean hasSetting) {
-        this.hasSetting = hasSetting;
-    }
 }

src/main/java/dev/resent/module/base/ModManager.java

@@ -38,7 +38,6 @@ import dev.resent.module.impl.misc.NoSwingDelay;
 import dev.resent.module.impl.misc.Scoreboard;
 import dev.resent.module.impl.misc.SelfNametag;
 import dev.resent.module.impl.misc.Sprint;
-import dev.resent.module.impl.misc.TabGui;
 
 public class ModManager {
 
@@ -71,7 +70,6 @@ public class ModManager {
     public static PotCounter potCounter;
     public static HUD hud = new HUD();
     public static CrystalOptimizer crystalOptimizer = new CrystalOptimizer();
-    public static TabGui tabGui = new TabGui();
     public static SelfNametag selfNametag = new SelfNametag();
     public static Cape cape = new Cape();
     public static BPS bps = new BPS();
@@ -88,7 +86,6 @@ public class ModManager {
         register(cape);
         register(selfNametag);
         register(cosmetics);
-        register(tabGui);
         register(crystalOptimizer);
         register(hud = new HUD());
         register(freelook = new Freelook());

src/main/java/dev/resent/module/impl/hud/BPS.java

@@ -4,7 +4,6 @@ import java.text.DecimalFormat;
 
 import dev.resent.annotation.RenderModule;
 import dev.resent.module.base.Mod.Category;
-import dev.resent.visual.ui.Theme;
 import dev.resent.module.base.RenderMod;
 
 @RenderModule(name = "BPS", category = Category.HUD, x = 4, y = 16)
@@ -20,9 +19,9 @@ public class BPS extends RenderMod{
     public String getText(){
         return "BPS: " + new DecimalFormat("0.##").format(getBPS());
     }
-    @Override
+
     public void draw(){
-        drawString(getText(), x+2, y+2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        drawString(getText(), x+2, y+2);
     }
     
 }

src/main/java/dev/resent/module/impl/hud/CPS.java

@@ -39,6 +39,6 @@ public class CPS extends RenderMod {
         final long time = System.currentTimeMillis();
         FuncUtils.removeIf(clicks, aLong -> aLong + 1000 < time);
 
-        drawString("[CPS: " + clicks.size() + "]", this.x + 2, this.y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        drawString("[CPS: " + clicks.size() + "]", this.x + 2, this.y + 2);
     }
 }

src/main/java/dev/resent/module/impl/hud/ComboCounter.java

@@ -45,6 +45,6 @@ public class ComboCounter extends RenderMod {
             combo = 0;
         }
 
-        drawString("[" + combo + " Combo]", this.x + 2, this.y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        drawString("[" + combo + " Combo]", this.x + 2, this.y + 2);
     }
 }

src/main/java/dev/resent/module/impl/hud/FPS.java

@@ -24,7 +24,7 @@ public class FPS extends RenderMod {
     @Override
     public void draw() {
         if (mc.thePlayer != null) {
-            drawString(getText(), this.x + 2, this.y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            drawString(getText(), this.x + 2, this.y + 2);
         }
     }
 }

src/main/java/dev/resent/module/impl/hud/Info.java

@@ -42,15 +42,15 @@ public class Info extends RenderMod {
         int rot = MathHelper.floor_double(this.mc.thePlayer.rotationYaw * 4 / 360 + 0.5) & 3;
         if (mc.thePlayer != null) {
             drawRect(this.x, this.y, this.x + this.getWidth(), this.y + this.getHeight(), new Color(0, 0, 0, 200).getRGB());
-            drawString(" X: " + getPositions()[0], this.x + 5, this.y + 14, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            drawString(" X: " + getPositions()[0], this.x + 5, this.y + 14);
-            drawString(" Y: " + getPositions()[1], this.x + 5, this.y + 24, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            drawString(" Y: " + getPositions()[1], this.x + 5, this.y + 24);
-            drawString(" Z: " + getPositions()[2], this.x + 5, this.y + 34, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            drawString(" Z: " + getPositions()[2], this.x + 5, this.y + 34);
 
             if (direction.getValue()){
-                drawString(" Dir: ", this.x + 5 + mc.fontRendererObj.getStringWidth(" X:  " + getPositions()[0]), this.y + 14, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+                drawString(" Dir: ", this.x + 5 + mc.fontRendererObj.getStringWidth(" X:  " + getPositions()[0]), this.y + 14);
                 mc.fontRendererObj.drawString(directionsF[rot], this.x+5+mc.fontRendererObj.getStringWidth(" X:   Dir: " + getPositions()[0]), this.y + 14, -1, Theme.getTextShadow());
             }
-            drawString(" Biome: " + mc.theWorld.getBiomeGenForCoords(new BlockPos(getPositions()[0], getPositions()[1], getPositions()[2])).biomeName, this.x + 5, this.y + 44, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+            drawString(" Biome: " + mc.theWorld.getBiomeGenForCoords(new BlockPos(getPositions()[0], getPositions()[1], getPositions()[2])).biomeName, this.x + 5, this.y + 44);
         }
     }
 }

src/main/java/dev/resent/module/impl/hud/PotCounter.java

@@ -31,6 +31,6 @@ public class PotCounter extends RenderMod {
             }
         }
 
-        drawString("[" + potinv + " Pots]", this.x + 2, this.y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        drawString("[" + potinv + " Pots]", this.x + 2, this.y + 2);
     }
 }

src/main/java/dev/resent/module/impl/hud/PotionHUD.java

@@ -56,9 +56,9 @@ public class PotionHUD extends RenderMod {
                 } else if (potioneffect.getAmplifier() == 3) {
                     s1 = String.valueOf(String.valueOf(s1)) + " " + I18n.format("enchantment.level.4", new Object[0]);
                 }
-                drawString(s1, (getX() + 21), (getY() + i2 - 14), 16777215, true);
+                drawString(s1, (getX() + 21), (getY() + i2 - 14));
                 String s2 = Potion.getDurationString(potioneffect);
-                drawString(s2, (getX() + 21), (getY() + i2 + 10 - 14), 8355711, true);
+                drawString(s2, (getX() + 21), (getY() + i2 + 10 - 14));
                 i2 += l;
             }
         }

src/main/java/dev/resent/module/impl/hud/ReachDisplay.java

@@ -25,7 +25,7 @@ public class ReachDisplay extends RenderMod {
 
     @Override
     public void draw() {
-        drawString("[" + df2.format(range) + " Blocks]", this.x + 2, this.y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        drawString("[" + df2.format(range) + " Blocks]", this.x + 2, this.y + 2);
     }
 
     public void onAttack(Entity e) {

src/main/java/dev/resent/module/impl/misc/Sprint.java

@@ -53,7 +53,7 @@ public class Sprint extends RenderMod {
 
     @Override
     public void draw() {
-        if (drawn.getValue()) drawString(getText(), x + 2, y + 2, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
+        if (drawn.getValue()) drawString(getText(), x + 2, y + 2);
     }
 
     @Override

src/main/java/dev/resent/module/impl/misc/TabGui.java

@@ -1,223 +0,0 @@
-package dev.resent.module.impl.misc;
-
-import java.util.List;
-
-import dev.resent.annotation.RenderModule;
-import dev.resent.client.Resent;
-import dev.resent.module.base.Mod;
-import dev.resent.module.base.Mod.Category;
-import dev.resent.module.base.RenderMod;
-import dev.resent.module.base.setting.BooleanSetting;
-import dev.resent.module.base.setting.ModeSetting;
-import dev.resent.module.base.setting.NumberSetting;
-import dev.resent.module.base.setting.Setting;
-import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-
-@RenderModule(name = "TabGUI", category = Category.HUD, x = 30, y = 150)
-public class TabGui extends RenderMod {
-
-	public int current = 0;
-	public boolean expanded;
-
-	public int getWidth() {
-		return expanded ? 139 : 70;
-	}
-
-	public int getHeight() {
-		return Category.values().length * 16 + 4;
-	}
-
-	public void draw() {
-		FontRenderer fr = mc.fontRendererObj;
-
-		int primaryColor = 0xffff69b4, secondaryColor = 0xffff46b4;
-
-		Gui.drawRect(x+5.5, y+5.5f, x+70, y+5 + Mod.Category.values().length * 16 + 1.5, 0x90000000);
-		Gui.drawRect(x+5.5, y+5.5f + current * 16, x+70, y+13 + current * 16 + 7 + 2.5f, primaryColor);
-
-		int count = 0;
-		for (Category c : Mod.Category.values()) {
-			fr.drawStringWithShadow(c.name, x+11, y+10 + count * 16, -1);
-
-			count++;
-		}
-
-		if (expanded) {
-			Category category = Mod.Category.values()[current];
-			List<Mod> modules = Resent.INSTANCE.modManager.modsInCategory(category);
-
-			if (modules.size() == 0) {
-				return;
-			}
-
-			Gui.drawRect(x+70, y+5.5, x+138, y+5 + modules.size() * 16 + 1.5, 0x90000000);
-			Gui.drawRect(x+70, y+5.5 + category.i * 16, x+138, y+8 + category.i * 16 + 14.5F, primaryColor);
-
-			count = 0;
-			for (Mod m : modules) {
-				fr.drawStringWithShadow(m.getName(), x+73, y+10 + count * 16, -1);
-
-				if (count == category.i && m.expanded) {
-
-					int index = 0, maxLength = 0;
-					for (Setting setting : m.settings) {
-						if (setting instanceof BooleanSetting) {
-							BooleanSetting bool = (BooleanSetting) setting;
-							if (maxLength < fr
-									.getStringWidth(setting.name + ": " + (bool.getValue() ? "Enabled" : "Disabled"))) {
-								maxLength = fr.getStringWidth(
-										setting.name + ": " + (bool.getValue() ? "Enabled" : "Disabled"));
-							}
-						}
-
-						if (setting instanceof ModeSetting) {
-							ModeSetting mode = (ModeSetting) setting;
-							if (maxLength < fr.getStringWidth(setting.name + ": " + mode.getValue())) {
-								maxLength = fr.getStringWidth(setting.name + ": " + mode.getValue());
-							}
-						}
-
-						index++;
-					}
-
-					if (!m.settings.isEmpty()) {
-
-						Gui.drawRect(x+138, y+5.5, x+70 + 68 + maxLength + 9, y+5 + m.settings.size() * 16 + 1.5,
-								0x90000000);
-						Gui.drawRect(x+138, y+5.5 + m.index * 16, x+68 + maxLength + 79,
-								y+8 + m.index * 16 + 12 + 2.5f,
-								m.settings.get(m.index).focused ? secondaryColor : primaryColor); // 0xffff69b4);
-
-						index = 0;
-						for (Setting setting : m.settings) {
-							if (setting instanceof BooleanSetting) {
-								BooleanSetting bool = (BooleanSetting) setting;
-								fr.drawStringWithShadow(
-										setting.name + ": " + (bool.getValue() ? "Enabled" : "Disabled"), 141+x,
-										y+10 + index * 16, -1);
-							}
-
-							if (setting instanceof ModeSetting) {
-								ModeSetting mode = (ModeSetting) setting;
-								fr.drawStringWithShadow(setting.name + ": " + mode.getValue(), 141+x, y+10 + index * 16,
-										-1);
-							}
-
-							index++;
-						}
-					}
-				}
-
-				count++;
-			}
-
-		}
-	}
-
-	public void onKey(int code) {
-
-		Category category = Mod.Category.values()[current];
-		List<Mod> modules = Resent.INSTANCE.modManager.modsInCategory(category);
-
-		if (code == KeyboardConstants.KEY_UP) {
-			if (expanded) {
-				if (expanded && !modules.isEmpty() && modules.get(category.i).expanded) {
-					Mod module = modules.get(category.i);
-
-					if (!module.settings.isEmpty()) {
-							if (module.index <= 0) {
-								module.index = module.settings.size() - 1;
-							} else {
-								module.index--;
-							}
-					}
-				} else {
-					if (category.i <= 0) {
-						category.i = modules.size() - 1;
-					} else
-						category.i--;
-				}
-			} else if (current <= 0) {
-				current = Mod.Category.values().length - 1;
-			} else
-				current--;
-		}
-		if (code == KeyboardConstants.KEY_DOWN) {
-			if (expanded) {
-				if (expanded && !modules.isEmpty() && modules.get(category.i).expanded) {
-					Mod module = modules.get(category.i);
-
-					if (!module.settings.isEmpty()) {
-							if (module.index >= module.settings.size() - 1) {
-								module.index = 0;
-							} else {
-								module.index++;
-							}
-						}
-				} else {
-					if (category.i >= modules.size() - 1) {
-						category.i = 0;
-					} else {
-						category.i++;
-					}
-				}
-			} else if (current >= Mod.Category.values().length - 1) {
-				current = 0;
-			} else {
-				current++;
-			}
-		}
-
-		if (code == KeyboardConstants.KEY_RETURN) {
-			if (expanded && modules.size() != 0) {
-				Mod module = modules.get(category.i);
-				if (!module.expanded && !module.settings.isEmpty())
-					module.expanded = true;
-				else if (module.expanded && !module.settings.isEmpty()) {
-					module.settings.get(module.index).focused = !module.settings.get(module.index).focused;
-				}
-			}
-		}
-
-		if (code == KeyboardConstants.KEY_RIGHT) {
-			if (expanded && modules.size() != 0) {
-				Mod module = modules.get(category.i);
-
-				if (expanded && !modules.isEmpty() && module.expanded) {
-					if (!module.settings.isEmpty()) {
-						Setting setting = module.settings.get(module.index);
-
-						if (setting instanceof BooleanSetting) {
-							((BooleanSetting) setting).toggle();
-						}
-						if (setting instanceof ModeSetting) {
-							((ModeSetting) setting).cycle(true);
-						}
-					}
-
-				} else {
-					if (!module.getName().equals("TabGUI"))
-						module.toggle();
-				}
-			} else
-				expanded = true;
-			
-			mc.gameSettings.saveOptions();
-		}
-		if (code == KeyboardConstants.KEY_LEFT) {
-			if (expanded && !modules.isEmpty() && modules.get(category.i).expanded) {
-				Mod module = modules.get(category.i);
-
-				if (!module.settings.isEmpty()) {
-					if (module.settings.get(module.index).focused) {
-
-					} else
-						modules.get(category.i).expanded = false;
-				}
-			} else
-				expanded = false;
-		}
-	}
-}

src/main/java/dev/resent/visual/ui/Theme.java

@@ -11,69 +11,35 @@ import dev.resent.visual.ui.animation.impl.SmoothStepAnimation;
 
 public class Theme {
 
-    public static int getFontColor(int id) {
+    public static int getFontColor() {
-        return getFontColor(getFontId(), 255);
-    }
-
-    public static int getFontColor(int id, int opacity) {
-        switch (id) {
-            case 1:
-                return -1;
-            case 50:
-                return RenderUtils.getRainbow(4f, 0.8f, 0.85f);
-            case 6942069:
-                return 6942069;
-        }
-        return -1;
-    }
-
-    public static Animation getAnimation(int id, int ms, int endpoint, float easeAmount, float elasticity, float smooth, boolean moreElasticity) {
-        switch (getAnimationId()) {
-            case 1:
-                return new EaseBackIn(ms, endpoint, easeAmount);
-            case 2:
-                return new ElasticAnimation(ms, endpoint, elasticity, smooth, moreElasticity);
-            case 3:
-                return new EaseInOutQuad(ms, endpoint);
-            case 4:
-                return new DecelerateAnimation(ms, endpoint);
-            case 5:
-                return new SmoothStepAnimation(ms, endpoint);
-            case 0:
-            	return null;
-        }
-
-        return null;
-    }
-
-    public static int getFontId() {
         switch (HUD.fontTheme.getValue()) {
             case "Classic":
-                return 1;
+                return -1;
             case "Rainbow":
-                return 50;
+                return RenderUtils.getRainbow(4f, 0.8f, 0.85f);
             case "Chroma":
                 return 6942069;
         }
         return -1;
     }
 
-    public static int getAnimationId() {
+    public static Animation getAnimation(int ms, int endpoint, float easeAmount, float elasticity, float smooth, boolean moreElasticity) {
         switch (HUD.animationTheme.getValue()) {
             case "Ease back in":
-                return 1;
+                return new EaseBackIn(ms, endpoint, easeAmount);
             case "Elastic":
-                return 2;
+                return new ElasticAnimation(ms, endpoint, elasticity, smooth, moreElasticity);
             case "Ease in out quad":
-                return 3;
+                return new EaseInOutQuad(ms, endpoint);
             case "Decelerate":
-                return 4;
+                return new DecelerateAnimation(ms, endpoint);
             case "Smooth step":
-                return 5;
+                return new SmoothStepAnimation(ms, endpoint);
             case "None":
-            	return 0;
+            	return null;
         }
-        return -1;
+
+        return null;
     }
 
     public static boolean getRounded() {

src/main/java/dev/resent/visual/ui/clickgui/ClickGUI.java

@@ -68,7 +68,7 @@ public class ClickGUI extends GuiScreen {
         for (Mod m : Resent.INSTANCE.modManager.modsInCategory(selectedCategory) ) {
             int fh = 9;
 
-            if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.isHasSetting() && openedMod == null) {
+            if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.doesHaveSettinging() && openedMod == null) {
                 // Open settings
                 this.openedMod = m;
             } else if (isMouseInside(mouseX, mouseY, x - 9 + 2, height + 27 + 9 + 2, x - 9 + 6 + fr.getStringWidth("<"), height + 33 + 9 + 2 + fr.getStringWidth("<")) && mouseButton == 0) {
@@ -213,7 +213,7 @@ public class ClickGUI extends GuiScreen {
 	                    );
                     }
 
-                    if (m.isHasSetting()) {
+                    if (m.doesHaveSettinging()) {
                         GlStateManager.enableBlend();
                         this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear.png"));
                         Gui.drawModalRectWithCustomSizedTexture(this.x + 99 + xo, height - 2 - fh * -(off) + 51 + 1 - offset, 0, 0, 8, 8, 8, 8);
@@ -301,7 +301,7 @@ public class ClickGUI extends GuiScreen {
     @Override
     public void initGui() {
         mc.gameSettings.loadOptions();
-        introAnimation = Theme.getAnimation(Theme.getAnimationId(), 500, 1, 3, 3.8f, 1.35f, false);
+        introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false);
     }
 
     @Override

src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java

@@ -86,7 +86,7 @@ public class ClickGuiRewrite extends GuiScreen{
         y = sr.getScaledHeight()/4;
         width = x + sr.getScaledWidth()/2;
         height = y + sr.getScaledHeight()/2;
-        introAnimation = Theme.getAnimation(Theme.getAnimationId(), 500, 1, 3, 3.8f, 1.35f, false);
+        introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false);
     }
 
     @Override

src/main/java/net/minecraft/client/Minecraft.java

@@ -1359,8 +1359,6 @@ public class Minecraft implements IThreadListener {
                             this.displayInGameMenu();
                         }
 
-                        ModManager.tabGui.onKey(k);
-
 						if(k == this.gameSettings.keyBindClickGui.getKeyCode()){
 							this.displayGuiScreen(new PreGUI());
 						}

src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java

@@ -64,7 +64,7 @@ public class GuiInventory extends InventoryEffectRenderer {
      */
     public void initGui() {
         this.buttonList.clear();
-        openAnim = Theme.getAnimation(Theme.getAnimationId(), 450, 1, 2, 3.8f, 1.35f, false);
+        openAnim = Theme.getAnimation(450, 1, 2, 3.8f, 1.35f, false);
         if (this.mc.playerController.isInCreativeMode()) {
             this.mc.displayGuiScreen(new GuiContainerCreative(this.mc.thePlayer));
         } else {