From b7a002cae386d78083d129b09f645414ddcd2ccf Mon Sep 17 00:00:00 2001 From: ThisIsALegitUsername Date: Wed, 8 Feb 2023 21:26:36 +0000 Subject: [PATCH] Remove hotbar animations --- .../dev/resent/module/base/ModManager.java | 3 --- .../java/dev/resent/module/impl/misc/HUD.java | 4 ++-- .../module/impl/misc/HotbarAnimation.java | 22 ------------------- .../net/minecraft/client/gui/GuiIngame.java | 10 +-------- 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java diff --git a/src/main/java/dev/resent/module/base/ModManager.java b/src/main/java/dev/resent/module/base/ModManager.java index 867786de..25876acd 100644 --- a/src/main/java/dev/resent/module/base/ModManager.java +++ b/src/main/java/dev/resent/module/base/ModManager.java @@ -28,7 +28,6 @@ import dev.resent.module.impl.misc.DynamicFOV; import dev.resent.module.impl.misc.FPSB; import dev.resent.module.impl.misc.Fullbright; import dev.resent.module.impl.misc.HUD; -import dev.resent.module.impl.misc.HotbarAnimation; import dev.resent.module.impl.misc.MinimalViewBobbing; import dev.resent.module.impl.misc.NoParticles; import dev.resent.module.impl.misc.NoRain; @@ -50,7 +49,6 @@ public class ModManager { public static NoRain noRain = new NoRain(); public static DynamicFOV dynamicFOV = new DynamicFOV(); public static PotionHUD potionHud; - public static HotbarAnimation hotbar = new HotbarAnimation(); //public static NoHurtCam noHurtCam = new NoHurtCam(); public static Info coordinate; public static FPS fps; @@ -81,7 +79,6 @@ public class ModManager { //Hud register(cosmetics); register(tabGui); - register(hotbar); register(crystalOptimizer); register(hud = new HUD()); register(ping = new Ping()); diff --git a/src/main/java/dev/resent/module/impl/misc/HUD.java b/src/main/java/dev/resent/module/impl/misc/HUD.java index 75495356..1bd8209e 100644 --- a/src/main/java/dev/resent/module/impl/misc/HUD.java +++ b/src/main/java/dev/resent/module/impl/misc/HUD.java @@ -8,10 +8,10 @@ import dev.resent.module.setting.ModeSetting; @Module(name = "Theme", category = Category.MISC, hasSetting = true) public class HUD extends Mod{ - public HUD(){ addSetting(fontTheme, rectTheme, animationTheme, tshadow, round); } + public HUD(){ addSetting(fontTheme, animationTheme, tshadow, round); } public static final ModeSetting fontTheme = new ModeSetting("Font", "", "Classic", "Rainbow", "Chroma"); - public static final ModeSetting rectTheme = new ModeSetting("Rectangle", "", "Classic", "Astolfo"); + //public static final ModeSetting rectTheme = new ModeSetting("Rectangle", "", "Classic", "Astolfo"); public static final BooleanSetting round = new BooleanSetting("Rounded", "", true); public static final BooleanSetting tshadow = new BooleanSetting("Text Shadow", "", true); public static final ModeSetting animationTheme = new ModeSetting("Animation", "", "Ease back in", "Ease in out quad", "Elastic", "Smooth step", "Decelerate"); diff --git a/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java b/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java deleted file mode 100644 index 0df386e1..00000000 --- a/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java +++ /dev/null @@ -1,22 +0,0 @@ -package dev.resent.module.impl.misc; - -import dev.resent.annotation.Module; -import dev.resent.module.base.Mod.Category; -import dev.resent.module.base.Mod; -import dev.resent.module.setting.ModeSetting; - -@Module(name = "Hotbar", category = Category.MISC, hasSetting = true) -public class HotbarAnimation extends Mod{ - - public HotbarAnimation(){ addSetting(speed); } - - public static ModeSetting speed = new ModeSetting("Speed", "", "Slow", "Fast", "Normal"); - - public int getSpeed(){ - if(speed.getValue() == "Fast") - return 20; - if(speed.getValue() == "Slow") - return 5; - return 12; - } -} diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java index fcaff69c..9cf1c467 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java @@ -355,16 +355,8 @@ public class GuiIngame extends Gui { float f = this.zLevel; this.zLevel = -90.0F; - simpleAnimation.setAnimation(entityplayer.inventory.currentItem * 20, ModManager.hotbar.getSpeed()); int itemX = i - 90 + ((int) simpleAnimation.getValue()); - - if(!ModManager.hotbar.isEnabled()){ - this.drawTexturedModalRect(i - 91, sr.getScaledHeight() - 22, 0, 0, 182, 22); - this.drawTexturedModalRect(i - 91 - 1 + entityplayer.inventory.currentItem * 20, - sr.getScaledHeight() - 22 - 1, 0, 22, 24, 22); - }else { - drawRect(itemX, sr.getScaledHeight() - 21, itemX + 24, sr.getScaledHeight(), new Color(230, 230, 230, 180).getRGB()); - } + drawRect(itemX, sr.getScaledHeight() - 21, itemX + 24, sr.getScaledHeight(), new Color(230, 230, 230, 180).getRGB()); this.zLevel = f;