diff --git a/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java b/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java index db79001..98194e4 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java @@ -305,7 +305,7 @@ public class CosmeticsGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35); scrollHelper.setMaxScroll(height - 25); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_SCISSOR_TEST); ScaledResolution r = new ScaledResolution(mc); diff --git a/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java b/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java index 0453a2e..42c8f2c 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java @@ -14,7 +14,6 @@ import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; @@ -73,7 +72,7 @@ public class OutfitsGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85); scrollHelper.setMaxScroll(height - 20); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); scrollHelper.setFlag(true); float scrollY = scrollHelper.getScroll(); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); diff --git a/src/main/java/net/silentclient/client/emotes/EmotesMod.java b/src/main/java/net/silentclient/client/emotes/EmotesMod.java index d0dd8d4..5779bd0 100644 --- a/src/main/java/net/silentclient/client/emotes/EmotesMod.java +++ b/src/main/java/net/silentclient/client/emotes/EmotesMod.java @@ -11,7 +11,7 @@ import java.util.ArrayList; public class EmotesMod extends Mod { public EmotesMod() { - super("Emotes", ModCategory.SETTINGS, null); + super("Emotes", ModCategory.SETTINGS, "silentclient/icons/settings/emotes.png"); } @Override diff --git a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java index 3a104fd..8b0be34 100644 --- a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java +++ b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java @@ -14,7 +14,6 @@ import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; @@ -52,7 +51,7 @@ public class EmoteMenuGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((float) Math.ceil((Client.getInstance().getCosmetics().getMyEmotes().size() + 3) / 3) * 85); scrollHelper.setMaxScroll(height - 20); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); scrollHelper.setFlag(true); float scrollY = scrollHelper.getScroll(); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); diff --git a/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java b/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java index 34e2e93..c62b097 100644 --- a/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java +++ b/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java @@ -20,7 +20,6 @@ import net.silentclient.client.gui.minecraft.GuiConnecting; import net.silentclient.client.gui.multiplayer.components.ServerComponent; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.mixin.ducks.ServerListExt; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; import org.lwjgl.opengl.GL11; @@ -143,7 +142,7 @@ public class SilentMultiplayerGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight(servers.size() * 38); scrollHelper.setMaxScroll(blockHeight - 43 - 41); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); float serverY = blockY + 43 + scrollHelper.getScroll(); trimContentStart(); int serverIndex = -1; diff --git a/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java b/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java index ac4df4f..6e945a3 100644 --- a/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java +++ b/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java @@ -18,7 +18,6 @@ import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.*; import org.apache.commons.io.FilenameUtils; import org.lwjgl.Sys; @@ -126,7 +125,7 @@ public class SilentResourcePacksGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight(availableResourcePacks.size() * 37 + 19); scrollHelper.setMaxScroll(blockHeight - 45); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { scrollHelper.setFlag(true); @@ -208,7 +207,8 @@ public class SilentResourcePacksGui extends SilentScreen { scrollHelper2.setStep(5); scrollHelper2.setElementsHeight(selectedResourcePacks.size() * 37 + 19); scrollHelper2.setMaxScroll(blockHeight - 45); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); + if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { scrollHelper2.setFlag(true); } else { diff --git a/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java b/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java index 871f52a..d9a9a88 100644 --- a/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java +++ b/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java @@ -43,7 +43,6 @@ public class GeneralMod extends Mod { this.addBooleanSetting("Menu Animations", this, true); this.addSliderSetting("Menu Animations Speed", this, 300, 100, 500, true); this.addBooleanSetting("Disable Scroll Wheel", this, false); - this.addSliderSetting("Scroll Speed", this, 150, 100, 1000, true); } @Override diff --git a/src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png b/src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png new file mode 100644 index 0000000..160357a Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png differ